gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Mon Mar 12 18:22:19 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/363b259b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2391db37 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4a8c2645 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8c9855a6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3ccebde8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fc5dd9d2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/21c52199 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/daca1312 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fd0ba2c7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dc391105 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fdfa6f52 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d61cd79a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/df26146d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/867fdce4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/10b7cbc2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c9f3c076 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fbb172d0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c3180ab3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/79dd7d69 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6ee1c71d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6a1af638 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/25883b17 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/563d7161 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b577a7da (commit)
	 via  https://github.com/Gnucash/gnucash/commit/751a3fec (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e71f5612 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6fe7d885 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/89c1534d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1449d4ca (commit)
	 via  https://github.com/Gnucash/gnucash/commit/612cb5c6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/59ae8571 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6cbf5dbb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/95329f23 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6f587f8c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/edd89aaf (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3fce50a2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f8fd9dd2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e766c71a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2acb6da2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5520fae8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/36d72965 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/25585de0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/25fc4d9b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d95eb0f7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6457b2eb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/30fb1dc4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ddba926e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e2d69b17 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8a338641 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/41d79f4e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/21ea6d56 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/22517f98 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/41322ec3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/551e9843 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/580ce72d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fc5bdfa1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a72e0bdd (commit)
	 via  https://github.com/Gnucash/gnucash/commit/51e25112 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/18f0d053 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/33508248 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2d983c67 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e4884cdf (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cf73c93b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/13e6880b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a64e40da (commit)
	 via  https://github.com/Gnucash/gnucash/commit/546b54c9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cb18d3ca (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4f98391a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/51768500 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dd0553af (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8fef1adc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/93f89207 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7054cc83 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/872aa6b7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/90fb712c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/840e1f8b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7ef8e6d4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d8d552ee (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7da9a3ba (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8353b569 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ad166460 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b71c346e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/66abe023 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fbaa41ac (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c1866241 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f111e595 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c29b9c9c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e7ec3a61 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/02c69a79 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ba799feb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3462abe7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/72a48c08 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cd30578b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f95ae1a9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4a6f0223 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e8363e29 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/839ba137 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ff0f4ac8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/06ad55ca (commit)



commit 363b259bd59c8fd4ae9ad9a28e0a9765c69af920
Merge: 06ad55c 2391db3
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Mar 12 15:21:56 2018 -0700

    Merge branch 'unstable'


commit 2391db37c102cfa1b1bc29e8f827d228c1c4f0d2
Author: Di Mang <DiMan at users.noreply.github.com>
Date:   Mon Mar 12 22:10:39 2018 +0100

    Update GC version and date.

diff --git a/NEWS b/NEWS
index 9cbbe3e..946755c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 Version history:
 ------- -------
-2.7.5 - 11 March 2018
+2.7.6 - 12 March 2018
 
     The Gnucash Development Team is pleased to release Gnucash 2.7.6,
     the seventh release of an unstable series leading to Gnucash 3.0.

commit 4a8c2645b4a926110024c458f700395a8b0f4882
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 11 10:38:14 2018 -0700

    Release 2.7.6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec7081..370a6d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,14 +13,14 @@ ENABLE_TESTING()
 # Version number of gnucash
 SET (GNUCASH_MAJOR_VERSION 2)
 SET (GNUCASH_MINOR_VERSION 7)
-SET (GNUCASH_MICRO_VERSION 5)
+SET (GNUCASH_MICRO_VERSION 6)
 SET (GNUCASH_NANO_VERSION 0)
 SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}.${GNUCASH_MICRO_VERSION}")
 SET (GNUCASH_LATEST_STABLE_SERIES 2.6)
 
 SET (PACKAGE gnucash)
 SET (PACKAGE_NAME GnuCash)
-SET (PACKAGE_VERSION 2.7.5)
+SET (PACKAGE_VERSION 2.7.6)
 SET (PACKAGE_BUGREPORT gnucash-devel at gnucash.org)
 SET (PACKAGE_TARNAME ${PACKAGE})
 SET (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
diff --git a/NEWS b/NEWS
index b2e778c..9cbbe3e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,129 @@
 Version history:
 ------- -------
+2.7.5 - 11 March 2018
+
+    The Gnucash Development Team is pleased to release Gnucash 2.7.6,
+    the seventh release of an unstable series leading to Gnucash 3.0.
+
+    Notice that we've decided that beginning with the upcoming major
+    release we will use two-digit release numbers and that the next
+    stable release will be 3.0. Mainenance releases will be 3.1, 3.2,
+    etc. The next unstable release will be 3.900 and will lead to 4.0.
+
+    This release is UNSTABLE and SHOULD NOT BE USED in production.
+    See the KNOWN PROBLEMS list at the bottom of the announcement.
+
+    This release changes file locations, binding APIs, report options,
+    and can make your data file no longer compatible with previous
+    versions. See https://wiki.gnucash.org/wiki/UpdateNotes for
+    details.
+
+New Features For Users:
+    Modernise chart colours from the dated CSS defaults to
+        modern colours as suggested by http://clrs.cc/.
+    Add "Subtotal Summary Grid" to the Transaction Report.
+        The subtotal summary-grid will tabulate subtotals - prime-sortkey
+        vertically, sec-sortkey horizontally. This will be useful, for
+        example, with prime-sortkey = accounts, sec-sortkey = date,
+        sec-subtotal = monthly... will produce a monthly time series
+        spreadsheet.
+
+For Developers and Distro packagers:
+    Rework source directory structure for gschema, gtkbuilder and ui files.
+        There is now a directory for each respective file type directly in
+        <srcdir>/gnucash as was already the case for gschema files.
+        In principle all files of each type should go into these global
+        directories. The only exception is if such a file belongs
+        to an optional module. In that case the file remains located inside
+        that module's directory. Currently we have ui, glade and gschema file
+        exceptions in aqb and ofx importers.
+    Drop intltool in favour or using modern gettext.
+        By default we require gettext 0.19.6 as this is needed to generate a
+        translated version of gnucash.desktop and gnucash.appdata.xml.
+        For platforms where this isn't available, setting ALLOW_OLD_GETTEXT=ON
+        will allow building but some strings will not be extracted to
+        gnucash.pot
+    Pass GTEST_ROOT and GMOCK_ROOT through to distcheck.
+        So that they don't have to be exported in the environment if they're
+        needed.
+The following bugs are fixed only in unstable/master:
+    Bug 764245 - multi-column reports include incorrect sub-reports
+    Bug 793460 - gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1941
+                 is impossible to translate.
+    Bug 793467 - GnuCash crashes when trying to open a binary file
+                 instead of a CSV.
+    Bug 793699 - start_spath could be used uninitialised.
+    Bug 793900 - 2.7.5: test failure: 105 - python-bindings.
+    Bug 793941 - 2.7.4: test failure on i686: 59 - test-gnc-timezone
+                 Don't test before 1916, that's not a common GnuCash use-case.
+    Bug 793947 - Impossible to render printable invoice
+    Bug 794031 - The checkbox "Placeholder" cann't be changed in dialog
+                 "Setup selected accounts". Enable placeholder toggle and
+                 provide callback. The text for this account tree view
+                 specifies "If you would like an account to be a placeholder
+                  account, click the checkbox for that account." but they were
+                  not enabled and no call back was defined so enabled the
+                  toggle button and provide callback.
+    Bug 794083 - gnucash-2.7.5: cmake+make build installs Makefile.
+    Bug 794137 - 2.7.5: test failure: 60 - test-gnc-numeric.
+                 Fixed by overloading operator<<(std::ostream&, GncNumeric) to
+                 call operator<<(std::wostream&, GncNumeric) and convert the
+                 result to utf8.
+Other repairs not marked as bugs in git:
+    Csv imp settings - internalize prefix handling
+        This information is not relevant outside of the settings code.
+        The way it's implemented now each settings module defines its
+        own unique prefix and the generic code can just use it when
+        needed.
+    Csv import - improve memory handling in the assistant class.
+        Make it more RAII, in that whatever the class allocates, it should
+        also deallocate. This simplifies a couple of memory handling cases.
+        The only exception is the generic import matcher that for some reason
+        has chosen to deallocate itself. To be fixed when more importers are
+        converted to c++
+    Add some background info on memory management in CSV importers.
+        As the assistant code combines multiple memory management models care
+        should be taken not to mix them up. The notes should give some
+        insights in how to do this.
+        Also fix a few minor issues
+        - delete default copy and move constructor/assignment for the
+          assistant gui class
+        - nullify a freed pointer
+    Lots of transient parent warnings fixed.
+    Fix Segmentation fault when going to File->New.
+        When selecting the File->New with existing register pages open a crash
+        can happen as the register pages get closed forcing a page-changed
+        signal to queue the page focus function when there is no page. Add a
+        call to remove the page focus function in the ..destroy_widget function.
+        Also with the addition of g_idle_remove before the add when page-changed
+        is emitted the page focus function only gets run once.
+    Speed up GUID equality comparison.
+    Fix CPack package version number.
+        Currently running "ninja-build package" produces a file with an
+        incorrect version number. This patch passes the CMake version
+        variables into CPack to get the correct filename. Note, however, that
+        there's more work to do to get CPack to actually be useful and the
+        current CPack settings may be removed unless that other work is done.
+    Add spacing between border and text in dialog "New Accounts Hierarchy
+        Setup".
+    With register obscured the sheet kept being redrawn
+        When the register is obscured by another window, the sheet would get
+        lot of draw events. This was tracked down to getting the foreground
+        colour for the item-edit widget for the state GTK_STATE_FLAG_NORMAL.
+        Changed this to use the value obtained from gtk_widget_get_state_flags.
+    Use the gnc_prefs_get_bool values to update cache values.
+        This way is a safer way to update the cache values in case the settings
+        changed signal fails to trigger or there is a double trigger and the
+        cached value gets out of sync with the preference value.
+
+Updated Translations: German, Norwegian, Spanish
+
+KNOWN PROBLEMS:
+
+    Bug 789594 - Unable to overwrite splite3 database file
+    Bug 791823 - There is no Gtk3 theme-setting tool for Windows.
+    Bug 791825 - Accounting period dates off-by-1
+
 2.7.5 - 25 February 2018
 
     The Gnucash Development Team is pleased to release Gnucash 2.7.5,

commit 8c9855a6bb226e612993e4fc5ea37b0a652f78a6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Mar 11 10:38:05 2018 -0700

    Pass GTEST_ROOT and GMOCK_ROOT through to distcheck.
    
    So that they don't have to be exported in the environment if they're needed.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbf92a5..0ec7081 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -847,6 +847,8 @@ ADD_CUSTOM_TARGET(distcheck DEPENDS dist
             -D PACKAGE_PREFIX=${PACKAGE_PREFIX}
             -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
             -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+            -D GTEST_ROOT=${GTEST_ROOT}
+            -D GMOCK_ROOT=${GMOCK_ROOT}
             -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
         )
 
diff --git a/common/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake
index 100ff4f..606915f 100644
--- a/common/cmake_modules/MakeDistCheck.cmake
+++ b/common/cmake_modules/MakeDistCheck.cmake
@@ -50,6 +50,8 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
               -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
               -D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
               -D CMAKE_INSTALL_PREFIX=../${INSTALL_DIR}
+              -D GTEST_ROOT=${GTEST_ROOT}
+              -D GMOCK_ROOT=${GMOCK_ROOT}
               ../${PACKAGE_PREFIX}
             WORKING_DIRECTORY ${BUILD_DIR}
             ERROR_MSG "CMake configure command failed."

commit 3ccebde831500fb8cf42b9774a323ffb3b9b9c48
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 10 15:56:00 2018 -0800

    Update the Spanish translation from the Translation Project.

diff --git a/po/es.po b/po/es.po
index 2d463e7..aa7944c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,5 +1,5 @@
-# translation of gnucash-2.7.4 to Spanish
-# Copyright (c) 2002 - 2017 Free Software Foundation, Inc.
+# translation of gnucash-2.7.5 to Spanish
+# Copyright (c) 2002 - 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnucash package.
 # Juan Manuel García Molina <juanmagm at mail.com>, 2000.
 # Raúl Miró <cotin at geocities.com>, 2001.
@@ -7,10 +7,10 @@
 # Francisco Javier Serrador <fserrador at gmail.com>, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnucash 2.7.4\n"
+"Project-Id-Version: gnucash 2.7.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-03 08:50-0800\n"
-"PO-Revision-Date: 2018-02-24 19:38+0100\n"
+"POT-Creation-Date: 2018-02-24 15:43-0800\n"
+"PO-Revision-Date: 2018-03-01 17:38+0100\n"
 "Last-Translator: Francisco Javier Serrador <fserrador at gmail.com>\n"
 "Language-Team: Spanish <es at tp.org.es>\n"
 "Language: es\n"
@@ -138,8 +138,8 @@ msgstr "Occidental"
 #: ../borrowed/goffice/go-charmap-sel.c:84
 #: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:60
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:27
-#: ../gnucash/report/standard-reports/account-piecharts.scm:532
-#: ../gnucash/report/standard-reports/category-barchart.scm:597
+#: ../gnucash/report/standard-reports/account-piecharts.scm:530
+#: ../gnucash/report/standard-reports/category-barchart.scm:595
 msgid "Other"
 msgstr "Otros"
 
@@ -381,7 +381,7 @@ msgstr "Rumano (ISO-8859-16)"
 
 #: ../borrowed/goffice/go-charmap-sel.c:199
 msgid "South European (ISO-8859-3)"
-msgstr "Sur europeo (ISO-8859-3)"
+msgstr "Europeo sur (ISO-8859-3)"
 
 #: ../borrowed/goffice/go-charmap-sel.c:201
 msgid "Thai (TIS-620)"
@@ -601,7 +601,7 @@ msgstr "Contenedor"
 #: ../gnucash/gnome/assistant-hierarchy.c:1008
 #: ../gnucash/gnome-utils/dialog-account.c:306
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:64
-#: ../libgnucash/app-utils/gnc-ui-util.c:928
+#: ../libgnucash/app-utils/gnc-ui-util.c:934
 msgid "Opening Balance"
 msgstr "Saldo de Apertura"
 
@@ -710,41 +710,36 @@ msgstr "Opción de Devolución de Préstamo: «%s»"
 #: ../gnucash/import-export/qif-imp/assistant-qif-import.c:3553
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:62
 #: ../gnucash/register/ledger-core/split-register-model.c:224
-#: ../gnucash/report/business-reports/customer-summary.scm:71
-#: ../gnucash/report/business-reports/easy-invoice.scm:110
-#: ../gnucash/report/business-reports/easy-invoice.scm:249
-#: ../gnucash/report/business-reports/easy-invoice.scm:785
-#: ../gnucash/report/business-reports/fancy-invoice.scm:128
-#: ../gnucash/report/business-reports/fancy-invoice.scm:259
-#: ../gnucash/report/business-reports/invoice.scm:104
-#: ../gnucash/report/business-reports/invoice.scm:244
-#: ../gnucash/report/business-reports/invoice.scm:716
-#: ../gnucash/report/business-reports/job-report.scm:43
+#: ../gnucash/report/business-reports/customer-summary.scm:70
+#: ../gnucash/report/business-reports/easy-invoice.scm:109
+#: ../gnucash/report/business-reports/easy-invoice.scm:248
+#: ../gnucash/report/business-reports/easy-invoice.scm:784
+#: ../gnucash/report/business-reports/fancy-invoice.scm:127
+#: ../gnucash/report/business-reports/fancy-invoice.scm:258
+#: ../gnucash/report/business-reports/invoice.scm:103
+#: ../gnucash/report/business-reports/invoice.scm:243
+#: ../gnucash/report/business-reports/invoice.scm:715
+#: ../gnucash/report/business-reports/job-report.scm:42
 #: ../gnucash/report/business-reports/owner-report.scm:51
 #: ../gnucash/report/business-reports/receipt.eguile.scm:163
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:296
 #: ../gnucash/report/standard-reports/account-summary.scm:72
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:68
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:356
-#: ../gnucash/report/standard-reports/category-barchart.scm:739
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:66
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:355
+#: ../gnucash/report/standard-reports/category-barchart.scm:737
 #: ../gnucash/report/standard-reports/general-journal.scm:107
 #: ../gnucash/report/standard-reports/general-ledger.scm:76
 #: ../gnucash/report/standard-reports/general-ledger.scm:97
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:408
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:454
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:819
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:870
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1064
-#: ../gnucash/report/standard-reports/net-barchart.scm:427
-#: ../gnucash/report/standard-reports/net-linechart.scm:481
-#: ../gnucash/report/standard-reports/portfolio.scm:53
+#: ../gnucash/report/standard-reports/net-barchart.scm:426
+#: ../gnucash/report/standard-reports/net-linechart.scm:480
+#: ../gnucash/report/standard-reports/portfolio.scm:51
 #: ../gnucash/report/standard-reports/register.scm:140
 #: ../gnucash/report/standard-reports/register.scm:410
 #: ../gnucash/report/standard-reports/register.scm:812
-#: ../gnucash/report/standard-reports/transaction.scm:160
-#: ../gnucash/report/standard-reports/transaction.scm:788
-#: ../gnucash/report/standard-reports/transaction.scm:895
-#: ../gnucash/report/standard-reports/transaction.scm:964
+#: ../gnucash/report/standard-reports/transaction.scm:153
+#: ../gnucash/report/standard-reports/transaction.scm:790
+#: ../gnucash/report/standard-reports/transaction.scm:908
+#: ../gnucash/report/standard-reports/transaction.scm:977
 msgid "Date"
 msgstr "Fecha"
 
@@ -766,8 +761,8 @@ msgstr "Fecha"
 #: ../gnucash/register/ledger-core/split-register.c:2534
 #: ../gnucash/register/ledger-core/split-register.c:2539
 #: ../gnucash/register/ledger-core/split-register.c:2550
+#: ../gnucash/report/business-reports/customer-summary.scm:228
 #: ../gnucash/report/business-reports/customer-summary.scm:229
-#: ../gnucash/report/business-reports/customer-summary.scm:230
 #: ../gnucash/report/business-reports/owner-report.scm:369
 #: ../libgnucash/app-utils/prefs.scm:66 ../libgnucash/app-utils/prefs.scm:74
 #: ../libgnucash/app-utils/prefs.scm:92 ../libgnucash/engine/gncOwner.c:789
@@ -789,7 +784,7 @@ msgstr "Principal"
 #: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2910
 #: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2919
 #: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2946
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:39
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:40
 #: ../gnucash/register/ledger-core/split-register.c:2488
 #: ../gnucash/register/ledger-core/split-register.c:2525
 #: ../gnucash/register/ledger-core/split-register.c:2533
@@ -827,25 +822,24 @@ msgstr "Error al añadir precio."
 #: ../gnucash/import-export/import-match-picker.c:392
 #: ../gnucash/import-export/qif-imp/dialog-account-picker.c:368
 #: ../gnucash/register/ledger-core/split-register-model.c:333
-#: ../gnucash/report/business-reports/job-report.scm:39
+#: ../gnucash/report/business-reports/job-report.scm:38
 #: ../gnucash/report/business-reports/owner-report.scm:49
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1044
-#: ../gnucash/report/standard-reports/budget-flow.scm:44
-#: ../gnucash/report/standard-reports/budget.scm:52
-#: ../gnucash/report/standard-reports/cash-flow.scm:51
+#: ../gnucash/report/standard-reports/budget-flow.scm:42
+#: ../gnucash/report/standard-reports/budget.scm:51
+#: ../gnucash/report/standard-reports/cash-flow.scm:50
 #: ../gnucash/report/standard-reports/general-journal.scm:112
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:477
-#: ../gnucash/report/standard-reports/portfolio.scm:255
+#: ../gnucash/report/standard-reports/portfolio.scm:253
 #: ../gnucash/report/standard-reports/register.scm:153
 #: ../gnucash/report/standard-reports/register.scm:435
-#: ../gnucash/report/standard-reports/transaction.scm:1023
+#: ../gnucash/report/standard-reports/transaction.scm:1035
 msgid "Account"
 msgstr "Cuenta"
 
 #: ../gnucash/gnome/assistant-stock-split.c:584
 #: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:390
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1056
-#: ../gnucash/report/standard-reports/portfolio.scm:256
+#: ../gnucash/report/standard-reports/portfolio.scm:254
 msgid "Symbol"
 msgstr "Símbolo"
 
@@ -859,9 +853,9 @@ msgstr "Símbolo"
 #: ../gnucash/report/standard-reports/general-ledger.scm:108
 #: ../gnucash/report/standard-reports/register.scm:156
 #: ../gnucash/report/standard-reports/register.scm:440
-#: ../gnucash/report/standard-reports/transaction.scm:801
-#: ../gnucash/report/standard-reports/transaction.scm:904
-#: ../gnucash/report/standard-reports/transaction.scm:1041
+#: ../gnucash/report/standard-reports/transaction.scm:803
+#: ../gnucash/report/standard-reports/transaction.scm:917
+#: ../gnucash/report/standard-reports/transaction.scm:1053
 msgid "Shares"
 msgstr "Mercancías"
 
@@ -890,11 +884,11 @@ msgstr "Editar..."
 #: ../gnucash/gnome-search/dialog-search.c:1090
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3065
 #: ../gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade.h:6
-#: ../gnucash/report/business-reports/customer-summary.scm:520
-#: ../gnucash/report/business-reports/easy-invoice.scm:701
-#: ../gnucash/report/business-reports/fancy-invoice.scm:787
-#: ../gnucash/report/business-reports/invoice.scm:671
-#: ../gnucash/report/business-reports/job-report.scm:425
+#: ../gnucash/report/business-reports/customer-summary.scm:519
+#: ../gnucash/report/business-reports/easy-invoice.scm:700
+#: ../gnucash/report/business-reports/fancy-invoice.scm:786
+#: ../gnucash/report/business-reports/invoice.scm:670
+#: ../gnucash/report/business-reports/job-report.scm:424
 #: ../libgnucash/app-utils/prefs.scm:91 ../libgnucash/engine/gncInvoice.c:984
 msgid "Bill"
 msgstr "Recibo"
@@ -916,12 +910,12 @@ msgstr "Comprobante"
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3140
 #: ../gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade.h:8
 #: ../gnucash/register/ledger-core/split-register.c:2538
-#: ../gnucash/report/business-reports/customer-summary.scm:516
-#: ../gnucash/report/business-reports/easy-invoice.scm:683
-#: ../gnucash/report/business-reports/fancy-invoice.scm:769
-#: ../gnucash/report/business-reports/invoice.scm:650
-#: ../gnucash/report/business-reports/job-report.scm:417
-#: ../gnucash/report/business-reports/job-report.scm:421
+#: ../gnucash/report/business-reports/customer-summary.scm:515
+#: ../gnucash/report/business-reports/easy-invoice.scm:682
+#: ../gnucash/report/business-reports/fancy-invoice.scm:768
+#: ../gnucash/report/business-reports/invoice.scm:649
+#: ../gnucash/report/business-reports/job-report.scm:416
+#: ../gnucash/report/business-reports/job-report.scm:420
 #: ../gnucash/report/business-reports/receipt.eguile.scm:109
 #: ../gnucash/report/business-reports/receipt.scm:163
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:130
@@ -937,17 +931,11 @@ msgstr "Factura"
 #: ../gnucash/import-export/csv-imp/gnc-price-props.cpp:46
 #: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:50
 #: ../gnucash/import-export/import-pending-matches.c:192
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:770
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:807
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:858
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:916
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1742
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1751
-#: ../gnucash/report/standard-reports/transaction.scm:241
-#: ../gnucash/report/standard-reports/transaction.scm:265
-#: ../gnucash/report/standard-reports/transaction.scm:302
-#: ../gnucash/report/standard-reports/transaction.scm:367
-#: ../gnucash/report/standard-reports/transaction.scm:866
+#: ../gnucash/report/standard-reports/transaction.scm:234
+#: ../gnucash/report/standard-reports/transaction.scm:258
+#: ../gnucash/report/standard-reports/transaction.scm:295
+#: ../gnucash/report/standard-reports/transaction.scm:360
+#: ../gnucash/report/standard-reports/transaction.scm:868
 #: ../libgnucash/engine/Recurrence.c:485 ../libgnucash/engine/Recurrence.c:673
 msgid "None"
 msgstr "Ninguna"
@@ -1012,7 +1000,7 @@ msgstr "Debe proporcionar un nombre único para esta Condición de Recibiente. S
 #: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:8
 #: ../gnucash/gnome-utils/gnc-date-delta.c:222
 #: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:92
-#: ../gnucash/report/standard-reports/price-scatter.scm:230
+#: ../gnucash/report/standard-reports/price-scatter.scm:228
 msgid "Days"
 msgstr "Días"
 
@@ -1025,11 +1013,11 @@ msgstr "Próximo"
 #: ../gnucash/gnome/dialog-trans-assoc.c:362
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:655
 #: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:5
-#: ../gnucash/report/business-reports/customer-summary.scm:231
-#: ../gnucash/report/business-reports/job-report.scm:255
+#: ../gnucash/report/business-reports/customer-summary.scm:230
+#: ../gnucash/report/business-reports/job-report.scm:254
 #: ../gnucash/report/business-reports/owner-report.scm:365
 #: ../gnucash/report/business-reports/owner-report.scm:370
-#: ../gnucash/report/standard-reports/transaction.scm:181
+#: ../gnucash/report/standard-reports/transaction.scm:174
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1073,7 +1061,7 @@ msgstr "¿Eliminar mercancía?"
 #: ../gnucash/gnome/dialog-price-edit-db.c:202
 #: ../gnucash/gnome/dialog-tax-info.c:1140
 #: ../gnucash/gnome/gnc-plugin-budget.c:328
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1540
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1541
 #: ../gnucash/gnome/gnc-plugin-page-invoice.c:157
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:1145
 #: ../gnucash/gnome/gnc-plugin-page-register2.c:1626
@@ -1137,7 +1125,7 @@ msgstr "¿Eliminar mercancía?"
 #: ../gnucash/import-export/qif-imp/dialog-account-picker.glade.h:13
 #: ../gnucash/register/ledger-core/gncEntryLedger.c:918
 #: ../gnucash/register/ledger-core/gncEntryLedgerControl.c:897
-#: ../gnucash/register/ledger-core/split-register-control.c:1559
+#: ../gnucash/register/ledger-core/split-register-control.c:1560
 #: ../gnucash/report/report-gnome/dialog-report.glade.h:14
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -1145,7 +1133,7 @@ msgstr "_Cancelar"
 #: ../gnucash/gnome/dialog-commodities.c:191
 #: ../gnucash/gnome/dialog-imap-editor.c:127
 #: ../gnucash/gnome/dialog-price-edit-db.c:203
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1541
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1542
 #: ../gnucash/gnome/gnc-plugin-page-invoice.c:162
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:1146
 #: ../gnucash/gnome/gnc-plugin-page-sx-list.c:160
@@ -1240,7 +1228,7 @@ msgstr "Código cliente"
 #: ../gnucash/gnome-utils/gnc-tree-view-owner.c:380
 #: ../gnucash/gnome-utils/gnc-tree-view-owner.c:388
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:175
-#: ../libgnucash/app-utils/app-utils.scm:306
+#: ../libgnucash/app-utils/app-utils.scm:308
 msgid "Company Name"
 msgstr "Nombre de Sociedad"
 
@@ -1252,7 +1240,7 @@ msgstr "Contacto"
 #: ../gnucash/gnome/dialog-invoice.c:3199
 #: ../gnucash/gnome/dialog-invoice.c:3349 ../gnucash/gnome/dialog-job.c:590
 #: ../gnucash/gnome/dialog-order.c:895 ../gnucash/gnome/dialog-vendor.c:740
-#: ../gnucash/report/business-reports/aging.scm:554
+#: ../gnucash/report/business-reports/aging.scm:563
 #: ../gnucash/report/business-reports/owner-report.scm:77
 msgid "Company"
 msgstr "Sociedad"
@@ -1335,7 +1323,7 @@ msgstr "Usuario"
 #: ../gnucash/gnome-utils/gnc-tree-view-owner.c:376
 #: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:163
 #: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:16
-#: ../gnucash/report/business-reports/aging.scm:364
+#: ../gnucash/report/business-reports/aging.scm:373
 msgid "Name"
 msgstr "Nombre"
 
@@ -1397,9 +1385,9 @@ msgstr "Cuadrado"
 #: ../gnucash/gnome/dialog-find-transactions2.c:117
 #: ../gnucash/gnome/dialog-find-transactions.c:116
 #: ../gnucash/report/report-system/html-acct-table.scm:630
-#: ../gnucash/report/standard-reports/equity-statement.scm:171
-#: ../gnucash/report/standard-reports/income-statement.scm:270
-#: ../gnucash/report/standard-reports/trial-balance.scm:256
+#: ../gnucash/report/standard-reports/equity-statement.scm:169
+#: ../gnucash/report/standard-reports/income-statement.scm:269
+#: ../gnucash/report/standard-reports/trial-balance.scm:255
 msgid "Closing Entries"
 msgstr "Asientos de Cierre"
 
@@ -1426,7 +1414,7 @@ msgstr "Precio Mercantil"
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2949
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2969
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1073
-#: ../gnucash/report/standard-reports/portfolio.scm:260
+#: ../gnucash/report/standard-reports/portfolio.scm:258
 #: ../gnucash/report/standard-reports/register.scm:168
 #: ../gnucash/report/standard-reports/register.scm:464
 msgid "Value"
@@ -1453,8 +1441,7 @@ msgstr "Fecha de Contabilización"
 #: ../gnucash/gnome-search/dialog-search.c:898
 #: ../gnucash/gnome-search/dialog-search.c:904
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:624
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:847
-#: ../gnucash/report/standard-reports/transaction.scm:217
+#: ../gnucash/report/standard-reports/transaction.scm:210
 msgid "Number/Action"
 msgstr "Número/Operación"
 
@@ -1475,8 +1462,8 @@ msgstr "Número/Operación"
 #: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:58
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:57
 #: ../gnucash/register/ledger-core/split-register-model.c:319
-#: ../gnucash/report/business-reports/fancy-invoice.scm:269
-#: ../gnucash/report/business-reports/invoice.scm:254
+#: ../gnucash/report/business-reports/fancy-invoice.scm:268
+#: ../gnucash/report/business-reports/invoice.scm:253
 msgid "Action"
 msgstr "Operación"
 
@@ -1492,8 +1479,7 @@ msgstr "Operación"
 #: ../gnucash/gnome-search/dialog-search.c:906
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:612
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:621
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:851
-#: ../gnucash/report/standard-reports/transaction.scm:229
+#: ../gnucash/report/standard-reports/transaction.scm:222
 msgid "Transaction Number"
 msgstr "Número Transaccional"
 
@@ -1511,8 +1497,7 @@ msgstr "Número Transaccional"
 #: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:14
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:612
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:621
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:898
-#: ../gnucash/report/standard-reports/transaction.scm:223
+#: ../gnucash/report/standard-reports/transaction.scm:216
 msgid "Number"
 msgstr "Número"
 
@@ -1537,20 +1522,14 @@ msgstr "Descripción, Anotaciones o Memorandum"
 #: ../gnucash/register/ledger-core/split-register-model.c:347
 #: ../gnucash/report/standard-reports/general-ledger.scm:81
 #: ../gnucash/report/standard-reports/general-ledger.scm:101
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:435
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:474
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:475
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:855
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:902
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1100
 #: ../gnucash/report/standard-reports/register.scm:150
 #: ../gnucash/report/standard-reports/register.scm:430
-#: ../gnucash/report/standard-reports/transaction.scm:235
-#: ../gnucash/report/standard-reports/transaction.scm:410
-#: ../gnucash/report/standard-reports/transaction.scm:817
-#: ../gnucash/report/standard-reports/transaction.scm:918
-#: ../gnucash/report/standard-reports/transaction.scm:1013
-#: ../gnucash/report/standard-reports/transaction.scm:1014
+#: ../gnucash/report/standard-reports/transaction.scm:228
+#: ../gnucash/report/standard-reports/transaction.scm:405
+#: ../gnucash/report/standard-reports/transaction.scm:819
+#: ../gnucash/report/standard-reports/transaction.scm:931
+#: ../gnucash/report/standard-reports/transaction.scm:1025
+#: ../gnucash/report/standard-reports/transaction.scm:1026
 msgid "Memo"
 msgstr "Memorandum"
 
@@ -1570,15 +1549,11 @@ msgstr "Memorandum"
 #: ../gnucash/report/business-reports/receipt.scm:75
 #: ../gnucash/report/business-reports/taxinvoice.scm:82
 #: ../gnucash/report/standard-reports/account-summary.scm:485
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:447
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:474
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1070
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1106
-#: ../gnucash/report/standard-reports/sx-summary.scm:488
-#: ../gnucash/report/standard-reports/transaction.scm:777
-#: ../gnucash/report/standard-reports/transaction.scm:794
-#: ../gnucash/report/standard-reports/transaction.scm:927
-#: ../gnucash/report/standard-reports/transaction.scm:1013
+#: ../gnucash/report/standard-reports/sx-summary.scm:487
+#: ../gnucash/report/standard-reports/transaction.scm:779
+#: ../gnucash/report/standard-reports/transaction.scm:796
+#: ../gnucash/report/standard-reports/transaction.scm:940
+#: ../gnucash/report/standard-reports/transaction.scm:1025
 msgid "Notes"
 msgstr "Anotaciones"
 
@@ -1603,32 +1578,27 @@ msgstr "Anotaciones"
 #: ../gnucash/import-export/qif-imp/assistant-qif-import.c:3561
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:67
 #: ../gnucash/register/ledger-core/split-register-model.c:287
-#: ../gnucash/report/business-reports/customer-summary.scm:74
-#: ../gnucash/report/business-reports/easy-invoice.scm:112
-#: ../gnucash/report/business-reports/easy-invoice.scm:254
-#: ../gnucash/report/business-reports/fancy-invoice.scm:130
-#: ../gnucash/report/business-reports/fancy-invoice.scm:264
-#: ../gnucash/report/business-reports/invoice.scm:106
-#: ../gnucash/report/business-reports/invoice.scm:249
-#: ../gnucash/report/business-reports/job-report.scm:47
+#: ../gnucash/report/business-reports/customer-summary.scm:73
+#: ../gnucash/report/business-reports/easy-invoice.scm:111
+#: ../gnucash/report/business-reports/easy-invoice.scm:253
+#: ../gnucash/report/business-reports/fancy-invoice.scm:129
+#: ../gnucash/report/business-reports/fancy-invoice.scm:263
+#: ../gnucash/report/business-reports/invoice.scm:105
+#: ../gnucash/report/business-reports/invoice.scm:248
+#: ../gnucash/report/business-reports/job-report.scm:46
 #: ../gnucash/report/business-reports/owner-report.scm:55
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:298
 #: ../gnucash/report/standard-reports/account-summary.scm:444
 #: ../gnucash/report/standard-reports/general-journal.scm:111
 #: ../gnucash/report/standard-reports/general-ledger.scm:80
 #: ../gnucash/report/standard-reports/general-ledger.scm:100
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:416
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:471
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:843
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:894
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1069
 #: ../gnucash/report/standard-reports/register.scm:148
 #: ../gnucash/report/standard-reports/register.scm:425
-#: ../gnucash/report/standard-reports/sx-summary.scm:447
-#: ../gnucash/report/standard-reports/transaction.scm:209
-#: ../gnucash/report/standard-reports/transaction.scm:793
-#: ../gnucash/report/standard-reports/transaction.scm:900
-#: ../gnucash/report/standard-reports/transaction.scm:1002
+#: ../gnucash/report/standard-reports/sx-summary.scm:446
+#: ../gnucash/report/standard-reports/transaction.scm:202
+#: ../gnucash/report/standard-reports/transaction.scm:795
+#: ../gnucash/report/standard-reports/transaction.scm:913
+#: ../gnucash/report/standard-reports/transaction.scm:1014
 msgid "Description"
 msgstr "Descripción"
 
@@ -1693,10 +1663,10 @@ msgstr "¡Este asiento está adjuntado a un operación y será eliminado de ése
 #: ../gnucash/gnome/dialog-invoice.c:3176
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2803
 #: ../gnucash/register/ledger-core/split-register-model.c:231
-#: ../gnucash/report/business-reports/aging.scm:404
-#: ../gnucash/report/business-reports/easy-invoice.scm:304
-#: ../gnucash/report/business-reports/invoice.scm:717
-#: ../gnucash/report/business-reports/job-report.scm:44
+#: ../gnucash/report/business-reports/aging.scm:413
+#: ../gnucash/report/business-reports/easy-invoice.scm:303
+#: ../gnucash/report/business-reports/invoice.scm:716
+#: ../gnucash/report/business-reports/job-report.scm:43
 #: ../gnucash/report/business-reports/owner-report.scm:52
 #: ../gnucash/report/business-reports/owner-report.scm:624
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:260
@@ -1705,7 +1675,7 @@ msgstr "Fecha vencida"
 
 #. Should be using standard label for due date?
 #: ../gnucash/gnome/dialog-invoice.c:704
-#: ../gnucash/report/business-reports/aging.scm:405
+#: ../gnucash/report/business-reports/aging.scm:414
 #: ../gnucash/report/business-reports/owner-report.scm:625
 msgid "Post Date"
 msgstr "Fecha Contabilizante"
@@ -1761,15 +1731,15 @@ msgstr "Total Cargo:"
 #: ../gnucash/gnome/dialog-invoice.c:1721
 #: ../gnucash/gnome/dialog-payment.c:1260
 #: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:25
-#: ../gnucash/report/business-reports/easy-invoice.scm:708
-#: ../gnucash/report/business-reports/easy-invoice.scm:712
-#: ../gnucash/report/business-reports/easy-invoice.scm:716
-#: ../gnucash/report/business-reports/fancy-invoice.scm:794
-#: ../gnucash/report/business-reports/fancy-invoice.scm:798
-#: ../gnucash/report/business-reports/fancy-invoice.scm:802
-#: ../gnucash/report/business-reports/invoice.scm:678
-#: ../gnucash/report/business-reports/invoice.scm:682
-#: ../gnucash/report/business-reports/invoice.scm:686
+#: ../gnucash/report/business-reports/easy-invoice.scm:707
+#: ../gnucash/report/business-reports/easy-invoice.scm:711
+#: ../gnucash/report/business-reports/easy-invoice.scm:715
+#: ../gnucash/report/business-reports/fancy-invoice.scm:793
+#: ../gnucash/report/business-reports/fancy-invoice.scm:797
+#: ../gnucash/report/business-reports/fancy-invoice.scm:801
+#: ../gnucash/report/business-reports/invoice.scm:677
+#: ../gnucash/report/business-reports/invoice.scm:681
+#: ../gnucash/report/business-reports/invoice.scm:685
 #: ../libgnucash/engine/gncInvoice.c:990
 msgid "Credit Note"
 msgstr "Anotación Crediticia"
@@ -1915,9 +1885,9 @@ msgid "Invoice Owner"
 msgstr "Titular de Factura"
 
 #: ../gnucash/gnome/dialog-invoice.c:3090
-#: ../gnucash/report/business-reports/easy-invoice.scm:339
-#: ../gnucash/report/business-reports/fancy-invoice.scm:329
-#: ../gnucash/report/business-reports/invoice.scm:314
+#: ../gnucash/report/business-reports/easy-invoice.scm:338
+#: ../gnucash/report/business-reports/fancy-invoice.scm:328
+#: ../gnucash/report/business-reports/invoice.scm:313
 msgid "Invoice Notes"
 msgstr "Anotación de Factura"
 
@@ -1928,10 +1898,10 @@ msgstr "Anotación de Factura"
 #: ../gnucash/gnome/dialog-job.c:586 ../gnucash/gnome/dialog-order.c:893
 #: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:11
 #: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:9
-#: ../gnucash/report/business-reports/easy-invoice.scm:334
-#: ../gnucash/report/business-reports/easy-invoice.scm:804
-#: ../gnucash/report/business-reports/fancy-invoice.scm:324
-#: ../gnucash/report/business-reports/invoice.scm:309
+#: ../gnucash/report/business-reports/easy-invoice.scm:333
+#: ../gnucash/report/business-reports/easy-invoice.scm:803
+#: ../gnucash/report/business-reports/fancy-invoice.scm:323
+#: ../gnucash/report/business-reports/invoice.scm:308
 msgid "Billing ID"
 msgstr "ID Recibiente"
 
@@ -1991,11 +1961,11 @@ msgstr "Anotaciones del comprobante"
 #: ../gnucash/gnome-utils/gnc-tree-view-price.c:448
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2939
 #: ../gnucash/register/ledger-core/split-register-model.c:354
-#: ../gnucash/report/business-reports/customer-summary.scm:73
-#: ../gnucash/report/business-reports/job-report.scm:46
+#: ../gnucash/report/business-reports/customer-summary.scm:72
+#: ../gnucash/report/business-reports/job-report.scm:45
 #: ../gnucash/report/business-reports/owner-report.scm:54
 #: ../gnucash/report/standard-reports/account-summary.scm:443
-#: ../gnucash/report/standard-reports/sx-summary.scm:446
+#: ../gnucash/report/standard-reports/sx-summary.scm:445
 msgid "Type"
 msgstr "Clase"
 
@@ -2010,7 +1980,7 @@ msgstr "Contabilizado"
 
 #: ../gnucash/gnome/dialog-invoice.c:3202
 #: ../gnucash/gnome/dialog-invoice.c:3351
-#: ../gnucash/report/business-reports/easy-invoice.scm:787
+#: ../gnucash/report/business-reports/easy-invoice.scm:786
 msgid "Due"
 msgstr "Vence"
 
@@ -2030,15 +2000,11 @@ msgstr "Abierto"
 #: ../gnucash/register/ledger-core/split-register-model.c:267
 #: ../gnucash/report/standard-reports/general-journal.scm:110
 #: ../gnucash/report/standard-reports/general-ledger.scm:99
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:412
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:413
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:469
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1068
 #: ../gnucash/report/standard-reports/register.scm:146
 #: ../gnucash/report/standard-reports/register.scm:420
-#: ../gnucash/report/standard-reports/transaction.scm:792
-#: ../gnucash/report/standard-reports/transaction.scm:899
-#: ../gnucash/report/standard-reports/transaction.scm:986
+#: ../gnucash/report/standard-reports/transaction.scm:794
+#: ../gnucash/report/standard-reports/transaction.scm:912
+#: ../gnucash/report/standard-reports/transaction.scm:998
 msgid "Num"
 msgstr "Núm"
 
@@ -2053,9 +2019,9 @@ msgstr "Encontrar Comprobante de Gasto"
 
 #: ../gnucash/gnome/dialog-invoice.c:3295
 #: ../gnucash/gnome-search/dialog-search.c:1102
-#: ../gnucash/report/business-reports/easy-invoice.scm:703
-#: ../gnucash/report/business-reports/fancy-invoice.scm:789
-#: ../gnucash/report/business-reports/invoice.scm:673
+#: ../gnucash/report/business-reports/easy-invoice.scm:702
+#: ../gnucash/report/business-reports/fancy-invoice.scm:788
+#: ../gnucash/report/business-reports/invoice.scm:672
 msgid "Expense Voucher"
 msgstr "Comprobante de Gasto"
 
@@ -2083,22 +2049,20 @@ msgstr "¿AC?"
 #: ../gnucash/import-export/import-match-picker.c:434
 #: ../gnucash/import-export/qif-imp/assistant-qif-import.c:3533
 #: ../gnucash/import-export/qif-imp/assistant-qif-import.c:3570
-#: ../gnucash/report/business-reports/customer-summary.scm:75
-#: ../gnucash/report/business-reports/job-report.scm:48
+#: ../gnucash/report/business-reports/customer-summary.scm:74
+#: ../gnucash/report/business-reports/job-report.scm:47
 #: ../gnucash/report/business-reports/owner-report.scm:60
 #: ../gnucash/report/report-system/options-utilities.scm:244
 #: ../gnucash/report/standard-reports/general-journal.scm:116
 #: ../gnucash/report/standard-reports/general-ledger.scm:91
 #: ../gnucash/report/standard-reports/general-ledger.scm:111
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:839
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:890
 #: ../gnucash/report/standard-reports/register.scm:455
 #: ../gnucash/report/standard-reports/register.scm:851
-#: ../gnucash/report/standard-reports/transaction.scm:203
-#: ../gnucash/report/standard-reports/transaction.scm:862
-#: ../gnucash/report/standard-reports/transaction.scm:894
-#: ../gnucash/report/standard-reports/transaction.scm:1123
-#: ../gnucash/report/standard-reports/transaction.scm:1141
+#: ../gnucash/report/standard-reports/transaction.scm:196
+#: ../gnucash/report/standard-reports/transaction.scm:864
+#: ../gnucash/report/standard-reports/transaction.scm:907
+#: ../gnucash/report/standard-reports/transaction.scm:1135
+#: ../gnucash/report/standard-reports/transaction.scm:1150
 msgid "Amount"
 msgstr "Cantidad"
 
@@ -2214,13 +2178,13 @@ msgstr "Título"
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3179
 #: ../gnucash/register/ledger-core/split-register-model.c:312
 #: ../gnucash/register/ledger-core/split-register-model.c:476
-#: ../gnucash/report/business-reports/customer-summary.scm:191
-#: ../gnucash/report/business-reports/job-report.scm:221
+#: ../gnucash/report/business-reports/customer-summary.scm:190
+#: ../gnucash/report/business-reports/job-report.scm:220
 #: ../gnucash/report/business-reports/owner-report.scm:331
-#: ../gnucash/report/report-system/html-utilities.scm:727
+#: ../gnucash/report/report-system/html-utilities.scm:725
 #: ../gnucash/report/standard-reports/account-summary.scm:462
 #: ../gnucash/report/standard-reports/register.scm:174
-#: ../gnucash/report/standard-reports/sx-summary.scm:465
+#: ../gnucash/report/standard-reports/sx-summary.scm:464
 msgid "Balance"
 msgstr "Balance"
 
@@ -2324,9 +2288,9 @@ msgstr "Las cuentas de transferencia y contabilización están asociadas con mon
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2850
 #: ../gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade.h:8
 #: ../gnucash/register/ledger-core/split-register-model.c:283
-#: ../gnucash/report/business-reports/customer-summary.scm:733
-#: ../gnucash/report/business-reports/customer-summary.scm:843
-#: ../gnucash/report/business-reports/job-report.scm:562
+#: ../gnucash/report/business-reports/customer-summary.scm:732
+#: ../gnucash/report/business-reports/customer-summary.scm:842
+#: ../gnucash/report/business-reports/job-report.scm:561
 #: ../gnucash/report/business-reports/owner-report.scm:73
 #: ../gnucash/report/business-reports/owner-report.scm:114
 msgid "Customer"
@@ -2340,8 +2304,8 @@ msgstr "Cliente"
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2861
 #: ../gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade.h:10
 #: ../gnucash/register/ledger-core/split-register-model.c:285
-#: ../gnucash/report/business-reports/customer-summary.scm:735
-#: ../gnucash/report/business-reports/job-report.scm:568
+#: ../gnucash/report/business-reports/customer-summary.scm:734
+#: ../gnucash/report/business-reports/job-report.scm:567
 #: ../gnucash/report/business-reports/owner-report.scm:118
 msgid "Vendor"
 msgstr "Proveedor"
@@ -2351,8 +2315,8 @@ msgstr "Proveedor"
 #: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:3
 #: ../gnucash/gnome/search-owner.c:240
 #: ../gnucash/gnome-search/dialog-search.c:1098
-#: ../gnucash/report/business-reports/customer-summary.scm:737
-#: ../gnucash/report/business-reports/job-report.scm:571
+#: ../gnucash/report/business-reports/customer-summary.scm:736
+#: ../gnucash/report/business-reports/job-report.scm:570
 #: ../gnucash/report/business-reports/owner-report.scm:74
 #: ../gnucash/report/business-reports/owner-report.scm:115
 msgid "Employee"
@@ -2424,10 +2388,10 @@ msgid "Delete prices?"
 msgstr "¿Elimino precios?"
 
 #: ../gnucash/gnome/dialog-price-edit-db.c:421
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:126
-#: ../gnucash/report/standard-reports/equity-statement.scm:87
-#: ../gnucash/report/standard-reports/income-statement.scm:119
-#: ../gnucash/report/standard-reports/trial-balance.scm:92
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:125
+#: ../gnucash/report/standard-reports/equity-statement.scm:85
+#: ../gnucash/report/standard-reports/income-statement.scm:118
+#: ../gnucash/report/standard-reports/trial-balance.scm:91
 msgid "Entries"
 msgstr "Asientos"
 
@@ -2688,7 +2652,7 @@ msgstr "Creado"
 
 #: ../gnucash/gnome/dialog-sx-since-last-run.c:456
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:101
-#: ../gnucash/report/standard-reports/transaction.scm:470
+#: ../gnucash/report/standard-reports/transaction.scm:474
 msgid "Never"
 msgstr "Nunca"
 
@@ -2732,7 +2696,7 @@ msgstr "Línea de datos del formulario: "
 
 #: ../gnucash/gnome/dialog-tax-info.c:286
 #: ../gnucash/report/standard-reports/account-summary.scm:442
-#: ../gnucash/report/standard-reports/sx-summary.scm:445
+#: ../gnucash/report/standard-reports/sx-summary.scm:444
 msgid "Code"
 msgstr "Código"
 
@@ -2844,30 +2808,30 @@ msgstr "Encontrar Proveedor"
 #: ../gnucash/gnome/gnc-budget-view.c:405
 #: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2951
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3043
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:32
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:38
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:47
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:53
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:59
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:65
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:33
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:39
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:48
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:54
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:60
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:66
 #: ../gnucash/register/ledger-core/split-register.c:2581
-#: ../gnucash/report/report-system/report-utilities.scm:117
+#: ../gnucash/report/report-system/report-utilities.scm:116
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1080
-#: ../gnucash/report/standard-reports/net-barchart.scm:368
-#: ../gnucash/report/standard-reports/net-barchart.scm:430
-#: ../gnucash/report/standard-reports/net-linechart.scm:411
-#: ../gnucash/report/standard-reports/net-linechart.scm:484
+#: ../gnucash/report/standard-reports/net-barchart.scm:367
+#: ../gnucash/report/standard-reports/net-barchart.scm:429
+#: ../gnucash/report/standard-reports/net-linechart.scm:410
+#: ../gnucash/report/standard-reports/net-linechart.scm:483
 #: ../libgnucash/app-utils/prefs.scm:89 ../libgnucash/engine/Account.cpp:4108
 #: ../libgnucash/engine/Scrub.c:421
 msgid "Income"
 msgstr "Ingreso"
 
 #: ../gnucash/gnome/gnc-budget-view.c:407
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:79
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:84
-#: ../gnucash/report/report-system/report-utilities.scm:118
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:675
-#: ../gnucash/report/standard-reports/income-statement.scm:611
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:80
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:85
+#: ../gnucash/report/report-system/report-utilities.scm:117
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:674
+#: ../gnucash/report/standard-reports/income-statement.scm:610
 msgid "Expenses"
 msgstr "Gastos"
 
@@ -2882,25 +2846,25 @@ msgstr "Transferencias"
 #: ../gnucash/gnome/gnc-budget-view.c:411
 #: ../gnucash/gnome/gnc-budget-view.c:1203
 #: ../gnucash/gnome-utils/gnc-tree-view-account.c:850
-#: ../gnucash/report/business-reports/aging.scm:560
-#: ../gnucash/report/business-reports/aging.scm:844
+#: ../gnucash/report/business-reports/aging.scm:569
+#: ../gnucash/report/business-reports/aging.scm:853
 #: ../gnucash/report/business-reports/balsheet-eg.eguile.scm:120
-#: ../gnucash/report/business-reports/customer-summary.scm:317
-#: ../gnucash/report/business-reports/customer-summary.scm:960
-#: ../gnucash/report/business-reports/easy-invoice.scm:126
-#: ../gnucash/report/business-reports/easy-invoice.scm:289
-#: ../gnucash/report/business-reports/fancy-invoice.scm:144
-#: ../gnucash/report/business-reports/fancy-invoice.scm:299
-#: ../gnucash/report/business-reports/invoice.scm:120
-#: ../gnucash/report/business-reports/invoice.scm:284
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:305
+#: ../gnucash/report/business-reports/customer-summary.scm:316
+#: ../gnucash/report/business-reports/customer-summary.scm:959
+#: ../gnucash/report/business-reports/easy-invoice.scm:125
+#: ../gnucash/report/business-reports/easy-invoice.scm:288
+#: ../gnucash/report/business-reports/fancy-invoice.scm:143
+#: ../gnucash/report/business-reports/fancy-invoice.scm:298
+#: ../gnucash/report/business-reports/invoice.scm:119
+#: ../gnucash/report/business-reports/invoice.scm:283
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:304
 #: ../gnucash/report/report-system/html-acct-table.scm:899
-#: ../gnucash/report/report-system/html-utilities.scm:619
+#: ../gnucash/report/report-system/html-utilities.scm:617
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1045
-#: ../gnucash/report/standard-reports/budget-flow.scm:171
-#: ../gnucash/report/standard-reports/budget-flow.scm:253
-#: ../gnucash/report/standard-reports/budget.scm:561
-#: ../gnucash/report/standard-reports/portfolio.scm:280
+#: ../gnucash/report/standard-reports/budget-flow.scm:169
+#: ../gnucash/report/standard-reports/budget-flow.scm:251
+#: ../gnucash/report/standard-reports/budget.scm:560
+#: ../gnucash/report/standard-reports/portfolio.scm:278
 msgid "Total"
 msgstr "Total"
 
@@ -3019,7 +2983,7 @@ msgid "Setup scheduled transactions for repayment of a loan"
 msgstr "Crea una transacción programada para la devolución de un préstamo"
 
 #: ../gnucash/gnome/gnc-plugin-basic-commands.c:180
-#: ../gnucash/report/report-system/report.scm:65
+#: ../gnucash/report/report-system/report.scm:64
 msgid "B_udget"
 msgstr "_Presupuesto"
 
@@ -3187,7 +3151,7 @@ msgstr "_Aceptar"
 #. Extensions Menu
 #: ../gnucash/gnome/gnc-plugin-business.c:152
 #: ../gnucash/gnome/gnc-plugin-business.c:297
-#: ../gnucash/report/report-system/report.scm:74
+#: ../gnucash/report/report-system/report.scm:73
 msgid "_Business"
 msgstr "_Negocios"
 
@@ -3238,7 +3202,7 @@ msgstr "Encontrar _factura..."
 
 #: ../gnucash/gnome/gnc-plugin-business.c:178
 msgid "Open the Find Invoice dialog"
-msgstr "Abre el diálogo “Encontrar factura”"
+msgstr "Abre el diálogo Encontrar Factura"
 
 #: ../gnucash/gnome/gnc-plugin-business.c:182
 #: ../gnucash/gnome/gnc-plugin-business.c:225
@@ -3345,7 +3309,7 @@ msgstr "Encontrar _operador..."
 
 #: ../gnucash/gnome/gnc-plugin-business.c:254
 msgid "Open the Find Employee dialog"
-msgstr "Abre el diálogo “Encontrar Operador”"
+msgstr "Abre el diálogo Encontrar Operador"
 
 #: ../gnucash/gnome/gnc-plugin-business.c:258
 msgid "New _Expense Voucher..."
@@ -3353,7 +3317,7 @@ msgstr "Crear _comprobante de gasto..."
 
 #: ../gnucash/gnome/gnc-plugin-business.c:259
 msgid "Open the New Expense Voucher dialog"
-msgstr "Abre el diálogo “Crear Comprobante de Gasto”"
+msgstr "Abre el diálogo Crear Comprobante de Gasto"
 
 #: ../gnucash/gnome/gnc-plugin-business.c:263
 msgid "Find Expense _Voucher..."
@@ -3361,7 +3325,7 @@ msgstr "Encontrar anotación de _comprobante..."
 
 #: ../gnucash/gnome/gnc-plugin-business.c:264
 msgid "Open the Find Expense Voucher dialog"
-msgstr "Abre el diálogo “Encontrar Comprobante de Gasto”"
+msgstr "Abre el diálogo Encontrar Comprobante de Gasto"
 
 #: ../gnucash/gnome/gnc-plugin-business.c:275
 msgid "Sales _Tax Table"
@@ -3661,6 +3625,7 @@ msgstr "Borrar"
 #. define all option's names so that they are properly defined
 #. in *one* place.
 #. Accounts
+#. Delete Accounts selector
 #. FIXME this could use an indent option
 #. Accounts
 #. FIXME this needs an indent option
@@ -3679,75 +3644,76 @@ msgstr "Borrar"
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2913
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2917
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:54
-#: ../gnucash/report/report-system/report.scm:70
-#: ../gnucash/report/standard-reports/account-piecharts.scm:72
+#: ../gnucash/report/report-system/report.scm:69
+#: ../gnucash/report/standard-reports/account-piecharts.scm:70
 #: ../gnucash/report/standard-reports/account-summary.scm:75
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:158
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:156
 #: ../gnucash/report/standard-reports/average-balance.scm:90
 #: ../gnucash/report/standard-reports/average-balance.scm:336
 #: ../gnucash/report/standard-reports/balance-sheet.scm:88
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:53
-#: ../gnucash/report/standard-reports/budget-barchart.scm:45
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:77
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:49
-#: ../gnucash/report/standard-reports/category-barchart.scm:81
-#: ../gnucash/report/standard-reports/daily-reports.scm:62
-#: ../gnucash/report/standard-reports/equity-statement.scm:70
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:707
-#: ../gnucash/report/standard-reports/income-statement.scm:64
-#: ../gnucash/report/standard-reports/net-barchart.scm:53
-#: ../gnucash/report/standard-reports/net-linechart.scm:49
-#: ../gnucash/report/standard-reports/portfolio.scm:71
-#: ../gnucash/report/standard-reports/sx-summary.scm:56
-#: ../gnucash/report/standard-reports/transaction.scm:60
-#: ../gnucash/report/standard-reports/trial-balance.scm:77
+#: ../gnucash/report/standard-reports/budget-barchart.scm:43
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:76
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:48
+#: ../gnucash/report/standard-reports/category-barchart.scm:79
+#: ../gnucash/report/standard-reports/daily-reports.scm:60
+#: ../gnucash/report/standard-reports/equity-statement.scm:68
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:76
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:82
+#: ../gnucash/report/standard-reports/income-statement.scm:63
+#: ../gnucash/report/standard-reports/net-barchart.scm:52
+#: ../gnucash/report/standard-reports/net-linechart.scm:48
+#: ../gnucash/report/standard-reports/portfolio.scm:69
+#: ../gnucash/report/standard-reports/sx-summary.scm:55
+#: ../gnucash/report/standard-reports/transaction.scm:57
+#: ../gnucash/report/standard-reports/trial-balance.scm:76
 #: ../libgnucash/engine/qofbookslots.h:65
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1325
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1326
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:1128
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1350
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1351
 #, c-format
 msgid "Deleting account %s"
 msgstr "Eliminando cuenta %s"
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1474
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1475
 #, c-format
 msgid "The account %s will be deleted."
 msgstr "La cuenta %s se eliminará."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1487
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1488
 #, c-format
 msgid "All transactions in this account will be moved to the account %s."
 msgstr "Todas las transacciones en esta cuenta serán movidos a la cuenta %s."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1493
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1494
 msgid "All transactions in this account will be deleted."
 msgstr "Todas las transacciones en esta cuenta serán eliminadas."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1502
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1503
 #, c-format
 msgid "All of its sub-accounts will be moved to the account %s."
 msgstr "Todas sus subcuentas se van a trasladar a la cuenta %s."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1508
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1509
 msgid "All of its subaccounts will be deleted."
 msgstr "Todas sus subcuentas serán eliminadas."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1513
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1514
 #, c-format
 msgid "All sub-account transactions will be moved to the account %s."
 msgstr "Todas las transacciones de las subcuentas se moverán a la cuenta %s."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1519
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1520
 msgid "All sub-account transactions will be deleted."
 msgstr "Todas las transacciones de las subcuentas serán eliminadas."
 
-#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1524
+#: ../gnucash/gnome/gnc-plugin-page-account-tree.c:1525
 msgid "Are you sure you want to do this?"
 msgstr "¿Está seguro que quiere hacer esto?"
 
@@ -3795,12 +3761,12 @@ msgstr "Estimar"
 #: ../gnucash/gnome/gnc-plugin-page-budget.c:316
 #: ../gnucash/gnome/gnc-plugin-page-budget.c:819
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:111
-#: ../gnucash/report/standard-reports/budget-barchart.scm:46
-#: ../gnucash/report/standard-reports/budget-barchart.scm:159
-#: ../gnucash/report/standard-reports/budget-barchart.scm:172
-#: ../gnucash/report/standard-reports/budget-flow.scm:46
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:59
-#: ../gnucash/report/standard-reports/budget.scm:100
+#: ../gnucash/report/standard-reports/budget-barchart.scm:44
+#: ../gnucash/report/standard-reports/budget-barchart.scm:157
+#: ../gnucash/report/standard-reports/budget-barchart.scm:170
+#: ../gnucash/report/standard-reports/budget-flow.scm:44
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:58
+#: ../gnucash/report/standard-reports/budget.scm:99
 msgid "Budget"
 msgstr "Presupuesto"
 
@@ -3989,8 +3955,8 @@ msgid "Sort by quantity"
 msgstr "Ordenar por inventario"
 
 #: ../gnucash/gnome/gnc-plugin-page-invoice.c:214
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1136
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1138
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1137
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1139
 #: ../gnucash/register/ledger-core/split-register.c:1955
 #: ../gnucash/register/ledger-core/split-register.c:1958
 msgid "_Price"
@@ -4116,7 +4082,7 @@ msgid "Show customer aging overview for all customers"
 msgstr "Muestra la relación del cliente frente a todos los clientes"
 
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:212
-#: ../gnucash/report/business-reports/job-report.scm:569
+#: ../gnucash/report/business-reports/job-report.scm:568
 #: ../gnucash/report/business-reports/owner-report.scm:878
 msgid "Vendor Report"
 msgstr "Boletín de Proveedor"
@@ -4126,7 +4092,7 @@ msgid "Show vendor report"
 msgstr "Muestra el boletín de proveedores"
 
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:217
-#: ../gnucash/report/business-reports/job-report.scm:563
+#: ../gnucash/report/business-reports/job-report.scm:562
 #: ../gnucash/report/business-reports/owner-report.scm:869
 msgid "Customer Report"
 msgstr "Boletín de Cliente"
@@ -4136,7 +4102,7 @@ msgid "Show customer report"
 msgstr "Muestra el boletín de clientes"
 
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:222
-#: ../gnucash/report/business-reports/job-report.scm:572
+#: ../gnucash/report/business-reports/job-report.scm:571
 #: ../gnucash/report/business-reports/owner-report.scm:887
 msgid "Employee Report"
 msgstr "Boletín de Operador"
@@ -4480,7 +4446,7 @@ msgstr "Línea _doble"
 
 #: ../gnucash/gnome/gnc-plugin-page-register2.c:411
 #: ../gnucash/gnome/gnc-plugin-page-register.c:425
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:101
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:101
 msgid "Show two lines of information for each transaction"
 msgstr "Muestra dos líneas de información para cada transacción"
 
@@ -4673,11 +4639,10 @@ msgstr "y subcuentas"
 #: ../gnucash/register/ledger-core/split-register.c:2523
 #: ../gnucash/register/ledger-core/split-register.c:2541
 #: ../gnucash/report/standard-reports/general-journal.scm:89
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:490
 #: ../gnucash/report/standard-reports/register.scm:400
-#: ../gnucash/report/standard-reports/transaction.scm:1133
-#: ../gnucash/report/standard-reports/transaction.scm:1153
-#: ../gnucash/report/standard-reports/trial-balance.scm:662
+#: ../gnucash/report/standard-reports/transaction.scm:1143
+#: ../gnucash/report/standard-reports/transaction.scm:1160
+#: ../gnucash/report/standard-reports/trial-balance.scm:661
 #: ../libgnucash/app-utils/guile-util.c:949
 msgid "Credit"
 msgstr "Crédito"
@@ -4689,11 +4654,10 @@ msgstr "Crédito"
 #: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3171
 #: ../gnucash/register/ledger-core/split-register.c:2384
 #: ../gnucash/report/standard-reports/general-journal.scm:88
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:488
 #: ../gnucash/report/standard-reports/register.scm:398
-#: ../gnucash/report/standard-reports/transaction.scm:1129
-#: ../gnucash/report/standard-reports/transaction.scm:1149
-#: ../gnucash/report/standard-reports/trial-balance.scm:659
+#: ../gnucash/report/standard-reports/transaction.scm:1140
+#: ../gnucash/report/standard-reports/transaction.scm:1157
+#: ../gnucash/report/standard-reports/trial-balance.scm:658
 #: ../libgnucash/app-utils/guile-util.c:918
 msgid "Debit"
 msgstr "Débito"
@@ -4784,7 +4748,7 @@ msgstr "Ha intentado abrir una cuenta en el registro antiguo mientras está abie
 #. Define the strings here to avoid typos and make changes easier.
 #: ../gnucash/gnome/gnc-plugin-page-register.c:2666
 #: ../gnucash/gnome/gnc-plugin-page-register.c:2684
-#: ../gnucash/report/standard-reports/transaction.scm:57
+#: ../gnucash/report/standard-reports/transaction.scm:54
 msgid "Transaction Report"
 msgstr "Boletín Transaccional"
 
@@ -5048,8985 +5012,8903 @@ msgstr "¿Borro la transacción actual?"
 msgid "You would be deleting a transaction with reconciled splits! This is not a good idea as it will cause your reconciled balance to be off."
 msgstr "¡Estaría borrando una transacción con desgloses conciliados! Esto no es una buena idea, puesto que haría que su saldo conciliado se perdiera."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:1
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:41
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in.h:2
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:1
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:9
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:1
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:2
-#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:1
-#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:1
-#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:1
-#: ../gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in.h:17
-#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:4
-msgid "Last window position and size"
-msgstr "Última posición y tamaño de la ventana"
-
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:2
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:42
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in.h:3
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:2
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:10
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:2
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:3
-#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:2
-#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:2
-#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:2
-#: ../gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in.h:18
-#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:5
-msgid "This setting describes the size and position of the window when it was last closed. The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window."
-msgstr "Este opción describe el tamaño y posición de la ventana cuando se cerró la última vez. Los números son las coordenadas X e Y de la esquina cima izquierda de la ventana seguida por el ancho y alto de la ventana."
-
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:3
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:4
-msgid "Search only in active items"
-msgstr "Buscar sólo en objetos activos"
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:1
+msgid ""
+"This assistant will help you setup and use accounting periods. \n"
+" \n"
+"Danger: this feature does not work correctly at this time; it is still under development. It will probably damage your data in such a way that it cannot be repaired!"
+msgstr ""
+"Este asistente le ayudará a configurar y usar periodos contables.\n"
+" \n"
+"Peligro: esta característica no funciona correctamente todavía; está en desarrollo. ¡Probablemente estropeará su información de tal manera que no se podrá recuperar!"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:4
-msgid "If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched."
-msgstr "Si está activo, solo se buscarán los objetos «activos» dentro de la clase actual. En otro caso se buscarán todos los objetos en la clase actual."
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:4
+msgid "Setup Account Period"
+msgstr "Configuración del Periodo de Cuenta"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:5
-msgid "Is tax included in this type of business entry?"
-msgstr "¿Está incluida la imposición en este tipo de asiento de negocios?"
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:5
+msgid ""
+"\n"
+"Select an accounting period and the closing date which must not be in the future and is greater than the closing date of the previous book.\n"
+"\n"
+"Books will be closed at midnight on the selected date."
+msgstr ""
+"\n"
+"Seleccione un periodo de cuentas y la fecha de cierre la cual no debe estar en el futuro y sea mayor que la fecha de cierre del ejercicio anterior.\n"
+"\n"
+"Los ejercicios serán cerradas a media noche en la fecha seleccionada."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:6
-msgid "If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors."
-msgstr "Si se marca, entonces la imposición se incluye por omisión en las anotación de este tipo. Los clientes y proveedores nuevos heredan este valor."
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:9
+msgid "xxx"
+msgstr "xxx"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:7
-msgid "Auto pay when posting."
-msgstr "Auto-liquidar cuando venza."
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:10
+msgid "Book Closing Dates"
+msgstr "Fechas de Cierre de Libro"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:8
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:27
-msgid "At post time, automatically attempt to pay customer documents with outstanding pre-payments and counter documents. The pre-payments and documents obviously have to be against the same customer. Counter documents are documents with opposite sign. For example for an invoice, customer credit notes and negative invoices are considered counter documents."
-msgstr "En tiempo contabilizante, automáticamente se intenta liquidar los documentos de clientes con adelantos y documentos contables. Las liquidaciones anticipadas y los documentos obviamente tienen que ser contra el mismo cliente. Los documentos de Contabilización son documentos con signo opuesto. Por ejemplo para una factura, las anotaciones del crédito del cliente y las facturas negativas se consideran documentos contables."
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:11
+msgid "Title:"
+msgstr "Título:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:9
-msgid "Show invoices due reminder at startup"
-msgstr "Mostrar recordatorio de facturaciones vencidas al inicio"
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:12
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:10
+msgid "Notes:"
+msgstr "Anotaciones:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:10
-msgid "If active, at startup GnuCash will check to see whether any invoices will become due soon. If so, it will present the user with a reminder dialog. The definition of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash does not check for due invoices."
-msgstr "Si está activo, al iniciar GnuCash comprobará para ver si cualquiera de las facturaciones se convertirá pronto en vencimiento. Si esto ocurre, se presentará al usuario con un diálogo de recuerdo. La definición de «pronto» lo controla a través de la opción «Días de antelación». En caso contrario GnuCash no comprueba el vencimiento facturante."
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:13
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:1
+msgid "Close Book"
+msgstr "Cierre de Libro"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:11
-msgid "Show invoices due within this many days"
-msgstr "Mostrar facturas vencidas dentro de estos cantidad de días"
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:14
+msgid "Account Period Finish"
+msgstr "Final del Periodo de Cuenta"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:12
-msgid "This field defines the number of days in advance that GnuCash will check for due invoices. Its value is only used if the \"Notify when due\" setting is active."
-msgstr "Este campo define el número de días de antelación con la que GnuCash comprobará para facturaciones vencidas. Su valor está empleado únicamente si la opción «Notificar cuando venza» está activa."
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:15
+msgid "Press 'Close' to Exit."
+msgstr "Pulse «Cerrar» al Salir."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:13
-msgid "Enable extra toolbar buttons for business"
-msgstr "Activa la barra de botones adicional para negocios"
+#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:16
+msgid "Summary Page"
+msgstr "Página de Totales"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:14
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:22
-msgid "If active, extra toolbar buttons for common business functions are shown as well. Otherwise they are not shown."
-msgstr "Si está activo, se mostrarán los botones extra para los botones de herramientas comunes para negocios. En otros casos, no se muestran."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:1
+msgid ""
+"This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have.\n"
+"\n"
+"You can pick a set of accounts here that seem close to your needs. After the assistant completes you will be able to add, rename, modify, and remove accounts, at any time later on. You will also be able to add sub-accounts, as well as move accounts (along with their sub-accounts) from one parent to another.\n"
+"\n"
+"Click 'Cancel'  if you do not wish to create any new accounts now."
+msgstr ""
+"Este asistente le ayudará a crear a un conjunto de cuentas GnuCash para sus activos (como una inversión, cuentas corrientes y ahorros), débitos (como una hipoteca) y familias diferentes de ingresos y gastos que quizá tenga.\n"
+"\n"
+"Puede escoger un conjunto de cuentas aquí que parece cerrar a sus necesidades. Tras la asistente complete será capaz de añadir, renombrar, modificar y quitar cuentas, en cualquier tiempo posterior. También será capaz de añadir subcuentas, ya sea como mover cuentas (a lo largo de sus subcuentas) desde uno ascendente a otro.\n"
+"\n"
+"Pulse `Cancelar´ si no quiere crear ninguna cuenta nueva ahora."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:15
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:23
-msgid "The invoice report to be used for printing."
-msgstr "El boletín facturante a ser empleado para declarar."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:6
+msgid "New Account Hierarchy Setup"
+msgstr "Preparación de un plan de cuentas nuevo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:16
-msgid "The name of the report to be used for invoice printing."
-msgstr "El nombre del boletín a ser utilizar para declarar facturas."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:7
+msgid ""
+"\n"
+"Please choose the currency to use for new accounts."
+msgstr ""
+"\n"
+"Por favor, elija la moneda a utilizar para las cuentas nuevas."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:17
-msgid "Open new invoice in new window"
-msgstr "Abre una factura nueva dentro de una ventana nueva"
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:9
+msgid "Choose Currency"
+msgstr "Escoja moneda"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:18
-msgid "If active, each new invoice will be opened in a new window. Otherwise a new invoice will be opened as a tab in the main window."
-msgstr "Si está activo, cada factura nuevo se abrirá en una ventana nueva. En otro caso una factura nuevo será abierto como una lengüeta en la ventana principal."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:10
+msgid ""
+"\n"
+"Select categories that correspond to the ways that you foresee you will use GnuCash. Each category you select will cause several accounts to be created.\n"
+"\n"
+"<b>Note:</b> the selection you make here is only the starting point for your personalized account hierarchy. Accounts can be added, renamed, moved, or deleted by hand later at any time."
+msgstr ""
+"\n"
+"Seleccione categorías que correspondan a las maneras que preverá usar GnuCash. Cada categoría que selecciona causará que se creen varias cuentas.\n"
+"\n"
+"<b>Nota:</b> la selección que haga aquí únicamente es el punto de inicio para su jerarquía de cuenta personalizada. Las cuentas pueden ser añadidas, renombradas, movidas o eliminadas a mano en cualquier momento."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:19
-msgid "Accumulate multiple splits into one"
-msgstr "Acumular múltiples desgloses en uno"
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:14
+msgid "<b>Categories</b>"
+msgstr "<b>Categorías</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:20
-msgid "If this field is active then multiple entries in an invoice that transfer to the same account will be accumulated into a single split. This field can be overridden per invoice in the Posting dialog."
-msgstr "Si este campo está activo entonces todos los asientos en una factura que se transfiere a la misma cuenta serán acumuladas en un único desglose. Este campo puede cambiarse en cada factura del diálogo de Contabilización."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:15
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:17
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:6
+msgid "_Select All"
+msgstr "_Seleccionar todo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:21
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:30
-msgid "At post time, automatically attempt to pay vendor documents with outstanding pre-payments and counter documents. The pre-payments and documents obviously have to be against the same vendor. Counter documents are documents with opposite sign. For example for a bill, vendor credit notes and negative bills are considered counter documents."
-msgstr "En tiempo contabilizante, automáticamente intentar liquidar documentos del proveedor con adelantos liquidados y documentos de Contabilidad. Los adelantos liquidados y documentos obviamente tienen que estar frente al mismo proveedor. Los documentos de Contabilidad son documentos con signo opuesto. Por ejemplo para un recibo, las anotaciones del crédito del proveedor y los recibos negativos son consideradas como documentos de Contabilidad."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:16
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:18
+msgid "C_lear All"
+msgstr "_Desmarcar todo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:22
-msgid "Show bills due reminder at startup"
-msgstr "Mostrar recordatorio de recibos vencidos al inicio"
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:17
+msgid "<b>Category Description</b>"
+msgstr "<b>Descripción de la categoría</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:23
-msgid "If active, at startup GnuCash will check to see whether any bills will become due soon. If so, it will present the user with a reminder dialog. The definition of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash does not check for due bills."
-msgstr "Si está activo, al iniciar GnuCash comprobará para ver si cualquiera de los recibos se convertirá pronto en vencimiento. Si esto ocurre, se presentará al usuario con un diálogo recordatorio. La definición de «pronto» lo controla a través de opción «Días de antelación». En caso contrario GnuCash no comprueba el vencimiento de recibos."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:18
+msgid "Choose accounts to create"
+msgstr "Escoja cuentas a crear"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:24
-msgid "Show bills due within this many days"
-msgstr "Mostrar recibos vencidos a lo largo de los siguientes días"
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:19
+msgid ""
+"\n"
+"If you would like to change an account's name, click on the row containing the account, then click on the account name and change it.\n"
+"\n"
+"Some accounts are marked as \"Placeholder\". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account.\n"
+"\n"
+"If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance.\n"
+"\n"
+"<b>Note:</b> all accounts except Equity and placeholder accounts may have an opening balance.\n"
+msgstr ""
+"\n"
+"Si le gustaría cambiar el nombre de una cuenta, pulse en la fila conteniendo la cuenta, entonces pulse sobre el nombre de la cuenta y cámbiela.\n"
+"\n"
+"Algunas cuentas están marcadas como «Marcador de posición». Los marcadores de posición se emplean para crear una jerarquía de cuentas y normalmente no tienen transacciones o saldos de apertura. Si le gustaría una cuenta que sea una cuenta de marcador de posición, marque la casilla de característica para esa cuenta.\n"
+"\n"
+"Si desea una cuenta para tener un balance de apertura, pulse en la fila que contiene la cuenta, a continuación, pulse en el campo de balance de apertura e introduzca el balance inicial.\n"
+"\n"
+"<b>Nota:</b> todas las cuentas excepto Patrimonio y las cuentas del marcador de posición quizá tengan un balance de apertura.\n"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:25
-msgid "This field defines the number of days in advance that GnuCash will check for due bills. Its value is only used if the \"Notify when due\" setting is active."
-msgstr "Este campo define el número de días de antelación con la que GnuCash comprobará recibos vencidos. Su valor se usa únicamente si la opción «Notificar vencimiento» está activa."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:28
+msgid "Setup selected accounts"
+msgstr "Configurar cuentas seleccionadas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:1
-msgid "GUID of predefined check format to use"
-msgstr "GUID del formato de comprobación predefinido a emplear"
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:29
+msgid ""
+"Press `Apply' to create your new accounts. You will then be able to save them to a file or database.\n"
+"\n"
+"Press `Back' to review your selections.\n"
+"\n"
+"Press `Cancel' to close this dialog without creating any new accounts."
+msgstr ""
+"Pulse «Aplicar» para crear sus cuentas nuevas. A continuación, podrá guardarlos en un fichero o\n"
+"base de datos.\n"
+"\n"
+"Pulse «Atrás» para revisar sus selecciones.\n"
+"\n"
+"Pulse «Cancelar» para cerrar este diálogo sin crear ninguna cuenta nueva."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:2
-msgid "This value specifies the predefined check format to use. The number is the guid of a known check format."
-msgstr "Este valor especifica el formato de comprobación predefinido para emplear. El número es el guid de un formato de comprobación conocido."
+#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:34
+msgid "Finish Account Setup"
+msgstr "Terminar Configuración de Cuentas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:3
-msgid "Which check position to print"
-msgstr "Cual posición de marca a escribir"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:1
+#: ../gnucash/gnome-utils/gnc-date-delta.c:226
+#: ../gnucash/report/standard-reports/price-scatter.scm:231
+msgid "Months"
+msgstr "Meses"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:4
-msgid "On preprinted checks containing multiple checks per page, this setting specifies which check position to print. The possible values are 0, 1 and 2, corresponding to the top, middle and bottom checks on the page."
-msgstr "En comprobaciones anticipadas que contienen múltiples comprobaciones por página, esta opción especifica cual posición marcar. Los valores posibles son 0, 1 y 2, que corresponden a los comprobaciones ubicados a la cima, mitad y fondo de la página."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:2
+#: ../gnucash/gnome-utils/gnc-date-delta.c:228
+#: ../gnucash/report/standard-reports/price-scatter.scm:232
+msgid "Years"
+msgstr "Años"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:5
-msgid "Number of checks to print on the first page."
-msgstr "Número de comprobaciones a marcar en la primera página."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:3
+msgid "Current Year"
+msgstr "Año actual"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:6
-msgid "Date format to use"
-msgstr "Formato de fecha a usar"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:4
+msgid "Now + 1 Year"
+msgstr "Ahora + 1 Año"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:7
-msgid "This is the numerical identifier of the predefined date format to use."
-msgstr "Este es el identificador numérico del formato de fecha predefinido a usar."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:5
+msgid "Whole Loan"
+msgstr "Préstamo Completo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:8
-msgid "Custom date format"
-msgstr "Formato de fecha personalizado"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:7
+msgid "Interest Rate"
+msgstr "Tipo de Interés"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:9
-msgid "If the date format is set to indicate a custom date format, this value is used as an argument to strftime to produce the date to be printed. It may be any valid strftime string; for more information about this format, read the manual page of strftime by \"man 3 strftime\"."
-msgstr "Si el formato de fecha está establecido para indicar un formato de fecha personalizado, este valor se usa como un argumento a “strftime” para producir la fecha que sea marcada. Puede ser cualquier cadena “strftime” válida; para más información sobre este formato, lea la página del manual de “strftime” con «man 3 strftime»."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:8
+msgid "APR (Compounded Daily)"
+msgstr "ARP (Comprobación Diaria)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:10
-msgid "Units in which the custom coordinates are expressed"
-msgstr "Unidades en las cuales las coordenadas personalizadas están expresadas"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:9
+msgid "APR (Compounded Weekly)"
+msgstr "ARP (Comprobación Semanal)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:11
-msgid "Units in which the custom coordinates are expressed (inches, mm, ...)."
-msgstr "Unidades en las cuales las coordenadas personalizadas están expresadas (pulgadas, mm, ...)."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:10
+msgid "APR (Compounded Monthly)"
+msgstr "ARP (Comprobación Mensual)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:12
-msgid "Position of payee name"
-msgstr "Posición del portador"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:11
+msgid "APR (Compounded Quarterly)"
+msgstr "ARP (Comprobación Trimestral)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:13
-msgid "This value contains the X,Y coordinates for the start of the payee line on the check."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de portador en la comprobación."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:12
+msgid "APR (Compounded Annually)"
+msgstr "ARP (Comprobación Anual)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:14
-msgid "Position of date line"
-msgstr "Posición de la línea de fecha"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:13
+msgid "Fixed Rate"
+msgstr "Tipo Fijo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:15
-msgid "This value contains the X,Y coordinates for the start of the date line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de fecha en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:14
+msgid "3/1 Year ARM"
+msgstr "3/1 año MTV"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:16
-msgid "Position of check amount in words"
-msgstr "Posición en la comprobación de la cantidad en palabras"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:15
+msgid "5/1 Year ARM"
+msgstr "5/1 año MTV"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:17
-msgid "This value contains the X,Y coordinates for the start of the written amount line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de la cantidad escrita en la comprobación. Las coordenadas son respecto a la esquina superior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:16
+msgid "7/1 Year ARM"
+msgstr "7/1 año MTV"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:18
-msgid "Position of check amount in numbers"
-msgstr "Posición de la cantidad en números de comprobación"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:17
+msgid "10/1 Year ARM"
+msgstr "10/1 año MTV"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:19
-msgid "This value contains the X,Y coordinates for the start of the numerical amount line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de cantidad numérica en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:18
+msgid ""
+"This is a step-by-step method for creating a loan repayment within GnuCash. In this assistant, you can input the details of your loan and its repayment along with the details of its payback. Using that information, the appropriate Scheduled Transactions will be created.\n"
+"\n"
+"If you make a mistake or want to make changes later, you can edit the created Scheduled Transactions directly."
+msgstr ""
+"Esto es un método de creación paso a paso para una opción de devolución de préstamos con GnuCash.  Este asistente puede introducir los parámetros de sus préstamos y amortización. Utilizando esa información, se crearán las Transacciones Programadas apropiadas.\n"
+"\n"
+"Si comete un error o si más tarde desea hacer cambios, puede editar las Transacciones Programadas creadas directamente."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:20
-msgid "Position of payee address"
-msgstr "Posición de la dirección del portador"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:21
+msgid "Loan / Mortgage Repayment Setup"
+msgstr "Configurar Devolución de Hipoteca / Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:21
-msgid "This value contains the X,Y coordinates for the start of the payee address line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de dirección del portador en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:22
+msgid "Enter the Loan Details, as a minimum enter a valid Loan Account and Amount.\n"
+msgstr "Introduzca los Detalles de Préstamo, como un mínimo introduzca una Cuenta de Préstamo y Cantidad.\n"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:22
-msgid "Position of notes line"
-msgstr "Posición de la línea de anotaciones"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:24
+msgid "Interest Rate:"
+msgstr "Tipo de interés:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:23
-msgid "This value contains the X,Y coordinates for the start of the notes line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de anotaciones en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:25
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:15
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:5
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:78
+msgid "Start Date:"
+msgstr "Fecha inicial:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:24
-msgid "Position of memo line"
-msgstr "Posición de la línea de memorándum"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:26
+msgid "Length:"
+msgstr "Duración:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:25
-msgid "This value contains the X,Y coordinates for the start of the memo line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de memorándum en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:27
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:3
+msgid "Amount:"
+msgstr "Cantidad:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:26
-msgid "Offset for complete check"
-msgstr "Desplazamiento para comprobación completa"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:28
+msgid "Loan Account:"
+msgstr "Cuenta de préstamo:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:27
-msgid "This value contains the X,Y offset for the complete check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas el offset X,Y para la comprobación completa. Las coordenadas están desde la esquina inferior izquierda de la posición de compobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:29
+msgid "Enter the number of months still to be paid off. This determines both the remaining principle and the duration of the scheduled transaction."
+msgstr "Introduzca el número de meses pendientes de una liquidación. Esto determina ambos los principales restantes y la duración de la transacción programada."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:28
-msgid "Rotation angle"
-msgstr "Ángulo de rotación"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:30
+msgid "Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans."
+msgstr "Introduzca el tipo de interés anual en porcentaje. Acepta valores desde 0'001 - 100. El Asistente de Amortización no admite devoluciones a cero de interés."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:29
-msgid "Number of degrees to rotate the check."
-msgstr "Número de grados para rotar la comprobación."
+#. oli-custom - make a string instead of a table
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:32
+#: ../gnucash/register/ledger-core/gncEntryLedgerLoad.c:57
+#: ../gnucash/report/business-reports/easy-invoice.scm:150
+#: ../gnucash/report/business-reports/fancy-invoice.scm:162
+#: ../gnucash/report/business-reports/invoice.scm:145
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:30
-msgid "Position of split's amount in numbers"
-msgstr "Posición del desglose de cantidad en números"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:33
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:31
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:6
+msgid "Type:"
+msgstr "Clasificación:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:31
-msgid "This value contains the X,Y coordinates for the start of the split's amount line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de cantidad del desglose en la comprobación. Las coordenadas están desde la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:34
+msgid "Months Remaining:"
+msgstr "Meses pendientes:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:32
-msgid "Position of split's memo line"
-msgstr "Posición del desglose de la línea del memorándum"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:35
+msgid "Interest Rate Change Frequency"
+msgstr "Frecuencia de cambio del tipo de interés"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:33
-msgid "This value contains the X,Y coordinates for the start of the split's memo line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de memorándum en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
-
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:34
-msgid "Position of split's account line"
-msgstr "Posición del desglose de la línea de cuenta"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:36
+msgid "Loan Details"
+msgstr "Detalles del Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:35
-msgid "This value contains the X,Y coordinates for the start of the split's account line on the check. Coordinates are from the lower left corner of the specified check position."
-msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de desglose de cuenta en la comprobación. Las coordenadas están desde la esquina inferior izquierda de la posición de comprobación especificada."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:37
+msgid ""
+"\n"
+"Do you utilise an escrow account, if so an account must be specified..."
+msgstr ""
+"\n"
+"¿Utiliza una cuenta de depósito, si es así debe especificarse una cuenta..."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:36
-msgid "Print the date format below the date."
-msgstr "Escribir el formato de fecha debajo de la fecha."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:39
+msgid "... utilize an escrow account for payments?"
+msgstr "... emplea una cuenta de aval para liquidaciones?"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:37
-msgid "Each time the date is printed, print the date format immediately below in 8 point type using the characters Y, M, and D."
-msgstr "Cada vez que la fecha está escrita, escriba el formato de fecha inmediatamente debajo del tipo de 8 puntos empleando los caracteres A, M, y D."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:40
+msgid "Escrow Account:"
+msgstr "Cuenta de aval:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:38
-msgid "The default check printing font"
-msgstr "El tipograma predeterminado para marcar casillas"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:41
+msgid "Loan Repayment Options"
+msgstr "Opciones de Devolución de Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:39
-msgid "The default font to use when printing checks. This value will be overridden by any font specified in a check description file."
-msgstr "El tipo de letra por omisión para usar cuando declare comprobaciones. Este valor será sobrescrito por cualquier tipo de letra especificada en un fichero de descripción de comprobación."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:42
+msgid ""
+"\n"
+"All accounts must have valid entries to continue.\n"
+msgstr ""
+"\n"
+"Todas las cuentas deben tener asientos válidos para continuar.\n"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:40
-msgid "Print '***' before and after text."
-msgstr "Escribe '***' antes y después del texto."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:45
+msgid "Payment From:"
+msgstr "Liquidación origen:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in.h:1
-msgid "Show currencies in this dialog"
-msgstr "Muestra monedas dentro de este diálogo"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:46
+msgid "Principal To:"
+msgstr "Principal a:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:3
-msgid "Position of the horizontal pane divider."
-msgstr "Posición del panel divisor horizontal."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:47
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:5
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:5
-msgid "This setting indicates whether to search in all items in the current class, or only in 'active' items in the current class."
-msgstr "Esta opción indica si se busca en todos los objetos de la clase actual, o sólo en los objetos «activos» de la familia actual."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:48
+msgid "Interest To:"
+msgstr "Interés al:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:6
-#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:19
-#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:3
-#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:3
-#: ../gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in.h:1
-#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:6
-msgid "Last pathname used"
-msgstr "Última ruta usada"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:49
+msgid "Repayment Frequency"
+msgstr "Frecuencia del Plazo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:7
-#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:20
-#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:4
-#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:4
-#: ../gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in.h:2
-#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:7
-msgid "This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened."
-msgstr "Este campo contiene la última ruta usada por esta ventana. Se usará como el nombre de fichero/nombre de ruta inicial la próxima vez que se abra la ventana."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:50
+msgid "Loan Repayment"
+msgstr "Devolución del Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:8
-msgid "Position of the vertical pane divider."
-msgstr "Posición del panel divisor vertical."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:51
+msgid ""
+"\n"
+"All enabled option pages must contain valid entries to continue.\n"
+msgstr ""
+"\n"
+"Todas las páginas de opción deben contener asientos válidos para continuar.\n"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:9
-msgid "Show the new user window"
-msgstr "Muestra la ventana del usuario nuevo"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:54
+msgid "Payment To (Escrow):"
+msgstr "Liquidación destino (aval):"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:10
-msgid "If active, the new user window will be shown. Otherwise it will not be shown."
-msgstr "Si está activo, se mostrará la ventana del usuario nuevo. De lo contrario, no se muestra."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:55
+msgid "Payment From (Escrow):"
+msgstr "Liquidación origen (aval):"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:11
-msgid "New hierarchy window on \"New File\""
-msgstr "Nueva ventana de jerarquía en «Crear fichero»"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:56
+msgid "Payment To:"
+msgstr "Liquidación destino:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:12
-msgid "If active, the \"New Hierarchy\" window will be shown whenever the \"New File\" menu item is chosen. Otherwise it will not be shown."
-msgstr "Si está activo, la ventana de «Nueva jerarquía» se mostrará siempre que se elija el «Nuevo fichero» del menú. En otro caso, no se mostrará."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:57
+msgid "Specify Source Account"
+msgstr "Especificar cuenta origen"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:13
-msgid "Default to 'new search' if fewer than this number of items is returned"
-msgstr "Predeterminar a 'nueva búsqueda' si menos  que este número de objetos es devuelto"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:58
+msgid "Use Escrow Account"
+msgstr "Emplee Cuenta Avalista"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:1
-msgid "Pre-select cleared transactions"
-msgstr "Preseleccionar transacciones punteadas"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:59
+msgid "Part of Payment Transaction"
+msgstr "Parte del liquidación por transacción"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:2
-msgid "If active, all transactions marked as cleared in the register will appear already selected in the reconcile dialog. Otherwise no transactions will be initially selected."
-msgstr "Si está activo, todas las transacciones marcadas como punteado en el registro aparecerán seleccionados en el diálogo de conciliación. En otro caso no se seleccionará inicialmente ninguna transacción."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:61
+msgid "Payment Frequency"
+msgstr "Frecuencia del Liquidación"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:3
-msgid "Prompt for interest charges"
-msgstr "Pide para cargos de intereses"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:62
+msgid "Previous Option"
+msgstr "Opción Anterior"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:4
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:136
-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 only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts."
-msgstr "Antes de conciliar una cuenta que carga o liquida intereses, solicitar al usuario que introduzca una transacción para la comisión de interés o liquidación. Actualmente solo se activa para cuentas de Banca, Crédito, Fondo, Activo, Recibos Pendientes, Liquidables y Pasivo."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:63
+msgid "Next Option"
+msgstr "Opción Siguiente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:5
-msgid "Prompt for credit card payment"
-msgstr "Pide liquidación por tarjetas de crédito"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:64
+msgid "Loan Payment"
+msgstr "Liquidación del Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:6
-msgid "If active, after reconciling a credit card account, prompt the user to enter a credit card payment. Otherwise do not prompt the user for this."
-msgstr "Si activo, después de conciliar una liquidación de tarjeta de crédito, solicitar al usuario la introducción de una liquidación por tarjeta de crédito. En otro caso no solicite esto al usuario."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:65
+msgid ""
+"\n"
+"Review the details below and if correct press Apply to create the schedule."
+msgstr ""
+"\n"
+"Revise los detalles debajo y si están correctos pulse Aplicar para crear el calendario."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:7
-msgid "Always reconcile to today"
-msgstr "Siempre conciliar al día de hoy"
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:67
+msgid "Range: "
+msgstr "Rango: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:8
-msgid "If active, always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations."
-msgstr "Si está activo, siempre abrirá el diálogo de conciliación usando la fecha del día para la fecha declarada, sin importar anteriores conciliaciones."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:68
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:17
+msgid "End Date:"
+msgstr "Fecha final:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:3
-msgid "Run \"since last run\" dialog when a file is opened."
-msgstr "Inicio del diálogo «desde la última ejecución» cuando se abra un fichero."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:69
+#: ../gnucash/report/business-reports/job-report.scm:620
+#: ../gnucash/report/business-reports/owner-report.scm:821
+msgid "Date Range"
+msgstr "Rango de Fechas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:4
-msgid "This setting controls whether the scheduled transactions \"since last run\" processing is run automatically when a data file is opened. This includes the initial opening of the data file when GnuCash starts. If this setting is active, run the \"since last run\" process, otherwise it is not run."
-msgstr "Este opción controla si la transacción programada procesándose «desde la última ejecución» se ejecuta automáticamente cuando el fichero de datos se abre. Esto incluye la apertura inicial del fichero de datos cuando se inicia GnuCash. Si esta opción está activa, se ejecuta el proceso «desde última ejecución», en otro caso no se ejecuta."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:70
+msgid "Loan Review"
+msgstr "Revisión del Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:5
-msgid "Show \"since last run\" notification dialog when a file is opened."
-msgstr "Muestra el diálogo de notificación «desde la última ejecución» cuando se abre un fichero."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:71
+msgid "Schedule added successfully."
+msgstr "Horario añadido correctamente."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:6
-msgid "This setting controls whether the scheduled transactions notification-only \"since last run\" dialog is shown when a data file is opened (if \"since last run\" processing is enabled on file open). 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 "Esta opción controla si la notificación-única de transacción programada del diálogo \"desde la última ejecución\" será mostrada cuando un fichero de datos está abierto (si el proceso de \"desde última ejecución\" está activado en un fichero abierta). Esto incluye la apertura inicial del fichero de datos cuando se inicia GnuCash. Si esta opción está activa, muestra el diálogo, en otro caso no lo muestra."
+#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:72
+msgid "Loan Summary"
+msgstr "Total del Préstamo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:7
-msgid "Set the \"auto create\" flag by default"
-msgstr "Activa la marca “autocrear” predeterminada"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:1
+msgid "Stock Split Assistant"
+msgstr "Asistencia de Desglose de Reservas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:8
-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 "Si está activo, cualquier transacción programado nuevo tendrá el valor «autocrear» activo por omisión. El usuario puede cambiar este valor durante la creación de la transacción, o en cualquier momento editando el transacción programado."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:2
+msgid "This assistant will help you record a stock split or stock merger.\n"
+msgstr "Este asistente le ayudará a registrar un desglose o unión de reservas. \n"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:9
-msgid "How many days in advance to notify the user."
-msgstr "Cuantos días de antelación para notificar al usuario."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:4
+msgid "Select the account for which you want to record a stock split or merger."
+msgstr "Seleccione la cuenta para la cual quiere registrar un desglose o fusión de reservas."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:10
-msgid "Set the \"notify\" flag by default"
-msgstr "Activa la marca “notificar” predeterminada"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:5
+msgid "Stock Split Account"
+msgstr "Cuenta de Desglose de Reservas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:11
-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 "Si está activo, cualquier transacción programada nueva tendrá el valor «notificar» activo por omisión. El usuario puede cambiar este valor durante la creación de la transacción, o en cualquier momento editando la transacción programada. Este valor solo tiene significado si el valor autocrear está activo."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.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 for the share distribution. You can also enter a description of the transaction, or accept the default one."
+msgstr "Introduzca la fecha y el número de mercancías que ha ganado o perdido por el desglose de reservas. Para fusiones (desglose negativo), utilice un valor negativo para la distribución de mercado. También puede introducir una descripción de la transacción o aceptar el valor por omisión."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:12
-msgid "How many days in advance to remind the user."
-msgstr "Cuantos días de antelación para recordar al usuario."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:7
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:15
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:31
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:5
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:58
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:61
+msgid "_Date:"
+msgstr "_Fecha:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:1
-msgid "The next tip to show."
-msgstr "Próximo consejo a mostrar."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:8
+msgid "_Shares:"
+msgstr "_Mercancías:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:4
-msgid "Show \"Tip Of The Day\" at GnuCash start"
-msgstr "Mostrar «Consejo del día» al iniciar GnuCash"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:9
+msgid "Desc_ription:"
+msgstr "Desc_ripción:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:5
-msgid "Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog will be shown. Otherwise it will not be shown."
-msgstr "Activa el «Consejo del día» cuando se inicia GnuCash. Si está activo, se mostrará el diálogo. En otro caso, no se mostrará."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:10
+msgid "Stock Split"
+msgstr "Desglose de Reservas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in.h:1
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:225
-msgid "Alpha Vantage API key"
-msgstr "Clave API Alpha Vantage"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:11
+msgid "If you want to record a stock price for the split, enter it below. You may safely leave it blank."
+msgstr "Si quiere registra un precio reservado para los desgloses, introdúzcalo debajo. Puede dejarlo en blanco con seguridad."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in.h:2
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:224
-msgid "To retrieve online quotes from Alphavantage, this key needs to be set. A key can be retrieved from the Alpha Vantage website."
-msgstr "Para obtener cotizaciones por conexión desde Alphavantage, esta clave necesita ser establecida. Una clave puede ser obtenida desde el sitio web Alpha Vantage."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:12
+msgid "New _Price:"
+msgstr "Crear _precio:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:1
-msgid "The version of these settings"
-msgstr "La versión de estas opciones"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:13
+msgid "Currenc_y:"
+msgstr "_Moneda:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:2
-msgid "This is used internally to determine whether some preferences may need conversion when switching to a newer version of GnuCash."
-msgstr "Esto se ha empleado internamente para determinar si algunas preferencias quizá requieran una conversión cuando cambia a una versión más moderna de GnuCash."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:14
+msgid "Stock Split Details"
+msgstr "Detalles del Desglose de Reserva"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:3
-msgid "Save window sizes and locations"
-msgstr "Guarda tamaño y localización"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:15
+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'."
+msgstr "Si ha recibido un desembolso de efectivo por el desglosado de reserva, introduzca los detalles de esa liquidación aquí. En otro caso, pulse «Siguiente»."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:4
-msgid "If active, the size and location of each dialog window will be saved when it is closed. The sizes and locations of content windows will be remembered when you quit GnuCash. Otherwise the sizes will not be saved."
-msgstr "Si está activo, se guardará el tamaño y ubicación de cada ventana del diálogo cuando ésta se cierre. Los tamaños y ubicaciones del contenido de las ventanas serán recordados cuando salga de GnuCash. En otro caso los tamaños no se guardarán."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:16
+msgid "_Amount:"
+msgstr "_Cantidad:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:5
-msgid "Character to use as separator between account names"
-msgstr "El carácter para usar como separador entre nombres de cuentas"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:17
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:43
+msgid "_Memo:"
+msgstr "_Memorandum:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:6
-msgid "This setting determines the character that will be used between components of an account name. Possible values are any single non-alphanumeric unicode character, or any of the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and \"period\"."
-msgstr "Esta opción determina el carácter que se usará entre los componentes de un nombre de cuenta. Los valores aceptados son cualquier carácter unicode no-alfanumérico, o cualquiera de las siguientes cadenas: «coma», «barra», «barra invertida», «guión» y «punto»."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:18
+msgid "Cash In Lieu"
+msgstr "Efectivo Contable"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:7
-msgid "Transaction Associations head path"
-msgstr "Cabecera de Transacciones Asociadas por ruta"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:19
+msgid "<b>_Income Account</b>"
+msgstr "<b>Cuenta de _Ingresos</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:8
-msgid "This is the path head for the Transaction file Associations"
-msgstr "Este esta es la ruta de cabecera para Asociaciones del fichero de Transacción por ruta"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:20
+msgid "<b>A_sset Account</b>"
+msgstr "<b>Cuenta de _Activos</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:9
-msgid "Compress the data file"
-msgstr "Comprimir el fichero de datos"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:21
+msgid "Cash in Lieu"
+msgstr "Efectivo Contable"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:10
-msgid "Enables file compression when writing the data file."
-msgstr "Activa la compresión cuando se escribe el fichero de datos."
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:22
+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 making any changes."
+msgstr "Si ha terminado de crear el desglose o unión de reserva, pulse «Aplicar». También puede pulsar «Volver» para revisar los datos o «Cancelar» para salir sin hacer ningún cambio."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:11
-msgid "Show auto-save explanation"
-msgstr "Mostrar explicación de auto-guardar"
+#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:23
+msgid "Stock Split Finish"
+msgstr "Final de Desglose de Reserva"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:12
-msgid "If active, GnuCash shows an explanation of the auto-save feature the first time that feature is started. Otherwise no extra explanation is shown."
-msgstr "Si está activo, Gnucash muestra una explicación de la característica de auto-guardar la primera vez que se ejecuta la misma. En otro caso, no se muestran explicaciones adicionales."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:1
+#: ../gnucash/report/business-reports/invoice.scm:815
+#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1800
+msgid "Printable Invoice"
+msgstr "Factura Declarable"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:13
-msgid "Auto-save time interval"
-msgstr "Intervalo de tiempo para auto-guardar"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:2
+#: ../gnucash/report/business-reports/taxinvoice.eguile.scm:451
+#: ../gnucash/report/business-reports/taxinvoice.scm:331
+#: ../gnucash/report/business-reports/taxinvoice.scm:333
+#: ../gnucash/report/business-reports/taxinvoice.scm:345
+#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1801
+msgid "Tax Invoice"
+msgstr "Factura Impositiva"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:14
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:97
-msgid "The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically."
-msgstr "El número de minutos hasta que guarden los datos al disco de forma automática. Si es cero, no se guardarán datos de forma automática."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:3
+#: ../gnucash/report/business-reports/easy-invoice.scm:863
+#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1802
+msgid "Easy Invoice"
+msgstr "Factura fácil"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:15
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:107
-msgid "Enable timeout on \"Save changes on closing\" question"
-msgstr "Activa la terminación del tiempo «Guardar cambios al cerrar» como pregunta"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:4
+#: ../gnucash/report/business-reports/fancy-invoice.scm:984
+#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1803
+msgid "Fancy Invoice"
+msgstr "Factura adornada"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:16
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:108
-msgid "If enabled, the \"Save changes on closing\" question will only wait a limited number of seconds for an answer. If the user didn't answer within that time, the changes will be saved automatically and the question window closed."
-msgstr "Si está activo, la pregunta «Guardar cambios al cerrar» sólo se esperará un número de segundos limitados para una respuesta. Si el usuario no responde en ese tiempo, los cambios se guardarán automáticamente y la ventana con la pregunta se cerrará."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:5
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:21
+#: ../gnucash/import-export/dialog-import.glade.h:8
+#: ../gnucash/import-export/qif-imp/dialog-account-picker.glade.h:1
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:17
-msgid "Time to wait for answer"
-msgstr "Tiempo de espera para la respuesta"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:6
+msgid "<b>Invoices</b>"
+msgstr "<b>Facturas</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:18
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:110
-msgid "The number of seconds to wait before the question window will be closed and the changes saved automatically."
-msgstr "El número de segundos a esperar antes de que la ventana de la pregunta se cierra y los cambios automáticamente guardados."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:7
+msgid "Ta_x included"
+msgstr "I_mposición incluida"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:19
-msgid "Display negative amounts in red"
-msgstr "Enseñar cantidades negativas en rojo"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:8
+msgid "Whether tax is included by default in entries on Bills. This setting is inherited by new customers and vendors."
+msgstr "Indica si la imposición está incluida por omisión en los asientos de Recibos. Esta opción está heredada por clientes y proveedores nuevos."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:20
-msgid "Automatically insert a decimal point"
-msgstr "Introduce un punto decimal automáticamente"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:9
+msgid "How many days in the future to warn about Bills coming due."
+msgstr "Cuantos días de antelación avisar sobre Recibos que van a vencer."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:21
-msgid "If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers."
-msgstr "Si está activo, GnuCash insertará automáticamente el separador decimal en cantidades que se introduzcan sin uno. En otro caso GnuCash no modificará los números introducidos."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:10
+msgid "_Days in advance:"
+msgstr "_Días de antelación:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:22
-msgid "Number of automatic decimal places"
-msgstr "Número de lugares decimales automáticos"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:11
+msgid "_Notify when due"
+msgstr "_Notificar vencimiento"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:23
-msgid "This field specifies the number of automatic decimal places that will be filled in."
-msgstr "Este campo especifica el número de dígitos decimales automáticos que se rellenarán."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:12
+msgid "Whether to display the list of Bills Due at startup."
+msgstr "Indica si debe enseñarse la lista de Recibos Vencidos al inicio."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:24
-msgid "Tool to migrate preferences from old backend (CGonf) to new one (GSettings) has run successfully."
-msgstr "La herramienta para migrar preferencias desde la reserva antigua (CGonf) a la nueva (GSetting) ha sido ejecutada correctamente."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:13
+msgid "<b>Bills</b>"
+msgstr "<b>Recibos</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:25
-msgid "GnuCash switched to another backend to store user preferences between 2.4 and 2.6. To smooth the transition, most preferences will be migrated the first time a 2.6 version of GnuCash is run. This migration should only run once. This preference keeps track whether or not this migration tool has run successfully."
-msgstr "GnuCash intercambió a otro apoyo para almacenar preferencias usadas entre 2.4 y 2.6. Para morder la transición, muchas preferencias serán emigradas la primera vez a la versión 2.6 está correr. Esta migracion debería ejecutarse únicamente una vez. Esta preferencia conserva los cambios si o no esta herramienta de migración ha ejecutado correctamente."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:14
+msgid "_Tax included"
+msgstr "_Imposición incluida"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:26
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:102
-msgid "Do not create log/backup files."
-msgstr "No cree ficheros de bitácora/respaldo."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:15
+msgid "Whether tax is included by default in entries on Invoices. This setting is inherited by new customers and vendors."
+msgstr "Indica si la imposición está incluido por omisión dentro de asientos de Facturas. Esta configuración está heredada por clientes y proveedores nuevos."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:27
-msgid "This setting specifies what to do with old log/backups files. \"forever\" means keep all old files. \"never\" means no old log/backup files are kept. Each time you save, older versions of the file are removed. \"days\" means keep old files for a number of days. How many days is defined in key 'retain-days'"
-msgstr "Esta opción especifica que hacer con los ficheros antiguos de bitácora/respaldo. \"forever\" quiere decir conservar todos los ficheros antiguos. \"never\" significa no conservar los ficheros de bitácora/respaldo más antiguos. Cada vez que guarda, las versiones más antiguas del fichero se eliminan. \"days\" significa conservar los ficheros antiguos por un número de días. Cuanta cantidad de días está especificado en la clave 'retain-days' (días de conservación)"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:16
+msgid "_Accumulate splits on post"
+msgstr "_Acumular desgloses al contabilizar"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:28
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:104
-msgid "Delete old log/backup files after this many days (0 = never)."
-msgstr "Borrar ficheros antiguos de bitácora/respaldo después de los días indicados (0 = nunca)."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:17
+msgid "Whether multiple entries in an invoice which transfer to the same account should be accumulated into a single split by default. This setting can be changed in the Post dialog."
+msgstr "Indica que en el caso de que haya más de una factura que se transfiera a la misma cuenta, estos deben acumularse por omisión en un único desglose. Este valor puede cambiarse en el diálogo Contabilizar."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:29
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:106
-msgid "Do not delete log/backup files."
-msgstr "No borre ficheros de bitácora/respaldo."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:18
+msgid "_Open in new window"
+msgstr "_Abrir en ventana nueva"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:30
-msgid "Delete old log/backup files after this many days (0 = never)"
-msgstr "Borrar ficheros antiguos de bitácora/respaldo después de los días indicados (0 = nunca)"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:19
+msgid "If checked, each invoice will be opened in its own top level window. If clear, the invoice will be opened in the current window."
+msgstr "Si está comprobado, cada factura será abierta en su propia ventana a nivel cima. Si está punteado, la factura será abierta dentro de la ventana actual."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:31
-msgid "This setting specifies the number of days after which old log/backup files will be deleted (0 = never)."
-msgstr "Esta opción especifica después de qué cantidad de días se eliminan los ficheros antiguos de bitácora/respaldo (0 = nunca)."
+#. Preferences Dialog, General Tab
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:20
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:71
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:32
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:34
-msgid "Don't sign reverse any accounts."
-msgstr "No invertir el signo de ninguna cuenta."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:21
+msgid "Enable extra _buttons"
+msgstr "Activar _botones extra"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:33
-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 for users who like to see negative expenses and positive income. The setting of \"credit\" is for users who want to see balances reflect the debit/credit status of the account. The setting \"none\" doesn't reverse the sign on any balances."
-msgstr "Esta opción permite invertir el signo algunas cuentas de positivo a negativo, o viceversa. La configuración «ingreso-gasto» es para usuarios que quieren ver gastos negativos e ingresos positivos. El valor «crédito» es para usuarios que quieren ver balances reflejados del estado de débito/crédito de la cuenta. El valor «ninguno» no invierte el signo en ningún balance."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:22
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:14
+msgid "If active, extra toolbar buttons for common business functions are shown as well. Otherwise they are not shown."
+msgstr "Si está activo, se mostrarán los botones extra para los botones de herramientas comunes para negocios. En otros casos, no se muestran."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:34
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:36
-msgid "Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income."
-msgstr "Invertir el signo de balances de las siguientes: Tarjeta de Crédito, Liquidables, Pasivo, Patrimonio e Ingresos."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:23
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:15
+msgid "The invoice report to be used for printing."
+msgstr "El boletín facturante a ser empleado para declarar."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:35
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:38
-msgid "Sign reverse balances on income and expense accounts."
-msgstr "Invertir el signo del saldo en cuentas de ingresos y gastos."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:24
+msgid "Report for printing:"
+msgstr "Boletín para declarar:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:36
-msgid "Use account colors in the account hierarchy"
-msgstr "Emplee los colores dentro de la jerarquía de las cuentas"
+#. See the tooltip "At post time..." for details.
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:26
+msgid "_Process payments on posting"
+msgstr "_Procesar liquidaciones a vencimiento"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:37
-msgid "If active the account hierarchy will colorize the account using the account's custom color if set. This can serve as a visual aid to quickly identify accounts."
-msgstr "Si activa la jerarquía de cuenta coloreará la cuenta utilizando el color de cuenta personalizado si se estatablece. Esto puede servir como una ayuda visual para identificar cuentas rápidamente."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:27
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:8
+msgid "At post time, automatically attempt to pay customer documents with outstanding pre-payments and counter documents. The pre-payments and documents obviously have to be against the same customer. Counter documents are documents with opposite sign. For example for an invoice, customer credit notes and negative invoices are considered counter documents."
+msgstr "En tiempo contabilizante, automáticamente se intenta liquidar los documentos de clientes con adelantos y documentos contables. Las liquidaciones anticipadas y los documentos obviamente tienen que ser contra el mismo cliente. Los documentos de Contabilización son documentos con signo opuesto. Por ejemplo para una factura, las anotaciones del crédito del cliente y las facturas negativas se consideran documentos contables."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:38
-msgid "Use account colors in the tabs of open account registers"
-msgstr "Emplee colores de cuenta en las lengüetas de los registros de cuenta abiertos"
+#. See the tooltip "At post time..." for details.
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:29
+msgid "Pro_cess payments on posting"
+msgstr "Pro_cesar liquidaciones a vencimiento"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:39
-msgid "If active the account register tabs will be colored using the account's custom color if set. This can serve as a visual aid to quickly identify accounts."
-msgstr "Si activa las lengüetas de registro de cuenta serán coloreadas utilizando el color personal de cuentas si se establece. Esto puede servir como una ayuda visual para identificar las cuentas rápidamente."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:30
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:21
+msgid "At post time, automatically attempt to pay vendor documents with outstanding pre-payments and counter documents. The pre-payments and documents obviously have to be against the same vendor. Counter documents are documents with opposite sign. For example for a bill, vendor credit notes and negative bills are considered counter documents."
+msgstr "En tiempo contabilizante, automáticamente intentar liquidar documentos del proveedor con adelantos liquidados y documentos de Contabilidad. Los adelantos liquidados y documentos obviamente tienen que estar frente al mismo proveedor. Los documentos de Contabilidad son documentos con signo opuesto. Por ejemplo para un recibo, las anotaciones del crédito del proveedor y los recibos negativos son consideradas como documentos de Contabilidad."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:40
-msgid "Use formal account labels"
-msgstr "Emplee las etiquetas de cuenta formales"
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:31
+msgid "Not_ify when due"
+msgstr "_Notificar cuando venza"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:41
-msgid "If active, formal accounting labels \"Credit\" and \"Debit\" will be used when designating fields on screen. Otherwise, informal labels such as Increase/Decrease, \"Funds In\"/\"Funds Out\", etc. will be used."
-msgstr "Si está activo, se usarán etiquetas de contabilidad formal «Crédito» y «Débito» para los campos mostrados en pantalla. En otro caso, se usarán etiquetas informales como «Incrementar» / «Decrementar», «Ingreso de Fondos» / «Retirada de Fondos», etc."
+#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:32
+msgid "Whether to display the list of Invoices Due at startup."
+msgstr "Indica si debe enseñarse la lista de Facturas Vencidas al inicio."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:42
-msgid "Show close buttons on notebook tabs"
-msgstr "Mostrar botones de cierre en pestañas"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:1
+msgid "Due Days: "
+msgstr "Días de vencimiento: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:43
-msgid "If active, a \"close\" button will be displayed on any notebook tab that may be closed. Otherwise, no such button will be shown on the tab. Regardless of this setting, pages can always be closed via the \"close\" menu item or the \"close\" button on toolbar."
-msgstr "Si está activo, se mostrará un botón «cerrar» en cualquier lengüeta del cuaderno que pueda ser cerrada. Si no, no se mostrará el botón en la lengüeta. A pesar de esta selección, las páginas siempre pueden cerrarse a través del elemento del menú “cerrar” o el botón “cerrar” en la barra de herramientas."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:2
+msgid "Discount Days: "
+msgstr "Días de descuento: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:44
-msgid "Width of notebook tabs"
-msgstr "Ancho de pestañas de anotación"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:4
+#, no-c-format
+msgid "Discount %: "
+msgstr "% descuento: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:45
-msgid "This key specifies the maximum width of notebook tabs. If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis."
-msgstr "Este valor especifica el ancho máximo de las pestañas de anotaciones. Si el texto en la lengüeta es aproximadamente más largo que el valor, la etiqueta de la lengüeta tendrá un corte y puntos suspensivos."
+# post -> límite
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:5
+msgid "The number of days to pay the bill after the post date."
+msgstr "El número de días para liquidar el recibo posterior de la fecha contabilizante."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:46
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:52
-msgid "Use the system locale currency for all newly created accounts."
-msgstr "Emplee la moneda del locale del sistema para las cuentas nuevas."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:6
+msgid "The number of days after the post date during which a discount will be applied for early payment."
+msgstr "El número de días tras la fecha contabilizante durante los cuales será aplicable el descuento por liquidación adelantada."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:47
-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 the user's locale setting. If set to \"other\", GnuCash will use the setting specified by the currency-other key."
-msgstr "Esta opción controla el origen de la moneda predeterminada para las cuentas creadas. Si se establece a \"local\" entonces GnuCash obtendrá la moneda predeterminada desde la opción local del usuario. Si establece a \"otro\", GnuCash empleará las opciones especificadas por la clave ‘currentcy-other’ (otras-monedas)."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:7
+msgid "The percentage discount applied for early payment."
+msgstr "El porcentaje de descuento aplicado por liquidación adelantada."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:48
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:43
-msgid "Use the specified currency for all newly created accounts."
-msgstr "Emplee la moneda especificada para las cuentas nuevas."
-
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:49
-msgid "Default currency for new accounts"
-msgstr "Moneda por omisión para cuentas nuevas"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:9
+msgid "Due Day: "
+msgstr "Día de vencimiento: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:50
-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)."
-msgstr "Esta opción especifica la moneda utilizada para las cuentas nuevas si la especificación del cambio de moneda está establecida a \"otro\". Este campo contiene las tres letras de código ISO 4217 para una moneda (ej. USD, GEP, RUB)."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:10
+msgid "Discount Day: "
+msgstr "Día de descuento: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:51
-msgid "Use 24 hour time format"
-msgstr "Utiliza el formato de 24 horas"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:11
+msgid "Cutoff Day: "
+msgstr "Día límite: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:52
-msgid "If active, use a 24 hour time format. Otherwise use a 12 hour time format."
-msgstr "Si está activo, emplear formato de 24 horas para la hora. En otro caso, usar formato hora de 12 horas."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:12
+msgid "The day of the month bills are due"
+msgstr "El día del mes que vencen los recibos"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:53
-msgid "Date format choice"
-msgstr "Elección del formato de fecha"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:13
+msgid "The last day of the month for the early payment discount."
+msgstr "El último día del mes para obtener el descuento por liquidación adelantada."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:54
-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 Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" for United Kingdom style dates, and \"us\" for United States style dates."
-msgstr "Esta opción elige la forma en la que se muestran las fecha en GnuCash. Los valores posibles son «local» para utilizar el valor del local del sistema,«ce» para fechas con formato de Europa Continental, «ISO» para formato ISO 8601 común, «uk» para formato del Reino Unido, y «us» para formato de los EE. UU."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:14
+msgid "The discount percentage applied if paid early."
+msgstr "El porcentaje de descuento aplicado por liquidación anticipada."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:55
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:62
-msgid "In the current calendar year"
-msgstr "Primer día del presente actual año del calendario"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:15
+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 from the end of the month."
+msgstr "El día límite para aplicar los recibos al próximo mes. Después del corte, los recibos se aplican al mes siguiente. Los valores negativos cuentan desde el último día del mes hacia atrás."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:56
-msgid "When a date is entered without year it can be completed so that it will be within the current calendar year or close to the current date based on a sliding window starting a set number of months backwards in time."
-msgstr "Cuando se entregue una fecha sin el año, puede completarse para que esté dentro del calendario actual o cerrar a la fecha actual basada en una ventana deslizante empezando un número establecido de meses hacia atrás en el tiempo."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:17
+msgid "Table"
+msgstr "Tabla"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:57
-msgid "In a sliding 12-month window starting a configurable number of months before the current month"
-msgstr "En una intervalo de 12 meses inciando un número de opción de meses antes del mes actual"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:18
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:12
+#: ../gnucash/report/business-reports/easy-invoice.scm:815
+#: ../gnucash/report/business-reports/fancy-invoice.scm:924
+#: ../gnucash/report/business-reports/invoice.scm:754
+msgid "Terms"
+msgstr "Condiciones"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:58
-msgid "Maximum number of months to go back."
-msgstr "Número máximo de meses para retroceder."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:19
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:8
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:4
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:3
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:8
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:3
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:48
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:14
+#: ../gnucash/gnome-search/dialog-search.glade.h:3
+#: ../gnucash/gnome-utils/gnc-main-window.c:297
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:12
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade.h:1
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:2
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:4
+#: ../gnucash/import-export/dialog-import.glade.h:46
+#: ../gnucash/report/report-gnome/dialog-custom-report.glade.h:3
+#: ../gnucash/report/report-gnome/dialog-report.glade.h:21
+msgid "_Close"
+msgstr "_Cerrar"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:59
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:66
-msgid "Dates will be completed so that they are close to the current date. Enter the maximum number of months to go backwards in time when completing dates."
-msgstr "Las fechas serán completadas para que sean cerradas a la fecha actual. Introduzca el número máximo de meses para revertir en el tiempo cuando complete las fechas."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:20
+msgid "Close this window"
+msgstr "Cierra esta ventana"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:60
-msgid "Show Horizontal Grid Lines"
-msgstr "Mostrar Líneas Horizontales de Cuadrícula"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:21
+msgid "<b>Terms</b>"
+msgstr "<b>Condiciones</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:61
-msgid "If active, horizontal grid lines will be shown on table displays. Otherwise no horizontal grid lines will be shown."
-msgstr "Si está activo, será mostradas las líneas horizontales de la rejilla en la vista de lengüeta. En otro caso, ninguna línea horizontal de rejilla se mostrará."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:23
+msgid "Delete the current Billing Term"
+msgstr "Borra la Condición de Recibiente actual"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:62
-msgid "Show Vertical Grid Lines"
-msgstr "Mostrar Líneas Verticales de Cuadrícula"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:25
+msgid "Create a new Billing Term"
+msgstr "Crea una Condición de Recibiente nuevo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:63
-msgid "If active, vertical grid lines will be shown on table displays. Otherwise no vertical grid lines will be shown."
-msgstr "Si está activo, será mostradas líneas verticales de la rejilla en la vista de lengüeta. En otro caso, ninguna línea de reja vertical se mostrará."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:26
+msgid "<b>Term Definition</b>"
+msgstr "<b>Definición de Condiciones</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:64
-msgid "Show splash screen"
-msgstr "Mostrar pantalla de presentación"
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:27
+msgid "De_scription:"
+msgstr "_Descripción:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:65
-msgid "If active, a splash screen will be shown at startup. Otherwise no splash screen will be shown."
-msgstr "Si está activo, se mostrará la pantalla de inicio. En otro caso, la pantalla no se mostrará."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:28
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:17
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:15
+msgid "_Type:"
+msgstr "_Tipo:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:66
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:205
-msgid "Display the notebook tabs at the top of the window."
-msgstr "Enseña las lengüetas de anotaciones en la cima de la ventana."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:29
+msgid "The description of the Billing Term, printed on invoices"
+msgstr "La descripción de las Condiciones de Recibiente, declarado en las facturas"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:67
-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 "Este opción determina el borde en el cual se elaboran las etiquetas para el cambio de las páginas de las anotaciones. Los valores posibles son «cima», «izquierda», «fondo» y «derecho». Por defecto es «cima»."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:31
+msgid "Edit the current Billing Term"
+msgstr "Edita la Condición de Recibiente actual"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:68
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:207
-msgid "Display the notebook tabs at the bottom of the window."
-msgstr "Enseña las lengüetas de anotaciones al fondo de la ventana."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:33
+msgid "Cancel your changes"
+msgstr "Cancelar los cambios"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:69
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:209
-msgid "Display the notebook tabs at the left of the window."
-msgstr "Enseña las lengüetas de anotaciones en la parte izquierda de la ventana."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:35
+msgid "Commit this Billing Term"
+msgstr "Confirmar estas Condiciones de Recibiente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:70
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:211
-msgid "Display the notebook tabs at the right of the window."
-msgstr "Enseña las lengüetas de anotaciones en la parte derecha de la ventana."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:36
+msgid "The internal name of the Billing Term."
+msgstr "El nombre interno de las Condiciones de Recibiente."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:71
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:214
-msgid "Display the summary bar at the top of the page."
-msgstr "Enseña la barra de resumen en la parte cima de la página."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:37
+msgid "<b>New Billing Term</b>"
+msgstr "<b>Creación de Condición de Recibiente</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:72
-msgid "This setting determines the edge at which the summary bar for various pages is drawn. Possible values are \"top\" and \"bottom\". It defaults to \"bottom\"."
-msgstr "Este opción determina el borde en el cual la barra de resumen para varias páginas está dibujada. Los posibles valores son «cima» y «fondo». Por defecto es «fondo»."
+#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:38
+#: ../gnucash/report/report-gnome/dialog-report.glade.h:25
+msgid "_Name:"
+msgstr "_Nombre:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:73
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:216
-msgid "Display the summary bar at the bottom of the page."
-msgstr "Enseña la barra de resumen en la parte fondo de la página."
+#: ../gnucash/gnome/gtkbuilder/dialog-choose-owner.glade.h:1
+msgid "Choose Owner Dialog"
+msgstr "Escoja Diálogo del Titular"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:74
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:202
-msgid "Closing a tab moves to the most recently visited tab."
-msgstr "El cierre de una lengüeta mueve a la última lengüeta visitada."
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:1
+#: ../gnucash/report/standard-reports/account-piecharts.scm:62
+msgid "Securities"
+msgstr "Garantías"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:75
-msgid "If active, closing a tab moves to the most recently visited tab. Otherwise closing a tab moves one tab to the left."
-msgstr "Si está activo, cerrar una lengüeta hace que se muestre la última lengüeta visitada. En otro caso cerrando una lengüeta mueve una lengüeta de la izquierda."
+#. Set the 'add criterion' button
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:2
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:51
+#: ../gnucash/gnome-search/dialog-search.c:1176
+#: ../gnucash/gnome-utils/gnc-recurrence.c:549
+msgid "_Add"
+msgstr "_Añadir"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:76
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:74
-msgid "Set book option on new files to use split \"action\" field for \"Num\" field on registers/reports"
-msgstr "Establece la opción del ejercicio en ficheros nuevo para usar campos del desglose “Operación” y “Num” en los registros/boletines"
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:3
+msgid "Add a new commodity."
+msgstr "Añadir una mercancía nueva."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:77
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:75
-msgid "If selected, the default book option for new files is set so that the 'Num' cell on registers shows/updates the split 'action' field and the transaction 'num' field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the 'Num' cell on registers shows/updates the transaction 'num' field."
-msgstr "Si está marcado, la opción predeterminada del libro para filas nuevas está establecida que la casilla 'Num' en los desgloses muestran/actualizan los campos de “Operación” de unión y el campo de 'num' de transacciones se muestra en la segunda línea en el modo de línea doble (y no es visible en el modo de línea simple). En otro caso, la opción del ejercicio predeterminado para ficheros nuevos se establece para que la casilla 'Num' en los registros mostrados / actualizados en el campo 'num' transaccional."
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:5
+msgid "Remove the current commodity."
+msgstr "Retira la mercancía actual."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:78
-msgid "Color the register using a gnucash specific color theme"
-msgstr "Colorear el registro tal como lo especifica el tema del sistema"
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:7
+msgid "Edit the current commodity."
+msgstr "Edita la mercancía actual."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:79
-msgid "When enabled the register will use a GnuCash specific color theme (green/yellow). Otherwise it will use the system color theme. Regardless of this setting the user can always override the color theme via a gnucash specific css file to be stored in the gnucash used config directory. More information can be found in the gnucash FAQ."
-msgstr "Cuando activó el registro empleará un tema de color especifico de GnuCash (verde/amarillo). En otro caso empleará el tema del color del sistema. A pesar de esta configuración el usuario puede siempre puede anular el tema del color por medio del fichero css específico para ser almacenado en el directorio de configuración de gnucash. Más información puede encontrarse en la P+F de gnucash."
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:9
+msgid "<b>Securities</b>"
+msgstr "<b>Garantías</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:80
-msgid "Superseded by \"use-gnucash-color-theme\""
-msgstr "Suplantado por \"use-gnucash-color-theme\""
+#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:10
+msgid "Show National Currencies"
+msgstr "Mostrar Monedas Nacionales"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:81
-msgid "This option is temporarily kept around for backwards compatibility. It will be removed in a future version."
-msgstr "Esta opción está conservada temporalmente debido a compatibilidad anterior. Será quitado en una versión futura."
+#. Add the help button for the matcher
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:2
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:2
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:22
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:2
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:2
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:17
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:38
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:2
+#: ../gnucash/gnome/window-reconcile2.c:2168
+#: ../gnucash/gnome/window-reconcile2.c:2249
+#: ../gnucash/gnome/window-reconcile.c:2224
+#: ../gnucash/gnome/window-reconcile.c:2305
+#: ../gnucash/gnome-search/dialog-search.glade.h:1
+#: ../gnucash/gnome-utils/gnc-main-window.c:273
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:37
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:2
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:5
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:2
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:11
+#: ../gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade.h:2
+#: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1914
+#: ../gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade.h:3
+#: ../gnucash/import-export/dialog-import.glade.h:62
+#: ../gnucash/report/report-gnome/dialog-custom-report.glade.h:2
+msgid "_Help"
+msgstr "Ay_uda"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:82
-msgid "\"Enter\" key moves to bottom of register"
-msgstr "La tecla «Intro» mueve al fondo del registro"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:5
+msgid "Customer Number: "
+msgstr "Número del cliente: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:83
-msgid "If active, pressing the enter key will move to the bottom of the register. Otherwise pressing the enter key will move to the next transaction line."
-msgstr "Si está activo, pulsar la tecla Entrar mueve al último del registro. En otro caso, pulsando la tecla Entrar mueve a la siguiente línea de transacción."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:6
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:6
+msgid "Company Name: "
+msgstr "Nombre de sociedad: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:84
-msgid "Automatically raise the list of accounts or actions during input"
-msgstr "Elevar automáticamente la lista de cuentas u operaciones durante entrada"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:7
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:7
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:7
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:9
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:7
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:506
+#: ../gnucash/report/business-reports/aging.scm:57
+#: ../gnucash/report/business-reports/aging.scm:720
+msgid "Active"
+msgstr "Activo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:85
-msgid "Move to Transfer field when memorised transaction auto filled"
-msgstr "Mover al campo de Transferencia cuando se auto-completa el memorándum de la transacción"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:8
+msgid "The customer ID number. If left blank a reasonable number will be chosen for you"
+msgstr "El código de ID del cliente . Si se deja en blanco se elegirá un número razonable"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:86
-msgid "If active then after a memorised transaction is automatically filled in the cursor will move to the Transfer field. If not active then it skips to the value field."
-msgstr "Si está activo, entonces tras un memorándum de la transacción se rellena automáticamente el cursor se moverá al campo de transferencia. Si no está activa, entonces omite al campo del valor."
-
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:87
-msgid "Create a new window for each new register"
-msgstr "Crea una ventana nueva para cada registro nuevo"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:9
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:9
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:9
+msgid "Identification"
+msgstr "Identificación"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:88
-msgid "If active, each new register will be opened in a new window. Otherwise each new register will be opened as a tab in the main window."
-msgstr "Si está activo, cada registro nuevo se abrirá en una ventana nueva. En otro caso, cada registro nuevo será abierto como una lengüeta en la ventana principal."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:10
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:10
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:10
+msgid "Name: "
+msgstr "Nombre: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:89
-msgid "Color all lines of a transaction the same"
-msgstr "Rellenar todas las líneas de una transacción con el mismo color"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:11
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:11
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:11
+msgid "Address: "
+msgstr "Dirección: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:90
-msgid "If active all lines that make up a single transaction will use the same color for their background. Otherwise the background colors are alternated on each line."
-msgstr "Si está activo, todas las líneas que conforman una transacción emplearán el mismo color de fondo. en otro caso los colores del fondo son alternados en cada línea."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:12
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:12
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:12
+msgid "Phone: "
+msgstr "Teléfono: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:91
-msgid "Show horizontal borders in a register"
-msgstr "Mostrar bordes horizontales en el registro"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:13
+msgid "Fax: "
+msgstr "Fax: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:92
-msgid "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 "Mostrar bordes horizontales entre filas en el registro. Si está activo el borde entre las casillas se mostrará con una línea gruesa. En otro caso el borde entre casillas no se marcará."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:14
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:14
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:14
+msgid "Email: "
+msgstr "Correo-e: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:93
-msgid "Show vertical borders in a register"
-msgstr "Mostrar bordes verticales en el registro"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:15
+msgid "Billing Address"
+msgstr "Dirección del Recibiente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:94
-msgid "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 "Mostrar bordes verticales entre las columnas en un registro. Si está activo, el borde entre las casillas se mostrará con una línea gruesa. En otro caso, el borde entre casillas no se marcará."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:18
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:20
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:18
+msgid "Currency: "
+msgstr "Moneda: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:95
-msgid "Show future transactions after the blank transaction in a register"
-msgstr "Mostrar transacciones futuras tras la transacción en blanco dentro de un registro"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:19
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:19
+msgid "Terms: "
+msgstr "Condiciones: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:96
-msgid "Show future transactions after the blank transaction in a register. If active then transactions with a date in the future will be displayed at the bottom of the register after the blank transaction. Otherwise the blank transaction will be at the bottom of the register after all transactions."
-msgstr "Muestra transacciones futuras tras la transacción en blanco dentro de un registro. Si activa entonces las transacciones con una fecha en el futuro será enseñada en el fondo del registro tras la transacción en blanco. En otro caso la transacción en blanco estará en el fondo del registro después de todas las transacciones."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:20
+msgid "Discount: "
+msgstr "Descuento: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:97
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:159
-msgid "Show all transactions on one line. (Two in double line mode.)"
-msgstr "Mostrar todas las transacciones en una línea (Dos en el modo de doble línea)."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:21
+msgid "Credit Limit: "
+msgstr "Límite de crédito: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:98
-msgid "This field specifies the default view style when opening a new register window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The \"ledger\" setting says to show each transaction on one or two lines. The \"auto-ledger\" setting does the same, but also expands only the current transaction to show all splits. The \"journal\" setting shows all transactions in expanded form."
-msgstr "Este campo especifica el estilo de vista por omisión al abrir una ventana de registro nueva. Los valores posibles son «libro», «auto-libro» y «diario». La opción «libro» indica que cada  la transacción debe mostrarse en una o dos líneas. La opción «auto-libro» hace lo mismo, pero expande además la transacción actual para mostrar todos los desgloses. La opción «diario» muestra todas las transacciones expandidas."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:22
+msgid "Tax Included: "
+msgstr "Impuesto Incluido: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:99
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:161
-msgid "Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)"
-msgstr "Expanda automáticamente la transacción actual para mostrar todos los desgloses. Todas las demás transacciones se muestran en una línea. (Dos en el modo de doble línea)"
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:23
+msgid "Tax Table: "
+msgstr "Tabla impositiva: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:100
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:163
-msgid "All transactions are expanded to show all splits."
-msgstr "Todas los transacciones se expanden para mostrar todos los desgloses."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:24
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:22
+msgid "Override the global Tax Table?"
+msgstr "¿Ignorar la Lengüeta Imponible global?"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:102
-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 changed at any time via the \"View->Double Line\" menu item."
-msgstr "Muestra dos líneas de información para cada transacción dentro de un registro. Esta es la opción predeterminada para cuando un registro se abra primero. La opción se puede cambiar en cualquier tiempo a través del elemento del menú \"Vista->Línea doble\"."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:25
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:22
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:12
+msgid "Billing Information"
+msgstr "Información del Recibiente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:103
-msgid "Only display leaf account names."
-msgstr "Sólo enseñar nombres de la lengüeta de cuenta."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:26
+msgid "Shipping Information"
+msgstr "Información de Transporte"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:104
-msgid "Show only the names of the leaf accounts in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Activating this option implies that you use unique leaf names."
-msgstr "Mostrar sólo los nombres de las hojas de las cuentas en el registro y en la selección automática de la cuenta. Por defecto el comportamiento es visualizar el nombre completo, incluyendo la ruta en el plan contable. La activación de esta opción implica que usted utiliza nombres de rama únicos."
+#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:27
+msgid "Shipping Address"
+msgstr "Dirección de Transporte"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:105
-msgid "Show the entered and reconcile dates"
-msgstr "Muestra la fechas introducidas y conciliadas"
+#: ../gnucash/gnome/gtkbuilder/dialog-date-close.glade.h:1
+msgid "Question"
+msgstr "Pregunta"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:106
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:178
-msgid "Show the date when the transaction was entered below the posted date and reconciled date on split row."
-msgstr "Muestra la fecha cuando la transacción fue introducida por debajo de la fecha de vencimiento y la fecha de conciliación en la fila del desglose."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:5
+msgid "Employee Number: "
+msgstr "Número de operador: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:107
-msgid "Show entered and reconciled dates on selection"
-msgstr "Muestra fechas introducudas y conciliadas en la selección"
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:6
+msgid "Username: "
+msgstr "Usuario: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:108
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:187
-msgid "Show the entered date and reconciled date on transaction selection."
-msgstr "Muestra la fecha introducida y la fecha de conciliación en la selección de transacción."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:8
+msgid "The employee ID number. If left blank a reasonable number will be chosen for you"
+msgstr "El código de operador. Si se deja en blanco, se elegirá un número razonable"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:109
-msgid "Show the calendar buttons"
-msgstr "Muestra los botones del calendario"
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:15
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:15
+msgid "Payment Address"
+msgstr "Dirección de liquidación"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:110
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:181
-msgid "Show the calendar buttons Cancel, Today and Select."
-msgstr "Muestra los botones Cancelar, Hoy y Seleccionar del calendario."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:16
+msgid "Language: "
+msgstr "Idioma: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:111
-msgid "Move the selection to the blank split on expand"
-msgstr "Mueve la selección al desglose vacío al expandir"
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:17
+msgid "Interface"
+msgstr "Interfaz"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:112
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:184
-msgid "This will move the selection to the blank split when the transaction is expanded."
-msgstr "Esto moverá la selección al desglose vacío cuando la transacción esté expandida."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:18
+msgid "Default Hours per Day: "
+msgstr "Horas al día por omisión: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:113
-msgid "Number of transactions to show in a register."
-msgstr "Número de transacciones que mostrar dentro de un registro."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:19
+msgid "Default Rate: "
+msgstr "Tipo por omisión: "
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:114
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:165
-msgid "Show this many transactions in a register. A value of zero means show all transactions."
-msgstr "Muestra este cantidad de transacciones en un registro. Un valor cero indica que se muestren todas las transacciones."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:21
+#: ../gnucash/gnome-utils/dialog-transfer.c:1947
+msgid "Credit Account"
+msgstr "Cuenta de crédito"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:115
-msgid "Number of characters for auto complete."
-msgstr "Número de carácteres para autocompletado."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:24
+msgid "Access Control List"
+msgstr "Lista de control de acceso"
 
-#. Register2 feature
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:116
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:175
-msgid "This sets the number of characters before auto complete starts for description, notes and memo fields."
-msgstr "Esto establece el número de caracteres antes de que inicie el auto-completado para los campos de descripción, anotaciones y memorándum."
+#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:25
+msgid "Access Control"
+msgstr "Control de Acceso"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:117
-msgid "Create a new window for each new report"
-msgstr "Crea una ventana nueva para cada boletín nuevo"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:1
+msgid "Annual"
+msgstr "Anual"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:118
-msgid "If active, each new report will be opened in its own window. Otherwise new reports will be opened as tabs in the main window."
-msgstr "Si está activo, cada boletín creado será abierto en su propia ventana. En otro caso, los boletines nuevos serán abiertos como lengüetas en la ventana principal."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:2
+msgid "Semi-annual"
+msgstr "Semi-anual"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:119
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:190
-msgid "Use the system locale currency for all newly created reports."
-msgstr "Emplee la moneda local del sistema para todos los boletines nuevos."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:3
+msgid "Tri-annual"
+msgstr "Cuatrimestral"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:120
-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 locale setting. If set to \"other\", GnuCash will use the setting specified by the currency-other key."
-msgstr "Esta opción controla la moneda por omisión usada en los boletines. Si se establece a «local» GnuCash obtendrá la moneda predeterminada desde las opciones locales del usuario. Si se establece a «otro», GnuCash empleará la opción especificado por la clave “currency-other”."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:4
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:8
+#: ../gnucash/report/standard-reports/transaction.scm:282
+msgid "Quarterly"
+msgstr "Trimestralmente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:121
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:189
-msgid "Use the specified currency for all newly created reports."
-msgstr "Emplee la moneda especificada para los boletines nuevos."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:5
+msgid "Bi-monthly"
+msgstr "Bimensualmente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:122
-msgid "Default currency for new reports"
-msgstr "Moneda por omisión para boletines nuevos"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:6
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:7
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:45
+#: ../gnucash/report/standard-reports/account-piecharts.scm:124
+#: ../gnucash/report/standard-reports/category-barchart.scm:131
+#: ../gnucash/report/standard-reports/transaction.scm:276
+#: ../libgnucash/engine/Recurrence.c:743 ../libgnucash/engine/Recurrence.c:759
+msgid "Monthly"
+msgstr "Mensualmente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:123
-msgid "Zoom factor to use by default for reports."
-msgstr "Factor de ampliación predefinido para boletines."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:7
+#: ../libgnucash/engine/Recurrence.c:694
+msgid "Semi-monthly"
+msgstr "Quincenalmente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:124
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:196
-msgid "On high resolution screens reports tend to be hard to read. This option allows you to scale reports up by the set factor. For example setting this to 2.0 will display reports at twice their typical size."
-msgstr "Los boletines en pantallas de alta resolución tienden a ser difíciles de leer. Esta opción permite escalar los boletines para establecer el factor. Por ejemplo aplicando esto al 2.0 enseñará boletines el doble que el tamaño típico."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:8
+msgid "Bi-weekly"
+msgstr "Quincenalmente"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:125
-msgid "PDF export file name format"
-msgstr "Nombre del formato de exportación en PDF"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:9
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:5
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:43
+#: ../gnucash/report/standard-reports/account-piecharts.scm:127
+#: ../gnucash/report/standard-reports/category-barchart.scm:134
+#: ../gnucash/report/standard-reports/transaction.scm:270
+#: ../libgnucash/engine/Recurrence.c:605
+msgid "Weekly"
+msgstr "Semanal"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:127
-#, no-c-format
-msgid "This setting chooses the file name for PDF export. This is a sprintf(3) string with three arguments: \"%1$s\" is the report name such as \"Invoice\". \"%2$s\" is the number of the report, which for an invoice report is the invoice number. \"%3$s\" is the date of the report, formatted according to the filename-date-format setting. (Note: Any characters that are not allowed in filenames, such as '/', will be replaced with underscores '_' in the resulting file name.)"
-msgstr "Esta opción elige el nombre del fichero para exportar como PDF. Esto es una cadena sprint(3) con tres argumentos: \"%1$s\" es el nombre del boletín como «Factura». «%2$s» es el número del boletín, al cual para un boletín facturante es el número de la factura. «%3$s» es la fecha del boletín, formateado de acuerdo a la opción de nombre-fichero-fecha-formato. (Nota: cualquier carácter que sea no permitido en nombres de ficheros, como '/', serán remplazados con guiones bajos '_' en el nombre del fichero resultante.)"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:10
+msgid "Daily (360)"
+msgstr "Diario (360)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:128
-msgid "PDF export file name date format choice"
-msgstr "Elección del nombre del formato de exportación en PDF"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:11
+msgid "Daily (365)"
+msgstr "Diario (365)"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:129
-msgid "This setting chooses the way dates are used in the filename of PDF export. Possible values for this setting are \"locale\" to use the system locale setting, \"ce\" for Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" for United Kingdom style dates, and \"us\" for United States style dates."
-msgstr "Esta opción elige la forma en que se utilizan las fechas en el nombre del fichero de exportación PDF. Los valores posibles para estas opciones son \"local\" para emplear el sistema local, \"ce\" para el estilo de datos de Europa Continental, \"iso\" para las fechas comunes ISO 8601, \"uk\" para el estilo de fechas del Reino Unido, y \"us\" para el estilo de fechas de Estados Unidos."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:12
+msgid "Loan Repayment Calculator"
+msgstr "Calculadora de Devolución de Préstamos"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:130
-msgid "Allow file incompatibility with older versions."
-msgstr "Permitir incompatibilidad de ficheros con versiones anteriores."
-
-#: ../gnucash/gnome/gschemas/org.gnucash.gschema.xml.in.in.h:131
-msgid "If active, gnucash will be allowed to intentionally break file compatibility with older versions, so that a data file saved in this version cannot be read by an older version again. Otherwise gnucash will write data files only in formats that can be read by older versions as well."
-msgstr "Si está activo, se permite que GnuCash rompa de forma intencionada la compatibilidad de ficheros con versiones anteriores, de forma que los datos guardados con esta versión no se podrán abrir con las anteriores. En otro caso, GnuCash guardará los datos de forma que se puedan leen con versiones anteriores."
-
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:1
-msgid "Show a grand total of all accounts converted to the default report currency"
-msgstr "Muestra un saldo de todas las cuentas convertida a boletín monetario predeterminado"
-
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:2
-msgid "Show non currency commodities"
-msgstr "Mostrar mercancías no monetarios"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:15
+msgid "_Schedule"
+msgstr "_Programación"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:3
-msgid "If active, non currency commodities (stocks) will be shown. Otherwise they will be hidden."
-msgstr "Si está activo, se mostrarán los mercancías no-monetarias (reservas). En otro caso se ocultarán."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:16
+msgid "<b>Calculations</b>"
+msgstr "<b>Cálculos</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:4
-msgid "Use relative profit/loss starting date"
-msgstr "Emplee la fecha de apertura relativa de beneficio/pérdidas"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:17
+msgid "Payment periods"
+msgstr "Periodos de liquidación"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:5
-msgid "This setting controls the type of starting date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the starting date specified by the start-date key. If set to anything else, GnuCash will retrieve the starting date specified by the start-period key."
-msgstr "Esta opción controla el tipo de fecha de inicio utilizando en los cálculos de beneficio/pérdidas. Si se establece a \"absoluto\" entonces GnuCash obtendrá la fecha inicial especificada por la clave “start-date”. Si establece a cualquier otra cosa, GnuCash obtendrá la fecha especificada por la clave “start-period”."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:18
+msgid "_Clear"
+msgstr "_Puntear"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:6
-msgid "Use absolute profit/loss starting date"
-msgstr "Emplee la fecha de apertura absoluta de beneficio/pérdidas"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:19
+msgid "Clear the entry."
+msgstr "Puntear el asiento."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:7
-msgid "Starting date (in seconds from Jan 1, 1970)"
-msgstr "Fecha de comienzo (en segundos desde el 1 de ene de 1970)"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:20
+msgid "Interest rate"
+msgstr "Tipo de interés"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:8
-msgid "This setting controls the starting date set in profit/loss calculations if the start-choice setting is set to \"absolute\". This field should contain a date as represented in seconds from January 1st, 1970."
-msgstr "Esta opción controla la fecha de inicio establecida en cálculos de beneficios/pérdidas si la opción de inicio establecido a \"absoluto\". Este campo debería contener una fecha como la representada en segundos desde el 1 de enero de 1970."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:21
+msgid "Present value"
+msgstr "Valor actual"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:9
-msgid "Starting time period identifier"
-msgstr "Identificador del periodo que comienza"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:22
+msgid "Periodic payment"
+msgstr "Liquidación periódica"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:10
-msgid "This setting controls the starting date set in profit/loss calculations if the start-choice setting is set to anything other than \"absolute\". This field should contain a value between 0 and 8."
-msgstr "Esta opción controla la fecha de inicio establecida en cálculos de beneficios/pérdidas si la opción de ‘start-choice’ está establecida a cualquier otra cosa cualquiera cuyo valor no sea «absoluto». Este campo debe contener un valor entre 0 y 8."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:23
+msgid "Future value"
+msgstr "Valor futuro"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:11
-msgid "Use relative profit/loss ending date"
-msgstr "Emplee la fecha de cierre relativo de beneficio/pérdidas"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:24
+msgid "Calculate"
+msgstr "Calcular"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:12
-msgid "This setting controls the type of ending date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the ending date specified by the end-date key. If set to anything else, GnuCash will retrieve the ending date specified by the end-period key."
-msgstr "Esta opción controla el tipo de fecha de final utilizando en los cálculos de beneficios/pérdidas. Si se establece a \"absoluto\" entonces GnuCash obtendrá la fecha final especificada por la clave ‘end-date’. Si ese establece a cualquier otra cosa, GnuCash obtendrá la fecha final por la clave ’end-period’."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:25
+msgid "Recalculate the (single) blank entry in the above fields."
+msgstr "Recalcular el (único) asiento vacío en los campos de arriba."
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:13
-msgid "Use absolute profit/loss ending date"
-msgstr "Emplee la fecha de cierre absoluta de beneficio/pérdidas"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:26
+msgid "<b>Payment Options</b>"
+msgstr "<b>Opciones de Liquidación</b>"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:14
-msgid "Ending date (in seconds from Jan 1, 1970)"
-msgstr "Fecha de finalización (en segundos desde el 1 de ene de 1970)"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:27
+msgid "Payment Total:"
+msgstr "Liquidación total:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:15
-msgid "This setting controls the ending date set in profit/loss calculations if the end-choice setting is set to \"absolute\". This field should contain a date as represented in seconds from January 1st, 1970."
-msgstr "Esta opción controla la fecha de fin establecida para cálculos de beneficios/pérdidas cuando el valor de elección_fin se establece a «absoluto». Este campo debe contener una fecha representada en forma de segundos desde el 1 de enero de 1970."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:28
+msgid "total"
+msgstr "total"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:16
-msgid "Ending time period identifier"
-msgstr "Identificador del periodo que finalizado"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:29
+msgid "Discrete"
+msgstr "Discreto"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:17
-msgid "This setting controls the ending date set in profit/loss calculations if the end-choice setting is set to anything other than \"absolute\". This field should contain a value between 0 and 8."
-msgstr "Esta opción controla la fecha final establecida en cálculos de beneficio/pérdidas si las opciones selección final está establecido a cualquier cosa distinta que \"absoluto\". Este campo debería contener un valor entre 0 y 8."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:30
+msgid "Continuous"
+msgstr "Contínuo"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:1
-msgid "Display this column"
-msgstr "Enseña esta columna"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:32
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:14
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:77
+msgid "Frequency:"
+msgstr "Frecuencia:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:2
-msgid "This setting controls whether the given column will be visible in the view. TRUE means visible, FALSE means hidden."
-msgstr "Esta opción controla si la columna dada será invisible en la vista. CIERTO significa visible, FALSO significa oculto."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:33
+msgid "When paid:"
+msgstr "Liquidado el:"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:3
-msgid "Width of this column"
-msgstr "Ancho de esta columna"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:34
+msgid "Beginning"
+msgstr "Iniciando"
 
-#: ../gnucash/gnome/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:4
-msgid "This setting stores the width of the given column in pixels."
-msgstr "Esta opción almacena la anchura de la columna dada en píxeles."
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:35
+msgid "End"
+msgstr "Final"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:1
-msgid ""
-"This assistant will help you setup and use accounting periods. \n"
-" \n"
-"Danger: this feature does not work correctly at this time; it is still under development. It will probably damage your data in such a way that it cannot be repaired!"
-msgstr ""
-"Este asistente le ayudará a configurar y usar periodos contables.\n"
-" \n"
-"Peligro: esta característica no funciona correctamente todavía; está en desarrollo. ¡Probablemente estropeará su información de tal manera que no se podrá recuperar!"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:36
+msgid "<b>Compounding:</b>"
+msgstr "<b>Cálculo de Interés:</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:4
-msgid "Setup Account Period"
-msgstr "Configuración del Periodo de Cuenta"
+#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:37
+msgid "<b>Period:</b>"
+msgstr "<b>Periodo:</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:5
-msgid ""
-"\n"
-"Select an accounting period and the closing date which must not be in the future and is greater than the closing date of the previous book.\n"
-"\n"
-"Books will be closed at midnight on the selected date."
-msgstr ""
-"\n"
-"Seleccione un periodo de cuentas y la fecha de cierre la cual no debe estar en el futuro y sea mayor que la fecha de cierre del ejercicio anterior.\n"
-"\n"
-"Los ejercicios serán cerradas a media noche en la fecha seleccionada."
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:1
+msgid "Find Account Dialog"
+msgstr "Diálogo Encontrar Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:9
-msgid "xxx"
-msgstr "xxx"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:2
+msgid "Close on Jump"
+msgstr "Cerrar al Omitir"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:10
-msgid "Book Closing Dates"
-msgstr "Fechas de Cierre de Libro"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:3
+msgid "_Jump To"
+msgstr "_Omitir a"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:11
-msgid "Title:"
-msgstr "Título:"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:5
+msgid "<b>Search the Account List</b>"
+msgstr "<b>Buscar Lista de Cuentas</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:12
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:10
-msgid "Notes:"
-msgstr "Anotaciones:"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:6
+msgid "Search from Root"
+msgstr "Buscar desde Raíz"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:13
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:1
-msgid "Close Book"
-msgstr "Cierre de Libro"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:7
+msgid "Search from Sub Account"
+msgstr "Buscar desde Subcuenta"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:14
-msgid "Account Period Finish"
-msgstr "Final del Periodo de Cuenta"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:8
+msgid "Account Full Name"
+msgstr "Nombre de Cuenta Completo"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:15
-msgid "Press 'Close' to Exit."
-msgstr "Pulse «Cerrar» al Salir."
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:9
+msgid "Case insensitive searching is available on 'Account Full Name'."
+msgstr "Búsqueda indistinguible de mayúsculas está disponible en 'Nombre Completo de Cuenta'."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-acct-period.glade.h:16
-msgid "Summary Page"
-msgstr "Página de Totales"
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:10
+msgid "_Search"
+msgstr "_Buscar"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:1
+#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:11
 msgid ""
-"This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have.\n"
-"\n"
-"You can pick a set of accounts here that seem close to your needs. After the assistant completes you will be able to add, rename, modify, and remove accounts, at any time later on. You will also be able to add sub-accounts, as well as move accounts (along with their sub-accounts) from one parent to another.\n"
-"\n"
-"Click 'Cancel'  if you do not wish to create any new accounts now."
+"Select a row and then press 'jump to' to jump to account in the Account Tree,\n"
+"if account should not be shown, this will be temporarily overridden."
 msgstr ""
-"Este asistente le ayudará a crear a un conjunto de cuentas GnuCash para sus activos (como una inversión, cuentas corrientes y ahorros), débitos (como una hipoteca) y familias diferentes de ingresos y gastos que quizá tenga.\n"
-"\n"
-"Puede escoger un conjunto de cuentas aquí que parece cerrar a sus necesidades. Tras la asistente complete será capaz de añadir, renombrar, modificar y quitar cuentas, en cualquier tiempo posterior. También será capaz de añadir subcuentas, ya sea como mover cuentas (a lo largo de sus subcuentas) desde uno ascendente a otro.\n"
-"\n"
-"Pulse `Cancelar´ si no quiere crear ninguna cuenta nueva ahora."
-
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:6
-msgid "New Account Hierarchy Setup"
-msgstr "Preparación de un plan de cuentas nuevo"
+"Seleccione una fila y después pulse 'omitir a' para omitir a cuenta dentro del Árbol de Cuenta,\n"
+"si la cuenta no debería ser mostrada, esto será sobrescrito temporalmente."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:7
-msgid ""
-"\n"
-"Please choose the currency to use for new accounts."
-msgstr ""
-"\n"
-"Por favor, elija la moneda a utilizar para las cuentas nuevas."
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:1
+msgid "Import Map Editor"
+msgstr "Importar Editor de Distribución"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:9
-msgid "Choose Currency"
-msgstr "Escoja moneda"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:4
+msgid "<b>What type of information to display?</b>"
+msgstr "<b>¿Qué familia de información para enseñar?</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:10
-msgid ""
-"\n"
-"Select categories that correspond to the ways that you foresee you will use GnuCash. Each category you select will cause several accounts to be created.\n"
-"\n"
-"<b>Note:</b> the selection you make here is only the starting point for your personalized account hierarchy. Accounts can be added, renamed, moved, or deleted by hand later at any time."
-msgstr ""
-"\n"
-"Seleccione categorías que correspondan a las maneras que preverá usar GnuCash. Cada categoría que selecciona causará que se creen varias cuentas.\n"
-"\n"
-"<b>Nota:</b> la selección que haga aquí únicamente es el punto de inicio para su jerarquía de cuenta personalizada. Las cuentas pueden ser añadidas, renombradas, movidas o eliminadas a mano en cualquier momento."
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:6
+msgid "Non-Bayesian"
+msgstr "No Bayesiano"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:14
-msgid "<b>Categories</b>"
-msgstr "<b>Categorías</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:7
+msgid "Online ID"
+msgstr "ID de conexión"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:15
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:17
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:6
-msgid "_Select All"
-msgstr "_Seleccionar todo"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:8
+msgid "Source Account Name"
+msgstr "Nombre de Cuenta Origen"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:16
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:18
-msgid "C_lear All"
-msgstr "_Desmarcar todo"
-
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:17
-msgid "<b>Category Description</b>"
-msgstr "<b>Descripción de la categoría</b>"
-
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:18
-msgid "Choose accounts to create"
-msgstr "Escoja cuentas a crear"
-
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:19
-msgid ""
-"\n"
-"If you would like to change an account's name, click on the row containing the account, then click on the account name and change it.\n"
-"\n"
-"Some accounts are marked as \"Placeholder\". Placeholder accounts are used to create a hierarchy of accounts and normally do not have transactions or opening balances. If you would like an account to be a placeholder account, click the checkbox for that account.\n"
-"\n"
-"If you would like an account to have an opening balance, click on the row containing the account, then click on the opening balance field and enter the starting balance.\n"
-"\n"
-"<b>Note:</b> all accounts except Equity and placeholder accounts may have an opening balance.\n"
-msgstr ""
-"\n"
-"Si le gustaría cambiar el nombre de una cuenta, pulse en la fila conteniendo la cuenta, entonces pulse sobre el nombre de la cuenta y cámbiela.\n"
-"\n"
-"Algunas cuentas están marcadas como «Marcador de posición». Los marcadores de posición se emplean para crear una jerarquía de cuentas y normalmente no tienen transacciones o saldos de apertura. Si le gustaría una cuenta que sea una cuenta de marcador de posición, marque la casilla de característica para esa cuenta.\n"
-"\n"
-"Si desea una cuenta para tener un balance de apertura, pulse en la fila que contiene la cuenta, a continuación, pulse en el campo de balance de apertura e introduzca el balance inicial.\n"
-"\n"
-"<b>Nota:</b> todas las cuentas excepto Patrimonio y las cuentas del marcador de posición quizá tengan un balance de apertura.\n"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:9
+msgid "Based On"
+msgstr "Basado en"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:28
-msgid "Setup selected accounts"
-msgstr "Configurar cuentas seleccionadas"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:10
+msgid "Match String"
+msgstr "Cadena Coincidente"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:29
-msgid ""
-"Press `Apply' to create your new accounts. You will then be able to save them to a file or database.\n"
-"\n"
-"Press `Back' to review your selections.\n"
-"\n"
-"Press `Cancel' to close this dialog without creating any new accounts."
-msgstr ""
-"Pulse «Aplicar» para crear sus cuentas nuevas. A continuación, podrá guardarlos en un fichero o\n"
-"base de datos.\n"
-"\n"
-"Pulse «Atrás» para revisar sus selecciones.\n"
-"\n"
-"Pulse «Cancelar» para cerrar este diálogo sin crear ninguna cuenta nueva."
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:11
+msgid "Mapped to Account Name"
+msgstr "Distribuído a Nombre de Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:34
-msgid "Finish Account Setup"
-msgstr "Terminar Configuración de Cuentas"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:12
+msgid "Count of Match String Usage"
+msgstr "Contador de Uso de Cadenas Cotejadas"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:1
-#: ../gnucash/gnome-utils/gnc-date-delta.c:226
-#: ../gnucash/report/standard-reports/price-scatter.scm:233
-msgid "Months"
-msgstr "Meses"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:13
+msgid "Case sensitive filtering is available on 'Match String' and 'Mapped to Account Name'."
+msgstr "Filtrado de distinción de mayúsculas está disponible en 'Coincidir Cadena' y 'Distribuido a Nombre de Cuenta'."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:2
-#: ../gnucash/gnome-utils/gnc-date-delta.c:228
-#: ../gnucash/report/standard-reports/price-scatter.scm:234
-msgid "Years"
-msgstr "Años"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:14
+msgid "_Filter"
+msgstr "_Filtro"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:3
-msgid "Current Year"
-msgstr "Año actual"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:15
+msgid "_Expand All"
+msgstr "_Expandir todo"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:4
-msgid "Now + 1 Year"
-msgstr "Ahora + 1 Año"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:16
+msgid "_Collapse All"
+msgstr "Colapsar _todo"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:5
-msgid "Whole Loan"
-msgstr "Préstamo Completo"
+#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:17
+msgid "Multiple rows can be selected and then deleted by pressing the delete button..."
+msgstr "Múltiples filas pueden ser seleccionadas y entonces eliminadas pulsando el botón de eliminación..."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:7
-msgid "Interest Rate"
-msgstr "Tipo de Interés"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:6
+msgid "Posted Account"
+msgstr "Cuenta contabilización"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:8
-msgid "APR (Compounded Daily)"
-msgstr "ARP (Comprobación Diaria)"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:8
+msgid "Invoice Information"
+msgstr "Información de Factura"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:9
-msgid "APR (Compounded Weekly)"
-msgstr "ARP (Comprobación Semanal)"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:9
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:19
+msgid "(owner)"
+msgstr "(titular)"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:10
-msgid "APR (Compounded Monthly)"
-msgstr "ARP (Comprobación Mensual)"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:10
+#: ../gnucash/gnome/search-owner.c:241
+#: ../gnucash/gnome-search/dialog-search.c:1110
+#: ../gnucash/report/business-reports/job-report.scm:39
+#: ../gnucash/report/business-reports/job-report.scm:564
+msgid "Job"
+msgstr "Ejercicio"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:11
-msgid "APR (Compounded Quarterly)"
-msgstr "ARP (Comprobación Trimestral)"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:15
+msgid "Customer: "
+msgstr "Cliente: "
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:12
-msgid "APR (Compounded Annually)"
-msgstr "ARP (Comprobación Anual)"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:16
+msgid "Job: "
+msgstr "Ejercicio: "
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:13
-msgid "Fixed Rate"
-msgstr "Tipo Fijo"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:17
+msgid "Default Chargeback Project"
+msgstr "Retroceso Predeterminado del Proyecto"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:14
-msgid "3/1 Year ARM"
-msgstr "3/1 año MTV"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:18
+msgid "Additional to Card:"
+msgstr "Adicional a la tarjeta:"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:15
-msgid "5/1 Year ARM"
-msgstr "5/1 año MTV"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:19
+msgid "Extra Payments"
+msgstr "Liquidaciones Adicionales"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:16
-msgid "7/1 Year ARM"
-msgstr "7/1 año MTV"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:20
+msgid "Invoice Entries"
+msgstr "Asientos de Facturas"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:17
-msgid "10/1 Year ARM"
-msgstr "10/1 año MTV"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:26
+msgid "The invoice ID number. If left blank a reasonable number will be chosen for you."
+msgstr "El ID facturante. Si se deja en blanco, se elegirá un número razonable por usted."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:18
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:28
 msgid ""
-"This is a step-by-step method for creating a loan repayment within GnuCash. In this assistant, you can input the details of your loan and its repayment along with the details of its payback. Using that information, the appropriate Scheduled Transactions will be created.\n"
-"\n"
-"If you make a mistake or want to make changes later, you can edit the created Scheduled Transactions directly."
+"Unposting this Invoice will delete the posted transaction.\n"
+"Are you sure you want to unpost it?"
 msgstr ""
-"Esto es un método de creación paso a paso para una opción de devolución de préstamos con GnuCash.  Este asistente puede introducir los parámetros de sus préstamos y amortización. Utilizando esa información, se crearán las Transacciones Programadas apropiadas.\n"
-"\n"
-"Si comete un error o si más tarde desea hacer cambios, puede editar las Transacciones Programadas creadas directamente."
-
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:21
-msgid "Loan / Mortgage Repayment Setup"
-msgstr "Configurar Devolución de Hipoteca / Préstamo"
+"Descontabilizar esta Factura eliminará la transacción contabilizada.\n"
+"¿Seguro que lo quiere descontabilizar?"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:22
-msgid "Enter the Loan Details, as a minimum enter a valid Loan Account and Amount.\n"
-msgstr "Introduzca los Detalles de Préstamo, como un mínimo introduzca una Cuenta de Préstamo y Cantidad.\n"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:30
+msgid "Yes, reset the Tax Tables"
+msgstr "Sí, restablecer las Lengüetas Impositivas"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:24
-msgid "Interest Rate:"
-msgstr "Tipo de interés:"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:31
+msgid "No, keep them as they are"
+msgstr "No, mantenerlos tal como están"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:25
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:15
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:5
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:78
-msgid "Start Date:"
-msgstr "Fecha inicial:"
+#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:32
+msgid "Reset Tax Tables to present Values?"
+msgstr "¿Restablecer Lengüetas de Imposición a Valores presentes?"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:26
-msgid "Length:"
-msgstr "Duración:"
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:1
+msgid "Job Dialog"
+msgstr "Ejercicio Dialogado"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:27
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:3
-msgid "Amount:"
-msgstr "Cantidad:"
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:7
+msgid "The job ID number. If left blank a reasonable number will be chosen for you"
+msgstr "El código del ejercicio. Si se deja en blanco se elegirá un número razonable"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:28
-msgid "Loan Account:"
-msgstr "Cuenta de préstamo:"
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:8
+msgid "Job Information"
+msgstr "Ejercicio Informado"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:29
-msgid "Enter the number of months still to be paid off. This determines both the remaining principle and the duration of the scheduled transaction."
-msgstr "Introduzca el número de meses pendientes de una liquidación. Esto determina ambos los principales restantes y la duración de la transacción programada."
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:11
+msgid "Owner Information"
+msgstr "Información del Titular"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:30
-msgid "Enter the annual interest rate in percent. Accepts values from 0.001 - 100. The Mortgage Assistant does not support zero-interest loans."
-msgstr "Introduzca el tipo de interés anual en porcentaje. Acepta valores desde 0'001 - 100. El Asistente de Amortización no admite devoluciones a cero de interés."
+#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:12
+msgid "Job Active"
+msgstr "Ejercicio Activo"
 
-#. oli-custom - make a string instead of a table
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:32
-#: ../gnucash/register/ledger-core/gncEntryLedgerLoad.c:57
-#: ../gnucash/report/business-reports/easy-invoice.scm:151
-#: ../gnucash/report/business-reports/fancy-invoice.scm:163
-#: ../gnucash/report/business-reports/invoice.scm:146
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:1
+msgid "Lot Viewer"
+msgstr "Visor de lote"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:33
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:31
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:6
-msgid "Type:"
-msgstr "Clasificación:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:2
+msgid "_New Lot"
+msgstr "Crear _lote"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:34
-msgid "Months Remaining:"
-msgstr "Meses pendientes:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:3
+msgid "Scrub _Account"
+msgstr "Cuadrar _cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:35
-msgid "Interest Rate Change Frequency"
-msgstr "Frecuencia de cambio del tipo de interés"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:4
+msgid "_Scrub"
+msgstr "_Cuadrar"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:36
-msgid "Loan Details"
-msgstr "Detalles del Préstamo"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:5
+msgid "Scrub the highlighted lot"
+msgstr "Cuadrar el lote resaltado"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:37
-msgid ""
-"\n"
-"Do you utilise an escrow account, if so an account must be specified..."
-msgstr ""
-"\n"
-"¿Utiliza una cuenta de depósito, si es así debe especificarse una cuenta..."
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:7
+msgid "Delete the highlighted lot"
+msgstr "Borra el lote seleccionado"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:39
-msgid "... utilize an escrow account for payments?"
-msgstr "... emplea una cuenta de aval para liquidaciones?"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:9
+msgid "Enter a name for the highlighted lot."
+msgstr "Introduzca un nombre para el lote seleccionada."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:40
-msgid "Escrow Account:"
-msgstr "Cuenta de aval:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:10
+msgid "<b>_Notes</b>"
+msgstr "<b>_Anotaciones</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:41
-msgid "Loan Repayment Options"
-msgstr "Opciones de Devolución de Préstamo"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:11
+msgid "Enter any notes you want to make about this lot."
+msgstr "Introduzca notas sobre este lote."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:42
-msgid ""
-"\n"
-"All accounts must have valid entries to continue.\n"
-msgstr ""
-"\n"
-"Todas las cuentas deben tener asientos válidos para continuar.\n"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:12
+msgid "<b>_Title</b>"
+msgstr "<b>_Título</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:45
-msgid "Payment From:"
-msgstr "Liquidación origen:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:13
+msgid "<b>_Lots in This Account</b>"
+msgstr "<b>_Lotes en Esta Cuenta</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:46
-msgid "Principal To:"
-msgstr "Principal a:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:14
+msgid "Show only open lots"
+msgstr "Muestra sólo lotes abiertos"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:47
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:5
-msgid "Name:"
-msgstr "Nombre:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:15
+msgid "<b>Splits _free</b>"
+msgstr "<b>Desgloses _Libres</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:48
-msgid "Interest To:"
-msgstr "Interés al:"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:16
+msgid ">>"
+msgstr ">>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:49
-msgid "Repayment Frequency"
-msgstr "Frecuencia del Plazo"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:17
+msgid "<<"
+msgstr "<<"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:50
-msgid "Loan Repayment"
-msgstr "Devolución del Préstamo"
+#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:18
+msgid "<b>Splits _in lot</b>"
+msgstr "<b>Desgloses por _lote</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:51
-msgid ""
-"\n"
-"All enabled option pages must contain valid entries to continue.\n"
-msgstr ""
-"\n"
-"Todas las páginas de opción deben contener asientos válidos para continuar.\n"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:1
+msgid "_No"
+msgstr "_No"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:54
-msgid "Payment To (Escrow):"
-msgstr "Liquidación destino (aval):"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:2
+msgid "_Yes"
+msgstr "_Sí"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:55
-msgid "Payment From (Escrow):"
-msgstr "Liquidación origen (aval):"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:3
+msgid "<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">¿Enseño el diálogo de Bienvenida otra vez?</span>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:56
-msgid "Payment To:"
-msgstr "Liquidación destino:"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:4
+msgid "If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again."
+msgstr "Si pulsa el botón <i>Sí</i>, el diálogo <i>Bienvenido a GnuCash</i> se mostrará de nuevo la próxima vez que inicie GnuCash. Si pulsa el botón <i>No</i>, no se volverá a mostrar otra vez."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:57
-msgid "Specify Source Account"
-msgstr "Especificar cuenta origen"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:7
+msgid "<span size=\"larger\" weight=\"bold\">Welcome to GnuCash!</span>"
+msgstr "<span size=\"larger\" weight=\"bold\">¡Bienvenido a GnuCash!</span>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:58
-msgid "Use Escrow Account"
-msgstr "Emplee Cuenta Avalista"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:8
+msgid "There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the <i>OK</i> button or press the <i>Cancel</i> button if you don't want to perform any of them."
+msgstr "Hay disponibles algunas operaciones predefinidas que la mayoría de los usuarios prefieren tenerlas al iniciar GnuCash. Seleccione una de estas operaciones predefinidas desde abajo y pulse el botón <i>Aceptar</i> o pulse el botón <i>Cancelar</i> si no quiere realizar ninguna de ellas."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:59
-msgid "Part of Payment Transaction"
-msgstr "Parte del liquidación por transacción"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:9
+msgid "C_reate a new set of accounts"
+msgstr "C_rear un conjunto de cuentas nuevo"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:61
-msgid "Payment Frequency"
-msgstr "Frecuencia del Liquidación"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:10
+msgid "_Import my QIF files"
+msgstr "_Importar mis ficheros QIF"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:62
-msgid "Previous Option"
-msgstr "Opción Anterior"
+#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:11
+msgid "_Open the new user tutorial"
+msgstr "_Abrir el tutorial para nuevos usuarios"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:63
-msgid "Next Option"
-msgstr "Opción Siguiente"
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:1
+msgid "Order Entry"
+msgstr "Asiento de Operación"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:64
-msgid "Loan Payment"
-msgstr "Liquidación del Préstamo"
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:4
+msgid "_Invoices"
+msgstr "_Facturas"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:65
-msgid ""
-"\n"
-"Review the details below and if correct press Apply to create the schedule."
-msgstr ""
-"\n"
-"Revise los detalles debajo y si están correctos pulse Aplicar para crear el calendario."
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:5
+msgid "Close _Order"
+msgstr "Cerrar _operación"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:67
-msgid "Range: "
-msgstr "Rango: "
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:10
+msgid "Order Information"
+msgstr "Información de Operación"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:68
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:17
-msgid "End Date:"
-msgstr "Fecha final:"
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:11
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2814
+#: ../gnucash/report/business-reports/customer-summary.scm:71
+#: ../gnucash/report/business-reports/fancy-invoice.scm:912
+#: ../gnucash/report/business-reports/invoice.scm:741
+#: ../gnucash/report/business-reports/job-report.scm:44
+#: ../gnucash/report/business-reports/owner-report.scm:53
+msgid "Reference"
+msgstr "Referencia"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:69
-#: ../gnucash/report/business-reports/job-report.scm:621
-#: ../gnucash/report/business-reports/owner-report.scm:821
-msgid "Date Range"
-msgstr "Rango de Fechas"
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:14
+msgid "Order Entries"
+msgstr "Asientos de Operación"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:70
-msgid "Loan Review"
-msgstr "Revisión del Préstamo"
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:15
+#: ../gnucash/gnome-search/dialog-search.c:1116
+msgid "New Order"
+msgstr "Crear Operación"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:71
-msgid "Schedule added successfully."
-msgstr "Horario añadido correctamente."
+#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:18
+msgid "The order ID number. If left blank a reasonable number will be chosen for you"
+msgstr "El código de operación. Si se deja en blanco se elegirá un número razonable"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-loan.glade.h:72
-msgid "Loan Summary"
-msgstr "Total del Préstamo"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:7
+msgid "The company associated with this payment."
+msgstr "La sociedad asociadas con esta liquidación."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:1
-msgid "Stock Split Assistant"
-msgstr "Asistencia de Desglose de Reservas"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:8
+msgid "Partner"
+msgstr "Socio"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:2
-msgid "This assistant will help you record a stock split or stock merger.\n"
-msgstr "Este asistente le ayudará a registrar un desglose o unión de reservas. \n"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:9
+msgid "Post To"
+msgstr "Contabilizar a"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:4
-msgid "Select the account for which you want to record a stock split or merger."
-msgstr "Seleccione la cuenta para la cual quiere registrar un desglose o fusión de reservas."
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:15
+msgid "Documents"
+msgstr "Documentos"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:5
-msgid "Stock Split Account"
-msgstr "Cuenta de Desglose de Reservas"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:16
+msgid ""
+"The amount to pay for this invoice.\n"
+"\n"
+"If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.\n"
+"\n"
+"In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company."
+msgstr ""
+"La cantidad para liquidar por esta factura.\n"
+"\n"
+"Si ha seleccionado una factura, GnuCash propondrá la cantidad que aún debe por ella. Usted puede cambiar esta cantidad para crear una liquidación parcial o una liquidación en exceso.\n"
+"\n"
+"En el caso de un factura en exceso o si no se ha seleccionado una factura, GnuCash le asignará automáticamente la cantidad de la primera factura pendiente de esta sociedad."
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.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 for the share distribution. You can also enter a description of the transaction, or accept the default one."
-msgstr "Introduzca la fecha y el número de mercancías que ha ganado o perdido por el desglose de reservas. Para fusiones (desglose negativo), utilice un valor negativo para la distribución de mercado. También puede introducir una descripción de la transacción o aceptar el valor por omisión."
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:21
+msgid "<b>Amount</b>"
+msgstr "<b>Cantidad</b>"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:7
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:15
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:31
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:5
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:58
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:61
-msgid "_Date:"
-msgstr "_Fecha:"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:23
+msgid "Refund"
+msgstr "Reembolso"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:8
-msgid "_Shares:"
-msgstr "_Mercancías:"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:26
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:16
+msgid "Print Check"
+msgstr "Declarar Comprobante"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:9
-msgid "Desc_ription:"
-msgstr "Desc_ripción:"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:27
+msgid "(USD)"
+msgstr "(EUR)"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:10
-msgid "Stock Split"
-msgstr "Desglose de Reservas"
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:28
+msgid "Transaction Details"
+msgstr "Detalles de Transacción"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:11
-msgid "If you want to record a stock price for the split, enter it below. You may safely leave it blank."
-msgstr "Si quiere registra un precio reservado para los desgloses, introdúzcalo debajo. Puede dejarlo en blanco con seguridad."
+#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:29
+#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:67
+msgid "Transfer Account"
+msgstr "Cuenta Transferencial"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:12
-msgid "New _Price:"
-msgstr "Crear _precio:"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:1
+msgid "Bid"
+msgstr "BID"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:13
-msgid "Currenc_y:"
-msgstr "_Moneda:"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:2
+msgid "Ask"
+msgstr "Razón"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:14
-msgid "Stock Split Details"
-msgstr "Detalles del Desglose de Reserva"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:3
+#: ../gnucash/report/standard-reports/budget.scm:134
+msgid "Last"
+msgstr "Último"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:15
-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'."
-msgstr "Si ha recibido un desembolso de efectivo por el desglosado de reserva, introduzca los detalles de esa liquidación aquí. En otro caso, pulse «Siguiente»."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:4
+msgid "Net Asset Value"
+msgstr "Valor de Activo Neto"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:16
-msgid "_Amount:"
-msgstr "_Cantidad:"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:6
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:1
+msgid "Dummy commodity Line"
+msgstr "Línea Ficticia de Mercancía"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:17
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:43
-msgid "_Memo:"
-msgstr "_Memorandum:"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:7
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:2
+msgid "Dummy namespace Line"
+msgstr "Línea Ficticia de Espacio"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:18
-msgid "Cash In Lieu"
-msgstr "Efectivo Contable"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:8
+msgid "Price Editor"
+msgstr "Editor de cotizaciones"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:19
-msgid "<b>_Income Account</b>"
-msgstr "<b>Cuenta de _Ingresos</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:12
+msgid "_Namespace:"
+msgstr "_Nombre Espaciado:"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:20
-msgid "<b>A_sset Account</b>"
-msgstr "<b>Cuenta de _Activos</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:13
+#: ../gnucash/gnome-utils/dialog-commodity.c:293
+msgid "_Security:"
+msgstr "_Garantía:"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:21
-msgid "Cash in Lieu"
-msgstr "Efectivo Contable"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:14
+#: ../gnucash/gnome-utils/dialog-commodity.c:298
+msgid "Cu_rrency:"
+msgstr "_Moneda:"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:22
-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 making any changes."
-msgstr "Si ha terminado de crear el desglose o unión de reserva, pulse «Aplicar». También puede pulsar «Volver» para revisar los datos o «Cancelar» para salir sin hacer ningún cambio."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:16
+msgid "S_ource:"
+msgstr "_Origen:"
 
-#: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:23
-msgid "Stock Split Finish"
-msgstr "Final de Desglose de Reserva"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:18
+msgid "_Price:"
+msgstr "_Precio:"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:1
-#: ../gnucash/report/business-reports/invoice.scm:816
-#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1800
-msgid "Printable Invoice"
-msgstr "Factura Declarable"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:19
+msgid "Remove Old Prices"
+msgstr "Quitar Precios Antiguos"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:2
-#: ../gnucash/report/business-reports/taxinvoice.eguile.scm:451
-#: ../gnucash/report/business-reports/taxinvoice.scm:331
-#: ../gnucash/report/business-reports/taxinvoice.scm:333
-#: ../gnucash/report/business-reports/taxinvoice.scm:345
-#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1801
-msgid "Tax Invoice"
-msgstr "Factura Impositiva"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:20
+msgid "Delete prices that meet the following criteria:"
+msgstr "Borra todos los precios coincidiendo en los criterios siguientes:"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:3
-#: ../gnucash/report/business-reports/easy-invoice.scm:864
-#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1802
-msgid "Easy Invoice"
-msgstr "Factura fácil"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:21
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:33
+msgid "_None"
+msgstr "_Ninguna"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:4
-#: ../gnucash/report/business-reports/fancy-invoice.scm:985
-#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1803
-msgid "Fancy Invoice"
-msgstr "Factura adornada"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:22
+msgid "Remove all prices before date."
+msgstr "Quitar todos los precios anteriores a la fecha."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:5
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:21
-#: ../gnucash/import-export/dialog-import.glade.h:8
-#: ../gnucash/import-export/qif-imp/dialog-account-picker.glade.h:1
-msgid "Preferences"
-msgstr "Preferencias"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:23
+msgid "Last of _Week"
+msgstr "Última de _Semana"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:6
-msgid "<b>Invoices</b>"
-msgstr "<b>Facturas</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:24
+msgid "Keep the last price of each week if present before date."
+msgstr "Conserva el precio último para cada semana si presenta antes de la fecha."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:7
-msgid "Ta_x included"
-msgstr "I_mposición incluida"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:25
+msgid "Last of _Month"
+msgstr "Último del _Mes"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:8
-msgid "Whether tax is included by default in entries on Bills. This setting is inherited by new customers and vendors."
-msgstr "Indica si la imposición está incluida por omisión en los asientos de Recibos. Esta opción está heredada por clientes y proveedores nuevos."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:26
+msgid "Keep the last price of each month if present before date."
+msgstr "Conserva el precio último para cada mes si presenta antes de la fecha."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:9
-msgid "How many days in the future to warn about Bills coming due."
-msgstr "Cuantos días de antelación avisar sobre Recibos que van a vencer."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:27
+msgid "Last of _Quarter"
+msgstr "Último del _Trimestre"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:10
-msgid "_Days in advance:"
-msgstr "_Días de antelación:"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:28
+msgid "Keep the last price of each fiscal quarter if present before date. The fiscal quarter is derived from the accounting period end date."
+msgstr "Conservar el último precio de cada trimestre fiscal si se presenta antes de la fecha. El trimestre fiscal está derivado desde la fecha final del periodo de contabilización."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:11
-msgid "_Notify when due"
-msgstr "_Notificar vencimiento"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:29
+msgid "Last of _Period"
+msgstr "Último del _Periodo"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:12
-msgid "Whether to display the list of Bills Due at startup."
-msgstr "Indica si debe enseñarse la lista de Recibos Vencidos al inicio."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:30
+msgid "Keep the last price of each fiscal period if present before date. The fiscal period is derived from the accounting period end date."
+msgstr "Conservar el último precio de cada periodo fiscal si se presenta antes de la fecha. El trimestre fiscal está derivado desde la fecha final del periodo de contabilización."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:13
-msgid "<b>Bills</b>"
-msgstr "<b>Recibos</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:31
+msgid "_Scaled"
+msgstr "_Escalada"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:14
-msgid "_Tax included"
-msgstr "_Imposición incluida"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:32
+msgid "With the scaled option, prices are removed relative to the date selected. 'One a month' is used for dates older than a year and 'One a week' is used for dates older than six months to a year."
+msgstr "Con la opción de escala, precios son quitados relativos para la fecha seleccionada. 'Una vez al mes' se emplea para datos más antiguos que un año y 'Una vez por semana' está empleado para dostos más antigis que seis meses a un año."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:15
-msgid "Whether tax is included by default in entries on Invoices. This setting is inherited by new customers and vendors."
-msgstr "Indica si la imposición está incluido por omisión dentro de asientos de Facturas. Esta configuración está heredada por clientes y proveedores nuevos."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:33
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:743
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2983
+msgid "Commodity"
+msgstr "Mercancía"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:16
-msgid "_Accumulate splits on post"
-msgstr "_Acumular desgloses al contabilizar"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:34
+msgid "First Date"
+msgstr "Fecha Primera"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:17
-msgid "Whether multiple entries in an invoice which transfer to the same account should be accumulated into a single split by default. This setting can be changed in the Post dialog."
-msgstr "Indica que en el caso de que haya más de una factura que se transfiera a la misma cuenta, estos deben acumularse por omisión en un único desglose. Este valor puede cambiarse en el diálogo Contabilizar."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:35
+msgid "From these Commodities:"
+msgstr "Desde estas Mercancías:"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:18
-msgid "_Open in new window"
-msgstr "_Abrir en ventana nueva"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:36
+msgid "Keeping the last available price for option:"
+msgstr "Conservar el último precio disponible para opción:"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:19
-msgid "If checked, each invoice will be opened in its own top level window. If clear, the invoice will be opened in the current window."
-msgstr "Si está comprobado, cada factura será abierta en su propia ventana a nivel cima. Si está punteado, la factura será abierta dentro de la ventana actual."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:37
+msgid "Source:"
+msgstr "Origen:"
 
-#. Preferences Dialog, General Tab
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:20
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:71
-msgid "<b>General</b>"
-msgstr "<b>General</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:38
+msgid "Include _Fetched online prices"
+msgstr "Incluir precios _traídos por conexión"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:21
-msgid "Enable extra _buttons"
-msgstr "Activar _botones extra"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:39
+msgid "If activated, prices added by Finance::Quote will be included."
+msgstr "Si activado, precios añadidos por Financia::Cotización será incluido."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:24
-msgid "Report for printing:"
-msgstr "Boletín para declarar:"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:40
+msgid "Include manually _Entered prices"
+msgstr "Incluir manualmente los precios _introducidos"
 
-#. See the tooltip "At post time..." for details.
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:26
-msgid "_Process payments on posting"
-msgstr "_Procesar liquidaciones a vencimiento"
-
-#. See the tooltip "At post time..." for details.
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:29
-msgid "Pro_cess payments on posting"
-msgstr "Pro_cesar liquidaciones a vencimiento"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:41
+msgid "If activated, include manually entered prices."
+msgstr "Si es activado, incluye manualmente precioes introducidos."
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:31
-msgid "Not_ify when due"
-msgstr "_Notificar cuando venza"
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:42
+msgid "_Added by the application"
+msgstr "_Añadido por la aplicación"
 
-#: ../gnucash/gnome/gtkbuilder/business-prefs.glade.h:32
-msgid "Whether to display the list of Invoices Due at startup."
-msgstr "Indica si debe enseñarse la lista de Facturas Vencidas al inicio."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:43
+msgid ""
+"If activated, include application added prices.\n"
+"\n"
+"These prices were added so that there's always a \"nearest in time\" price for every multi-commodity transaction so that the Accounts page and reports are able to correctly report values so removing them may make this less reliable."
+msgstr ""
+"Si está activado, incluye precios añadidos por aplicación.\n"
+"\n"
+"Estos precios fueron añadidos tal que siempre hay un precio  «cercanos en tiempo» para cada transacción multicolumna tal que la página de Cuentas y boletines son capaces de informar correctamente valores tal que quitándolos puede hacer esto menos fiable."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:1
-msgid "Due Days: "
-msgstr "Días de vencimiento: "
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:46
+msgid "Before _Date:"
+msgstr "Anterior a _fecha:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:2
-msgid "Discount Days: "
-msgstr "Días de descuento: "
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:47
+#: ../gnucash/report/standard-reports/price-scatter.scm:96
+msgid "Price Database"
+msgstr "Base de datos de precios"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:4
-#, no-c-format
-msgid "Discount %: "
-msgstr "% descuento: "
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:49
+msgid "_Get Quotes"
+msgstr "_Obtener cotizaciones"
 
-# post -> límite
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:5
-msgid "The number of days to pay the bill after the post date."
-msgstr "El número de días para liquidar el recibo posterior de la fecha contabilizante."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:50
+msgid "Get new online quotes for stock accounts."
+msgstr "Descargar cotizaciones nuevas para cuentas de reservas."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:6
-msgid "The number of days after the post date during which a discount will be applied for early payment."
-msgstr "El número de días tras la fecha contabilizante durante los cuales será aplicable el descuento por liquidación adelantada."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:52
+msgid "Add a new price."
+msgstr "Añade un precio nuevo."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:7
-msgid "The percentage discount applied for early payment."
-msgstr "El porcentaje de descuento aplicado por liquidación adelantada."
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:54
+msgid "Remove the current price."
+msgstr "Retira el precio actual."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:9
-msgid "Due Day: "
-msgstr "Día de vencimiento: "
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:56
+msgid "Edit the current price."
+msgstr "Editar el precio actual."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:10
-msgid "Discount Day: "
-msgstr "Día de descuento: "
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:57
+msgid "Remove _Old"
+msgstr "Retirar antigu_os"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:11
-msgid "Cutoff Day: "
-msgstr "Día límite: "
+#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:58
+msgid "Remove prices older than a user-entered date."
+msgstr "Quitar precios más anteriores que la fecha introducida por el usuario."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:12
-msgid "The day of the month bills are due"
-msgstr "El día del mes que vencen los recibos"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:1
+msgid "Save Custom Check Format"
+msgstr "Guarda Formato de Comprobación Personalizada"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:13
-msgid "The last day of the month for the early payment discount."
-msgstr "El último día del mes para obtener el descuento por liquidación adelantada."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:4
+msgid "Enter a title for this custom format. This title will appear in the \"Check format\" selector of the Print Check dialog. Using the title of an existing custom format will cause that format to be overwritten."
+msgstr "Introduzca un nombre para este formato personalizado. Este título aparecerá dentro del selector «Formato de comprobación» del diálogo Escribir Comprobación. Empleando el título de un formato personalizado ya existente causará que el formato sea sobrescrito."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:14
-msgid "The discount percentage applied if paid early."
-msgstr "El porcentaje de descuento aplicado por liquidación anticipada."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:5
+msgid "Inches"
+msgstr "Pulgadas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:15
-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 from the end of the month."
-msgstr "El día límite para aplicar los recibos al próximo mes. Después del corte, los recibos se aplican al mes siguiente. Los valores negativos cuentan desde el último día del mes hacia atrás."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:6
+msgid "Centimeters"
+msgstr "Centímetros"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:17
-msgid "Table"
-msgstr "Tabla"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:7
+msgid "Millimeters"
+msgstr "Milímetros"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:18
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:12
-#: ../gnucash/report/business-reports/easy-invoice.scm:816
-#: ../gnucash/report/business-reports/fancy-invoice.scm:925
-#: ../gnucash/report/business-reports/invoice.scm:755
-msgid "Terms"
-msgstr "Condiciones"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:8
+msgid "Points"
+msgstr "Puntos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:19
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:8
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:4
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:3
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:8
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:3
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:48
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:14
-#: ../gnucash/gnome-search/dialog-search.glade.h:3
-#: ../gnucash/gnome-utils/gnc-main-window.c:297
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:12
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade.h:1
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:2
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:4
-#: ../gnucash/import-export/dialog-import.glade.h:46
-#: ../gnucash/report/report-gnome/dialog-custom-report.glade.h:3
-#: ../gnucash/report/report-gnome/dialog-report.glade.h:21
-msgid "_Close"
-msgstr "_Cerrar"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:10
+msgid "Middle"
+msgstr "Medio"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:20
-msgid "Close this window"
-msgstr "Cierra esta ventana"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:11
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:215
+msgid "Bottom"
+msgstr "Suelo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:21
-msgid "<b>Terms</b>"
-msgstr "<b>Condiciones</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:13
+msgid "Quicken/QuickBooks (tm) US-Letter"
+msgstr "Quicken/QuickBooksâ„¢ (Sobre EE. UU.)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:23
-msgid "Delete the current Billing Term"
-msgstr "Borra la Condición de Recibiente actual"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:14
+msgid "Deluxe(tm) Personal Checks US-Letter"
+msgstr "Comprobante Deluxeâ„¢ Personal (Sobre EE. UU.)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:25
-msgid "Create a new Billing Term"
-msgstr "Crea una Condición de Recibiente nuevo"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:15
+msgid "Quicken(tm) Wallet Checks w/ side stub"
+msgstr "Comprobante Quickenâ„¢ Wallet (lateral)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:26
-msgid "<b>Term Definition</b>"
-msgstr "<b>Definición de Condiciones</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:18
+msgid "_Print"
+msgstr "_Imprimir"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:27
-msgid "De_scription:"
-msgstr "_Descripción:"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:19
+msgid "Check _format:"
+msgstr "_Formato de comprobación:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:28
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:17
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:15
-msgid "_Type:"
-msgstr "_Tipo:"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:20
+msgid "Check po_sition:"
+msgstr "Po_sición de comprobación:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:29
-msgid "The description of the Billing Term, printed on invoices"
-msgstr "La descripción de las Condiciones de Recibiente, declarado en las facturas"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:21
+msgid "_Date format:"
+msgstr "Formato de _fecha:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:31
-msgid "Edit the current Billing Term"
-msgstr "Edita la Condición de Recibiente actual"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:22
+msgid ""
+"Check format must have an\n"
+"ADDRESS item defined in order\n"
+"to print an address on the check."
+msgstr ""
+"Compruebe que el formato debe \n"
+"tener un elemento de dirección \n"
+"DIRECCIÓN definida con el fin de \n"
+"para escribir una dirección en \n"
+"la comprobación."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:33
-msgid "Cancel your changes"
-msgstr "Cancelar los cambios"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:25
+msgid "_Address"
+msgstr "_Dirección"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:35
-msgid "Commit this Billing Term"
-msgstr "Confirmar estas Condiciones de Recibiente"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:26
+msgid "Checks on first _page:"
+msgstr "Comprobaciones en la primera _página:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:36
-msgid "The internal name of the Billing Term."
-msgstr "El nombre interno de las Condiciones de Recibiente."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:28
+msgid "x"
+msgstr "x"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:37
-msgid "<b>New Billing Term</b>"
-msgstr "<b>Creación de Condición de Recibiente</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:29
+msgid "y"
+msgstr "y"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-billterms.glade.h:38
-#: ../gnucash/report/report-gnome/dialog-report.glade.h:25
-msgid "_Name:"
-msgstr "_Nombre:"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:30
+msgid "Pa_yee:"
+msgstr "_Portador:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-choose-owner.glade.h:1
-msgid "Choose Owner Dialog"
-msgstr "Escoja Diálogo del Titular"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:32
+msgid "Amount (_words):"
+msgstr "Cantidad (_palabras):"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:1
-#: ../gnucash/report/standard-reports/account-piecharts.scm:64
-msgid "Securities"
-msgstr "Garantías"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:33
+msgid "Amount (_numbers):"
+msgstr "Cantidad (_números):"
 
-#. Set the 'add criterion' button
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:2
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:51
-#: ../gnucash/gnome-search/dialog-search.c:1176
-#: ../gnucash/gnome-utils/gnc-recurrence.c:549
-msgid "_Add"
-msgstr "_Añadir"
-
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:3
-msgid "Add a new commodity."
-msgstr "Añadir una mercancía nueva."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:34
+msgid "_Notes:"
+msgstr "_Anotaciones:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:5
-msgid "Remove the current commodity."
-msgstr "Retira la mercancía actual."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:35
+msgid "_Units:"
+msgstr "_Unidades:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:7
-msgid "Edit the current commodity."
-msgstr "Edita la mercancía actual."
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:36
+msgid "_Translation:"
+msgstr "_Translación:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:9
-msgid "<b>Securities</b>"
-msgstr "<b>Garantías</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:37
+msgid "_Rotation"
+msgstr "_Rotación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-commodities.glade.h:10
-msgid "Show National Currencies"
-msgstr "Mostrar Monedas Nacionales"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:38
+msgid "The origin point is the upper left-hand corner of the page."
+msgstr "El punto origen es la esquina superior izquierda de la página."
 
-#. Add the help button for the matcher
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:2
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:2
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:22
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:2
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:2
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:17
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:38
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:2
-#: ../gnucash/gnome/window-reconcile2.c:2168
-#: ../gnucash/gnome/window-reconcile2.c:2249
-#: ../gnucash/gnome/window-reconcile.c:2224
-#: ../gnucash/gnome/window-reconcile.c:2305
-#: ../gnucash/gnome-search/dialog-search.glade.h:1
-#: ../gnucash/gnome-utils/gnc-main-window.c:273
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:37
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:2
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:5
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:2
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:11
-#: ../gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade.h:2
-#: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1914
-#: ../gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade.h:3
-#: ../gnucash/import-export/dialog-import.glade.h:62
-#: ../gnucash/report/report-gnome/dialog-custom-report.glade.h:2
-msgid "_Help"
-msgstr "Ay_uda"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:39
+msgid "The origin point is the lower left-hand corner of the page."
+msgstr "El punto origen es la esquina inferior izquierda de la página."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:5
-msgid "Customer Number: "
-msgstr "Número del cliente: "
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:40
+msgid "Degrees"
+msgstr "Grados"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:6
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:6
-msgid "Company Name: "
-msgstr "Nombre de sociedad: "
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:41
+msgid "_Save Format"
+msgstr "Guardar _formato"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:7
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:7
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:7
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:9
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:7
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:506
-#: ../gnucash/report/business-reports/aging.scm:58
-#: ../gnucash/report/business-reports/aging.scm:711
-msgid "Active"
-msgstr "Activo"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:42
+msgid "_Address:"
+msgstr "_Dirección:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:8
-msgid "The customer ID number. If left blank a reasonable number will be chosen for you"
-msgstr "El código de ID del cliente . Si se deja en blanco se elegirá un número razonable"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:44
+msgid "Splits Memo"
+msgstr "Desgloses de Memorándum"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:9
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:9
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:9
-msgid "Identification"
-msgstr "Identificación"
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:45
+msgid "Splits Amount"
+msgstr "Desgloses de Débito"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:10
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:10
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:10
-msgid "Name: "
-msgstr "Nombre: "
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:46
+msgid "Splits Account"
+msgstr "Desgloses de Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:11
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:11
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:11
-msgid "Address: "
-msgstr "Dirección: "
+#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:47
+msgid "Custom format"
+msgstr "Formato personalizado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:12
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:12
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:12
-msgid "Phone: "
-msgstr "Teléfono: "
+#: ../gnucash/gnome/gtkbuilder/dialog-progress.glade.h:1
+msgid "1234567890123456789012345678901234567890"
+msgstr "1234567890123456789012345678901234567890"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:13
-msgid "Fax: "
-msgstr "Fax: "
+#: ../gnucash/gnome/gtkbuilder/dialog-progress.glade.h:2
+msgid "Working..."
+msgstr "Ocupado..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:14
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:14
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:14
-msgid "Email: "
-msgstr "Correo-e: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:1
+msgid "Account Deletion"
+msgstr "Eliminación de Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:15
-msgid "Billing Address"
-msgstr "Dirección del Recibiente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:3
+msgid "The following Scheduled Transactions reference the deleted account and must now be corrected. Press OK to edit them."
+msgstr "Las Transacciones Programadas siguientes hacen referencia a la cuenta eliminada y debe ser corregida. Pulse “Aceptar” para editarlas."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:18
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:20
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:18
-msgid "Currency: "
-msgstr "Moneda: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:4
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:42
+#: ../gnucash/report/standard-reports/category-barchart.scm:137
+#: ../gnucash/report/standard-reports/transaction.scm:264
+#: ../libgnucash/engine/Recurrence.c:726
+msgid "Daily"
+msgstr "Diariamente"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:19
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:19
-msgid "Terms: "
-msgstr "Condiciones: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:6
+msgid "Bi-Weekly"
+msgstr "Quincenalmente"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:20
-msgid "Discount: "
-msgstr "Descuento: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:9
+#: ../gnucash/report/standard-reports/account-piecharts.scm:121
+#: ../gnucash/report/standard-reports/transaction.scm:288
+#: ../libgnucash/engine/Recurrence.c:771
+msgid "Yearly"
+msgstr "Anualmente"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:21
-msgid "Credit Limit: "
-msgstr "Límite de crédito: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:10
+msgid "Make Scheduled Transaction"
+msgstr "Crear Transacción Programada"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:22
-msgid "Tax Included: "
-msgstr "Impuesto Incluido: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:11
+msgid "Advanced..."
+msgstr "Avanzado..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:23
-msgid "Tax Table: "
-msgstr "Tabla impositiva: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:16
+msgid "Never End"
+msgstr "Nunca Finalizar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:24
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:22
-msgid "Override the global Tax Table?"
-msgstr "¿Ignorar la Lengüeta Imponible global?"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:18
+msgid "Number of Occurrences:"
+msgstr "Número de coincidencias:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:25
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:22
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:12
-msgid "Billing Information"
-msgstr "Información del Recibiente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:19
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:29
+msgid "1"
+msgstr "1"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:26
-msgid "Shipping Information"
-msgstr "Información de Transporte"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:20
+msgid "End: "
+msgstr "Finalizar: "
 
-#: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:27
-msgid "Shipping Address"
-msgstr "Dirección de Transporte"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:22
+msgid "<b>Since Last Run</b>"
+msgstr "<b>Desde Última Ejecución</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-date-close.glade.h:1
-msgid "Question"
-msgstr "Pregunta"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:23
+msgid "<b>Transaction Editor Defaults</b>"
+msgstr "<b>Editor de Transacción Predeterminadas</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:5
-msgid "Employee Number: "
-msgstr "Número de operador: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:24
+msgid "_Run when data file opened"
+msgstr "_Ejecutar cuando el fichero de datos esté abierto"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:6
-msgid "Username: "
-msgstr "Usuario: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:25
+msgid "Run the \"since last run\" process when a file is opened."
+msgstr "Inicio el proceso «desde la última ejecución» cuando se abra un fichero."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:8
-msgid "The employee ID number. If left blank a reasonable number will be chosen for you"
-msgstr "El código de operador. Si se deja en blanco, se elegirá un número razonable"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:26
+msgid "_Show notification window"
+msgstr "_Mostrar ventana de notificación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:15
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:15
-msgid "Payment Address"
-msgstr "Dirección de liquidación"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:27
+msgid "Show the notification window for the \"since last run\" process when a file is opened."
+msgstr "Muestra la ventana de notificación «desde la última ejecución» cuando se abre un fichero."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:16
-msgid "Language: "
-msgstr "Idioma: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:28
+msgid "_Auto-create new transactions"
+msgstr "_Auto-crear transacciones nuevas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:17
-msgid "Interface"
-msgstr "Interfaz"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:29
+msgid "Set the 'auto-create' flag on newly created scheduled transactions."
+msgstr "Activar la marca 'autocrear' en las transacciones programadas nuevamente creadas."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:18
-msgid "Default Hours per Day: "
-msgstr "Horas al día por omisión: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:30
+msgid "Crea_te in advance:"
+msgstr "Creación an_ticipada:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:19
-msgid "Default Rate: "
-msgstr "Tipo por omisión: "
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:31
+msgid "R_emind in advance:"
+msgstr "R_ecuerdo anticipado:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:21
-#: ../gnucash/gnome-utils/dialog-transfer.c:1947
-msgid "Credit Account"
-msgstr "Cuenta de crédito"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:32
+msgid "Begin notifications this many days before the transaction is created."
+msgstr "Comenzar notificaciones estos días antes de que la transacción sea creada."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:24
-msgid "Access Control List"
-msgstr "Lista de control de acceso"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:33
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:79
+msgid "days"
+msgstr "días"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:25
-msgid "Access Control"
-msgstr "Control de Acceso"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:34
+msgid "Create the transaction this many days before its effective date."
+msgstr "Crea la transacción esta cantidad de días antes de su fecha efectiva."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:1
-msgid "Annual"
-msgstr "Anual"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:35
+msgid "_Notify before transactions are created "
+msgstr "_Notificar antes de crear las transacciones "
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:2
-msgid "Semi-annual"
-msgstr "Semi-anual"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:36
+msgid "Set the 'notify' flag on newly created scheduled transactions."
+msgstr "Activa la marca 'notificar' en las transacciones programadas creadas recientemente."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:3
-msgid "Tri-annual"
-msgstr "Cuatrimestral"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:37
+msgid "Edit Scheduled Transaction"
+msgstr "Editar Transacción Programada"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:4
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:8
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:919
-#: ../gnucash/report/standard-reports/transaction.scm:289
-msgid "Quarterly"
-msgstr "Trimestralmente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:39
+msgid "<b>Name</b>"
+msgstr "<b>Nombre</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:5
-msgid "Bi-monthly"
-msgstr "Bimensualmente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:40
+msgid "<b>Options</b>"
+msgstr "<b>Opciones</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:6
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:7
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:45
-#: ../gnucash/report/standard-reports/account-piecharts.scm:126
-#: ../gnucash/report/standard-reports/category-barchart.scm:133
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:918
-#: ../gnucash/report/standard-reports/transaction.scm:283
-#: ../libgnucash/engine/Recurrence.c:743 ../libgnucash/engine/Recurrence.c:759
-msgid "Monthly"
-msgstr "Mensualmente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:41
+msgid "Create in advance:"
+msgstr "Crear con adelanto:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:7
-#: ../libgnucash/engine/Recurrence.c:694
-msgid "Semi-monthly"
-msgstr "Quincenalmente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:42
+msgid "Remind in advance:"
+msgstr "Recordar con adelanto:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:8
-msgid "Bi-weekly"
-msgstr "Quincenalmente"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:43
+msgid " days"
+msgstr " días"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:9
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:5
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:43
-#: ../gnucash/report/standard-reports/account-piecharts.scm:129
-#: ../gnucash/report/standard-reports/category-barchart.scm:136
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:917
-#: ../gnucash/report/standard-reports/transaction.scm:277
-#: ../libgnucash/engine/Recurrence.c:605
-msgid "Weekly"
-msgstr "Semanal"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:44
+msgid "Create automatically"
+msgstr "Crear automáticamente"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:10
-msgid "Daily (360)"
-msgstr "Diario (360)"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:45
+msgid "Conditional on splits not having variables"
+msgstr "Condicional en desgloses que no tienen variables"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:11
-msgid "Daily (365)"
-msgstr "Diario (365)"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:46
+msgid "Notify me when created"
+msgstr "Avisarme cuando se cree"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:12
-msgid "Loan Repayment Calculator"
-msgstr "Calculadora de Devolución de Préstamos"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:47
+#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:168
+#: ../libgnucash/app-utils/options.scm:2028
+msgid "Enabled"
+msgstr "Activado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:15
-msgid "_Schedule"
-msgstr "_Programación"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:48
+msgid "<b>Occurrences</b>"
+msgstr "<b>Coincidencias</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:16
-msgid "<b>Calculations</b>"
-msgstr "<b>Cálculos</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:49
+msgid "Last Occurred: "
+msgstr "Última coincidencia: "
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:17
-msgid "Payment periods"
-msgstr "Periodos de liquidación"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:50
+msgid "Repeats:"
+msgstr "Repeticiones:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:18
-msgid "_Clear"
-msgstr "_Puntear"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:51
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:105
+msgid "Forever"
+msgstr "Siempre"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:19
-msgid "Clear the entry."
-msgstr "Puntear el asiento."
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:52
+msgid "Until:"
+msgstr "Hasta:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:20
-msgid "Interest rate"
-msgstr "Tipo de interés"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:53
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:103
+msgid "For:"
+msgstr "Por:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:21
-msgid "Present value"
-msgstr "Valor actual"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:54
+msgid "occurrences"
+msgstr "coincidencias"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:22
-msgid "Periodic payment"
-msgstr "Liquidación periódica"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:55
+msgid "remaining"
+msgstr "restantes"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:23
-msgid "Future value"
-msgstr "Valor futuro"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:56
+msgid "Overview"
+msgstr "Sinopsis"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:24
-msgid "Calculate"
-msgstr "Calcular"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:57
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:357
+#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:177
+msgid "Frequency"
+msgstr "Frecuencia"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:25
-msgid "Recalculate the (single) blank entry in the above fields."
-msgstr "Recalcular el (único) asiento vacío en los campos de arriba."
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:58
+msgid "Template Transaction"
+msgstr "Plantilla Transaccional"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:26
-msgid "<b>Payment Options</b>"
-msgstr "<b>Opciones de Liquidación</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:59
+msgid "Since Last Run..."
+msgstr "Desde la última ejecución..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:27
-msgid "Payment Total:"
-msgstr "Liquidación total:"
+#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:60
+msgid "_Review created transactions"
+msgstr "_Revisar transacciones creadas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:28
-msgid "total"
-msgstr "total"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:1
+msgid "Income Tax Information"
+msgstr "Información de Imposición sobre Ingresos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:29
-msgid "Discrete"
-msgstr "Discreto"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:4
+msgid "<b>Income Tax Identity</b>"
+msgstr "<b>Identidad de Imposicioines Ingresantes</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:30
-msgid "Continuous"
-msgstr "Contínuo"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:8
+msgid "Click to change Tax Name and/or Tax Type."
+msgstr "Pulse para cambiar el Nombre y/o el Tipo Impositivo."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:32
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:14
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:77
-msgid "Frequency:"
-msgstr "Frecuencia:"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:9
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:15
+msgid "<b>_Accounts</b>"
+msgstr "<b>_Cuentas</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:33
-msgid "When paid:"
-msgstr "Liquidado el:"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:10
+msgid "_Income"
+msgstr "_Ingreso"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:34
-msgid "Beginning"
-msgstr "Iniciando"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:11
+msgid "_Expense"
+msgstr "_Gasto"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:35
-msgid "End"
-msgstr "Final"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:12
+msgid "_Asset"
+msgstr "_Activo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:36
-msgid "<b>Compounding:</b>"
-msgstr "<b>Cálculo de Interés:</b>"
-
-#: ../gnucash/gnome/gtkbuilder/dialog-fincalc.glade.h:37
-msgid "<b>Period:</b>"
-msgstr "<b>Periodo:</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:13
+msgid "_Liability/Equity"
+msgstr "_Pasivo/Patrimonio"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:1
-msgid "Find Account Dialog"
-msgstr "Diálogo Encontrar Cuenta"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:14
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:16
+msgid "Accounts Selected:"
+msgstr "Cuentas seleccionadas:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:2
-msgid "Close on Jump"
-msgstr "Cerrar al Omitir"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:15
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:17
+msgid "0"
+msgstr "0"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:3
-msgid "_Jump To"
-msgstr "_Omitir a"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:16
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:18
+msgid "_Select Subaccounts"
+msgstr "_Seleccionar subcuentas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:5
-msgid "<b>Search the Account List</b>"
-msgstr "<b>Buscar Lista de Cuentas</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:17
+msgid "<b>Account Tax Information</b>"
+msgstr "<b>Cuenta de Información Imponible</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:6
-msgid "Search from Root"
-msgstr "Buscar desde Raíz"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:18
+msgid "Tax _Related"
+msgstr "Imposición _específica"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:7
-msgid "Search from Sub Account"
-msgstr "Buscar desde Subcuenta"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:19
+msgid "<b>_TXF Categories</b>"
+msgstr "<b>Categorías _TXF</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:8
-msgid "Account Full Name"
-msgstr "Nombre de Cuenta Completo"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:20
+msgid "<b>Payer Name Source</b>"
+msgstr "<b>Nombre Origen del Portador</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:9
-msgid "Case insensitive searching is available on 'Account Full Name'."
-msgstr "Búsqueda indistinguible de mayúsculas está disponible en 'Nombre Completo de Cuenta'."
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:21
+msgid "C_urrent Account"
+msgstr "Cuenta act_ual"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:10
-msgid "_Search"
-msgstr "_Buscar"
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:22
+msgid "_Parent Account"
+msgstr "Cuenta _matriz"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-find-account.glade.h:11
-msgid ""
-"Select a row and then press 'jump to' to jump to account in the Account Tree,\n"
-"if account should not be shown, this will be temporarily overridden."
-msgstr ""
-"Seleccione una fila y después pulse 'omitir a' para omitir a cuenta dentro del Árbol de Cuenta,\n"
-"si la cuenta no debería ser mostrada, esto será sobrescrito temporalmente."
+#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:23
+msgid "<b>Copy Number</b>"
+msgstr "<b>Copiar Número</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:1
-msgid "Import Map Editor"
-msgstr "Importar Editor de Distribución"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:1
+msgid "Transaction Association Dialog"
+msgstr "Dialogo de Asociación Transacional"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:4
-msgid "<b>What type of information to display?</b>"
-msgstr "<b>¿Qué familia de información para enseñar?</b>"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:2
+msgid "_Sort Association"
+msgstr "_Ordenar asociación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:6
-msgid "Non-Bayesian"
-msgstr "No Bayesiano"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:3
+msgid "_Locate Association"
+msgstr "Asociación _local"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:7
-msgid "Online ID"
-msgstr "ID de conexión"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:4
+msgid "All Transaction Associations"
+msgstr "Todas Asociaciones Transaccionadas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:8
-msgid "Source Account Name"
-msgstr "Nombre de Cuenta Origen"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:7
+msgid "Association"
+msgstr "Asociación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:9
-msgid "Based On"
-msgstr "Basado en"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:8
+msgid "Available ?"
+msgstr "¿Disponible?"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:10
-msgid "Match String"
-msgstr "Cadena Coincidente"
+#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:9
+msgid ""
+"     To jump to the Transaction, double click on the entry in the\n"
+"Description column or Association column to open the Association"
+msgstr ""
+"     Para omitir a la Transacción, pulse dos veces sobre el asiento dentro\n"
+" de la columna Descripción o Asociación para abrir la Asociación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:11
-msgid "Mapped to Account Name"
-msgstr "Distribuído a Nombre de Cuenta"
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:5
+msgid "Vendor Number: "
+msgstr "Número de proveedor: "
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:12
-msgid "Count of Match String Usage"
-msgstr "Contador de Uso de Cadenas Cotejadas"
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:8
+msgid "The vendor ID number. If left blank a reasonable number will be chosen for you"
+msgstr "El código de proveedor. Si se deja vacío se elegirá un número razonable por usted"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:13
-msgid "Case sensative filtering is available on 'Match String' and 'Mapped to Account Name'."
-msgstr "Distinción de mayúsculas está disponible en 'Coincidir Cadena' y 'Distribuido a Nombre de Cuenta'."
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:20
+msgid "Tax Included:"
+msgstr "Cargo incluido:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:14
-msgid "_Filter"
-msgstr "_Filtro"
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:21
+msgid "Tax Table:"
+msgstr "Tabla impositiva:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:15
-msgid "_Expand All"
-msgstr "_Expandir todo"
+#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:23
+#: ../gnucash/gnome/window-reconcile2.c:467
+#: ../gnucash/gnome/window-reconcile.c:505
+msgid "Payment Information"
+msgstr "Información de Liquidación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:16
-msgid "_Collapse All"
-msgstr "Colapsar _todo"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:1
+msgid "Estimate Budget Values"
+msgstr "Estimar Valores Presupuestarios"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:17
-msgid "Multiple rows can be selected and then deleted by pressing the delete button..."
-msgstr "Múltiples filas pueden ser seleccionadas y entonces eliminadas pulsando el botón de eliminación..."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:4
+msgid "GnuCash will estimate budget values for the selected accounts from past transactions."
+msgstr "GnuCash estimará los valores a presupuestar para las cuentas seleccionadas desde transacciones anteriores."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:6
-msgid "Posted Account"
-msgstr "Cuenta contabilización"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:6
+msgid "Significant Digits:"
+msgstr "Dígitos significativos:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:8
-msgid "Invoice Information"
-msgstr "Información de Factura"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:7
+msgid "The number of leading digits to keep when rounding"
+msgstr "El número de dígitos a mantener para conservar el redondeo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:9
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:19
-msgid "(owner)"
-msgstr "(titular)"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:9
+msgid "Budget Name:"
+msgstr "Nombre del presupuestos:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:10
-#: ../gnucash/gnome/search-owner.c:241
-#: ../gnucash/gnome-search/dialog-search.c:1110
-#: ../gnucash/report/business-reports/job-report.scm:40
-#: ../gnucash/report/business-reports/job-report.scm:565
-msgid "Job"
-msgstr "Ejercicio"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:11
+msgid "Number of Periods:"
+msgstr "Número de periodos:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:15
-msgid "Customer: "
-msgstr "Cliente: "
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:12
+msgid "Budget Period:"
+msgstr "Periodo del presupuesto:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:16
-msgid "Job: "
-msgstr "Ejercicio: "
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:13
+msgid "Budget List"
+msgstr "Lista de presupuestos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:17
-msgid "Default Chargeback Project"
-msgstr "Retroceso Predeterminado del Proyecto"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:15
+msgid "Close the Budget List"
+msgstr "Cerrar la Lista de Presupuestos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:18
-msgid "Additional to Card:"
-msgstr "Adicional a la tarjeta:"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:17
+msgid "Create a New Budget"
+msgstr "Crea un Presupuesto"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:19
-msgid "Extra Payments"
-msgstr "Liquidaciones Adicionales"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:18
+#: ../gnucash/gnome-utils/dialog-file-access.c:299
+#: ../gnucash/gnome-utils/gnc-file.c:89 ../gnucash/gnome-utils/gnc-file.c:100
+#: ../gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade.h:6
+msgid "_Open"
+msgstr "_Abrir"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:20
-msgid "Invoice Entries"
-msgstr "Asientos de Facturas"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:19
+msgid "Open the Selected Budget"
+msgstr "Abrir Presupuesto Seleccionado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:26
-msgid "The invoice ID number. If left blank a reasonable number will be chosen for you."
-msgstr "El ID facturante. Si se deja en blanco, se elegirá un número razonable por usted."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:21
+msgid "Delete the Selected Budget"
+msgstr "Borrar Presupuesto Seleccionado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:28
-msgid ""
-"Unposting this Invoice will delete the posted transaction.\n"
-"Are you sure you want to unpost it?"
-msgstr ""
-"Descontabilizar esta Factura eliminará la transacción contabilizada.\n"
-"¿Seguro que lo quiere descontabilizar?"
+#. Duplicate Transaction Dialog
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:1
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:56
+msgid "Duplicate Transaction"
+msgstr "Duplicar Transacción"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:30
-msgid "Yes, reset the Tax Tables"
-msgstr "Sí, restablecer las Lengüetas Impositivas"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:4
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:57
+msgid "<b>New Transaction Information</b>"
+msgstr "<b>Información de Transacción Nueva</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:31
-msgid "No, keep them as they are"
-msgstr "No, mantenerlos tal como están"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:6
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:59
+msgid "_Number:"
+msgstr "_Número:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-invoice.glade.h:32
-msgid "Reset Tax Tables to present Values?"
-msgstr "¿Restablecer Lengüetas de Imposición a Valores presentes?"
+#. Filter register by... Dialog
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:7
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:2
+msgid "Filter register by..."
+msgstr "Filtrar el registro por..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:1
-msgid "Job Dialog"
-msgstr "Ejercicio Dialogado"
+#. Filter By Dialog, Date Tab
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:8
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:6
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:20
+msgid "Show _All"
+msgstr "Mostrar _todo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:7
-msgid "The job ID number. If left blank a reasonable number will be chosen for you"
-msgstr "El código del ejercicio. Si se deja en blanco se elegirá un número razonable"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:9
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:7
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:21
+msgid "Select Range:"
+msgstr "Seleccionar rango:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:8
-msgid "Job Information"
-msgstr "Ejercicio Informado"
+#. Filter By Dialog, Date Tab, Start section
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:10
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:9
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:22
+msgid "Start:"
+msgstr "Inicio:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:11
-msgid "Owner Information"
-msgstr "Información del Titular"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:11
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:10
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:23
+msgid "_Earliest"
+msgstr "Más r_eciente"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-job.glade.h:12
-msgid "Job Active"
-msgstr "Ejercicio Activo"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:12
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:11
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:24
+msgid "Choo_se Date:"
+msgstr "E_scoja fecha:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:1
-msgid "Lot Viewer"
-msgstr "Visor de lote"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:13
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:12
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:25
+msgid "Toda_y"
+msgstr "Ho_y"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:2
-msgid "_New Lot"
-msgstr "Crear _lote"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:14
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:13
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:26
+msgid "_Latest"
+msgstr "Ú_ltimo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:3
-msgid "Scrub _Account"
-msgstr "Cuadrar _cuenta"
+#. Filter By Dialog, Date Tab, End section
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:15
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:15
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:27
+msgid "End:"
+msgstr "Final:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:4
-msgid "_Scrub"
-msgstr "_Cuadrar"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:16
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:16
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:28
+msgid "C_hoose Date:"
+msgstr "Escoja _fecha:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:5
-msgid "Scrub the highlighted lot"
-msgstr "Cuadrar el lote resaltado"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:17
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:17
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:29
+msgid "_Today"
+msgstr "_Hoy"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:7
-msgid "Delete the highlighted lot"
-msgstr "Borra el lote seleccionado"
+#. Filter By Dialog, State Tab
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:19
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:20
+msgid "_Unreconciled"
+msgstr "_No conciliado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:9
-msgid "Enter a name for the highlighted lot."
-msgstr "Introduzca un nombre para el lote seleccionada."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:20
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:21
+#: ../gnucash/import-export/qif-imp/dialog-account-picker.glade.h:5
+msgid "_Reconciled"
+msgstr "_Conciliado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:10
-msgid "<b>_Notes</b>"
-msgstr "<b>_Anotaciones</b>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:21
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:22
+msgid "C_leared"
+msgstr "P_unteado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:11
-msgid "Enter any notes you want to make about this lot."
-msgstr "Introduzca notas sobre este lote."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:22
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:23
+msgid "_Voided"
+msgstr "_Vaciado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:12
-msgid "<b>_Title</b>"
-msgstr "<b>_Título</b>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:23
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:24
+msgid "_Frozen"
+msgstr "_Congelado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:13
-msgid "<b>_Lots in This Account</b>"
-msgstr "<b>_Lotes en Esta Cuenta</b>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:24
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:25
+msgid "Select _All"
+msgstr "Seleccionar _todo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:14
-msgid "Show only open lots"
-msgstr "Muestra sólo lotes abiertos"
+#. Filter By Dialog, below tabs
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:26
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:28
+msgid "Sa_ve Filter"
+msgstr "Guardar _filtro"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:15
-msgid "<b>Splits _free</b>"
-msgstr "<b>Desgloses _Libres</b>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:27
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:61
+msgid "Void Transaction"
+msgstr "Transacción Vacía"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:16
-msgid ">>"
-msgstr ">>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:28
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:62
+msgid "Reason for voiding transaction:"
+msgstr "Razón para invalidando transacción:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:17
-msgid "<<"
-msgstr "<<"
+#. Sort register by Dialog
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:30
+msgid "Sort register by..."
+msgstr "Ordenar registro por..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade.h:18
-msgid "<b>Splits _in lot</b>"
-msgstr "<b>Desgloses por _lote</b>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:31
+msgid "_Standard Order"
+msgstr "_Operación común"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:1
-msgid "_No"
-msgstr "_No"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:32
+msgid "Keep normal account order."
+msgstr "Conservar operación de cuenta común."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:2
-msgid "_Yes"
-msgstr "_Sí"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:34
+#: ../gnucash/report/standard-reports/transaction.scm:154
+msgid "Sort by date."
+msgstr "Ordenar por Fecha."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:3
-msgid "<span weight=\"bold\" size=\"larger\">Display Welcome Dialog Again?</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">¿Enseño el diálogo de Bienvenida otra vez?</span>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:36
+msgid "Sort by the date of entry."
+msgstr "Ordenar por día de asiento."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:4
-msgid "If you press the <i>Yes</i> button, the <i>Welcome to GnuCash</i> dialog will be displayed again next time you start GnuCash. If you press the <i>No</i> button, it will not be displayed again."
-msgstr "Si pulsa el botón <i>Sí</i>, el diálogo <i>Bienvenido a GnuCash</i> se mostrará de nuevo la próxima vez que inicie GnuCash. Si pulsa el botón <i>No</i>, no se volverá a mostrar otra vez."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:37
+msgid "S_tatement Date"
+msgstr "Fecha _declarada"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:7
-msgid "<span size=\"larger\" weight=\"bold\">Welcome to GnuCash!</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">¡Bienvenido a GnuCash!</span>"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:38
+msgid "Sort by the statement date (and group by cleared, unreconciled, reconciled)."
+msgstr "Ordenar por fecha declarada (y grupo por punteado, no conciliados, conciliados)."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:8
-msgid "There are some predefined actions available that most new users prefer to get started with GnuCash. Select one of these actions from below and click the <i>OK</i> button or press the <i>Cancel</i> button if you don't want to perform any of them."
-msgstr "Hay disponibles algunas operaciones predefinidas que la mayoría de los usuarios prefieren tenerlas al iniciar GnuCash. Seleccione una de estas operaciones predefinidas desde abajo y pulse el botón <i>Aceptar</i> o pulse el botón <i>Cancelar</i> si no quiere realizar ninguna de ellas."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:39
+msgid "Num_ber"
+msgstr "_Número"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:9
-msgid "C_reate a new set of accounts"
-msgstr "C_rear un conjunto de cuentas nuevo"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:40
+msgid "Sort by number."
+msgstr "Ordenar por Número."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:10
-msgid "_Import my QIF files"
-msgstr "_Importar mis ficheros QIF"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:41
+msgid "Amo_unt"
+msgstr "_Cantidad"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-new-user.glade.h:11
-msgid "_Open the new user tutorial"
-msgstr "_Abrir el tutorial para nuevos usuarios"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:42
+#: ../gnucash/report/standard-reports/transaction.scm:197
+msgid "Sort by amount."
+msgstr "Ordenar por Cantidad."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:1
-msgid "Order Entry"
-msgstr "Asiento de Operación"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:43
+msgid "_Memo"
+msgstr "_Memorandum"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:4
-msgid "_Invoices"
-msgstr "_Facturas"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:44
+#: ../gnucash/report/standard-reports/transaction.scm:229
+msgid "Sort by memo."
+msgstr "Ordenar por memorándum."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:5
-msgid "Close _Order"
-msgstr "Cerrar _operación"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:46
+#: ../gnucash/report/standard-reports/transaction.scm:203
+msgid "Sort by description."
+msgstr "Ordenar por Descripción."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:10
-msgid "Order Information"
-msgstr "Información de Operación"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:47
+msgid "_Action"
+msgstr "_Operación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:11
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2814
-#: ../gnucash/report/business-reports/customer-summary.scm:72
-#: ../gnucash/report/business-reports/fancy-invoice.scm:913
-#: ../gnucash/report/business-reports/invoice.scm:742
-#: ../gnucash/report/business-reports/job-report.scm:45
-#: ../gnucash/report/business-reports/owner-report.scm:53
-msgid "Reference"
-msgstr "Referencia"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:48
+msgid "Sort by action field."
+msgstr "Ordenar por campo de operación."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:14
-msgid "Order Entries"
-msgstr "Asientos de Operación"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:49
+msgid "_Notes"
+msgstr "_Anotaciones"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:15
-#: ../gnucash/gnome-search/dialog-search.c:1116
-msgid "New Order"
-msgstr "Crear Operación"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:50
+msgid "Sort by notes field."
+msgstr "Ordenar por el campo de anotaciones."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-order.glade.h:18
-msgid "The order ID number. If left blank a reasonable number will be chosen for you"
-msgstr "El código de operación. Si se deja en blanco se elegirá un número razonable"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:51
+msgid "Sa_ve Sort Order"
+msgstr "Guardar _Orden de Operación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:7
-msgid "The company associated with this payment."
-msgstr "La sociedad asociadas con esta liquidación."
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:52
+msgid "Save the sort order for this register."
+msgstr "Guarda el orden de operación para este registro."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:8
-msgid "Partner"
-msgstr "Socio"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:53
+msgid "_Reverse Order"
+msgstr "_Revertir operación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:9
-msgid "Post To"
-msgstr "Contabilizar a"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:54
+msgid "Sort in descending order."
+msgstr "Ordenar en orden descendiente."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:15
-msgid "Documents"
-msgstr "Documentos"
+#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:60
+msgid "_Transaction Number:"
+msgstr "Número _transaccional:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:16
-msgid ""
-"The amount to pay for this invoice.\n"
-"\n"
-"If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.\n"
-"\n"
-"In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company."
-msgstr ""
-"La cantidad para liquidar por esta factura.\n"
-"\n"
-"Si ha seleccionado una factura, GnuCash propondrá la cantidad que aún debe por ella. Usted puede cambiar esta cantidad para crear una liquidación parcial o una liquidación en exceso.\n"
-"\n"
-"En el caso de un factura en exceso o si no se ha seleccionado una factura, GnuCash le asignará automáticamente la cantidad de la primera factura pendiente de esta sociedad."
+#: ../gnucash/gnome/gtkbuilder/window-autoclear.glade.h:3
+msgid "<b>Auto-Clear Information</b>"
+msgstr "<b>Información de Autopunteado</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:21
-msgid "<b>Amount</b>"
-msgstr "<b>Cantidad</b>"
+#: ../gnucash/gnome/gtkbuilder/window-autoclear.glade.h:4
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:6
+msgid "_Ending Balance:"
+msgstr "_Saldo:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:23
-msgid "Refund"
-msgstr "Reembolso"
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:3
+msgid "<b>Reconcile Information</b>"
+msgstr "<b>Información de Conciliación</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:26
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:16
-msgid "Print Check"
-msgstr "Declarar Comprobante"
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:4
+msgid "Statement _Date:"
+msgstr "_Fecha declarada:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:27
-msgid "(USD)"
-msgstr "(EUR)"
+#. starting balance title/value
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:5
+#: ../gnucash/gnome/window-reconcile2.c:1833
+#: ../gnucash/gnome/window-reconcile.c:1875
+msgid "Starting Balance:"
+msgstr "Saldo de Inicio:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:28
-msgid "Transaction Details"
-msgstr "Detalles de Transacción"
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:7
+msgid "Include _subaccounts"
+msgstr "Incluir _subcuentas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-payment.glade.h:29
-#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:67
-msgid "Transfer Account"
-msgstr "Cuenta Transferencial"
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:8
+msgid "Include all descendant accounts in the reconcile. All of them must use the same commodity as this one."
+msgstr "Incluye todas las cuentas descendientes en la conciliación. Todas de ellas deben usar la misma mercancía como esta."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:1
-msgid "Bid"
-msgstr "BID"
+#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:9
+#: ../gnucash/gnome/window-reconcile2.c:766
+#: ../gnucash/gnome/window-reconcile.c:805
+msgid "Enter _Interest Payment..."
+msgstr "Introducir liquidación de _intereses..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:2
-msgid "Ask"
-msgstr "Razón"
+#. Translators: The abbreviation for 'Reconciled'
+#. in the header row of the register. Please only
+#. translate the portion after the ':' and
+#. leave the rest ("Reconciled:") as is.
+#: ../gnucash/gnome/reconcile-view.c:394
+#: ../gnucash/register/ledger-core/split-register-layout.c:699
+#: ../gnucash/register/ledger-core/split-register-model.c:304
+msgid "Reconciled:R"
+msgstr "C"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:3
-#: ../gnucash/report/standard-reports/budget.scm:135
-msgid "Last"
-msgstr "Último"
+#: ../gnucash/gnome/search-owner.c:163
+msgid "You have not selected an owner"
+msgstr "No ha seleccionado un titular"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:4
-msgid "Net Asset Value"
-msgstr "Valor de Activo Neto"
+#: ../gnucash/gnome/search-owner.c:258
+#: ../gnucash/gnome-search/search-reconciled.c:189
+msgid "is"
+msgstr "es"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:6
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:1
-msgid "Dummy commodity Line"
-msgstr "Línea Ficticia de Mercancía"
+#: ../gnucash/gnome/search-owner.c:259
+#: ../gnucash/gnome-search/search-reconciled.c:190
+msgid "is not"
+msgstr "no es"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:7
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:2
-msgid "Dummy namespace Line"
-msgstr "Línea Ficticia de Espacio"
+#: ../gnucash/gnome/top-level.c:105
+#, c-format
+msgid "Entity Not Found: %s"
+msgstr "Entidad no encontrada: %s"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:8
-msgid "Price Editor"
-msgstr "Editor de cotizaciones"
+#: ../gnucash/gnome/top-level.c:165
+#, c-format
+msgid "Transaction with no Accounts: %s"
+msgstr "Transacción sin ninguna Cuentas: %s"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:12
-msgid "_Namespace:"
-msgstr "_Nombre Espaciado:"
+#: ../gnucash/gnome/top-level.c:181
+#, c-format
+msgid "Unsupported entity type: %s"
+msgstr "Tipo de entidad no soportado: %s"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:13
-#: ../gnucash/gnome-utils/dialog-commodity.c:293
-msgid "_Security:"
-msgstr "_Garantía:"
+#: ../gnucash/gnome/top-level.c:218
+#, c-format
+msgid "No such price: %s"
+msgstr "Sin precio: %s"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:14
-#: ../gnucash/gnome-utils/dialog-commodity.c:298
-msgid "Cu_rrency:"
-msgstr "_Moneda:"
+# Notas:
+# Account Tree: Plan Contable
+# Bill → Abonación, Facturación, [Factura]
+# Billing → Abonando, efectivo
+# Bizarre  → Guarro
+# Book |
+#  | Libro General: General Ledge
+#  | Libro Diario: Transaction Journal
+#  | Libro Básico: Basic Ledge
+#  | Asiento --> Entrada EntryLedge
+# Account _Hierarchy → Plan de Cuentas
+# Business → Negocio, Empresa
+# Company → Empresa, Sociedad (Limitada/Anónima)
+# Chart → Gráfico
+#   Barchart	→ Barra
+#   Linechart → Línea
+#   Piechart  → Porción
+# Balance Sheet → Hoja de Balance
+# Choose →  Elegir
+# Equity → Patrimonio, Acciones (de bolsa)
+# Expense → Gasto
+# Invoice → Albarán
+# Job → Ejercicio
+# Liability → Obligación, Responsabilidad, Pasivo(Eco), Deuda
+# Match → [Cotejo], Coincidencia
+# Memo → Memorandum
+# Net Worth → Valor Neto?
+# Operation → Operación
+# Payment -→ Pago, Abonación
+# Page → ?PESTAÑA
+# Plot → Gráfico
+# Post → publicar
+# Posted → Publicado?
+# Preparer → "Preparador"
+# Profit → Beneficio
+# Prompt → ??
+# Quantity → [Inventario], Cantidad
+# Quotes :: Cotización
+# Record → Registrar
+# Scheduled Transaction
+#    → Calendario de Transacción.
+#    → Registro de Transacción.
+#    → Transacción Programada.
+#    →
+# Security → Garantía
+# Skip Errors → Saltar errores
+# Statement
+# Stoke → mercancía
+# Tax Invoice
+#  reconciled balance : Balance conciliado
+# Voucher: Comprobante
+# Withdrawal: Retirada (de fondos)
+# Worth: Valor
+# (Editar)
+# Comentarios extraídos:
+# Business options
+#. Business options
+#: ../gnucash/gnome/top-level.c:429 ../libgnucash/app-utils/app-utils.scm:307
+msgid "Business"
+msgstr "Negocios"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:16
-msgid "S_ource:"
-msgstr "_Origen:"
+#: ../gnucash/gnome/window-autoclear.c:138
+msgid "Searching for splits to clear ..."
+msgstr "Buscando desgloses para puntear..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:18
-msgid "_Price:"
-msgstr "_Precio:"
+#: ../gnucash/gnome/window-autoclear.c:240
+msgid "Cannot uniquely clear splits. Found multiple possibilities."
+msgstr "No se puede puntear únicamente desgloses únicos. Se encontraron múltiples posibilidades."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:19
-msgid "Remove Old Prices"
-msgstr "Quitar Precios Antiguos"
+#: ../gnucash/gnome/window-autoclear.c:247
+msgid "The selected amount cannot be cleared."
+msgstr "La cantidad seleccionada no puede estar punteada."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:20
-msgid "Delete prices that meet the following criteria:"
-msgstr "Borra todos los precios coincidiendo en los criterios siguientes:"
+#: ../gnucash/gnome/window-reconcile2.c:456
+#: ../gnucash/gnome/window-reconcile.c:494
+msgid "Interest Payment"
+msgstr "Liquidación del Interés"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:21
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:33
-msgid "_None"
-msgstr "_Ninguna"
+#: ../gnucash/gnome/window-reconcile2.c:459
+#: ../gnucash/gnome/window-reconcile.c:497
+msgid "Interest Charge"
+msgstr "Cargo de Interés"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:22
-msgid "Remove all prices before date."
-msgstr "Quitar todos los precios anteriores a la fecha."
+#: ../gnucash/gnome/window-reconcile2.c:477
+#: ../gnucash/gnome/window-reconcile.c:515
+msgid "Payment From"
+msgstr "Liquidación Origen"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:23
-msgid "Last of _Week"
-msgstr "Última de _Semana"
+#: ../gnucash/gnome/window-reconcile2.c:483
+#: ../gnucash/gnome/window-reconcile2.c:493
+#: ../gnucash/gnome/window-reconcile.c:521
+#: ../gnucash/gnome/window-reconcile.c:531
+msgid "Reconcile Account"
+msgstr "Conciliar Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:24
-msgid "Keep the last price of each week if present before date."
-msgstr "Conserva el precio último para cada semana si presenta antes de la fecha."
+#: ../gnucash/gnome/window-reconcile2.c:498
+#: ../gnucash/gnome/window-reconcile.c:536
+msgid "Payment To"
+msgstr "Liquidación Destino"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:25
-msgid "Last of _Month"
-msgstr "Último del _Mes"
+#: ../gnucash/gnome/window-reconcile2.c:511
+#: ../gnucash/gnome/window-reconcile.c:549
+msgid "No Auto Interest Payments for this Account"
+msgstr "Sin Interés de Liquidación Automáticas para esta Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:26
-msgid "Keep the last price of each month if present before date."
-msgstr "Conserva el precio último para cada mes si presenta antes de la fecha."
+#: ../gnucash/gnome/window-reconcile2.c:512
+#: ../gnucash/gnome/window-reconcile.c:550
+msgid "No Auto Interest Charges for this Account"
+msgstr "Sin Interés de Cambios Automáticas para esta Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:27
-msgid "Last of _Quarter"
-msgstr "Último del _Trimestre"
+#: ../gnucash/gnome/window-reconcile2.c:768
+#: ../gnucash/gnome/window-reconcile.c:807
+msgid "Enter _Interest Charge..."
+msgstr "Introducir _Interés Cargado..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:28
-msgid "Keep the last price of each fiscal quarter if present before date. The fiscal quarter is derived from the accounting period end date."
-msgstr "Conservar el último precio de cada trimestre fiscal si se presenta antes de la fecha. El trimestre fiscal está derivado desde la fecha final del periodo de contabilización."
+#: ../gnucash/gnome/window-reconcile2.c:1073
+#: ../gnucash/gnome/window-reconcile.c:1112
+#: ../gnucash/report/business-reports/owner-report.scm:59
+msgid "Debits"
+msgstr "Débitos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:29
-msgid "Last of _Period"
-msgstr "Último del _Periodo"
+#: ../gnucash/gnome/window-reconcile2.c:1083
+#: ../gnucash/gnome/window-reconcile.c:1122
+#: ../gnucash/report/business-reports/owner-report.scm:58
+#: ../gnucash/report/report-system/report-utilities.scm:110
+msgid "Credits"
+msgstr "Créditos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:30
-msgid "Keep the last price of each fiscal period if present before date. The fiscal period is derived from the accounting period end date."
-msgstr "Conservar el último precio de cada periodo fiscal si se presenta antes de la fecha. El trimestre fiscal está derivado desde la fecha final del periodo de contabilización."
+#: ../gnucash/gnome/window-reconcile2.c:1277
+#: ../gnucash/gnome/window-reconcile.c:1316
+msgid "Are you sure you want to delete the selected transaction?"
+msgstr "¿Está seguro que quiere borrar la transacción seleccionada?"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:31
-msgid "_Scaled"
-msgstr "_Escalada"
+#. statement date title/value
+#: ../gnucash/gnome/window-reconcile2.c:1823
+#: ../gnucash/gnome/window-reconcile.c:1865
+msgid "Statement Date:"
+msgstr "Fecha Declarada:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:32
-msgid "With the scaled option, prices are removed relative to the date selected. 'One a month' is used for dates older than a year and 'One a week' is used for dates older than six months to a year."
-msgstr "Con la opción de escala, precios son quitados relativos para la fecha seleccionada. 'Una vez al mes' se emplea para datos más antiguos que un año y 'Una vez por semana' está empleado para dostos más antigis que seis meses a un año."
+#. ending balance title/value
+#: ../gnucash/gnome/window-reconcile2.c:1843
+#: ../gnucash/gnome/window-reconcile.c:1885
+msgid "Ending Balance:"
+msgstr "Saldo:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:33
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:743
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2983
-msgid "Commodity"
-msgstr "Mercancía"
+#. reconciled balance title/value
+#: ../gnucash/gnome/window-reconcile2.c:1853
+#: ../gnucash/gnome/window-reconcile.c:1895
+msgid "Reconciled Balance:"
+msgstr "Saldo conciliado:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:34
-msgid "First Date"
-msgstr "Fecha Primera"
+#. difference title/value
+#: ../gnucash/gnome/window-reconcile2.c:1863
+#: ../gnucash/gnome/window-reconcile.c:1905
+msgid "Difference:"
+msgstr "Diferencia:"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:35
-msgid "From these Commodities:"
-msgstr "Desde estas Mercancías:"
+#: ../gnucash/gnome/window-reconcile2.c:1952
+#: ../gnucash/gnome/window-reconcile.c:2008
+msgid "You have made changes to this reconcile window. Are you sure you want to cancel?"
+msgstr "Ha hecho cambios a esta ventana de conciliación. ¿Está seguro de que desea cancelar?"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:36
-msgid "Keeping the last available price for option:"
-msgstr "Conservar el último precio disponible para opción:"
+#: ../gnucash/gnome/window-reconcile2.c:2070
+#: ../gnucash/gnome/window-reconcile.c:2126
+msgid "The account is not balanced. Are you sure you want to finish?"
+msgstr "Esta cuenta no está cuadrada. ¿Está seguro que desea terminar?"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:37
-msgid "Source:"
-msgstr "Origen:"
+#: ../gnucash/gnome/window-reconcile2.c:2127
+#: ../gnucash/gnome/window-reconcile.c:2183
+msgid "Do you want to postpone this reconciliation and finish it later?"
+msgstr "¿Quiere posponer esta conciliación y finalizarla posteriormente?"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:38
-msgid "Include _Fetched online prices"
-msgstr "Incluir precios _traídos por conexión"
+#. Toplevel
+#: ../gnucash/gnome/window-reconcile2.c:2165
+#: ../gnucash/gnome/window-reconcile.c:2221
+msgid "_Reconcile"
+msgstr "_Conciliar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:39
-msgid "If activated, prices added by Finance::Quote will be included."
-msgstr "Si activado, precios añadidos por Financia::Cotización será incluido."
+#: ../gnucash/gnome/window-reconcile2.c:2166
+#: ../gnucash/gnome/window-reconcile.c:2222
+msgid "_Account"
+msgstr "_Cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:40
-msgid "Include manually _Entered prices"
-msgstr "Incluir manualmente los precios _introducidos"
+#: ../gnucash/gnome/window-reconcile2.c:2173
+#: ../gnucash/gnome/window-reconcile.c:2229
+msgid "_Reconcile Information..."
+msgstr "_Información de conciliación..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:41
-msgid "If activated, include manually entered prices."
-msgstr "Si es activado, incluye manualmente precioes introducidos."
+#: ../gnucash/gnome/window-reconcile2.c:2174
+#: ../gnucash/gnome/window-reconcile.c:2230
+msgid "Change the reconcile information including statement date and ending balance."
+msgstr "Cambiar la información de la conciliación incluyendo fecha declarada y saldo final."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:42
-msgid "_Added by the application"
-msgstr "_Añadido por la aplicación"
+#: ../gnucash/gnome/window-reconcile2.c:2179
+#: ../gnucash/gnome/window-reconcile.c:2235
+msgid "_Finish"
+msgstr "_Finalizar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:43
-msgid ""
-"If activated, include application added prices.\n"
-"\n"
-"These prices were added so that there's always a \"nearest in time\" price for every multi-commodity transaction so that the Accounts page and reports are able to correctly report values so removing them may make this less reliable."
-msgstr ""
-"Si está activado, incluye precios añadidos por aplicación.\n"
-"\n"
-"Estos precios fueron añadidos tal que siempre hay un precio  «cercanos en tiempo» para cada transacción multicolumna tal que la página de Cuentas y boletines son capaces de informar correctamente valores tal que quitándolos puede hacer esto menos fiable."
+#: ../gnucash/gnome/window-reconcile2.c:2180
+#: ../gnucash/gnome/window-reconcile.c:2236
+msgid "Finish the reconciliation of this account"
+msgstr "Finalizar la conciliación de esta cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:46
-msgid "Before _Date:"
-msgstr "Anterior a _fecha:"
+#: ../gnucash/gnome/window-reconcile2.c:2184
+#: ../gnucash/gnome/window-reconcile.c:2240
+msgid "_Postpone"
+msgstr "_Posponer"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:47
-#: ../gnucash/report/standard-reports/price-scatter.scm:98
-msgid "Price Database"
-msgstr "Base de datos de precios"
+#: ../gnucash/gnome/window-reconcile2.c:2185
+#: ../gnucash/gnome/window-reconcile.c:2241
+msgid "Postpone the reconciliation of this account"
+msgstr "Pospone la conciliación de esta cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:49
-msgid "_Get Quotes"
-msgstr "_Obtener cotizaciones"
+#: ../gnucash/gnome/window-reconcile2.c:2190
+#: ../gnucash/gnome/window-reconcile.c:2246
+msgid "Cancel the reconciliation of this account"
+msgstr "Cancela la conciliación de esta cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:50
-msgid "Get new online quotes for stock accounts."
-msgstr "Descargar cotizaciones nuevas para cuentas de reservas."
+#: ../gnucash/gnome/window-reconcile2.c:2197
+#: ../gnucash/gnome/window-reconcile.c:2253
+msgid "_Open Account"
+msgstr "_Abrir cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:52
-msgid "Add a new price."
-msgstr "Añade un precio nuevo."
+#: ../gnucash/gnome/window-reconcile2.c:2198
+#: ../gnucash/gnome/window-reconcile.c:2254
+msgid "Open the account"
+msgstr "Abre la cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:54
-msgid "Remove the current price."
-msgstr "Retira el precio actual."
+#: ../gnucash/gnome/window-reconcile2.c:2202
+#: ../gnucash/gnome/window-reconcile.c:2258
+msgid "_Edit Account"
+msgstr "_Editar cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:56
-msgid "Edit the current price."
-msgstr "Editar el precio actual."
+#: ../gnucash/gnome/window-reconcile2.c:2203
+#: ../gnucash/gnome/window-reconcile.c:2259
+msgid "Edit the main account for this register"
+msgstr "Edita la cuenta principal para este registro"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:57
-msgid "Remove _Old"
-msgstr "Retirar antigu_os"
+#. Actions menu
+#: ../gnucash/gnome/window-reconcile2.c:2212
+#: ../gnucash/gnome/window-reconcile.c:2268
+#: ../gnucash/gnome-utils/gnc-main-window.c:348
+msgid "_Check & Repair"
+msgstr "_Comprobar y Reparar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-price.glade.h:58
-msgid "Remove prices older than a user-entered date."
-msgstr "Quitar precios más anteriores que la fecha introducida por el usuario."
+#: ../gnucash/gnome/window-reconcile2.c:2221
+#: ../gnucash/gnome/window-reconcile.c:2277
+msgid "_Balance"
+msgstr "_Balance"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:1
-msgid "Save Custom Check Format"
-msgstr "Guarda Formato de Comprobación Personalizada"
+#: ../gnucash/gnome/window-reconcile2.c:2222
+#: ../gnucash/gnome/window-reconcile.c:2278
+msgid "Add a new balancing entry to the account"
+msgstr "Añade un asiento de balance nuevo a la cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:4
-msgid "Enter a title for this custom format. This title will appear in the \"Check format\" selector of the Print Check dialog. Using the title of an existing custom format will cause that format to be overwritten."
-msgstr "Introduzca un nombre para este formato personalizado. Este título aparecerá dentro del selector «Formato de comprobación» del diálogo Escribir Comprobación. Empleando el título de un formato personalizado ya existente causará que el formato sea sobrescrito."
+#: ../gnucash/gnome/window-reconcile2.c:2227
+#: ../gnucash/gnome/window-reconcile.c:2283
+msgid "Edit the current transaction"
+msgstr "Edita la transacción actual"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:5
-msgid "Inches"
-msgstr "Pulgadas"
+#: ../gnucash/gnome/window-reconcile2.c:2232
+#: ../gnucash/gnome/window-reconcile.c:2288
+msgid "Delete the selected transaction"
+msgstr "Borra la transacción seleccionada"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:6
-msgid "Centimeters"
-msgstr "Centímetros"
+#: ../gnucash/gnome/window-reconcile2.c:2236
+#: ../gnucash/gnome/window-reconcile.c:2292
+msgid "_Reconcile Selection"
+msgstr "_Conciliar selección"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:7
-msgid "Millimeters"
-msgstr "Milímetros"
+#: ../gnucash/gnome/window-reconcile2.c:2237
+#: ../gnucash/gnome/window-reconcile.c:2293
+msgid "Reconcile the selected transactions"
+msgstr "Concilia las transacciones seleccionadas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:8
-msgid "Points"
-msgstr "Puntos"
+#: ../gnucash/gnome/window-reconcile2.c:2241
+#: ../gnucash/gnome/window-reconcile.c:2297
+msgid "_Unreconcile Selection"
+msgstr "_Desconciliar selección"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:10
-msgid "Middle"
-msgstr "Medio"
+#: ../gnucash/gnome/window-reconcile2.c:2242
+#: ../gnucash/gnome/window-reconcile.c:2298
+msgid "Unreconcile the selected transactions"
+msgstr "Desconcilia las transacciones seleccionadas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:11
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:215
-msgid "Bottom"
-msgstr "Suelo"
+#: ../gnucash/gnome/window-reconcile2.c:2250
+#: ../gnucash/gnome/window-reconcile.c:2306
+msgid "Open the GnuCash help window"
+msgstr "Abre la ventana de ayuda de GnuCash"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:13
-msgid "Quicken/QuickBooks (tm) US-Letter"
-msgstr "Quicken/QuickBooksâ„¢ (Sobre EE. UU.)"
+#: ../gnucash/gnome-search/dialog-search.c:236
+msgid "You must select an item from the list"
+msgstr "Debe seleccionar un elemento del índice"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:14
-msgid "Deluxe(tm) Personal Checks US-Letter"
-msgstr "Comprobante Deluxeâ„¢ Personal (Sobre EE. UU.)"
+#: ../gnucash/gnome-search/dialog-search.c:349
+#: ../gnucash/gnome-utils/gnc-cell-renderer-date.c:171
+msgid "Select"
+msgstr "Seleccionar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:15
-msgid "Quicken(tm) Wallet Checks w/ side stub"
-msgstr "Comprobante Quickenâ„¢ Wallet (lateral)"
+#: ../gnucash/gnome-search/dialog-search.c:1114
+msgid "Order"
+msgstr "Operación"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:18
-msgid "_Print"
-msgstr "_Imprimir"
+#: ../gnucash/gnome-search/dialog-search.c:1120
+msgid "New Transaction"
+msgstr "Transacción Nueva"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:19
-msgid "Check _format:"
-msgstr "_Formato de comprobación:"
+#: ../gnucash/gnome-search/dialog-search.c:1124
+msgid "New Split"
+msgstr "Crear Desglose"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:20
-msgid "Check po_sition:"
-msgstr "Po_sición de comprobación:"
+#. Translators: This string has a disambiguation prefix. Translate only the part behind '|'
+#: ../gnucash/gnome-search/dialog-search.c:1134
+msgid "Item represents an unknown object type (in the sense of bill, customer, invoice, transaction, split,...)|New item"
+msgstr "Elemento nuevo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:21
-msgid "_Date format:"
-msgstr "Formato de _fecha:"
+#: ../gnucash/gnome-search/dialog-search.c:1186
+msgid "all criteria are met"
+msgstr "todos los criterios se cumplen"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:22
-msgid ""
-"Check format must have an\n"
-"ADDRESS item defined in order\n"
-"to print an address on the check."
-msgstr ""
-"Compruebe que el formato debe \n"
-"tener un elemento de dirección \n"
-"DIRECCIÓN definida con el fin de \n"
-"para escribir una dirección en \n"
-"la comprobación."
+#: ../gnucash/gnome-search/dialog-search.c:1187
+msgid "any criteria are met"
+msgstr "cualquier criterio se cumple"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:25
-msgid "_Address"
-msgstr "_Dirección"
+#: ../gnucash/gnome-search/dialog-search.glade.h:2
+msgid "_New item..."
+msgstr "_Crear elemento..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:26
-msgid "Checks on first _page:"
-msgstr "Comprobaciones en la primera _página:"
+#: ../gnucash/gnome-search/dialog-search.glade.h:5
+msgid "_Find"
+msgstr "_Encontrar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:28
-msgid "x"
-msgstr "x"
+#: ../gnucash/gnome-search/dialog-search.glade.h:6
+msgid "()"
+msgstr "()"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:29
-msgid "y"
-msgstr "y"
+#: ../gnucash/gnome-search/dialog-search.glade.h:7
+msgid " Search "
+msgstr " Buscar "
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:30
-msgid "Pa_yee:"
-msgstr "_Portador:"
+#: ../gnucash/gnome-search/dialog-search.glade.h:8
+msgid "Search for items where"
+msgstr "Buscar objetos donde"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:32
-msgid "Amount (_words):"
-msgstr "Cantidad (_palabras):"
+#: ../gnucash/gnome-search/dialog-search.glade.h:9
+msgid "<b>Match all entries</b>"
+msgstr "<b>Cotejar todos los asientos</b>"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:33
-msgid "Amount (_numbers):"
-msgstr "Cantidad (_números):"
+#: ../gnucash/gnome-search/dialog-search.glade.h:10
+msgid "Search Criteria"
+msgstr "Criterio de Búsqueda"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:34
-msgid "_Notes:"
-msgstr "_Anotaciones:"
+#: ../gnucash/gnome-search/dialog-search.glade.h:11
+msgid "New search"
+msgstr "Crear búsqueda"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:35
-msgid "_Units:"
-msgstr "_Unidades:"
+#: ../gnucash/gnome-search/dialog-search.glade.h:12
+msgid "Refine current search"
+msgstr "Refinar la búsqueda actual"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:36
-msgid "_Translation:"
-msgstr "_Translación:"
+#: ../gnucash/gnome-search/dialog-search.glade.h:13
+msgid "Add results to current search"
+msgstr "Añadir resultados a la búsqueda actual"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:37
-msgid "_Rotation"
-msgstr "_Rotación"
+#: ../gnucash/gnome-search/dialog-search.glade.h:14
+msgid "Delete results from current search"
+msgstr "Borra resultados de la búsqueda actual"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:38
-msgid "The origin point is the upper left-hand corner of the page."
-msgstr "El punto origen es la esquina superior izquierda de la página."
+#: ../gnucash/gnome-search/dialog-search.glade.h:15
+msgid "Search only active data"
+msgstr "Buscar sólo datos activos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:39
-msgid "The origin point is the lower left-hand corner of the page."
-msgstr "El punto origen es la esquina inferior izquierda de la página."
+#: ../gnucash/gnome-search/dialog-search.glade.h:16
+msgid "Choose whether to search all your data or only that marked as \"active\"."
+msgstr "Escoja si se debe buscar en todos sus datos o solo en el marcado como «activo»."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:40
-msgid "Degrees"
-msgstr "Grados"
+#: ../gnucash/gnome-search/dialog-search.glade.h:17
+msgid "Type of search"
+msgstr "Tipo de búsqueda"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:41
-msgid "_Save Format"
-msgstr "Guardar _formato"
+#: ../gnucash/gnome-search/search-account.c:176
+msgid "You have not selected any accounts"
+msgstr "No ha seleccionado ninguna cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:42
-msgid "_Address:"
-msgstr "_Dirección:"
+#: ../gnucash/gnome-search/search-account.c:197
+msgid "matches all accounts"
+msgstr "coteja con todas las cuentas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:44
-msgid "Splits Memo"
-msgstr "Desgloses de Memorándum"
+#: ../gnucash/gnome-search/search-account.c:202
+msgid "matches any account"
+msgstr "coteja con cualquier cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:45
-msgid "Splits Amount"
-msgstr "Desgloses de Débito"
+#: ../gnucash/gnome-search/search-account.c:203
+msgid "matches no accounts"
+msgstr "no coteja con ninguna cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:46
-msgid "Splits Account"
-msgstr "Desgloses de Cuenta"
+#: ../gnucash/gnome-search/search-account.c:220
+#: ../gnucash/report/standard-reports/cash-flow.scm:259
+msgid "Selected Accounts"
+msgstr "Cuentas Seleccionadas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-print-check.glade.h:47
-msgid "Custom format"
-msgstr "Formato personalizado"
+#: ../gnucash/gnome-search/search-account.c:221
+msgid "Choose Accounts"
+msgstr "Escoja Cuentas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-progress.glade.h:1
-msgid "1234567890123456789012345678901234567890"
-msgstr "1234567890123456789012345678901234567890"
+#. Create the label
+#: ../gnucash/gnome-search/search-account.c:255
+msgid "Select Accounts to Match"
+msgstr "Seleccione Cotejos de Cuentas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-progress.glade.h:2
-msgid "Working..."
-msgstr "Ocupado..."
+#: ../gnucash/gnome-search/search-account.c:259
+msgid "Select the Accounts to Compare"
+msgstr "Seleccione las Cuentas a Comparar"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:1
-msgid "Account Deletion"
-msgstr "Eliminación de Cuenta"
-
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:3
-msgid "The following Scheduled Transactions reference the deleted account and must now be corrected. Press OK to edit them."
-msgstr "Las Transacciones Programadas siguientes hacen referencia a la cuenta eliminada y debe ser corregida. Pulse “Aceptar” para editarlas."
+#: ../gnucash/gnome-search/search-date.c:195
+msgid "is before"
+msgstr "es antes que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:4
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:42
-#: ../gnucash/report/standard-reports/category-barchart.scm:139
-#: ../gnucash/report/standard-reports/transaction.scm:271
-#: ../libgnucash/engine/Recurrence.c:726
-msgid "Daily"
-msgstr "Diariamente"
+#: ../gnucash/gnome-search/search-date.c:196
+msgid "is before or on"
+msgstr "es antes que o sobre"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:6
-msgid "Bi-Weekly"
-msgstr "Quincenalmente"
+#: ../gnucash/gnome-search/search-date.c:197
+msgid "is on"
+msgstr "está en"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:9
-#: ../gnucash/report/standard-reports/account-piecharts.scm:123
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:920
-#: ../gnucash/report/standard-reports/transaction.scm:295
-#: ../libgnucash/engine/Recurrence.c:771
-msgid "Yearly"
-msgstr "Anualmente"
+#: ../gnucash/gnome-search/search-date.c:198
+msgid "is not on"
+msgstr "no está en"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:10
-msgid "Make Scheduled Transaction"
-msgstr "Crear Transacción Programada"
+#: ../gnucash/gnome-search/search-date.c:199
+msgid "is after"
+msgstr "está después de"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:11
-msgid "Advanced..."
-msgstr "Avanzado..."
+#: ../gnucash/gnome-search/search-date.c:200
+msgid "is on or after"
+msgstr "es el o despues de"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:16
-msgid "Never End"
-msgstr "Nunca Finalizar"
+#: ../gnucash/gnome-search/search-double.c:187
+#: ../gnucash/gnome-search/search-int64.c:189
+#: ../gnucash/gnome-search/search-numeric.c:220
+msgid "is less than"
+msgstr "es menor que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:18
-msgid "Number of Occurrences:"
-msgstr "Número de coincidencias:"
+#: ../gnucash/gnome-search/search-double.c:188
+#: ../gnucash/gnome-search/search-int64.c:190
+#: ../gnucash/gnome-search/search-numeric.c:224
+msgid "is less than or equal to"
+msgstr "es menor o igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:19
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:29
-msgid "1"
-msgstr "1"
+#: ../gnucash/gnome-search/search-double.c:189
+#: ../gnucash/gnome-search/search-int64.c:191
+#: ../gnucash/gnome-search/search-numeric.c:227
+#: ../gnucash/gnome-search/search-string.c:265
+msgid "equals"
+msgstr "es igual a"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:20
-msgid "End: "
-msgstr "Finalizar: "
+#: ../gnucash/gnome-search/search-double.c:190
+#: ../gnucash/gnome-search/search-int64.c:192
+#: ../gnucash/gnome-search/search-numeric.c:230
+msgid "does not equal"
+msgstr "no es igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:22
-msgid "<b>Since Last Run</b>"
-msgstr "<b>Desde Última Ejecución</b>"
+#: ../gnucash/gnome-search/search-double.c:191
+#: ../gnucash/gnome-search/search-int64.c:193
+#: ../gnucash/gnome-search/search-numeric.c:233
+msgid "is greater than"
+msgstr "es mayor que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:23
-msgid "<b>Transaction Editor Defaults</b>"
-msgstr "<b>Editor de Transacción Predeterminadas</b>"
+#: ../gnucash/gnome-search/search-double.c:192
+#: ../gnucash/gnome-search/search-int64.c:194
+#: ../gnucash/gnome-search/search-numeric.c:237
+msgid "is greater than or equal to"
+msgstr "el mayor o igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:24
-msgid "_Run when data file opened"
-msgstr "_Ejecutar cuando el fichero de datos esté abierto"
+#: ../gnucash/gnome-search/search-numeric.c:220
+msgid "less than"
+msgstr "menor que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:25
-msgid "Run the \"since last run\" process when a file is opened."
-msgstr "Inicio el proceso «desde la última ejecución» cuando se abra un fichero."
+#: ../gnucash/gnome-search/search-numeric.c:223
+msgid "less than or equal to"
+msgstr "menor o igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:26
-msgid "_Show notification window"
-msgstr "_Mostrar ventana de notificación"
+#: ../gnucash/gnome-search/search-numeric.c:227
+msgid "equal to"
+msgstr "igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:27
-msgid "Show the notification window for the \"since last run\" process when a file is opened."
-msgstr "Muestra la ventana de notificación «desde la última ejecución» cuando se abre un fichero."
+#: ../gnucash/gnome-search/search-numeric.c:230
+msgid "not equal to"
+msgstr "no es igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:28
-msgid "_Auto-create new transactions"
-msgstr "_Auto-crear transacciones nuevas"
+#: ../gnucash/gnome-search/search-numeric.c:233
+msgid "greater than"
+msgstr "mayor que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:29
-msgid "Set the 'auto-create' flag on newly created scheduled transactions."
-msgstr "Activar la marca 'autocrear' en las transacciones programadas nuevamente creadas."
+#: ../gnucash/gnome-search/search-numeric.c:236
+msgid "greater than or equal to"
+msgstr "mayor o igual que"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:30
-msgid "Crea_te in advance:"
-msgstr "Creación an_ticipada:"
+#: ../gnucash/gnome-search/search-numeric.c:253
+msgid "has credits or debits"
+msgstr "tiene créditos o débitos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:31
-msgid "R_emind in advance:"
-msgstr "R_ecuerdo anticipado:"
+#: ../gnucash/gnome-search/search-numeric.c:254
+msgid "has debits"
+msgstr "tiene débito"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:32
-msgid "Begin notifications this many days before the transaction is created."
-msgstr "Comenzar notificaciones estos días antes de que la transacción sea creada."
+#: ../gnucash/gnome-search/search-numeric.c:255
+msgid "has credits"
+msgstr "tiene créditos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:33
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:79
-msgid "days"
-msgstr "días"
+#. Build and connect the toggles
+#: ../gnucash/gnome-search/search-reconciled.c:227
+msgid "Not Cleared"
+msgstr "No Punteado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:34
-msgid "Create the transaction this many days before its effective date."
-msgstr "Crea la transacción esta cantidad de días antes de su fecha efectiva."
+#: ../gnucash/gnome-search/search-reconciled.c:230
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:802
+#: ../gnucash/report/standard-reports/transaction.scm:170
+#: ../gnucash/report/standard-reports/transaction.scm:334
+msgid "Cleared"
+msgstr "Punteado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:35
-msgid "_Notify before transactions are created "
-msgstr "_Notificar antes de crear las transacciones "
+#: ../gnucash/gnome-search/search-reconciled.c:233
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:816
+#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:64
+#: ../gnucash/import-export/import-match-picker.c:437
+#: ../gnucash/report/standard-reports/transaction.scm:169
+#: ../gnucash/report/standard-reports/transaction.scm:338
+msgid "Reconciled"
+msgstr "Conciliado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:36
-msgid "Set the 'notify' flag on newly created scheduled transactions."
-msgstr "Activa la marca 'notificar' en las transacciones programadas creadas recientemente."
+#: ../gnucash/gnome-search/search-reconciled.c:236
+#: ../gnucash/report/standard-reports/transaction.scm:172
+msgid "Frozen"
+msgstr "Congelado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:37
-msgid "Edit Scheduled Transaction"
-msgstr "Editar Transacción Programada"
+#: ../gnucash/gnome-search/search-reconciled.c:239
+#: ../gnucash/report/standard-reports/transaction.scm:173
+msgid "Voided"
+msgstr "Invalidado"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:39
-msgid "<b>Name</b>"
-msgstr "<b>Nombre</b>"
+#: ../gnucash/gnome-search/search-string.c:191
+msgid "You need to enter some search text."
+msgstr "Requiere introducir algo del texto de búsqueda."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:40
-msgid "<b>Options</b>"
-msgstr "<b>Opciones</b>"
+#: ../gnucash/gnome-search/search-string.c:220
+#: ../gnucash/import-export/bi-import/dialog-bi-import.c:118
+#: ../gnucash/import-export/csv-imp/csv-account-import.c:112
+#: ../gnucash/import-export/customer-import/dialog-customer-import.c:102
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Error en la expresión regular «%s»:\n"
+"%s"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:41
-msgid "Create in advance:"
-msgstr "Crear con adelanto:"
+#: ../gnucash/gnome-search/search-string.c:264
+msgid "contains"
+msgstr "contiene"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:42
-msgid "Remind in advance:"
-msgstr "Recordar con adelanto:"
+#: ../gnucash/gnome-search/search-string.c:266
+msgid "matches regex"
+msgstr "cotejo por exreg"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:43
-msgid " days"
-msgstr " días"
+#: ../gnucash/gnome-search/search-string.c:268
+msgid "does not match regex"
+msgstr "sin cotejo por exreg"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:44
-msgid "Create automatically"
-msgstr "Crear automáticamente"
+#. Build and connect the case-sensitive check button; defaults to off
+#: ../gnucash/gnome-search/search-string.c:331
+msgid "Match case"
+msgstr "Coincidir MAY/min"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:45
-msgid "Conditional on splits not having variables"
-msgstr "Condicional en desgloses que no tienen variables"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:178
+msgid ""
+"\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"
+"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"
+"Press 'Forward' now to select the correct character encoding for your data file.\n"
+msgstr ""
+"\n"
+"El fichero que está intentando cargar es de una versión más antigua de GnuCash. El formato de fichero en las versiones anteriores faltaba la definición detallada de la codificación de los caracteres usados. Esto significa que el texto en el fichero de datos se puede leer en múltiples formas ambiguas. Esta ambigüedad no se puede resolver de forma automática, pero el nuevo formato de fichero GnuCash 2.0.0 se incluyen todas las especificaciones necesarias para que usted no tenga que pasar de nuevo por este paso.\n"
+"\n"
+"GnuCash tratará de adivinar la codificación correcta de caracteres para su fichero de datos. En el GnuCash siguiente página mostrará los textos resultantes al utilizar esta suposición. Tiene que marcar si las palabras mirar como se esperaba. O todo se ve bien y puede simplemente pulse «Adelante». O las palabras contienen caracteres inesperados, en cuyo caso hay que seleccionar diferentes codificaciones de caracteres para ver resultados diferentes. Puede que tenga que modificar la lista de codificaciones de caracteres haciendo clic en el botón correspondiente.\n"
+"\n"
+"Ahora pulse 'Adelante' para seleccionar la codificación de caracteres correcta para el fichero de datos.\n"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:46
-msgid "Notify me when created"
-msgstr "Avisarme cuando se cree"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:198
+msgid "Ambiguous character encoding"
+msgstr "Codificación de caracteres ambiguos"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:47
-#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:168
-#: ../gnucash/report/standard-reports/transaction.scm:1727
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:48
-msgid "<b>Occurrences</b>"
-msgstr "<b>Coincidencias</b>"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:201
+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 file as backup in the same directory.\n"
+"\n"
+"You can also go back and verify your selections by clicking on 'Back'."
+msgstr ""
+"El fichero se ha cargado correctamente. Si pulsa «Aplicar» será guardado y recargado a la aplicación principal. De esta forma tendrá un fichero funcionando como respaldo en el mismo directorio.\n"
+"\n"
+"También puede volver y verificar sus selecciones pulsando «Volver»."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:49
-msgid "Last Occurred: "
-msgstr "Última coincidencia: "
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:226
+msgid "European"
+msgstr "Europeo"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:50
-msgid "Repeats:"
-msgstr "Repeticiones:"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:227
+msgid "ISO-8859-1 (West European)"
+msgstr "ISO-8859-1 (occidental europeo)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:51
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:105
-msgid "Forever"
-msgstr "Siempre"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:228
+msgid "ISO-8859-2 (East European)"
+msgstr "ISO-8859-2 (oriental europeo)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:52
-msgid "Until:"
-msgstr "Hasta:"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:229
+msgid "ISO-8859-3 (South European)"
+msgstr "ISO-8859-3 (sur europeo)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:53
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:103
-msgid "For:"
-msgstr "Por:"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:230
+msgid "ISO-8859-4 (North European)"
+msgstr "ISO-8859-4 (norte europeo)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:54
-msgid "occurrences"
-msgstr "coincidencias"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:231
+msgid "ISO-8859-5 (Cyrillic)"
+msgstr "ISO-8859-5 (cirílico)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:55
-msgid "remaining"
-msgstr "restantes"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:232
+msgid "ISO-8859-6 (Arabic)"
+msgstr "ISO-8859-6 (arábico)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:56
-msgid "Overview"
-msgstr "Sinopsis"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:233
+msgid "ISO-8859-7 (Greek)"
+msgstr "ISO-8859-7 (griego)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:57
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:357
-#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:177
-msgid "Frequency"
-msgstr "Frecuencia"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:234
+msgid "ISO-8859-8 (Hebrew)"
+msgstr "ISO-8859-8 (hebreo)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:58
-msgid "Template Transaction"
-msgstr "Plantilla Transaccional"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:235
+msgid "ISO-8859-9 (Turkish)"
+msgstr "ISO-8859-9 (turco)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:59
-msgid "Since Last Run..."
-msgstr "Desde la última ejecución..."
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:236
+msgid "ISO-8859-10 (Nordic)"
+msgstr "ISO-8859-10 (nórdico)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:60
-msgid "_Review created transactions"
-msgstr "_Revisar transacciones creadas"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:237
+msgid "ISO-8859-11 (Thai)"
+msgstr "ISO-8859-11 (tailandés)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:1
-msgid "Income Tax Information"
-msgstr "Información de Imposición sobre Ingresos"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:238
+msgid "ISO-8859-13 (Baltic)"
+msgstr "ISO-8859-13 (báltico)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:4
-msgid "<b>Income Tax Identity</b>"
-msgstr "<b>Identidad de Imposicioines Ingresantes</b>"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:239
+msgid "ISO-8859-14 (Celtic)"
+msgstr "ISO-8859-14 (celta)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:8
-msgid "Click to change Tax Name and/or Tax Type."
-msgstr "Pulse para cambiar el Nombre y/o el Tipo Impositivo."
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:240
+msgid "ISO-8859-15 (West European, Euro sign)"
+msgstr "ISO-8859-15 (occidental europeo, signo Euro)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:9
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:15
-msgid "<b>_Accounts</b>"
-msgstr "<b>_Cuentas</b>"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:241
+msgid "ISO-8859-16 (South-East European)"
+msgstr "ISO-8859-16 (sudeste europeo)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:10
-msgid "_Income"
-msgstr "_Ingreso"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:243
+msgid "KOI8-R (Russian)"
+msgstr "KOI8-R (Ruso)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:11
-msgid "_Expense"
-msgstr "_Gasto"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:244
+msgid "KOI8-U (Ukrainian)"
+msgstr "KOI8-U (Ucraniano)"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:12
-msgid "_Asset"
-msgstr "_Activo"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:680
+#, c-format
+msgid "There are %d unassigned and %d undecodable words. Please add encodings."
+msgstr "Hay %d palabras sin asignar y %d palabras sin descodificar. Por favor añada codificaciones."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:13
-msgid "_Liability/Equity"
-msgstr "_Pasivo/Patrimonio"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:688
+#, c-format
+msgid "There are %d unassigned words. Please decide on them or add encodings."
+msgstr "Hay %d palabras sin asignar. Por favor decida sobre ellos o añada codificaciones."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:14
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:16
-msgid "Accounts Selected:"
-msgstr "Cuentas seleccionadas:"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:699
+#, c-format
+msgid "There are %d undecodable words. Please add encodings."
+msgstr "Hay %d palabras no descodificables. Por favor añada codificaciones."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:15
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:17
-msgid "0"
-msgstr "0"
+#. 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.
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1010
+msgid "ISO-8859-1 KOI8-U"
+msgstr "ISO-8859-1 KOI8-U"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:16
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:18
-msgid "_Select Subaccounts"
-msgstr "_Seleccionar subcuentas"
+#. another error, cannot handle this here
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1089
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1109
+msgid "The file could not be reopened."
+msgstr "El fichero no se ha podido reabrir."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:17
-msgid "<b>Account Tax Information</b>"
-msgstr "<b>Cuenta de Información Imponible</b>"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1094
+msgid "Reading file..."
+msgstr "Leyendo fichero..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:18
-msgid "Tax _Related"
-msgstr "Imposición _específica"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1117
+msgid "Parsing file..."
+msgstr "Cotejando fichero..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:19
-msgid "<b>_TXF Categories</b>"
-msgstr "<b>Categorías _TXF</b>"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1124
+msgid "There was an error parsing the file."
+msgstr "Hubo un error al interpretar el fichero."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:20
-msgid "<b>Payer Name Source</b>"
-msgstr "<b>Nombre Origen del Portador</b>"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1149
+#: ../gnucash/gnome-utils/gnc-file.c:1314
+#: ../gnucash/gnome-utils/gnc-file.c:1549
+msgid "Writing file..."
+msgstr "Escribiendo fichero..."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:21
-msgid "C_urrent Account"
-msgstr "Cuenta act_ual"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1308
+msgid "This encoding has been added to the list already."
+msgstr "Esta codificación ya ha sido añadida al listado."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:22
-msgid "_Parent Account"
-msgstr "Cuenta _matriz"
+#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1319
+msgid "This is an invalid encoding."
+msgstr "Esto es una codificación inválida."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-tax-info.glade.h:23
-msgid "<b>Copy Number</b>"
-msgstr "<b>Copiar Número</b>"
+#: ../gnucash/gnome-utils/dialog-account.c:469
+msgid "Could not create opening balance."
+msgstr "No se pudo crear el saldo de apertura."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:1
-msgid "Transaction Association Dialog"
-msgstr "Dialogo de Asociación Transacional"
+#. primary label
+#: ../gnucash/gnome-utils/dialog-account.c:666
+msgid "Give the children the same type?"
+msgstr "¿Dar a la subcuenta el mismo tipo?"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:2
-msgid "_Sort Association"
-msgstr "_Ordenar asociación"
+#. secondary label
+#: ../gnucash/gnome-utils/dialog-account.c:677
+#, c-format
+msgid "The children of the edited account have to be changed to type \"%s\" to make them compatible."
+msgstr "La matriz de la edición de cuentas tienen que ser cambiadas al tipo «%s» para hacerlas compatibles."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:3
-msgid "_Locate Association"
-msgstr "Asociación _local"
+#. children
+#: ../gnucash/gnome-utils/dialog-account.c:688
+msgid "_Show children accounts"
+msgstr "_Mostrar subcuentas"
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:4
-msgid "All Transaction Associations"
-msgstr "Todas Asociaciones Transaccionadas"
+#: ../gnucash/gnome-utils/dialog-account.c:758
+msgid "The account must be given a name."
+msgstr "La cuenta debe de tener un nombre."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:7
-msgid "Association"
-msgstr "Asociación"
+#: ../gnucash/gnome-utils/dialog-account.c:784
+msgid "There is already an account with that name."
+msgstr "Ya existe una cuenta con ese nombre."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:8
-msgid "Available ?"
-msgstr "¿Disponible?"
+#: ../gnucash/gnome-utils/dialog-account.c:793
+msgid "You must choose a valid parent account."
+msgstr "Debe elegir una cuenta padre válida."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade.h:9
-msgid ""
-"     To jump to the Transaction, double click on the entry in the\n"
-"Description column or Association column to open the Association"
-msgstr ""
-"     Para omitir a la Transacción, pulse dos veces sobre el asiento dentro\n"
-" de la columna Descripción o Asociación para abrir la Asociación"
+#: ../gnucash/gnome-utils/dialog-account.c:802
+msgid "You must select an account type."
+msgstr "Debe seleccionar un tipo de cuenta."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:5
-msgid "Vendor Number: "
-msgstr "Número de proveedor: "
+#: ../gnucash/gnome-utils/dialog-account.c:811
+msgid "The selected account type is incompatible with the one of the selected parent."
+msgstr "El tipo de cuenta seleccionado es incompatible con alguno seleccionado desde el origen."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:8
-msgid "The vendor ID number. If left blank a reasonable number will be chosen for you"
-msgstr "El código de proveedor. Si se deja vacío se elegirá un número razonable por usted"
+#: ../gnucash/gnome-utils/dialog-account.c:823
+msgid "You must choose a commodity."
+msgstr "Debe elegir una mercancía."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:20
-msgid "Tax Included:"
-msgstr "Cargo incluido:"
+#: ../gnucash/gnome-utils/dialog-account.c:879
+msgid "You must enter a valid opening balance or leave it blank."
+msgstr "Debe introducir un saldo de apertura válido o dejarlo en blanco."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:21
-msgid "Tax Table:"
-msgstr "Tabla impositiva:"
+#: ../gnucash/gnome-utils/dialog-account.c:903
+msgid "You must select a transfer account or choose the opening balances equity account."
+msgstr "Debe seleccionar una cuenta a la que transferir o elija la cuenta de Balance de Patrimonio para apertura."
 
-#: ../gnucash/gnome/gtkbuilder/dialog-vendor.glade.h:23
-#: ../gnucash/gnome/window-reconcile2.c:467
-#: ../gnucash/gnome/window-reconcile.c:505
-msgid "Payment Information"
-msgstr "Información de Liquidación"
+#: ../gnucash/gnome-utils/dialog-account.c:1307
+msgid ""
+"This Account contains Transactions.\n"
+"Changing this option is not possible."
+msgstr ""
+"Esta Cuenta contiene Transacciones.\n"
+"Cambiando esta opción no es posible."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:1
-msgid "Estimate Budget Values"
-msgstr "Estimar Valores Presupuestarios"
+#: ../gnucash/gnome-utils/dialog-account.c:1488
+msgid "Edit Account"
+msgstr "Editar cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:4
-msgid "GnuCash will estimate budget values for the selected accounts from past transactions."
-msgstr "GnuCash estimará los valores a presupuestar para las cuentas seleccionadas desde transacciones anteriores."
+#: ../gnucash/gnome-utils/dialog-account.c:1491
+#, c-format
+msgid "(%d) New Accounts"
+msgstr "(%d) Cuentas Nuevas"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:6
-msgid "Significant Digits:"
-msgstr "Dígitos significativos:"
+#: ../gnucash/gnome-utils/dialog-account.c:1501
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:36
+msgid "New Account"
+msgstr "Cuenta Nueva"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:7
-msgid "The number of leading digits to keep when rounding"
-msgstr "El número de dígitos a mantener para conservar el redondeo"
+#: ../gnucash/gnome-utils/dialog-account.c:2063
+#, c-format
+msgid "Renumber the immediate sub-accounts of %s? This will replace the account code field of each child account with a newly generated code."
+msgstr "¿Renumerar las subcuentas inmediatas de %s? Esto reemplazará el campo de código de cuenta de cada cuenta hija con un código generado."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:9
-msgid "Budget Name:"
-msgstr "Nombre del presupuestos:"
+#: ../gnucash/gnome-utils/dialog-book-close.c:301
+msgid "Please select an Equity account to hold the total Period Income."
+msgstr "Seleccione una cuenta de Patrimonio para mantener el Período de Ingresos total."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:11
-msgid "Number of Periods:"
-msgstr "Número de periodos:"
+#: ../gnucash/gnome-utils/dialog-book-close.c:308
+msgid "Please select an Equity account to hold the total Period Expense."
+msgstr "Seleccione una cuenta de Patrimonio para mantener el total del Período de Gastos."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:12
-msgid "Budget Period:"
-msgstr "Periodo del presupuesto:"
+#: ../gnucash/gnome-utils/dialog-commodity.c:174
+msgid ""
+"\n"
+"Please select a commodity to match:"
+msgstr ""
+"\n"
+"Seleccione una mercancía para cotejar:"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:13
-msgid "Budget List"
-msgstr "Lista de presupuestos"
+#: ../gnucash/gnome-utils/dialog-commodity.c:181
+msgid ""
+"\n"
+"Commodity: "
+msgstr ""
+"\n"
+"Mercancía: "
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:15
-msgid "Close the Budget List"
-msgstr "Cerrar la Lista de Presupuestos"
+#. Translators: Replace here and later CUSIP by the name of your local
+#. National Securities Identifying Number
+#. like gb:SEDOL, de:WKN, ch:Valorennummer, fr:SICOVAM ...
+#. See http://en.wikipedia.org/wiki/ISIN for hints.
+#: ../gnucash/gnome-utils/dialog-commodity.c:187
+msgid ""
+"\n"
+"Exchange code (ISIN, CUSIP or similar): "
+msgstr ""
+"\n"
+"Código de cambio monetario (ISIN, CUSIP o similar): "
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:17
-msgid "Create a New Budget"
-msgstr "Crea un Presupuesto"
+#: ../gnucash/gnome-utils/dialog-commodity.c:189
+msgid ""
+"\n"
+"Mnemonic (Ticker symbol or similar): "
+msgstr ""
+"\n"
+"Mnemónico (Símbolo de puntuar o similar): "
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:18
-#: ../gnucash/gnome-utils/dialog-file-access.c:299
-#: ../gnucash/gnome-utils/gnc-file.c:89 ../gnucash/gnome-utils/gnc-file.c:100
-#: ../gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade.h:6
-msgid "_Open"
-msgstr "_Abrir"
+#: ../gnucash/gnome-utils/dialog-commodity.c:287
+msgid "Select security/currency"
+msgstr "Seleccionar garantía/moneda"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:19
-msgid "Open the Selected Budget"
-msgstr "Abrir Presupuesto Seleccionado"
+#: ../gnucash/gnome-utils/dialog-commodity.c:288
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:42
+msgid "_Security/currency:"
+msgstr "_Garantía/Moneda:"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade.h:21
-msgid "Delete the Selected Budget"
-msgstr "Borrar Presupuesto Seleccionado"
+#: ../gnucash/gnome-utils/dialog-commodity.c:292
+msgid "Select security"
+msgstr "Seleccionar garantía"
 
-#. Duplicate Transaction Dialog
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:1
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:56
-msgid "Duplicate Transaction"
-msgstr "Duplicar Transacción"
+#: ../gnucash/gnome-utils/dialog-commodity.c:297
+msgid "Select currency"
+msgstr "Seleccionar moneda"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:4
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:57
-msgid "<b>New Transaction Information</b>"
-msgstr "<b>Información de Transacción Nueva</b>"
+#: ../gnucash/gnome-utils/dialog-commodity.c:772
+#: ../gnucash/gnome-utils/dialog-options.c:673
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:440
+#: ../gnucash/gnome-utils/gnc-tree-view-price.c:430
+#: ../libgnucash/engine/Account.cpp:4107
+msgid "Currency"
+msgstr "Moneda"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:6
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:59
-msgid "_Number:"
-msgstr "_Número:"
+#: ../gnucash/gnome-utils/dialog-commodity.c:867
+msgid "Use local time"
+msgstr "Emplee hora local"
 
-#. Filter register by... Dialog
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:7
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:2
-msgid "Filter register by..."
-msgstr "Filtrar el registro por..."
+#: ../gnucash/gnome-utils/dialog-commodity.c:1001
+msgid "Edit currency"
+msgstr "Editar moneda"
 
-#. Filter By Dialog, Date Tab
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:8
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:6
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:20
-msgid "Show _All"
-msgstr "Mostrar _todo"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1002
+msgid "Currency Information"
+msgstr "Información de Moneda"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:9
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:7
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:21
-msgid "Select Range:"
-msgstr "Seleccionar rango:"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1007
+msgid "Edit security"
+msgstr "Editar garantía"
 
-#. Filter By Dialog, Date Tab, Start section
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:10
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:9
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:22
-msgid "Start:"
-msgstr "Inicio:"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1007
+msgid "New security"
+msgstr "Crear garantía"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:11
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:10
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:23
-msgid "_Earliest"
-msgstr "Más r_eciente"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1008
+msgid "Security Information"
+msgstr "Información de Garantía"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:12
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:11
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:24
-msgid "Choo_se Date:"
-msgstr "E_scoja fecha:"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1286
+msgid "You may not create a new national currency."
+msgstr "No puede crear una moneda nacional nueva."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:13
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:12
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:25
-msgid "Toda_y"
-msgstr "Ho_y"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1296
+#, c-format
+msgid "%s is a reserved commodity type. Please use something else."
+msgstr "%s es un tipo de mercancía reservada. Emplee otra cosa."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:14
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:13
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:26
-msgid "_Latest"
-msgstr "Ú_ltimo"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1311
+msgid "That commodity already exists."
+msgstr "Esa mercancía ya existe."
 
-#. Filter By Dialog, Date Tab, End section
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:15
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:15
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:27
-msgid "End:"
-msgstr "Final:"
+#: ../gnucash/gnome-utils/dialog-commodity.c:1360
+msgid "You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type\" for the commodity."
+msgstr "Debe introducir valores no vacíos para «Nombre completo», «Símbolo/Abreviatura» y «Tipo» para la mercancía."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:16
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:16
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:28
-msgid "C_hoose Date:"
-msgstr "Escoja _fecha:"
-
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:17
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:17
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.glade.h:29
-msgid "_Today"
-msgstr "_Hoy"
-
-#. Filter By Dialog, State Tab
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:19
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:20
-msgid "_Unreconciled"
-msgstr "_No conciliado"
+#. The "date" and the "tnum" fields aren't being asked for, this is a split copy
+#: ../gnucash/gnome-utils/dialog-dup-trans.c:237
+msgid "Action/Number:"
+msgstr "Operación/Número:"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:20
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:21
-#: ../gnucash/import-export/qif-imp/dialog-account-picker.glade.h:5
-msgid "_Reconciled"
-msgstr "_Conciliado"
+#: ../gnucash/gnome-utils/dialog-file-access.c:298
+msgid "Open..."
+msgstr "Abrir..."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:21
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:22
-msgid "C_leared"
-msgstr "P_unteado"
+#: ../gnucash/gnome-utils/dialog-file-access.c:305
+msgid "Save As..."
+msgstr "Guardar como..."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:22
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:23
-msgid "_Voided"
-msgstr "_Vaciado"
+#: ../gnucash/gnome-utils/dialog-file-access.c:306
+#: ../gnucash/gnome-utils/dialog-file-access.c:315
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:2
+msgid "_Save As"
+msgstr "Guardar _como"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:23
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:24
-msgid "_Frozen"
-msgstr "_Congelado"
+#: ../gnucash/gnome-utils/dialog-file-access.c:314
+#: ../gnucash/gnome-utils/gnc-file.c:121 ../gnucash/gnome-utils/gnc-file.c:298
+#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1116
+msgid "Export"
+msgstr "Exportar"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:24
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:25
-msgid "Select _All"
-msgstr "Seleccionar _todo"
+#: ../gnucash/gnome-utils/dialog-options.c:612
+msgid "Because no accounts have been set up yet,you will need to return to this dialog (via File->Properties), after account setup, if you want to set a default gain/loss account."
+msgstr "Porque ninguna cuenta ha sido configurada aún, necesitará volver a este diálogo (por Archivo→Propiedades), tras configurar la cuenta, si quiere establecer una cuenta predeterminada de ganancias/pérdidas."
 
-#. Filter By Dialog, below tabs
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:26
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:28
-msgid "Sa_ve Filter"
-msgstr "Guardar _filtro"
+#: ../gnucash/gnome-utils/dialog-options.c:656
+msgid "Select no account"
+msgstr "No seleccione ninguna cuenta"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:27
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:61
-msgid "Void Transaction"
-msgstr "Transacción Vacía"
+#. Translators: This string has a context prefix; the
+#. translation must only contain the part after
+#. the | character.
+#. Translators: This string has a context prefix; the translation
+#. must only contain the part after the | character.
+#: ../gnucash/gnome-utils/dialog-options.c:694
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:906
+msgid "Column letter for 'Placeholder'|P"
+msgstr "C"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade.h:28
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:62
-msgid "Reason for voiding transaction:"
-msgstr "Razón para invalidando transacción:"
+#: ../gnucash/gnome-utils/dialog-options.c:761
+msgid ""
+"There are no income or expense accounts of the specified\n"
+"book currency; you will have to return to this dialog\n"
+"(via File->Properties), after account setup, to select a\n"
+"default gain/loss account."
+msgstr ""
+"No hay ninguna cuentas de ingreso o gasto de de la moneda\n"
+"del libro actualmente especificada; tendrá que volver a este\n"
+"diálogo (vía Archivo→Propiedades), tras configurar la cuenta,\n"
+"para seleccionar una cuenta de ganancia/pérdidas predeterminada."
 
-#. Sort register by Dialog
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:30
-msgid "Sort register by..."
-msgstr "Ordenar registro por..."
+#: ../gnucash/gnome-utils/dialog-options.c:830
+msgid "You have selected a placeholder account, which is shown so that child accounts are displayed, but is invalid. Please select another account. (You can expand the tree below the placeholder account by clicking on the arrow to the left.)"
+msgstr "Ha seleccionado un cuenta contenedora, la cual es mostrada tal que las cuentas descendientes se enseñen, pero es inválida. Seleccione otra cuenta. (Puede expandir el plan debajo del la cuenta contenedora pulsando en la flecha de la izquierda.)"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:31
-msgid "_Standard Order"
-msgstr "_Operación común"
+#: ../gnucash/gnome-utils/dialog-options.c:1266
+msgid "Book currency:"
+msgstr "Moneda del libro:"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:32
-msgid "Keep normal account order."
-msgstr "Conservar operación de cuenta común."
+#: ../gnucash/gnome-utils/dialog-options.c:1295
+msgid "Default lot tracking policy:"
+msgstr "Política predeterminada de seguimiento de lote:"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:34
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:820
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:871
-#: ../gnucash/report/standard-reports/transaction.scm:161
-msgid "Sort by date."
-msgstr "Ordenar por Fecha."
+#: ../gnucash/gnome-utils/dialog-options.c:1323
+msgid "Default gain/loss account:"
+msgstr "Cuenta ganancias/pérdicas predeterminada:"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:36
-msgid "Sort by the date of entry."
-msgstr "Ordenar por día de asiento."
+#: ../gnucash/gnome-utils/dialog-options.c:1495
+#: ../gnucash/gnome-utils/dialog-options.c:1638
+msgid "Select All"
+msgstr "Seleccionar Todo"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:37
-msgid "S_tatement Date"
-msgstr "Fecha _declarada"
+#: ../gnucash/gnome-utils/dialog-options.c:1497
+msgid "Select all accounts."
+msgstr "Seleccionar todas las cuentas."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:38
-msgid "Sort by the statement date (and group by cleared, unreconciled, reconciled)."
-msgstr "Ordenar por fecha declarada (y grupo por punteado, no conciliados, conciliados)."
+#: ../gnucash/gnome-utils/dialog-options.c:1502
+#: ../gnucash/gnome-utils/dialog-options.c:1645
+msgid "Clear All"
+msgstr "Puntear Todo"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:39
-msgid "Num_ber"
-msgstr "_Número"
+#: ../gnucash/gnome-utils/dialog-options.c:1504
+msgid "Clear the selection and unselect all accounts."
+msgstr "Puntea la selección y deselecciona todas las cuentas."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:40
-msgid "Sort by number."
-msgstr "Ordenar por Número."
+#: ../gnucash/gnome-utils/dialog-options.c:1509
+msgid "Select Children"
+msgstr "Seleccionar Descendientes"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:41
-msgid "Amo_unt"
-msgstr "_Cantidad"
+#: ../gnucash/gnome-utils/dialog-options.c:1511
+msgid "Select all descendents of selected account."
+msgstr "Seleccionar todas los descendientes de una cuenta seleccionada."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:42
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:840
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:891
-#: ../gnucash/report/standard-reports/transaction.scm:204
-msgid "Sort by amount."
-msgstr "Ordenar por Cantidad."
+#: ../gnucash/gnome-utils/dialog-options.c:1517
+#: ../gnucash/gnome-utils/dialog-options.c:1652
+msgid "Select Default"
+msgstr "Selección Predeterminada"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:43
-msgid "_Memo"
-msgstr "_Memorandum"
+#: ../gnucash/gnome-utils/dialog-options.c:1519
+msgid "Select the default account selection."
+msgstr "Seleccione la elección por omisión de cuentas."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:44
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:856
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:903
-#: ../gnucash/report/standard-reports/transaction.scm:236
-msgid "Sort by memo."
-msgstr "Ordenar por memorándum."
+#: ../gnucash/gnome-utils/dialog-options.c:1533
+msgid "Show Hidden Accounts"
+msgstr "Mostrar Cuentas Ocultas"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:46
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:844
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:895
-#: ../gnucash/report/standard-reports/transaction.scm:210
-msgid "Sort by description."
-msgstr "Ordenar por Descripción."
+#: ../gnucash/gnome-utils/dialog-options.c:1535
+msgid "Show accounts that have been marked hidden."
+msgstr "Muestra cuentas que fueron marcadas como ocultas."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:47
-msgid "_Action"
-msgstr "_Operación"
+#: ../gnucash/gnome-utils/dialog-options.c:1640
+msgid "Select all entries."
+msgstr "Seleccionar todos los asientos."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:48
-msgid "Sort by action field."
-msgstr "Ordenar por campo de operación."
+#: ../gnucash/gnome-utils/dialog-options.c:1647
+msgid "Clear the selection and unselect all entries."
+msgstr "Puntea la selección y deselecciona todos los asientos."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:49
-msgid "_Notes"
-msgstr "_Anotaciones"
+#: ../gnucash/gnome-utils/dialog-options.c:1654
+msgid "Select the default selection."
+msgstr "Seleccionar la elección por omisión."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:50
-msgid "Sort by notes field."
-msgstr "Ordenar por el campo de anotaciones."
+#. The reset button on each option page
+#: ../gnucash/gnome-utils/dialog-options.c:1823
+msgid "Reset defaults"
+msgstr "Restablecer predeterminados"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:51
-msgid "Sa_ve Sort Order"
-msgstr "Guardar _Orden de Operación"
+#: ../gnucash/gnome-utils/dialog-options.c:1825
+msgid "Reset all values to their defaults."
+msgstr "Restablece todos los valores a sus predeterminaciones."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:52
-msgid "Save the sort order for this register."
-msgstr "Guarda el orden de operación para este registro."
+#: ../gnucash/gnome-utils/dialog-options.c:2182
+msgid "Page"
+msgstr "Página"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:53
-msgid "_Reverse Order"
-msgstr "_Revertir operación"
+#: ../gnucash/gnome-utils/dialog-options.c:2822
+#: ../gnucash/gnome-utils/dialog-preferences.c:1328
+msgid "Clear"
+msgstr "Puntear"
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:54
-msgid "Sort in descending order."
-msgstr "Ordenar en orden descendiente."
+#: ../gnucash/gnome-utils/dialog-options.c:2823
+msgid "Clear any selected image file."
+msgstr "Quita cualquier fichero de imagen seleccionado."
 
-#: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:60
-msgid "_Transaction Number:"
-msgstr "Número _transaccional:"
+#: ../gnucash/gnome-utils/dialog-options.c:2825
+msgid "Select image"
+msgstr "Seleccione imagen"
 
-#: ../gnucash/gnome/gtkbuilder/window-autoclear.glade.h:3
-msgid "<b>Auto-Clear Information</b>"
-msgstr "<b>Información de Autopunteado</b>"
+#: ../gnucash/gnome-utils/dialog-options.c:2827
+msgid "Select an image file."
+msgstr "Seleccione un fichero de imagen."
 
-#: ../gnucash/gnome/gtkbuilder/window-autoclear.glade.h:4
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:6
-msgid "_Ending Balance:"
-msgstr "_Saldo:"
+#: ../gnucash/gnome-utils/dialog-options.c:3013
+msgid "Pixels"
+msgstr "Píxeles"
 
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:3
-msgid "<b>Reconcile Information</b>"
-msgstr "<b>Información de Conciliación</b>"
+#: ../gnucash/gnome-utils/dialog-options.c:3019
+msgid "Percent"
+msgstr "Porcentaje"
 
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:4
-msgid "Statement _Date:"
-msgstr "_Fecha declarada:"
-
-#. starting balance title/value
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:5
-#: ../gnucash/gnome/window-reconcile2.c:1833
-#: ../gnucash/gnome/window-reconcile.c:1875
-msgid "Starting Balance:"
-msgstr "Saldo de Inicio:"
-
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:7
-msgid "Include _subaccounts"
-msgstr "Incluir _subcuentas"
+#. 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
+#. names with other account names that are more suitable for your
+#. language - just keep in mind to have exactly two %s in your
+#. translation.
+#: ../gnucash/gnome-utils/dialog-preferences.c:163
+#, c-format
+msgid "Income%sSalary%sTaxable"
+msgstr "Ingreso%sSalario%sImponible"
 
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:8
-msgid "Include all descendant accounts in the reconcile. All of them must use the same commodity as this one."
-msgstr "Incluye todas las cuentas descendientes en la conciliación. Todas de ellas deben usar la misma mercancía como esta."
+#: ../gnucash/gnome-utils/dialog-preferences.c:798
+msgid "Path does not exist, "
+msgstr "La ruta no existe, "
 
-#: ../gnucash/gnome/gtkbuilder/window-reconcile.glade.h:9
-#: ../gnucash/gnome/window-reconcile2.c:766
-#: ../gnucash/gnome/window-reconcile.c:805
-msgid "Enter _Interest Payment..."
-msgstr "Introducir liquidación de _intereses..."
+#: ../gnucash/gnome-utils/dialog-preferences.c:848
+#: ../gnucash/gnome-utils/dialog-preferences.c:1325
+msgid "Select a folder"
+msgstr "Selecciona una carpeta"
 
-#. Translators: The abbreviation for 'Reconciled'
-#. in the header row of the register. Please only
-#. translate the portion after the ':' and
-#. leave the rest ("Reconciled:") as is.
-#: ../gnucash/gnome/reconcile-view.c:394
-#: ../gnucash/register/ledger-core/split-register-layout.c:699
-#: ../gnucash/register/ledger-core/split-register-model.c:304
-msgid "Reconciled:R"
-msgstr "C"
+#: ../gnucash/gnome-utils/dialog-tax-table.c:116
+msgid "You must provide a name for this Tax Table."
+msgstr "Tiene que proporcionar un nombre para esta Lengüeta Impositiva."
 
-#: ../gnucash/gnome/search-owner.c:163
-msgid "You have not selected an owner"
-msgstr "No ha seleccionado un titular"
+#: ../gnucash/gnome-utils/dialog-tax-table.c:123
+#, c-format
+msgid "You must provide a unique name for this Tax Table. Your choice \"%s\" is already in use."
+msgstr "Tiene que proporcionar un nombre único para esta Lengüeta Impositiva. Su elección «%s» ya está utilizado."
 
-#: ../gnucash/gnome/search-owner.c:258
-#: ../gnucash/gnome-search/search-reconciled.c:189
-msgid "is"
-msgstr "es"
+#: ../gnucash/gnome-utils/dialog-tax-table.c:137
+msgid "Percentage amount must be between -100 and 100."
+msgstr "La cantidad del porcentaje debe estar entre -100 y 100."
 
-#: ../gnucash/gnome/search-owner.c:259
-#: ../gnucash/gnome-search/search-reconciled.c:190
-msgid "is not"
-msgstr "no es"
+#: ../gnucash/gnome-utils/dialog-tax-table.c:146
+msgid "You must choose a Tax Account."
+msgstr "Debe elegir una Cuenta de Imposiciones."
 
-#: ../gnucash/gnome/top-level.c:105
+#: ../gnucash/gnome-utils/dialog-tax-table.c:564
 #, c-format
-msgid "Entity Not Found: %s"
-msgstr "Entidad no encontrada: %s"
+msgid "Tax table \"%s\" is in use. You cannot delete it."
+msgstr "Tabla impositiva «%s» está activo. No lo puede eliminarlo."
 
-#: ../gnucash/gnome/top-level.c:165
-#, c-format
-msgid "Transaction with no Accounts: %s"
-msgstr "Transacción sin ninguna Cuentas: %s"
+#: ../gnucash/gnome-utils/dialog-tax-table.c:612
+msgid "You cannot remove the last entry from the tax table. Try deleting the tax table if you want to do that."
+msgstr ""
+"No puede quitar el último asiento de la lengüeta impositiva. Trate eliminar la lengüeta impositiva\n"
+"si quiere hacer eso."
 
-#: ../gnucash/gnome/top-level.c:181
-#, c-format
-msgid "Unsupported entity type: %s"
-msgstr "Tipo de entidad no soportado: %s"
+#: ../gnucash/gnome-utils/dialog-tax-table.c:619
+msgid "Are you sure you want to delete this entry?"
+msgstr "¿Está seguro que quiere borrar este asiento?"
 
-#: ../gnucash/gnome/top-level.c:218
-#, c-format
-msgid "No such price: %s"
-msgstr "Sin precio: %s"
+#: ../gnucash/gnome-utils/dialog-transfer.c:590
+msgid "Show the income and expense accounts"
+msgstr "Muestra las cuentas de ingresos y gastos"
 
-# Notas:
-# Account Tree: Plan Contable
-# Bill → Abonación, Facturación, [Factura]
-# Billing → Abonando, efectivo
-# Bizarre  → Guarro
-# Book |
-#  | Libro General: General Ledge
-#  | Libro Diario: Transaction Journal
-#  | Libro Básico: Basic Ledge
-#  | Asiento --> Entrada EntryLedge
-# Account _Hierarchy → Plan de Cuentas
-# Business → Negocio, Empresa
-# Company → Empresa, Sociedad (Limitada/Anónima)
-# Chart → Gráfico
-#   Barchart	→ Barra
-#   Linechart → Línea
-#   Piechart  → Porción
-# Balance Sheet → Hoja de Balance
-# Choose →  Elegir
-# Equity → Patrimonio, Acciones (de bolsa)
-# Expense → Gasto
-# Invoice → Albarán
-# Job → Ejercicio
-# Liability → Obligación, Responsabilidad, Pasivo(Eco), Deuda
-# Match → [Cotejo], Coincidencia
-# Memo → Memorandum
-# Net Worth → Valor Neto?
-# Operation → Operación
-# Payment -→ Pago, Abonación
-# Page → ?PESTAÑA
-# Plot → Gráfico
-# Post → publicar
-# Posted → Publicado?
-# Preparer → "Preparador"
-# Profit → Beneficio
-# Prompt → ??
-# Quantity → [Inventario], Cantidad
-# Quotes :: Cotización
-# Record → Registrar
-# Scheduled Transaction
-#    → Calendario de Transacción.
-#    → Registro de Transacción.
-#    → Transacción Programada.
-#    →
-# Security → Garantía
-# Skip Errors → Saltar errores
-# Statement
-# Stoke → mercancía
-# Tax Invoice
-#  reconciled balance : Balance conciliado
-# Voucher: Comprobante
-# Withdrawal: Retirada (de fondos)
-# Worth: Valor
-# (Editar)
-# Comentarios extraídos:
-# Business options
-#. Business options
-#: ../gnucash/gnome/top-level.c:429 ../libgnucash/app-utils/app-utils.scm:305
-msgid "Business"
-msgstr "Negocios"
+#: ../gnucash/gnome-utils/dialog-transfer.c:694
+msgid "Error"
+msgstr "Error"
 
-#: ../gnucash/gnome/window-autoclear.c:138
-msgid "Searching for splits to clear ..."
-msgstr "Buscando desgloses para puntear..."
+#: ../gnucash/gnome-utils/dialog-transfer.c:1311
+msgid "Retrieve the current online quote. This will fail if there is a manually-created price for today."
+msgstr ""
+"Obtiene la cotización actual por conexión.\n"
+"Esto fallará si hay un precio generado manualmente para hoy."
 
-#: ../gnucash/gnome/window-autoclear.c:240
-msgid "Cannot uniquely clear splits. Found multiple possibilities."
-msgstr "No se puede puntear únicamente desgloses únicos. Se encontraron múltiples posibilidades."
+#: ../gnucash/gnome-utils/dialog-transfer.c:1315
+msgid "Finance::Quote must be installed to enable this button."
+msgstr "Finanza::Cotización debe estar instalado para activar este botón."
 
-#: ../gnucash/gnome/window-autoclear.c:247
-msgid "The selected amount cannot be cleared."
-msgstr "La cantidad seleccionada no puede estar punteada."
+#: ../gnucash/gnome-utils/dialog-transfer.c:1417
+msgid "You must specify an account to transfer from, or to, or both, for this transaction. Otherwise, it will not be recorded."
+msgstr "Debe especificar una cuenta desde la que transferir, a la que transferir, o ambas, para esta transacción. De otro modo, no será registrado."
 
-#: ../gnucash/gnome/window-reconcile2.c:456
-#: ../gnucash/gnome/window-reconcile.c:494
-msgid "Interest Payment"
-msgstr "Liquidación del Interés"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1427
+msgid "You can't transfer from and to the same account!"
+msgstr "¡No puede transferir con origen y destino a la misma cuenta!"
 
-#: ../gnucash/gnome/window-reconcile2.c:459
-#: ../gnucash/gnome/window-reconcile.c:497
-msgid "Interest Charge"
-msgstr "Cargo de Interés"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1438
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1950
+#: ../gnucash/register/ledger-core/gncEntryLedger.c:85
+#: ../gnucash/register/ledger-core/split-register.c:1848
+#, c-format
+msgid "The account %s does not allow transactions."
+msgstr "La cuenta %s no permite transacciones."
 
-#: ../gnucash/gnome/window-reconcile2.c:477
-#: ../gnucash/gnome/window-reconcile.c:515
-msgid "Payment From"
-msgstr "Liquidación Origen"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1454
+msgid "You can't transfer from a non-currency account. Try reversing the \"from\" and \"to\" accounts and making the \"amount\" negative."
+msgstr "No puede transferir desde una cuenta que no es de moneda. Inténtelo invirtiendo las cuentas «desde» y «a» y haciendo la «cantidad» negativa."
 
-#: ../gnucash/gnome/window-reconcile2.c:483
-#: ../gnucash/gnome/window-reconcile2.c:493
-#: ../gnucash/gnome/window-reconcile.c:521
-#: ../gnucash/gnome/window-reconcile.c:531
-msgid "Reconcile Account"
-msgstr "Conciliar Cuenta"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1472
+msgid "You must enter a valid price."
+msgstr "Debe introducir un precio válido."
 
-#: ../gnucash/gnome/window-reconcile2.c:498
-#: ../gnucash/gnome/window-reconcile.c:536
-msgid "Payment To"
-msgstr "Liquidación Destino"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1484
+msgid "You must enter a valid `to' amount."
+msgstr "Debe introducir una cantidad `a´ válida."
 
-#: ../gnucash/gnome/window-reconcile2.c:511
-#: ../gnucash/gnome/window-reconcile.c:549
-msgid "No Auto Interest Payments for this Account"
-msgstr "Sin Interés de Liquidación Automáticas para esta Cuenta"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1705
+msgid "You must enter an amount to transfer."
+msgstr "Debe introducir una cantidad a transferir."
 
-#: ../gnucash/gnome/window-reconcile2.c:512
-#: ../gnucash/gnome/window-reconcile.c:550
-msgid "No Auto Interest Charges for this Account"
-msgstr "Sin Interés de Cambios Automáticas para esta Cuenta"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1951
+msgid "Debit Account"
+msgstr "Cuenta de débito"
 
-#: ../gnucash/gnome/window-reconcile2.c:768
-#: ../gnucash/gnome/window-reconcile.c:807
-msgid "Enter _Interest Charge..."
-msgstr "Introducir _Interés Cargado..."
+#: ../gnucash/gnome-utils/dialog-transfer.c:1969
+msgid "Transfer From"
+msgstr "Transferencia Origen"
 
-#: ../gnucash/gnome/window-reconcile2.c:1073
-#: ../gnucash/gnome/window-reconcile.c:1112
-#: ../gnucash/report/business-reports/owner-report.scm:59
-msgid "Debits"
-msgstr "Débitos"
+#: ../gnucash/gnome-utils/dialog-transfer.c:1973
+msgid "Transfer To"
+msgstr "Transferencia Destino"
 
-#: ../gnucash/gnome/window-reconcile2.c:1083
-#: ../gnucash/gnome/window-reconcile.c:1122
-#: ../gnucash/report/business-reports/owner-report.scm:58
-#: ../gnucash/report/report-system/report-utilities.scm:111
-msgid "Credits"
-msgstr "Créditos"
+#: ../gnucash/gnome-utils/dialog-transfer.c:2030
+msgid "Debit Amount:"
+msgstr "Cuenta de débito:"
 
-#: ../gnucash/gnome/window-reconcile2.c:1277
-#: ../gnucash/gnome/window-reconcile.c:1316
-msgid "Are you sure you want to delete the selected transaction?"
-msgstr "¿Está seguro que quiere borrar la transacción seleccionada?"
+#: ../gnucash/gnome-utils/dialog-transfer.c:2035
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:14
+msgid "To Amount:"
+msgstr "Dest. cantidad:"
 
-#. statement date title/value
-#: ../gnucash/gnome/window-reconcile2.c:1823
-#: ../gnucash/gnome/window-reconcile.c:1865
-msgid "Statement Date:"
-msgstr "Fecha Declarada:"
+#: ../gnucash/gnome-utils/dialog-utils.c:635
+msgid "Remember and don't _ask me again."
+msgstr "Recordar y no preguntarme _más."
 
-#. ending balance title/value
-#: ../gnucash/gnome/window-reconcile2.c:1843
-#: ../gnucash/gnome/window-reconcile.c:1885
-msgid "Ending Balance:"
-msgstr "Saldo:"
+#: ../gnucash/gnome-utils/dialog-utils.c:636
+msgid "Don't _tell me again."
+msgstr "No _avisarme otra vez."
 
-#. reconciled balance title/value
-#: ../gnucash/gnome/window-reconcile2.c:1853
-#: ../gnucash/gnome/window-reconcile.c:1895
-msgid "Reconciled Balance:"
-msgstr "Saldo conciliado:"
+#: ../gnucash/gnome-utils/dialog-utils.c:639
+msgid "Remember and don't ask me again this _session."
+msgstr "Recordar y no preguntarme en esta _sesión."
 
-#. difference title/value
-#: ../gnucash/gnome/window-reconcile2.c:1863
-#: ../gnucash/gnome/window-reconcile.c:1905
-msgid "Difference:"
-msgstr "Diferencia:"
+#: ../gnucash/gnome-utils/dialog-utils.c:640
+msgid "Don't tell me again this _session."
+msgstr "No recordarme otra vez esta _sesión."
 
-#: ../gnucash/gnome/window-reconcile2.c:1952
-#: ../gnucash/gnome/window-reconcile.c:2008
-msgid "You have made changes to this reconcile window. Are you sure you want to cancel?"
-msgstr "Ha hecho cambios a esta ventana de conciliación. ¿Está seguro de que desea cancelar?"
+#. create the button.
+#: ../gnucash/gnome-utils/gnc-account-sel.c:462
+msgid "New..."
+msgstr "Crear..."
 
-#: ../gnucash/gnome/window-reconcile2.c:2070
-#: ../gnucash/gnome/window-reconcile.c:2126
-msgid "The account is not balanced. Are you sure you want to finish?"
-msgstr "Esta cuenta no está cuadrada. ¿Está seguro que desea terminar?"
+#: ../gnucash/gnome-utils/gnc-autosave.c:99
+msgid "Save file automatically?"
+msgstr "¿Guardo el fichero automáticamente?"
 
-#: ../gnucash/gnome/window-reconcile2.c:2127
-#: ../gnucash/gnome/window-reconcile.c:2183
-msgid "Do you want to postpone this reconciliation and finish it later?"
-msgstr "¿Quiere posponer esta conciliación y finalizarla posteriormente?"
+#: ../gnucash/gnome-utils/gnc-autosave.c:106
+#, c-format
+msgid ""
+"Your data file needs to be saved to your hard disk to save your changes. GnuCash has a feature to save the file automatically every %d minute, just as if you had pressed the \"Save\" button each time. \n"
+"\n"
+"You can change the time interval or turn off this feature under Edit -> Preferences -> General -> Auto-save time interval. \n"
+"\n"
+"Should your file be saved automatically?"
+msgid_plural ""
+"Your data file needs to be saved to your hard disk to save your changes. GnuCash has a feature to save the file automatically every %d minutes, just as if you had pressed the \"Save\" button each time. \n"
+"\n"
+"You can change the time interval or turn off this feature under Edit -> Preferences -> General -> Auto-save time interval. \n"
+"\n"
+"Should your file be saved automatically?"
+msgstr[0] ""
+"Su fichero de datos necesita ser guardado en su disco duro para guardar sus cambios. GnuCash tiene una característica para guardar el fichero automáticamente cada %d minuto, tan solo si ha pulsado el botón \"Guardar\" cada vez. \n"
+"\n"
+"Puede cambiar el intervalo de tiempo o desactivar esta característica en Editar → Preferencias → General → Intervalo de tiempo de Autoguardar. \n"
+"\n"
+"¿Quiere que su fichero deba guardarse automáticamente?"
+msgstr[1] ""
+"Su fichero de datos necesita ser guardado en su disco duro para guardar sus cambios. GnuCash tiene una característica para guardar el fichero automáticamente cada %d minutos, tan solo si ha pulsado el botón \"Guardar\" cada vez. \n"
+"\n"
+"Puede cambiar el intervalo de tiempo o desactivar esta característica en Editar → Preferencias → General → Intervalo de tiempo de Autoguardar. \n"
+"\n"
+"¿Quiere que su fichero deba guardarse automáticamente?"
 
-#. Toplevel
-#: ../gnucash/gnome/window-reconcile2.c:2165
-#: ../gnucash/gnome/window-reconcile.c:2221
-msgid "_Reconcile"
-msgstr "_Conciliar"
+#: ../gnucash/gnome-utils/gnc-autosave.c:121
+msgid "_Yes, this time"
+msgstr "_Sí, esta vez"
 
-#: ../gnucash/gnome/window-reconcile2.c:2166
-#: ../gnucash/gnome/window-reconcile.c:2222
-msgid "_Account"
-msgstr "_Cuenta"
+#: ../gnucash/gnome-utils/gnc-autosave.c:122
+msgid "Yes, _always"
+msgstr "Sí, sie_mpre"
 
-#: ../gnucash/gnome/window-reconcile2.c:2173
-#: ../gnucash/gnome/window-reconcile.c:2229
-msgid "_Reconcile Information..."
-msgstr "_Información de conciliación..."
+#: ../gnucash/gnome-utils/gnc-autosave.c:123
+msgid "No, n_ever"
+msgstr "No, n_unca"
 
-#: ../gnucash/gnome/window-reconcile2.c:2174
-#: ../gnucash/gnome/window-reconcile.c:2230
-msgid "Change the reconcile information including statement date and ending balance."
-msgstr "Cambiar la información de la conciliación incluyendo fecha declarada y saldo final."
+#: ../gnucash/gnome-utils/gnc-autosave.c:124
+msgid "_No, not this time"
+msgstr "_No, esta vez"
 
-#: ../gnucash/gnome/window-reconcile2.c:2179
-#: ../gnucash/gnome/window-reconcile.c:2235
-msgid "_Finish"
-msgstr "_Finalizar"
+#. CY (current year) Strings
+#: ../gnucash/gnome-utils/gnc-cell-renderer-date.c:165
+#: ../gnucash/gnome-utils/gnc-period-select.c:70
+#: ../gnucash/gnome-utils/gnc-period-select.c:86
+#: ../libgnucash/app-utils/date-utilities.scm:900
+msgid "Today"
+msgstr "Hoy"
 
-#: ../gnucash/gnome/window-reconcile2.c:2180
-#: ../gnucash/gnome/window-reconcile.c:2236
-msgid "Finish the reconciliation of this account"
-msgstr "Finalizar la conciliación de esta cuenta"
+#: ../gnucash/gnome-utils/gnc-date-delta.c:224
+#: ../gnucash/report/standard-reports/price-scatter.scm:229
+msgid "Weeks"
+msgstr "Semanas"
 
-#: ../gnucash/gnome/window-reconcile2.c:2184
-#: ../gnucash/gnome/window-reconcile.c:2240
-msgid "_Postpone"
-msgstr "_Posponer"
+#: ../gnucash/gnome-utils/gnc-date-delta.c:252
+msgid "Ago"
+msgstr "Anterior"
 
-#: ../gnucash/gnome/window-reconcile2.c:2185
-#: ../gnucash/gnome/window-reconcile.c:2241
-msgid "Postpone the reconciliation of this account"
-msgstr "Pospone la conciliación de esta cuenta"
+#: ../gnucash/gnome-utils/gnc-date-delta.c:254
+msgid "From Now"
+msgstr "Desde Ahora"
 
-#: ../gnucash/gnome/window-reconcile2.c:2190
-#: ../gnucash/gnome/window-reconcile.c:2246
-msgid "Cancel the reconciliation of this account"
-msgstr "Cancela la conciliación de esta cuenta"
+#. Calendar label, only shown if the date editor has a time field
+#: ../gnucash/gnome-utils/gnc-date-edit.c:922
+msgid "Calendar"
+msgstr "Calendario"
 
-#: ../gnucash/gnome/window-reconcile2.c:2197
-#: ../gnucash/gnome/window-reconcile.c:2253
-msgid "_Open Account"
-msgstr "_Abrir cuenta"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:251
+msgid "12 months"
+msgstr "12 meses"
 
-#: ../gnucash/gnome/window-reconcile2.c:2198
-#: ../gnucash/gnome/window-reconcile.c:2254
-msgid "Open the account"
-msgstr "Abre la cuenta"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:252
+msgid "6 months"
+msgstr "6 meses"
 
-#: ../gnucash/gnome/window-reconcile2.c:2202
-#: ../gnucash/gnome/window-reconcile.c:2258
-msgid "_Edit Account"
-msgstr "_Editar cuenta"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:253
+msgid "4 months"
+msgstr "4 meses"
 
-#: ../gnucash/gnome/window-reconcile2.c:2203
-#: ../gnucash/gnome/window-reconcile.c:2259
-msgid "Edit the main account for this register"
-msgstr "Edita la cuenta principal para este registro"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:254
+msgid "3 months"
+msgstr "3 meses"
 
-#. Actions menu
-#: ../gnucash/gnome/window-reconcile2.c:2212
-#: ../gnucash/gnome/window-reconcile.c:2268
-#: ../gnucash/gnome-utils/gnc-main-window.c:348
-msgid "_Check & Repair"
-msgstr "_Comprobar y Reparar"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:255
+msgid "2 months"
+msgstr "2 meses"
 
-#: ../gnucash/gnome/window-reconcile2.c:2221
-#: ../gnucash/gnome/window-reconcile.c:2277
-msgid "_Balance"
-msgstr "_Balance"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:256
+msgid "1 month"
+msgstr "1 mes"
 
-#: ../gnucash/gnome/window-reconcile2.c:2222
-#: ../gnucash/gnome/window-reconcile.c:2278
-msgid "Add a new balancing entry to the account"
-msgstr "Añade un asiento de balance nuevo a la cuenta"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:291
+msgid "View:"
+msgstr "Vista:"
 
-#: ../gnucash/gnome/window-reconcile2.c:2227
-#: ../gnucash/gnome/window-reconcile.c:2283
-msgid "Edit the current transaction"
-msgstr "Edita la transacción actual"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:340
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:439
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:434
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:452
+msgid "Date: "
+msgstr "Fecha: "
 
-#: ../gnucash/gnome/window-reconcile2.c:2232
-#: ../gnucash/gnome/window-reconcile.c:2288
-msgid "Delete the selected transaction"
-msgstr "Borra la transacción seleccionada"
+#: ../gnucash/gnome-utils/gnc-dense-cal.c:1239
+msgid "(unnamed)"
+msgstr "(sin nombre)"
 
-#: ../gnucash/gnome/window-reconcile2.c:2236
-#: ../gnucash/gnome/window-reconcile.c:2292
-msgid "_Reconcile Selection"
-msgstr "_Conciliar selección"
+#. File menu
+#. Menu Items
+#: ../gnucash/gnome-utils/gnc-file.c:106
+#: ../gnucash/gnome-utils/gnc-main-window.c:277
+#: ../gnucash/import-export/bi-import/gnc-plugin-bi-import.c:56
+#: ../gnucash/import-export/customer-import/gnc-plugin-customer-import.c:56
+msgid "_Import"
+msgstr "_Importar"
 
-#: ../gnucash/gnome/window-reconcile2.c:2237
-#: ../gnucash/gnome/window-reconcile.c:2293
-msgid "Reconcile the selected transactions"
-msgstr "Concilia las transacciones seleccionadas"
+#: ../gnucash/gnome-utils/gnc-file.c:108 ../gnucash/gnome-utils/gnc-file.c:282
+msgid "Import"
+msgstr "Importar"
 
-#: ../gnucash/gnome/window-reconcile2.c:2241
-#: ../gnucash/gnome/window-reconcile.c:2297
-msgid "_Unreconcile Selection"
-msgstr "_Desconciliar selección"
+#: ../gnucash/gnome-utils/gnc-file.c:114 ../gnucash/gnome-utils/gnc-file.c:290
+#: ../gnucash/gnome-utils/gnc-file.c:1104
+#: ../gnucash/gnome-utils/gnc-file.c:1365
+msgid "Save"
+msgstr "Guardar"
 
-#: ../gnucash/gnome/window-reconcile2.c:2242
-#: ../gnucash/gnome/window-reconcile.c:2298
-msgid "Unreconcile the selected transactions"
-msgstr "Desconcilia las transacciones seleccionadas"
+#: ../gnucash/gnome-utils/gnc-file.c:118
+#: ../gnucash/gnome-utils/gnc-main-window.c:278
+msgid "_Export"
+msgstr "_Exportar"
 
-#: ../gnucash/gnome/window-reconcile2.c:2250
-#: ../gnucash/gnome/window-reconcile.c:2306
-msgid "Open the GnuCash help window"
-msgstr "Abre la ventana de ayuda de GnuCash"
+#: ../gnucash/gnome-utils/gnc-file.c:156
+msgid "All files"
+msgstr "Todos los ficheros"
 
-#: ../gnucash/gnome-search/dialog-search.c:236
-msgid "You must select an item from the list"
-msgstr "Debe seleccionar un elemento del índice"
+#: ../gnucash/gnome-utils/gnc-file.c:208
+msgid "(null)"
+msgstr "(nulo)"
 
-#: ../gnucash/gnome-search/dialog-search.c:349
-#: ../gnucash/gnome-utils/gnc-cell-renderer-date.c:171
-msgid "Select"
-msgstr "Seleccionar"
+#: ../gnucash/gnome-utils/gnc-file.c:227
+#, c-format
+msgid "No suitable backend was found for %s."
+msgstr "No se ha encontrado backend adecuado para %s."
 
-#: ../gnucash/gnome-search/dialog-search.c:1114
-msgid "Order"
-msgstr "Operación"
+#: ../gnucash/gnome-utils/gnc-file.c:232
+#, c-format
+msgid "The URL %s is not supported by this version of GnuCash."
+msgstr "La URL %s no está soportada por esta versión de GnuCash."
 
-#: ../gnucash/gnome-search/dialog-search.c:1120
-msgid "New Transaction"
-msgstr "Transacción Nueva"
+#: ../gnucash/gnome-utils/gnc-file.c:237
+#, c-format
+msgid "Can't parse the URL %s."
+msgstr "No pudo interpretar la URL %s."
 
-#: ../gnucash/gnome-search/dialog-search.c:1124
-msgid "New Split"
-msgstr "Crear Desglose"
+#: ../gnucash/gnome-utils/gnc-file.c:242
+#, c-format
+msgid "Can't connect to %s. The host, username or password were incorrect."
+msgstr "No pudo conectar con %s. El servidor, el usuario o la clave son incorrectos."
 
-#. Translators: This string has a disambiguation prefix. Translate only the part behind '|'
-#: ../gnucash/gnome-search/dialog-search.c:1134
-msgid "Item represents an unknown object type (in the sense of bill, customer, invoice, transaction, split,...)|New item"
-msgstr "Elemento nuevo"
+#: ../gnucash/gnome-utils/gnc-file.c:248
+#, c-format
+msgid "Can't connect to %s. Connection was lost, unable to send data."
+msgstr "No pudo conectar con %s. Conexión perdida, imposible enviar datos."
 
-#: ../gnucash/gnome-search/dialog-search.c:1186
-msgid "all criteria are met"
-msgstr "todos los criterios se cumplen"
+#: ../gnucash/gnome-utils/gnc-file.c:254
+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."
+msgstr "El fichero/URL parece ser de una versión más reciente de GnuCash. Debe actualizar su versión de GnuCash para poder funcionar con este dato."
 
-#: ../gnucash/gnome-search/dialog-search.c:1187
-msgid "any criteria are met"
-msgstr "cualquier criterio se cumple"
+#: ../gnucash/gnome-utils/gnc-file.c:261
+#, c-format
+msgid "The database %s doesn't seem to exist. Do you want to create it?"
+msgstr "La base de datos %s no existe. ¿Quiere crearla?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:2
-msgid "_New item..."
-msgstr "_Crear elemento..."
+#: ../gnucash/gnome-utils/gnc-file.c:275
+#, c-format
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not open the database. Do you want to proceed with opening the database?"
+msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería abrir la base de datos. ¿Realmente quiere continuar abriendo la base de datos?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:5
-msgid "_Find"
-msgstr "_Encontrar"
+#: ../gnucash/gnome-utils/gnc-file.c:283
+#, c-format
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not import the database. Do you want to proceed with importing the database?"
+msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería importar la base de datos. ¿Realmente quiere continuar importando la base de datos?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:6
-msgid "()"
-msgstr "()"
+#: ../gnucash/gnome-utils/gnc-file.c:291
+#, c-format
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not save the database. Do you want to proceed with saving the database?"
+msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería guardar la base de datos. ¿Realmente quiere continuar guardando la base de datos?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:7
-msgid " Search "
-msgstr " Buscar "
+#: ../gnucash/gnome-utils/gnc-file.c:299
+#, c-format
+msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not export the database. Do you want to proceed with exporting the database?"
+msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería exportar la base de datos. ¿Realmente quiere continuar exportando la base de datos?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:8
-msgid "Search for items where"
-msgstr "Buscar objetos donde"
+#: ../gnucash/gnome-utils/gnc-file.c:324
+#, c-format
+msgid "GnuCash could not write to %s. That database may be on a read-only file system, or you may not have write permission for the directory."
+msgstr "GnuCash no ha podido escribir a %s. Puede que esa base de datos esté en un sistema de ficheros de sólo lectura, o que no tenga permisos de escritura en ese directorio."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:9
-msgid "<b>Match all entries</b>"
-msgstr "<b>Cotejar todos los asientos</b>"
+#: ../gnucash/gnome-utils/gnc-file.c:331
+#, c-format
+msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
+msgstr "El fichero/URL %s no contiene datos de GnuCash o los datos están corruptos."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:10
-msgid "Search Criteria"
-msgstr "Criterio de Búsqueda"
+#: ../gnucash/gnome-utils/gnc-file.c:337
+#, c-format
+msgid "The server at URL %s experienced an error or encountered bad or corrupt data."
+msgstr "El servidor en la URL %s tuvo un error o encontró datos incorrectos o corruptos."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:11
-msgid "New search"
-msgstr "Crear búsqueda"
+#: ../gnucash/gnome-utils/gnc-file.c:343
+#, c-format
+msgid "You do not have permission to access %s."
+msgstr "No tiene permiso para acceder a %s."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:12
-msgid "Refine current search"
-msgstr "Refinar la búsqueda actual"
+#: ../gnucash/gnome-utils/gnc-file.c:348
+#: ../gnucash/register/register-core/formulacell.c:118
+#: ../gnucash/register/register-core/pricecell.c:181
+#, c-format
+msgid "An error occurred while processing %s."
+msgstr "Ocurrió un error mientras se procesa %s."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:13
-msgid "Add results to current search"
-msgstr "Añadir resultados a la búsqueda actual"
+#: ../gnucash/gnome-utils/gnc-file.c:353
+msgid "There was an error reading the file. Do you want to continue?"
+msgstr "Hubo un error leeyendo el fichero. ¿Quiere continuar?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:14
-msgid "Delete results from current search"
-msgstr "Borra resultados de la búsqueda actual"
+#: ../gnucash/gnome-utils/gnc-file.c:362
+#, c-format
+msgid "There was an error parsing the file %s."
+msgstr "Hubo un error al interpretar el fichero %s."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:15
-msgid "Search only active data"
-msgstr "Buscar sólo datos activos"
+#: ../gnucash/gnome-utils/gnc-file.c:367
+#, c-format
+msgid "The file %s is empty."
+msgstr "El fichero %s está vacío."
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:16
-msgid "Choose whether to search all your data or only that marked as \"active\"."
-msgstr "Escoja si se debe buscar en todos sus datos o solo en el marcado como «activo»."
+#: ../gnucash/gnome-utils/gnc-file.c:380
+#, c-format
+msgid ""
+"The file/URI %s could not be found.\n"
+"\n"
+"The file is in the history list, do you want to remove it?"
+msgstr ""
+"El fichero/URI %s no pudo ser encontrado.\n"
+"\n"
+"El fichero está en el historial, ¿quiere quitarlo?"
 
-#: ../gnucash/gnome-search/dialog-search.glade.h:17
-msgid "Type of search"
-msgstr "Tipo de búsqueda"
+#: ../gnucash/gnome-utils/gnc-file.c:386
+#, c-format
+msgid "The file/URI %s could not be found."
+msgstr "El fichero/URI %s no pudo ser encontrado."
 
-#: ../gnucash/gnome-search/search-account.c:176
-msgid "You have not selected any accounts"
-msgstr "No ha seleccionado ninguna cuenta"
+#: ../gnucash/gnome-utils/gnc-file.c:393
+msgid "This file is from an older version of GnuCash. Do you want to continue?"
+msgstr "Este fichero es de una versión anterior de GnuCash. ¿Quiere continuar?"
 
-#: ../gnucash/gnome-search/search-account.c:197
-msgid "matches all accounts"
-msgstr "coteja con todas las cuentas"
+#: ../gnucash/gnome-utils/gnc-file.c:402
+#, c-format
+msgid "The file type of file %s is unknown."
+msgstr "El tipo del fichero %s es desconocido."
 
-#: ../gnucash/gnome-search/search-account.c:202
-msgid "matches any account"
-msgstr "coteja con cualquier cuenta"
+#: ../gnucash/gnome-utils/gnc-file.c:407
+#, c-format
+msgid "Could not make a backup of the file %s"
+msgstr "Error al hacer una respaldo del fichero %s"
 
-#: ../gnucash/gnome-search/search-account.c:203
-msgid "matches no accounts"
-msgstr "no coteja con ninguna cuenta"
+#: ../gnucash/gnome-utils/gnc-file.c:412
+#, c-format
+msgid "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 "No se puede escribir al fichero %s. Compruebe que tiene permiso para escribir a ese fichero y que hay suficiente espacio para crearlo."
 
-#: ../gnucash/gnome-search/search-account.c:220
-#: ../gnucash/report/standard-reports/cash-flow.scm:260
-msgid "Selected Accounts"
-msgstr "Cuentas Seleccionadas"
+#: ../gnucash/gnome-utils/gnc-file.c:419
+#, c-format
+msgid "No read permission to read from file %s."
+msgstr "Sin permiso de lectura para leer desde %s."
 
-#: ../gnucash/gnome-search/search-account.c:221
-msgid "Choose Accounts"
-msgstr "Escoja Cuentas"
+#. Translators: the first %s is a path in the filesystem,
+#. * the second %s is PACKAGE_NAME, which by default is "GnuCash"
+#.
+#: ../gnucash/gnome-utils/gnc-file.c:427
+#, c-format
+msgid ""
+"You attempted to save in\n"
+"%s\n"
+"or a subdirectory thereof. This is not allowed as %s reserves that directory for internal use.\n"
+"\n"
+"Please try again in a different directory."
+msgstr ""
+"Intentó guardar en\n"
+"%s\n"
+"o su carpeta. Esto no está permitido como %s reservas que carpetas para uso interno.\n"
+"\n"
+"Intente otra vez en un directorio diferente."
 
-#. Create the label
-#: ../gnucash/gnome-search/search-account.c:255
-msgid "Select Accounts to Match"
-msgstr "Seleccione Cotejos de Cuentas"
+#: ../gnucash/gnome-utils/gnc-file.c:434
+msgid "This database is from an older version of GnuCash. Select OK to upgrade it to the current version, Cancel to mark it read-only."
+msgstr "Esta base de datos es de una versión anterior de GnuCash. Seleccione Aceptar para modernizarlo a la versión actual, Cancelar para marcarlo en solo lectura."
 
-#: ../gnucash/gnome-search/search-account.c:259
-msgid "Select the Accounts to Compare"
-msgstr "Seleccione las Cuentas a Comparar"
+#: ../gnucash/gnome-utils/gnc-file.c:443
+msgid "This database is from a newer version of GnuCash. This version can read it, but cannot safely save to it. It will be marked read-only until you do File>Save As, but data may be lost in writing to the old version."
+msgstr "Esta base de datos es de una versión más moderna de GnuCash. Esta versión puede leerlo, pero no puede guardarlo con seguridad. Será marcada como solo lectura hasta que haga “Archivo → Guardar como”, pero los datos pueden perderse al escribir en la versión antigua."
 
-#: ../gnucash/gnome-search/search-date.c:195
-msgid "is before"
-msgstr "es antes que"
+#: ../gnucash/gnome-utils/gnc-file.c:452
+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 the  documentation to learn how to clear out dangling login sessions."
+msgstr "La base de datos SQL está siendo empleada por otros usuarios y la actualización no puede realizarse hasta que salgan. Si no hay otros usuarios, consulte la documentación para saber cómo expulsa sesiones bloqueadas."
 
-#: ../gnucash/gnome-search/search-date.c:196
-msgid "is before or on"
-msgstr "es antes que o sobre"
+#: ../gnucash/gnome-utils/gnc-file.c:462
+msgid "The library \"libdbi\" installed on your system doesn't correctly store large numbers. This means GnuCash cannot use SQL databases correctly. Gnucash will not open or save to SQL databases until this is fixed by installing a different version of \"libdbi\". Please see https://bugzilla.gnome.org/show_bug.cgi?id=611936 for more information."
+msgstr "La biblioteca “libdbi” instalada en su sistema no almacena correctamente los números largos. Esto significa que Gnucash no puede utilizar bases de datos SQL correctamente. Gnucash no abrirá ni guardará bases de datos SQL hasta que esto sea solucionado instalando un versión distinta de “libdb”. Vea https://bugzilla.gnome.org/show_bug.cgi?id=611936 para más información."
 
-#: ../gnucash/gnome-search/search-date.c:197
-msgid "is on"
-msgstr "está en"
-
-#: ../gnucash/gnome-search/search-date.c:198
-msgid "is not on"
-msgstr "no está en"
-
-#: ../gnucash/gnome-search/search-date.c:199
-msgid "is after"
-msgstr "está después de"
-
-#: ../gnucash/gnome-search/search-date.c:200
-msgid "is on or after"
-msgstr "es el o despues de"
-
-#: ../gnucash/gnome-search/search-double.c:187
-#: ../gnucash/gnome-search/search-int64.c:189
-#: ../gnucash/gnome-search/search-numeric.c:220
-msgid "is less than"
-msgstr "es menor que"
-
-#: ../gnucash/gnome-search/search-double.c:188
-#: ../gnucash/gnome-search/search-int64.c:190
-#: ../gnucash/gnome-search/search-numeric.c:224
-msgid "is less than or equal to"
-msgstr "es menor o igual que"
-
-#: ../gnucash/gnome-search/search-double.c:189
-#: ../gnucash/gnome-search/search-int64.c:191
-#: ../gnucash/gnome-search/search-numeric.c:227
-#: ../gnucash/gnome-search/search-string.c:265
-msgid "equals"
-msgstr "es igual a"
-
-#: ../gnucash/gnome-search/search-double.c:190
-#: ../gnucash/gnome-search/search-int64.c:192
-#: ../gnucash/gnome-search/search-numeric.c:230
-msgid "does not equal"
-msgstr "no es igual que"
-
-#: ../gnucash/gnome-search/search-double.c:191
-#: ../gnucash/gnome-search/search-int64.c:193
-#: ../gnucash/gnome-search/search-numeric.c:233
-msgid "is greater than"
-msgstr "es mayor que"
+#: ../gnucash/gnome-utils/gnc-file.c:474
+msgid "GnuCash could not complete a critical test for the presence of a bug in the \"libdbi\" library. This may be caused by a permissions misconfiguration of your SQL database. Please see https://bugzilla.gnome.org/show_bug.cgi?id=645216 for more information."
+msgstr "GnuCash no pudo completar una prueba crítica para la presencia de un bicho en la biblioteca \"libdbi\". Esto puede ser causado por una desconfiguración errónea de los permisos de su base de datos SQL. Por favor, vea  https://bugzilla.gnome.org/show_bug.cgi?id=645216 para mayor información."
 
-#: ../gnucash/gnome-search/search-double.c:192
-#: ../gnucash/gnome-search/search-int64.c:194
-#: ../gnucash/gnome-search/search-numeric.c:237
-msgid "is greater than or equal to"
-msgstr "el mayor o igual que"
+#: ../gnucash/gnome-utils/gnc-file.c:484
+msgid "This file is from an older version of GnuCash and will be upgraded when saved by this version. You will not be able to read the saved file from the older version of Gnucash (it will report an \"error parsing the file\"). If you wish to preserve the old version, exit without saving."
+msgstr "Este fichero es de una versión antigua de GnuCash y será actualizado cuando se guarde con esta versión. No podrá leer el fichero guardado desde la versión anterior de GnuCash (boletinará un \"error al filtrar el fichero\"). Si desea conservar la versión antigua, salga sin guardarlo."
 
-#: ../gnucash/gnome-search/search-numeric.c:220
-msgid "less than"
-msgstr "menor que"
+#: ../gnucash/gnome-utils/gnc-file.c:495
+#, c-format
+msgid "An unknown I/O error (%d) occurred."
+msgstr "Ocurrió un error de E/S desconocido (%d)."
 
-#: ../gnucash/gnome-search/search-numeric.c:223
-msgid "less than or equal to"
-msgstr "menor o igual que"
+#: ../gnucash/gnome-utils/gnc-file.c:589
+msgid "Save changes to the file?"
+msgstr "¿Guardar cambios al fichero?"
 
-#: ../gnucash/gnome-search/search-numeric.c:227
-msgid "equal to"
-msgstr "igual que"
+#: ../gnucash/gnome-utils/gnc-file.c:602
+#: ../gnucash/gnome-utils/gnc-main-window.c:1259
+#, c-format
+msgid "If you don't save, changes from the past %d minute will be discarded."
+msgid_plural "If you don't save, changes from the past %d minutes will be discarded."
+msgstr[0] "Si no guarda, los cambios del último minuto se perderán."
+msgstr[1] "Si no guarda, los cambios de los últimos %d minutos se perderán."
 
-#: ../gnucash/gnome-search/search-numeric.c:230
-msgid "not equal to"
-msgstr "no es igual que"
+#: ../gnucash/gnome-utils/gnc-file.c:606
+msgid "Continue _Without Saving"
+msgstr "Continuar _sin guardar"
 
-#: ../gnucash/gnome-search/search-numeric.c:233
-msgid "greater than"
-msgstr "mayor que"
+#: ../gnucash/gnome-utils/gnc-file.c:763
+#, c-format
+msgid "GnuCash could not obtain the lock for %s."
+msgstr "GnuCash no pudo obtener el bloqueo para %s."
 
-#: ../gnucash/gnome-search/search-numeric.c:236
-msgid "greater than or equal to"
-msgstr "mayor o igual que"
+#: ../gnucash/gnome-utils/gnc-file.c:765
+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?"
+msgstr "Esa base de datos podría estar abierta por otro usuario, en cuyo caso no debería abrir la base de datos. ¿Qué quiere hacer?"
 
-#: ../gnucash/gnome-search/search-numeric.c:253
-msgid "has credits or debits"
-msgstr "tiene créditos o débitos"
+#: ../gnucash/gnome-utils/gnc-file.c:768
+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 changes. What would you like to do?"
+msgstr "Esa base de datos podría estar en un sistema de ficheros de sólo lectura, o no tiene permisos de escritura en el directorio. Si continúa es posible que no pueda guardar los cambios. ¿Qué quiere hacer?"
 
-#: ../gnucash/gnome-search/search-numeric.c:254
-msgid "has debits"
-msgstr "tiene débito"
+#: ../gnucash/gnome-utils/gnc-file.c:789
+msgid "_Open Read-Only"
+msgstr "_Abrir a solo lectura"
 
-#: ../gnucash/gnome-search/search-numeric.c:255
-msgid "has credits"
-msgstr "tiene créditos"
+#: ../gnucash/gnome-utils/gnc-file.c:791
+msgid "_Create New File"
+msgstr "_Crear un fichero nuevo"
 
-#. Build and connect the toggles
-#: ../gnucash/gnome-search/search-reconciled.c:227
-msgid "Not Cleared"
-msgstr "No Punteado"
+#: ../gnucash/gnome-utils/gnc-file.c:793
+msgid "Open _Anyway"
+msgstr "Abrir de _todas formas"
 
-#: ../gnucash/gnome-search/search-reconciled.c:230
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:802
-#: ../gnucash/report/standard-reports/transaction.scm:177
-#: ../gnucash/report/standard-reports/transaction.scm:341
-msgid "Cleared"
-msgstr "Punteado"
+#: ../gnucash/gnome-utils/gnc-file.c:797
+#: ../gnucash/gnome-utils/gnc-main-window.c:302
+msgid "_Quit"
+msgstr "_Salir"
 
-#: ../gnucash/gnome-search/search-reconciled.c:233
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:816
-#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:64
-#: ../gnucash/import-export/import-match-picker.c:437
-#: ../gnucash/report/standard-reports/transaction.scm:176
-#: ../gnucash/report/standard-reports/transaction.scm:345
-msgid "Reconciled"
-msgstr "Conciliado"
+#. try to load once again
+#: ../gnucash/gnome-utils/gnc-file.c:871 ../gnucash/gnome-utils/gnc-file.c:891
+msgid "Loading user data..."
+msgstr "Cargando datos del usuario..."
 
-#: ../gnucash/gnome-search/search-reconciled.c:236
-#: ../gnucash/report/standard-reports/transaction.scm:179
-msgid "Frozen"
-msgstr "Congelado"
+#: ../gnucash/gnome-utils/gnc-file.c:907
+msgid "Re-saving user data..."
+msgstr "Re-guardar datos del usuario..."
 
-#: ../gnucash/gnome-search/search-reconciled.c:239
-#: ../gnucash/report/standard-reports/transaction.scm:180
-msgid "Voided"
-msgstr "Invalidado"
+#: ../gnucash/gnome-utils/gnc-file.c:1228
+#: ../gnucash/gnome-utils/gnc-file.c:1464
+#: ../gnucash/import-export/csv-exp/assistant-csv-export.c:145
+#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1582
+#, c-format
+msgid "The file %s already exists. Are you sure you want to overwrite it?"
+msgstr "El fichero %s ya existe. ¿Seguro que desea sobrescribirlo?"
 
-#: ../gnucash/gnome-search/search-string.c:191
-msgid "You need to enter some search text."
-msgstr "Requiere introducir algo del texto de búsqueda."
+#: ../gnucash/gnome-utils/gnc-file.c:1257
+msgid "Exporting file..."
+msgstr "Exportando fichero..."
 
-#: ../gnucash/gnome-search/search-string.c:220
-#: ../gnucash/import-export/bi-import/dialog-bi-import.c:118
-#: ../gnucash/import-export/csv-imp/csv-account-import.c:112
-#: ../gnucash/import-export/customer-import/dialog-customer-import.c:102
+#. %s is the strerror(3) error string of the error that occurred.
+#: ../gnucash/gnome-utils/gnc-file.c:1270
 #, c-format
 msgid ""
-"Error in regular expression '%s':\n"
+"There was an error saving the file.\n"
+"\n"
 "%s"
 msgstr ""
-"Error en la expresión regular «%s»:\n"
+"Hubo un error guardando el fichero.\n"
+"\n"
 "%s"
 
-#: ../gnucash/gnome-search/search-string.c:264
-msgid "contains"
-msgstr "contiene"
-
-#: ../gnucash/gnome-search/search-string.c:266
-msgid "matches regex"
-msgstr "cotejo por exreg"
+#: ../gnucash/gnome-utils/gnc-file.c:1302
+msgid "The database was opened read-only. Do you want to save it to a different place?"
+msgstr "La base de datos fue abierta con solo lectura. ¿Quiere guardarlo en un lugar diferente?"
 
-#: ../gnucash/gnome-search/search-string.c:268
-msgid "does not match regex"
-msgstr "sin cotejo por exreg"
+#: ../gnucash/gnome-utils/gnc-file.c:1593
+#, c-format
+msgid "Reverting will discard all unsaved changes to %s. Are you sure you want to proceed ?"
+msgstr "La reversión descartará todas los cambios no registrados a %s. ¿Seguro que quiere hacerlo?"
 
-#. Build and connect the case-sensitive check button; defaults to off
-#: ../gnucash/gnome-search/search-string.c:331
-msgid "Match case"
-msgstr "Coincidir MAY/min"
+#: ../gnucash/gnome-utils/gnc-file.c:1601
+#: ../gnucash/gnome-utils/gnc-main-window.c:1227
+msgid "<unknown>"
+msgstr "<desconocido>"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:178
-msgid ""
-"\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"
-"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"
-"Press 'Forward' now to select the correct character encoding for your data file.\n"
-msgstr ""
-"\n"
-"El fichero que está intentando cargar es de una versión más antigua de GnuCash. El formato de fichero en las versiones anteriores faltaba la definición detallada de la codificación de los caracteres usados. Esto significa que el texto en el fichero de datos se puede leer en múltiples formas ambiguas. Esta ambigüedad no se puede resolver de forma automática, pero el nuevo formato de fichero GnuCash 2.0.0 se incluyen todas las especificaciones necesarias para que usted no tenga que pasar de nuevo por este paso.\n"
-"\n"
-"GnuCash tratará de adivinar la codificación correcta de caracteres para su fichero de datos. En el GnuCash siguiente página mostrará los textos resultantes al utilizar esta suposición. Tiene que marcar si las palabras mirar como se esperaba. O todo se ve bien y puede simplemente pulse «Adelante». O las palabras contienen caracteres inesperados, en cuyo caso hay que seleccionar diferentes codificaciones de caracteres para ver resultados diferentes. Puede que tenga que modificar la lista de codificaciones de caracteres haciendo clic en el botón correspondiente.\n"
-"\n"
-"Ahora pulse 'Adelante' para seleccionar la codificación de caracteres correcta para el fichero de datos.\n"
+#: ../gnucash/gnome-utils/gnc-general-select.c:224
+msgid "View..."
+msgstr "Vista..."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:198
-msgid "Ambiguous character encoding"
-msgstr "Codificación de caracteres ambiguos"
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:284
+msgid "GnuCash could not find the files for the help documentation. This is likely because the 'gnucash-docs' package is not installed"
+msgstr "GnuCash no pudo encontrar los ficheros para la documentación de ayuda. Esto se debe a que el paquete 'gnucash-docs' no está instalado"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:201
-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 file as backup in the same directory.\n"
-"\n"
-"You can also go back and verify your selections by clicking on 'Back'."
-msgstr ""
-"El fichero se ha cargado correctamente. Si pulsa «Aplicar» será guardado y recargado a la aplicación principal. De esta forma tendrá un fichero funcionando como respaldo en el mismo directorio.\n"
-"\n"
-"También puede volver y verificar sus selecciones pulsando «Volver»."
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:377
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:443
+msgid "GnuCash could not find the files for the help documentation. This is likely because the 'gnucash-docs' package is not installed."
+msgstr "GnuCash no pudo encontrar los ficheros para la documentación de ayuda. Esto se debe a que no está instalado el paquete 'gnucash-docs'."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:226
-msgid "European"
-msgstr "Europeo"
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:408
+msgid "GnuCash could not find the files for the help documentation."
+msgstr "GnuCash no pudo encontrar los ficheros para la documentación de ayuda."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:227
-msgid "ISO-8859-1 (West European)"
-msgstr "ISO-8859-1 (occidental europeo)"
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:467
+msgid "GnuCash could not find the associated file."
+msgstr "GnuCash no pudo encontrar el fichero asociado."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:228
-msgid "ISO-8859-2 (East European)"
-msgstr "ISO-8859-2 (oriental europeo)"
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:505
+msgid "GnuCash could not find the associated file"
+msgstr "GnuCash no pudo encontrar el fichero asociado"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:229
-msgid "ISO-8859-3 (South European)"
-msgstr "ISO-8859-3 (sur europeo)"
-
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:230
-msgid "ISO-8859-4 (North European)"
-msgstr "ISO-8859-4 (norte europeo)"
+#: ../gnucash/gnome-utils/gnc-gnome-utils.c:536
+msgid "GnuCash could not open the associated URI:"
+msgstr "GnuCash no pudo abrir la URI asociada:"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:231
-msgid "ISO-8859-5 (Cyrillic)"
-msgstr "ISO-8859-5 (cirílico)"
+#. Translators: %s is a path to a database or any other url,
+#. like mysql://user@server.somewhere/somedb, http://www.somequotes.com/thequotes
+#: ../gnucash/gnome-utils/gnc-keyring.c:344
+#, c-format
+msgid "Enter a user name and password to connect to: %s"
+msgstr "Introduzca un nombre de usuario y contraseña para conectarse a: %s"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:232
-msgid "ISO-8859-6 (Arabic)"
-msgstr "ISO-8859-6 (arábico)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:128
+#, c-format
+msgid "Changes will be saved automatically in %u seconds"
+msgstr "Los cambios se guardarán automáticamente en %u segundos"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:233
-msgid "ISO-8859-7 (Greek)"
-msgstr "ISO-8859-7 (griego)"
+#. Toplevel
+#: ../gnucash/gnome-utils/gnc-main-window.c:264
+msgid "_File"
+msgstr "_Archivo"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:234
-msgid "ISO-8859-8 (Hebrew)"
-msgstr "ISO-8859-8 (hebreo)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:268
+msgid "Tra_nsaction"
+msgstr "_Transacción"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:235
-msgid "ISO-8859-9 (Turkish)"
-msgstr "ISO-8859-9 (turco)"
+# Letra modificada_OK
+#: ../gnucash/gnome-utils/gnc-main-window.c:269
+msgid "_Reports"
+msgstr "_Boletines"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:236
-msgid "ISO-8859-10 (Nordic)"
-msgstr "ISO-8859-10 (nórdico)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:270
+msgid "_Tools"
+msgstr "_Herramientas"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:237
-msgid "ISO-8859-11 (Thai)"
-msgstr "ISO-8859-11 (tailandés)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:271
+msgid "E_xtensions"
+msgstr "E_xtensiones"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:238
-msgid "ISO-8859-13 (Baltic)"
-msgstr "ISO-8859-13 (báltico)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:272
+msgid "_Windows"
+msgstr "Ven_tanas"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:239
-msgid "ISO-8859-14 (Celtic)"
-msgstr "ISO-8859-14 (celta)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:280
+msgid "_Print..."
+msgstr "Im_primir..."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:240
-msgid "ISO-8859-15 (West European, Euro sign)"
-msgstr "ISO-8859-15 (occidental europeo, signo Euro)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:281
+msgid "Print the currently active page"
+msgstr "Imprime la página activa actual"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:241
-msgid "ISO-8859-16 (South-East European)"
-msgstr "ISO-8859-16 (sudeste europeo)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:287
+msgid "Pa_ge Setup..."
+msgstr "Configurar _página..."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:243
-msgid "KOI8-R (Russian)"
-msgstr "KOI8-R (Ruso)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:288
+msgid "Specify the page size and orientation for printing"
+msgstr "Especifique el tamaño y la orientación de la página para escribir"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:244
-msgid "KOI8-U (Ukrainian)"
-msgstr "KOI8-U (Ucraniano)"
+#: ../gnucash/gnome-utils/gnc-main-window.c:292
+msgid "Proper_ties"
+msgstr "P_ropiedades"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:680
-#, c-format
-msgid "There are %d unassigned and %d undecodable words. Please add encodings."
-msgstr "Hay %d palabras sin asignar y %d palabras sin descodificar. Por favor añada codificaciones."
+#: ../gnucash/gnome-utils/gnc-main-window.c:293
+msgid "Edit the properties of the current file"
+msgstr "Edita las propiedades del fichero actual"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:688
-#, c-format
-msgid "There are %d unassigned words. Please decide on them or add encodings."
-msgstr "Hay %d palabras sin asignar. Por favor decida sobre ellos o añada codificaciones."
+#: ../gnucash/gnome-utils/gnc-main-window.c:298
+msgid "Close the currently active page"
+msgstr "Cierra la página activa actual"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:699
-#, c-format
-msgid "There are %d undecodable words. Please add encodings."
-msgstr "Hay %d palabras no descodificables. Por favor añada codificaciones."
+#: ../gnucash/gnome-utils/gnc-main-window.c:303
+msgid "Quit this application"
+msgstr "Sale de esta aplicación"
 
-#. 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.
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1010
-msgid "ISO-8859-1 KOI8-U"
-msgstr "ISO-8859-1 KOI8-U"
+#: ../gnucash/gnome-utils/gnc-main-window.c:325
+msgid "Pr_eferences"
+msgstr "_Preferencias"
 
-#. another error, cannot handle this here
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1089
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1109
-msgid "The file could not be reopened."
-msgstr "El fichero no se ha podido reabrir."
+#: ../gnucash/gnome-utils/gnc-main-window.c:326
+msgid "Edit the global preferences of GnuCash"
+msgstr "Edita las preferencias globales de GnuCash"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1094
-msgid "Reading file..."
-msgstr "Leyendo fichero..."
+#: ../gnucash/gnome-utils/gnc-main-window.c:334
+msgid "Select sorting criteria for this page view"
+msgstr "Seleccione un criterio de ordenación para esta vista de página"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1117
-msgid "Parsing file..."
-msgstr "Cotejando fichero..."
+#: ../gnucash/gnome-utils/gnc-main-window.c:338
+msgid "Select the account types that should be displayed."
+msgstr "Seleccione los tipos de cuentas que se deberían ser enseñados."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1124
-msgid "There was an error parsing the file."
-msgstr "Hubo un error al interpretar el fichero."
+#: ../gnucash/gnome-utils/gnc-main-window.c:350
+msgid "Reset _Warnings..."
+msgstr "Restablecer _advertencias..."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1149
-#: ../gnucash/gnome-utils/gnc-file.c:1314
-#: ../gnucash/gnome-utils/gnc-file.c:1549
-msgid "Writing file..."
-msgstr "Escribiendo fichero..."
+#: ../gnucash/gnome-utils/gnc-main-window.c:351
+msgid "Reset the state of all warning messages so they will be shown again."
+msgstr "Restablecer el estado de todos los mensajes de advertencia, de forma que se vuelvan a mostrar."
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1308
-msgid "This encoding has been added to the list already."
-msgstr "Esta codificación ya ha sido añadida al listado."
+#: ../gnucash/gnome-utils/gnc-main-window.c:355
+msgid "Re_name Page"
+msgstr "Re_nombrar página"
 
-#: ../gnucash/gnome-utils/assistant-xml-encoding.c:1319
-msgid "This is an invalid encoding."
-msgstr "Esto es una codificación inválida."
+#: ../gnucash/gnome-utils/gnc-main-window.c:356
+msgid "Rename this page."
+msgstr "Renombra esta página."
 
-#: ../gnucash/gnome-utils/dialog-account.c:469
-msgid "Could not create opening balance."
-msgstr "No se pudo crear el saldo de apertura."
+#: ../gnucash/gnome-utils/gnc-main-window.c:363
+msgid "_New Window"
+msgstr "_Crear ventana"
 
-#. primary label
-#: ../gnucash/gnome-utils/dialog-account.c:666
-msgid "Give the children the same type?"
-msgstr "¿Dar a la subcuenta el mismo tipo?"
+#: ../gnucash/gnome-utils/gnc-main-window.c:364
+msgid "Open a new top-level GnuCash window."
+msgstr "Abre una ventana GnuCash de nivel cima."
 
-#. secondary label
-#: ../gnucash/gnome-utils/dialog-account.c:677
-#, c-format
-msgid "The children of the edited account have to be changed to type \"%s\" to make them compatible."
-msgstr "La matriz de la edición de cuentas tienen que ser cambiadas al tipo «%s» para hacerlas compatibles."
+#: ../gnucash/gnome-utils/gnc-main-window.c:368
+msgid "New Window with _Page"
+msgstr "Crear ventana con _página"
 
-#. children
-#: ../gnucash/gnome-utils/dialog-account.c:688
-msgid "_Show children accounts"
-msgstr "_Mostrar subcuentas"
+#: ../gnucash/gnome-utils/gnc-main-window.c:369
+msgid "Move the current page to a new top-level GnuCash window."
+msgstr "Mueve la página actual a una ventana de nivel-cima nueva de GnuCash."
 
-#: ../gnucash/gnome-utils/dialog-account.c:758
-msgid "The account must be given a name."
-msgstr "La cuenta debe de tener un nombre."
+#: ../gnucash/gnome-utils/gnc-main-window.c:376
+msgid "Tutorial and Concepts _Guide"
+msgstr "_Tutorial y guía de conceptos"
 
-#: ../gnucash/gnome-utils/dialog-account.c:784
-msgid "There is already an account with that name."
-msgstr "Ya existe una cuenta con ese nombre."
+#: ../gnucash/gnome-utils/gnc-main-window.c:377
+msgid "Open the GnuCash Tutorial"
+msgstr "Abre el tutorial de GnuCash"
 
-#: ../gnucash/gnome-utils/dialog-account.c:793
-msgid "You must choose a valid parent account."
-msgstr "Debe elegir una cuenta padre válida."
+#: ../gnucash/gnome-utils/gnc-main-window.c:381
+msgid "_Contents"
+msgstr "Índi_ce"
 
-#: ../gnucash/gnome-utils/dialog-account.c:802
-msgid "You must select an account type."
-msgstr "Debe seleccionar un tipo de cuenta."
+#: ../gnucash/gnome-utils/gnc-main-window.c:382
+msgid "Open the GnuCash Help"
+msgstr "Abrir la ayuda de GnuCash"
 
-#: ../gnucash/gnome-utils/dialog-account.c:811
-msgid "The selected account type is incompatible with the one of the selected parent."
-msgstr "El tipo de cuenta seleccionado es incompatible con alguno seleccionado desde el origen."
+#: ../gnucash/gnome-utils/gnc-main-window.c:386
+msgid "_About"
+msgstr "Acerca _de"
 
-#: ../gnucash/gnome-utils/dialog-account.c:823
-msgid "You must choose a commodity."
-msgstr "Debe elegir una mercancía."
+#: ../gnucash/gnome-utils/gnc-main-window.c:387
+msgid "About GnuCash"
+msgstr "Acerca de GnuCash"
 
-#: ../gnucash/gnome-utils/dialog-account.c:879
-msgid "You must enter a valid opening balance or leave it blank."
-msgstr "Debe introducir un saldo de apertura válido o dejarlo en blanco."
+#: ../gnucash/gnome-utils/gnc-main-window.c:399
+msgid "_Toolbar"
+msgstr "Barra de _herramientas"
 
-#: ../gnucash/gnome-utils/dialog-account.c:903
-msgid "You must select a transfer account or choose the opening balances equity account."
-msgstr "Debe seleccionar una cuenta a la que transferir o elija la cuenta de Balance de Patrimonio para apertura."
+#: ../gnucash/gnome-utils/gnc-main-window.c:400
+msgid "Show/hide the toolbar on this window"
+msgstr "Mostrar/ocultar la barra de herramientas en esta ventana"
 
-#: ../gnucash/gnome-utils/dialog-account.c:1307
-msgid ""
-"This Account contains Transactions.\n"
-"Changing this option is not possible."
-msgstr ""
-"Esta Cuenta contiene Transacciones.\n"
-"Cambiando esta opción no es posible."
+#: ../gnucash/gnome-utils/gnc-main-window.c:404
+msgid "Su_mmary Bar"
+msgstr "Barra de _resumen"
 
-#: ../gnucash/gnome-utils/dialog-account.c:1488
-msgid "Edit Account"
-msgstr "Editar cuenta"
+#: ../gnucash/gnome-utils/gnc-main-window.c:405
+msgid "Show/hide the summary bar on this window"
+msgstr "Mostrar/ocultar la barra de resumen en esta ventana"
 
-#: ../gnucash/gnome-utils/dialog-account.c:1491
-#, c-format
-msgid "(%d) New Accounts"
-msgstr "(%d) Cuentas Nuevas"
+#: ../gnucash/gnome-utils/gnc-main-window.c:409
+msgid "Stat_us Bar"
+msgstr "Barra de _estado"
 
-#: ../gnucash/gnome-utils/dialog-account.c:1501
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:36
-msgid "New Account"
-msgstr "Cuenta Nueva"
+#: ../gnucash/gnome-utils/gnc-main-window.c:410
+msgid "Show/hide the status bar on this window"
+msgstr "Mostrar/ocultar la barra de estado en esta ventana"
 
-#: ../gnucash/gnome-utils/dialog-account.c:2051
-#, c-format
-msgid "Renumber the immediate sub-accounts of %s? This will replace the account code field of each child account with a newly generated code."
-msgstr "¿Renumerar las subcuentas inmediatas de %s? Esto reemplazará el campo de código de cuenta de cada cuenta hija con un código generado."
+#: ../gnucash/gnome-utils/gnc-main-window.c:422
+msgid "Window _1"
+msgstr "Ventana _1"
 
-#: ../gnucash/gnome-utils/dialog-book-close.c:301
-msgid "Please select an Equity account to hold the total Period Income."
-msgstr "Seleccione una cuenta de Patrimonio para mantener el Período de Ingresos total."
+#: ../gnucash/gnome-utils/gnc-main-window.c:423
+msgid "Window _2"
+msgstr "Ventana _2"
 
-#: ../gnucash/gnome-utils/dialog-book-close.c:308
-msgid "Please select an Equity account to hold the total Period Expense."
-msgstr "Seleccione una cuenta de Patrimonio para mantener el total del Período de Gastos."
+#: ../gnucash/gnome-utils/gnc-main-window.c:424
+msgid "Window _3"
+msgstr "Ventana _3"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:174
-msgid ""
-"\n"
-"Please select a commodity to match:"
-msgstr ""
-"\n"
-"Seleccione una mercancía para cotejar:"
+#: ../gnucash/gnome-utils/gnc-main-window.c:425
+msgid "Window _4"
+msgstr "Ventana _4"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:181
-msgid ""
-"\n"
-"Commodity: "
-msgstr ""
-"\n"
-"Mercancía: "
+#: ../gnucash/gnome-utils/gnc-main-window.c:426
+msgid "Window _5"
+msgstr "Ventana _5"
 
-#. Translators: Replace here and later CUSIP by the name of your local
-#. National Securities Identifying Number
-#. like gb:SEDOL, de:WKN, ch:Valorennummer, fr:SICOVAM ...
-#. See http://en.wikipedia.org/wiki/ISIN for hints.
-#: ../gnucash/gnome-utils/dialog-commodity.c:187
-msgid ""
-"\n"
-"Exchange code (ISIN, CUSIP or similar): "
-msgstr ""
-"\n"
-"Código de cambio monetario (ISIN, CUSIP o similar): "
+#: ../gnucash/gnome-utils/gnc-main-window.c:427
+msgid "Window _6"
+msgstr "Ventana _6"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:189
-msgid ""
-"\n"
-"Mnemonic (Ticker symbol or similar): "
-msgstr ""
-"\n"
-"Mnemónico (Símbolo de puntuar o similar): "
+#: ../gnucash/gnome-utils/gnc-main-window.c:428
+msgid "Window _7"
+msgstr "Ventana _7"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:287
-msgid "Select security/currency"
-msgstr "Seleccionar garantía/moneda"
+#: ../gnucash/gnome-utils/gnc-main-window.c:429
+msgid "Window _8"
+msgstr "Ventana _8"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:288
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:42
-msgid "_Security/currency:"
-msgstr "_Garantía/Moneda:"
+#: ../gnucash/gnome-utils/gnc-main-window.c:430
+msgid "Window _9"
+msgstr "Ventana _9"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:292
-msgid "Select security"
-msgstr "Seleccionar garantía"
+#: ../gnucash/gnome-utils/gnc-main-window.c:431
+msgid "Window _0"
+msgstr "Ventana _0"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:297
-msgid "Select currency"
-msgstr "Seleccionar moneda"
+#: ../gnucash/gnome-utils/gnc-main-window.c:1214
+#, c-format
+msgid "Save changes to file %s before closing?"
+msgstr "¿Guardar cambios en el fichero %s antes de cerrar?"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:772
-#: ../gnucash/gnome-utils/dialog-options.c:673
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:440
-#: ../gnucash/gnome-utils/gnc-tree-view-price.c:430
-#: ../libgnucash/engine/Account.cpp:4107
-msgid "Currency"
-msgstr "Moneda"
+#: ../gnucash/gnome-utils/gnc-main-window.c:1217
+#, c-format
+msgid "If you don't save, changes from the past %d hours and %d minutes will be discarded."
+msgstr "Si no guarda, los cambios de las últimas %d horas y %d minutos se perderán."
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:867
-msgid "Use local time"
-msgstr "Emplee hora local"
+#: ../gnucash/gnome-utils/gnc-main-window.c:1219
+#, c-format
+msgid "If you don't save, changes from the past %d days and %d hours will be discarded."
+msgstr "Si no guarda, los cambios de los últimos %d días y %d horas se perderán."
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1001
-msgid "Edit currency"
-msgstr "Editar moneda"
+#: ../gnucash/gnome-utils/gnc-main-window.c:1264
+msgid "Close _Without Saving"
+msgstr "Cerrar _sin guardar"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1002
-msgid "Currency Information"
-msgstr "Información de Moneda"
+#. Translators: This string is shown in the window title if this
+#. document is, well, read-only.
+#: ../gnucash/gnome-utils/gnc-main-window.c:1489
+msgid "(read-only)"
+msgstr "(solo-lectura)"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1007
-msgid "Edit security"
-msgstr "Editar garantía"
+#: ../gnucash/gnome-utils/gnc-main-window.c:1497
+msgid "Unsaved Book"
+msgstr "Libro No Guardado"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1007
-msgid "New security"
-msgstr "Crear garantía"
+#: ../gnucash/gnome-utils/gnc-main-window.c:1658
+msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
+msgstr "Última modificación en %a, %b, %d, %Y en %I%M%p"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1008
-msgid "Security Information"
-msgstr "Información de Garantía"
+#. g_warning("got time %ld, str=%s\n", mtime, time_string);
+#. Translators: This message appears in the status bar after opening the file.
+#: ../gnucash/gnome-utils/gnc-main-window.c:1661
+#, c-format
+msgid "File %s opened. %s"
+msgstr "Fichero %s abierto. %s"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1286
-msgid "You may not create a new national currency."
-msgstr "No puede crear una moneda nacional nueva."
+#: ../gnucash/gnome-utils/gnc-main-window.c:2712
+msgid "Unable to save to database."
+msgstr "Incapaz de guardar en la base de datos."
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1296
+#: ../gnucash/gnome-utils/gnc-main-window.c:2714
+msgid "Unable to save to database: Book is marked read-only."
+msgstr "Incapaz de guardar en la base de datos: el libro está marcado como sólo lectura."
+
+#: ../gnucash/gnome-utils/gnc-main-window.c:4092
+msgid "Book Options"
+msgstr "Opciones del Libro"
+
+#. Translators: %s will be replaced with the current year
+#: ../gnucash/gnome-utils/gnc-main-window.c:4480
 #, c-format
-msgid "%s is a reserved commodity type. Please use something else."
-msgstr "%s es un tipo de mercancía reservada. Emplee otra cosa."
+msgid "Copyright © 1997-%s The GnuCash contributors."
+msgstr "© 1997-%s Las contribuciones de GnuCash."
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1311
-msgid "That commodity already exists."
-msgstr "Esa mercancía ya existe."
+#: ../gnucash/gnome-utils/gnc-main-window.c:4503
+#: ../gnucash/gnome-utils/gnc-main-window.c:4507
+#: ../gnucash/gnome-utils/gnc-splash.c:106
+#: ../gnucash/gnome-utils/gnc-splash.c:109
+msgid "Version"
+msgstr "Versión"
 
-#: ../gnucash/gnome-utils/dialog-commodity.c:1360
-msgid "You must enter a non-empty \"Full name\", \"Symbol/abbreviation\", and \"Type\" for the commodity."
-msgstr "Debe introducir valores no vacíos para «Nombre completo», «Símbolo/Abreviatura» y «Tipo» para la mercancía."
+#: ../gnucash/gnome-utils/gnc-main-window.c:4504
+#: ../gnucash/gnome-utils/gnc-main-window.c:4508
+#: ../gnucash/gnome-utils/gnc-splash.c:107
+#: ../gnucash/gnome-utils/gnc-splash.c:110 ../gnucash/gnucash-bin.c:454
+#: ../gnucash/gnucash-bin.c:457
+msgid "Build ID"
+msgstr "ID de Compilación"
 
-#. The "date" and the "tnum" fields aren't being asked for, this is a split copy
-#: ../gnucash/gnome-utils/dialog-dup-trans.c:237
-msgid "Action/Number:"
-msgstr "Operación/Número:"
+#: ../gnucash/gnome-utils/gnc-main-window.c:4514
+msgid "Accounting for personal and small business finance."
+msgstr "Contabilidad financiara personal y pequeños negocios."
 
-#: ../gnucash/gnome-utils/dialog-file-access.c:298
-msgid "Open..."
-msgstr "Abrir..."
+#. Translators: the following string will be shown in Help->About->Credits
+#. * Enter your name or that of your team and an email contact for feedback.
+#. * The string can have multiple rows, so you can also add a list of
+#. * contributors.
+#: ../gnucash/gnome-utils/gnc-main-window.c:4523
+msgid "translator_credits"
+msgstr ""
+"Francisco Javier Serrador <fserrador at fserrador.com>  26-feb-2018\n"
+"Eneko Lacunza <enlar at enlar.net>"
 
-#: ../gnucash/gnome-utils/dialog-file-access.c:305
-msgid "Save As..."
-msgstr "Guardar como..."
+#: ../gnucash/gnome-utils/gnc-main-window.c:4526
+msgid "Visit the GnuCash website."
+msgstr "Visite el sitio web GnuCash."
 
-#: ../gnucash/gnome-utils/dialog-file-access.c:306
-#: ../gnucash/gnome-utils/dialog-file-access.c:315
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:2
-msgid "_Save As"
-msgstr "Guardar _como"
+#: ../gnucash/gnome-utils/gnc-period-select.c:71
+#: ../libgnucash/app-utils/date-utilities.scm:816
+msgid "Start of this month"
+msgstr "Inicio de este mes"
 
-#: ../gnucash/gnome-utils/dialog-file-access.c:314
-#: ../gnucash/gnome-utils/gnc-file.c:121 ../gnucash/gnome-utils/gnc-file.c:298
-#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1116
-msgid "Export"
-msgstr "Exportar"
+#: ../gnucash/gnome-utils/gnc-period-select.c:72
+#: ../libgnucash/app-utils/date-utilities.scm:830
+msgid "Start of previous month"
+msgstr "Inicio del mes anterior"
 
-#: ../gnucash/gnome-utils/dialog-options.c:612
-msgid "Because no accounts have been set up yet,you will need to return to this dialog (via File->Properties), after account setup, if you want to set a default gain/loss account."
-msgstr "Porque ninguna cuenta ha sido configurada aún, necesitará volver a este diálogo (por Archivo→Propiedades), tras configurar la cuenta, si quiere establecer una cuenta predeterminada de ganancias/pérdidas."
+#: ../gnucash/gnome-utils/gnc-period-select.c:73
+msgid "Start of this quarter"
+msgstr "Inicio de este trimestre"
 
-#: ../gnucash/gnome-utils/dialog-options.c:656
-msgid "Select no account"
-msgstr "No seleccione ninguna cuenta"
+#: ../gnucash/gnome-utils/gnc-period-select.c:74
+#: ../libgnucash/app-utils/date-utilities.scm:872
+msgid "Start of previous quarter"
+msgstr "Inicio del trimestre anterior"
 
-#. Translators: This string has a context prefix; the
-#. translation must only contain the part after
-#. the | character.
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: ../gnucash/gnome-utils/dialog-options.c:694
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:906
-msgid "Column letter for 'Placeholder'|P"
-msgstr "C"
+#: ../gnucash/gnome-utils/gnc-period-select.c:75
+#: ../libgnucash/app-utils/date-utilities.scm:760
+msgid "Start of this year"
+msgstr "Inicio de este año"
 
-#: ../gnucash/gnome-utils/dialog-options.c:761
-msgid ""
-"There are no income or expense accounts of the specified\n"
-"book currency; you will have to return to this dialog\n"
-"(via File->Properties), after account setup, to select a\n"
-"default gain/loss account."
-msgstr ""
-"No hay ninguna cuentas de ingreso o gasto de de la moneda\n"
-"del libro actualmente especificada; tendrá que volver a este\n"
-"diálogo (vía Archivo→Propiedades), tras configurar la cuenta,\n"
-"para seleccionar una cuenta de ganancia/pérdidas predeterminada."
+#: ../gnucash/gnome-utils/gnc-period-select.c:76
+#: ../libgnucash/app-utils/date-utilities.scm:774
+msgid "Start of previous year"
+msgstr "Inicio del año anterior"
 
-#: ../gnucash/gnome-utils/dialog-options.c:830
-msgid "You have selected a placeholder account, which is shown so that child accounts are displayed, but is invalid. Please select another account. (You can expand the tree below the placeholder account by clicking on the arrow to the left.)"
-msgstr "Ha seleccionado un cuenta contenedora, la cual es mostrada tal que las cuentas descendientes se enseñen, pero es inválida. Seleccione otra cuenta. (Puede expandir el plan debajo del la cuenta contenedora pulsando en la flecha de la izquierda.)"
+#. FY (fiscal year) Strings
+#: ../gnucash/gnome-utils/gnc-period-select.c:79
+msgid "Start of this accounting period"
+msgstr "Inicio de este periodo contable"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1266
-msgid "Book currency:"
-msgstr "Moneda del libro:"
+#: ../gnucash/gnome-utils/gnc-period-select.c:80
+msgid "Start of previous accounting period"
+msgstr "Inicio del período contable anterior"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1295
-msgid "Default lot tracking policy:"
-msgstr "Política predeterminada de seguimiento de lote:"
+#: ../gnucash/gnome-utils/gnc-period-select.c:87
+#: ../libgnucash/app-utils/date-utilities.scm:823
+msgid "End of this month"
+msgstr "Final de este mes"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1323
-msgid "Default gain/loss account:"
-msgstr "Cuenta ganancias/pérdicas predeterminada:"
+#: ../gnucash/gnome-utils/gnc-period-select.c:88
+#: ../libgnucash/app-utils/date-utilities.scm:837
+msgid "End of previous month"
+msgstr "Final del mes anterior"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1495
-#: ../gnucash/gnome-utils/dialog-options.c:1638
-msgid "Select All"
-msgstr "Seleccionar Todo"
+#: ../gnucash/gnome-utils/gnc-period-select.c:89
+msgid "End of this quarter"
+msgstr "Final de este trimestre"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1497
-msgid "Select all accounts."
-msgstr "Seleccionar todas las cuentas."
+#: ../gnucash/gnome-utils/gnc-period-select.c:90
+#: ../libgnucash/app-utils/date-utilities.scm:879
+msgid "End of previous quarter"
+msgstr "Final del trimestre anterior"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1502
-#: ../gnucash/gnome-utils/dialog-options.c:1645
-msgid "Clear All"
-msgstr "Puntear Todo"
+#: ../gnucash/gnome-utils/gnc-period-select.c:91
+#: ../libgnucash/app-utils/date-utilities.scm:767
+msgid "End of this year"
+msgstr "Final de este año"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1504
-msgid "Clear the selection and unselect all accounts."
-msgstr "Puntea la selección y deselecciona todas las cuentas."
+#: ../gnucash/gnome-utils/gnc-period-select.c:92
+#: ../libgnucash/app-utils/date-utilities.scm:781
+msgid "End of previous year"
+msgstr "Final del año anterior"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1509
-msgid "Select Children"
-msgstr "Seleccionar Descendientes"
+#. FY (fiscal year) Strings
+#: ../gnucash/gnome-utils/gnc-period-select.c:95
+msgid "End of this accounting period"
+msgstr "Final de este período contable"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1511
-msgid "Select all descendents of selected account."
-msgstr "Seleccionar todas los descendientes de una cuenta seleccionada."
+#: ../gnucash/gnome-utils/gnc-period-select.c:96
+msgid "End of previous accounting period"
+msgstr "Final del anterior período contable"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1517
-#: ../gnucash/gnome-utils/dialog-options.c:1652
-msgid "Select Default"
-msgstr "Selección Predeterminada"
+#: ../gnucash/gnome-utils/gnc-splash.c:126
+msgid "Loading..."
+msgstr "Cargando..."
 
-#: ../gnucash/gnome-utils/dialog-options.c:1519
-msgid "Select the default account selection."
-msgstr "Seleccione la elección por omisión de cuentas."
+#: ../gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c:490
+msgid "never"
+msgstr "nunca"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1533
-msgid "Show Hidden Accounts"
-msgstr "Mostrar Cuentas Ocultas"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:113
+msgid "You can not change this transaction, the Book or Register is set to Read Only."
+msgstr "No puede cambiar esta transacción, el Libro o Registro está establecido a Solo Lectura."
 
-#: ../gnucash/gnome-utils/dialog-options.c:1535
-msgid "Show accounts that have been marked hidden."
-msgstr "Muestra cuentas que fueron marcadas como ocultas."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:131
+msgid "Save Transaction before proceeding?"
+msgstr "¿Guardar Transacciones antes de procesar?"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1640
-msgid "Select all entries."
-msgstr "Seleccionar todos los asientos."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:133
+msgid "The current transaction has been changed. Would you like to record the changes before proceeding, or cancel?"
+msgstr "La transacción actual ha sido modificada. ¿Quiere registrar los cambios antes de proceder, o cancelar?"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1647
-msgid "Clear the selection and unselect all entries."
-msgstr "Puntea la selección y deselecciona todos los asientos."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:149
+#: ../gnucash/register/ledger-core/gncEntryLedger.c:919
+#: ../gnucash/register/ledger-core/gncEntryLedgerControl.c:898
+#: ../gnucash/register/ledger-core/split-register.c:468
+msgid "_Record"
+msgstr "_Registrar"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1654
-msgid "Select the default selection."
-msgstr "Seleccionar la elección por omisión."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:185
+msgid "This transaction is being edited in a different register."
+msgstr "Esta transacción ya se está editando en un registro diferente."
 
-#. The reset button on each option page
-#: ../gnucash/gnome-utils/dialog-options.c:1823
-msgid "Reset defaults"
-msgstr "Restablecer predeterminados"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:205
+#: ../gnucash/register/ledger-core/split-register-control.c:59
+msgid "Rebalance Transaction"
+msgstr "Cuadro de Transacción"
 
-#: ../gnucash/gnome-utils/dialog-options.c:1825
-msgid "Reset all values to their defaults."
-msgstr "Restablece todos los valores a sus predeterminaciones."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:206
+#: ../gnucash/register/ledger-core/split-register-control.c:60
+msgid "The current transaction is not balanced."
+msgstr "La transacción actual no está cuadrada."
 
-#: ../gnucash/gnome-utils/dialog-options.c:2182
-msgid "Page"
-msgstr "Página"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:287
+#: ../gnucash/register/ledger-core/split-register-control.c:138
+msgid "Balance it _manually"
+msgstr "Cuadrarlo _manualmente"
 
-#: ../gnucash/gnome-utils/dialog-options.c:2822
-#: ../gnucash/gnome-utils/dialog-preferences.c:1328
-msgid "Clear"
-msgstr "Puntear"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:289
+#: ../gnucash/register/ledger-core/split-register-control.c:140
+msgid "Let GnuCash _add an adjusting split"
+msgstr "Permitir a GnuCash _añadir un desglose de ajuste"
 
-#: ../gnucash/gnome-utils/dialog-options.c:2823
-msgid "Clear any selected image file."
-msgstr "Quita cualquier fichero de imagen seleccionado."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:294
+#: ../gnucash/register/ledger-core/split-register-control.c:145
+msgid "Adjust current account _split total"
+msgstr "Ajustar el total del de_sglose de la cuenta actual"
 
-#: ../gnucash/gnome-utils/dialog-options.c:2825
-msgid "Select image"
-msgstr "Seleccione imagen"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:300
+#: ../gnucash/register/ledger-core/split-register-control.c:151
+msgid "Adjust _other account split total"
+msgstr "Ajustar el total del desglose de _otra cuenta"
 
-#: ../gnucash/gnome-utils/dialog-options.c:2827
-msgid "Select an image file."
-msgstr "Seleccione un fichero de imagen."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:311
+#: ../gnucash/register/ledger-core/split-register-control.c:162
+msgid "_Rebalance"
+msgstr "_Cuadrar"
 
-#: ../gnucash/gnome-utils/dialog-options.c:3013
-msgid "Pixels"
-msgstr "Píxeles"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:405
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:413
+#: ../gnucash/register/ledger-core/split-register-control.c:1330
+#: ../gnucash/register/ledger-core/split-register-control.c:1343
+msgid "This register does not support editing exchange rates."
+msgstr "Este registro no respalda la edición de los tipos de cambios."
 
-#: ../gnucash/gnome-utils/dialog-options.c:3019
-msgid "Percent"
-msgstr "Porcentaje"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:421
+#: ../gnucash/register/ledger-core/split-register-control.c:1384
+#: ../gnucash/register/ledger-core/split-register-control.c:1459
+msgid "You need to expand the transaction in order to modify its exchange rates."
+msgstr "Debe desglosar la Transacción para poder cambiar sus tipos de cambio."
 
-#. 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
-#. names with other account names that are more suitable for your
-#. language - just keep in mind to have exactly two %s in your
-#. translation.
-#: ../gnucash/gnome-utils/dialog-preferences.c:163
-#, c-format
-msgid "Income%sSalary%sTaxable"
-msgstr "Ingreso%sSalario%sImponible"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:461
+#: ../gnucash/register/ledger-core/split-register-control.c:1431
+#: ../gnucash/register/ledger-core/split-register-control.c:1444
+msgid "The two currencies involved equal each other."
+msgstr "Las dos monedas participan como iguales entre sí."
 
-#: ../gnucash/gnome-utils/dialog-preferences.c:798
-msgid "Path does not exist, "
-msgstr "La ruta no existe, "
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1253
+#: ../gnucash/register/ledger-core/split-register.c:509
+msgid "New Split Information"
+msgstr "Crear Información Desglosada"
 
-#: ../gnucash/gnome-utils/dialog-preferences.c:848
-#: ../gnucash/gnome-utils/dialog-preferences.c:1325
-msgid "Select a folder"
-msgstr "Selecciona una carpeta"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1303
+msgid "This is the split anchoring this transaction to the register. You can not duplicate it from this register window."
+msgstr "Esto es el ampliación del desglose de esta transacción al registro. No puede duplicarlo desde esta ventana del registro."
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:116
-msgid "You must provide a name for this Tax Table."
-msgstr "Tiene que proporcionar un nombre para esta Lengüeta Impositiva."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1355
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:476
+#: ../gnucash/register/ledger-core/split-register.c:611
+#: ../gnucash/register/register-gnome/datecell-gnome.c:105
+msgid "Cannot store a transaction at this date"
+msgstr "No se puede almacenar una transacción en esta fecha"
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:123
-#, c-format
-msgid "You must provide a unique name for this Tax Table. Your choice \"%s\" is already in use."
-msgstr "Tiene que proporcionar un nombre único para esta Lengüeta Impositiva. Su elección «%s» ya está utilizado."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1357
+#: ../gnucash/register/ledger-core/split-register.c:613
+msgid "The entered date of the duplicated transaction is older than the \"Read-Only Threshold\" set for this book. This setting can be changed in File -> Properties -> Accounts."
+msgstr "La fecha introducida de la transacción duplicada es más antigua que el «Umbral de Solo Lectura» establecido para este libro. Esta opción puede cambiarse en Archivo → Propiedades → Cuentas."
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:137
-msgid "Percentage amount must be between -100 and 100."
-msgstr "La cantidad del porcentaje debe estar entre -100 y 100."
+#. Translators: This message will be presented when a user *
+#. * attempts to record a transaction without splits
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1715
+msgid "Not enough information for Blank Transaction?"
+msgstr "¿Sin información suficiente para Transacción Vacía?"
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:146
-msgid "You must choose a Tax Account."
-msgstr "Debe elegir una Cuenta de Imposiciones."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1717
+msgid "The blank transaction does not have enough information to save it. Would you like to return to the transaction to update, or cancel the save?"
+msgstr "La transacción vacía no tiene suficiente información para guardarla. ¿Quiere volver a la transacción para actualizar o cancelar el guardado?"
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:564
-#, c-format
-msgid "Tax table \"%s\" is in use. You cannot delete it."
-msgstr "Tabla impositiva «%s» está activo. No lo puede eliminarlo."
+#. Translators: Return to the transaction to update
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1729
+msgid "_Return"
+msgstr "_Devolución"
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:612
-msgid "You cannot remove the last entry from the tax table. Try deleting the tax table if you want to do that."
-msgstr ""
-"No puede quitar el último asiento de la lengüeta impositiva. Trate eliminar la lengüeta impositiva\n"
-"si quiere hacer eso."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1772
+#: ../gnucash/register/ledger-core/split-register-control.c:1848
+msgid "Mark split as unreconciled?"
+msgstr "¿Marcar desglose como no conciliado?"
 
-#: ../gnucash/gnome-utils/dialog-tax-table.c:619
-msgid "Are you sure you want to delete this entry?"
-msgstr "¿Está seguro que quiere borrar este asiento?"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1774
+#: ../gnucash/register/ledger-core/split-register-control.c:1850
+msgid "You are about to mark a reconciled split as unreconciled. Doing so might make future reconciliation difficult! Continue with this change?"
+msgstr "Va a marcar este desglose conciliado como no conciliado. ¡Hacer esto puede dificultar la conciliación en el futuro! ¿Continúo con este cambio?"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:590
-msgid "Show the income and expense accounts"
-msgstr "Muestra las cuentas de ingresos y gastos"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1818
+#: ../gnucash/register/ledger-core/split-register-control.c:1867
+msgid "_Unreconcile"
+msgstr "_Desconciliar"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:694
-msgid "Error"
-msgstr "Error"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1903
+#: ../gnucash/register/ledger-core/split-register-model.c:2074
+msgid "Change reconciled split?"
+msgstr "¿Cambiar desglose conciliado?"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1311
-msgid "Retrieve the current online quote. This will fail if there is a manually-created price for today."
-msgstr ""
-"Obtiene la cotización actual por conexión.\n"
-"Esto fallará si hay un precio generado manualmente para hoy."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1905
+msgid "You are about to change a reconciled split. Doing so might make future reconciliation difficult! Continue with this change?"
+msgstr "Va a cambiar un desglose conciliado. ¡Hacerlo puede dificultar conciliaciones futuras! ¿Continuar con este cambio?"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1315
-msgid "Finance::Quote must be installed to enable this button."
-msgstr "Finanza::Cotización debe estar instalado para activar este botón."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1910
+msgid "Change split linked to a reconciled split?"
+msgstr "¿Cambiar el enlace del desglose a un desglose conciliado?"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1417
-msgid "You must specify an account to transfer from, or to, or both, for this transaction. Otherwise, it will not be recorded."
-msgstr "Debe especificar una cuenta desde la que transferir, a la que transferir, o ambas, para esta transacción. De otro modo, no será registrado."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1912
+msgid "You are about to change a split that is linked to a reconciled split. Doing so might make future reconciliation difficult! Continue with this change?"
+msgstr "Va a cambiar un desglose que está enlazado a un desglose conciliado. Hacerlo puede dificultar conciliaciones futuras. ¿Quiere continuar con este cambio?"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1427
-msgid "You can't transfer from and to the same account!"
-msgstr "¡No puede transferir con origen y destino a la misma cuenta!"
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1926
+#: ../gnucash/register/ledger-core/split-register-model.c:2098
+msgid "Chan_ge Split"
+msgstr "Cambiar des_glose"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1438
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1950
-#: ../gnucash/register/ledger-core/gncEntryLedger.c:85
-#: ../gnucash/register/ledger-core/split-register.c:1848
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1951
+#: ../gnucash/register/ledger-core/gncEntryLedger.c:86
+#: ../gnucash/register/ledger-core/split-register.c:1849
 #, c-format
-msgid "The account %s does not allow transactions."
-msgstr "La cuenta %s no permite transacciones."
+msgid "The account %s does not exist. Would you like to create it?"
+msgstr "La cuenta %s no existe. ¿Quiere crearla?"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1454
-msgid "You can't transfer from a non-currency account. Try reversing the \"from\" and \"to\" accounts and making the \"amount\" negative."
-msgstr "No puede transferir desde una cuenta que no es de moneda. Inténtelo invirtiendo las cuentas «desde» y «a» y haciendo la «cantidad» negativa."
+#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:2113
+msgid "You can not paste from the general journal to a register."
+msgstr "No puede pegar desde el Libro Diario a un registro."
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1472
-msgid "You must enter a valid price."
-msgstr "Debe introducir un precio válido."
+#: ../gnucash/gnome-utils/gnc-tree-model-account.c:629
+msgid "New top level account"
+msgstr "Cuenta nueva de nivel principal"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1484
-msgid "You must enter a valid `to' amount."
-msgstr "Debe introducir una cantidad `a´ válida."
+#. Translators: This string has a context prefix; the translation
+#. must only contain the part after the | character.
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2855
+#: ../gnucash/register/ledger-core/split-register.c:2485
+msgid "Action Column|Deposit"
+msgstr "Depósito"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1705
-msgid "You must enter an amount to transfer."
-msgstr "Debe introducir una cantidad a transferir."
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2856
+#: ../gnucash/register/ledger-core/split-register.c:2486
+msgid "Withdraw"
+msgstr "Retirada"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1951
-msgid "Debit Account"
-msgstr "Cuenta de débito"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2857
+#: ../gnucash/register/ledger-core/split-register.c:2487
+msgid "Check"
+msgstr "Comprobación"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1969
-msgid "Transfer From"
-msgstr "Transferencia Origen"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2859
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2890
+#: ../gnucash/register/ledger-core/split-register.c:2489
+#: ../gnucash/register/ledger-core/split-register.c:2520
+msgid "ATM Deposit"
+msgstr "Cajero ATM Depósito"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:1973
-msgid "Transfer To"
-msgstr "Transferencia Destino"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2860
+#: ../gnucash/register/ledger-core/split-register.c:2490
+#: ../gnucash/register/ledger-core/split-register.c:2521
+msgid "ATM Draw"
+msgstr "Cajero ATM Señal"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:2030
-msgid "Debit Amount:"
-msgstr "Cuenta de débito:"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2861
+#: ../gnucash/register/ledger-core/split-register.c:2491
+msgid "Teller"
+msgstr "Cajero"
 
-#: ../gnucash/gnome-utils/dialog-transfer.c:2035
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:14
-msgid "To Amount:"
-msgstr "Dest. cantidad:"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2862
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3037
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3123
+#: ../gnucash/register/ledger-core/gncEntryLedgerLoad.c:135
+#: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:533
+#: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:1099
+#: ../gnucash/register/ledger-core/split-register.c:2492
+#: ../gnucash/report/standard-reports/register.scm:851
+#: ../libgnucash/app-utils/prefs.scm:72 ../libgnucash/app-utils/prefs.scm:83
+msgid "Charge"
+msgstr "Cargo"
 
-#: ../gnucash/gnome-utils/dialog-utils.c:635
-msgid "Remember and don't _ask me again."
-msgstr "Recordar y no preguntarme _más."
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2864
+#: ../gnucash/register/ledger-core/split-register.c:2494
+#: ../gnucash/report/business-reports/receipt.eguile.scm:297
+#: ../gnucash/report/business-reports/receipt.eguile.scm:304
+#: ../gnucash/report/business-reports/receipt.scm:265
+#: ../gnucash/report/business-reports/receipt.scm:267
+msgid "Receipt"
+msgstr "Recibo"
 
-#: ../gnucash/gnome-utils/dialog-utils.c:636
-msgid "Don't _tell me again."
-msgstr "No _avisarme otra vez."
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2865
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2879
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2915
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2926
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2959
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3032
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3110
+#: ../gnucash/register/ledger-core/split-register.c:2495
+#: ../gnucash/register/ledger-core/split-register.c:2509
+#: ../gnucash/register/ledger-core/split-register.c:2545
+#: ../gnucash/register/ledger-core/split-register.c:2556
+#: ../gnucash/register/ledger-core/split-register.c:2589
+#: ../libgnucash/app-utils/prefs.scm:67 ../libgnucash/app-utils/prefs.scm:85
+#: ../libgnucash/app-utils/prefs.scm:93 ../libgnucash/app-utils/prefs.scm:94
+msgid "Increase"
+msgstr "Incremento"
 
-#: ../gnucash/gnome-utils/dialog-utils.c:639
-msgid "Remember and don't ask me again this _session."
-msgstr "Recordar y no preguntarme en esta _sesión."
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2866
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2880
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2916
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2927
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2960
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3025
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3117
+#: ../gnucash/register/ledger-core/split-register.c:2496
+#: ../gnucash/register/ledger-core/split-register.c:2510
+#: ../gnucash/register/ledger-core/split-register.c:2546
+#: ../gnucash/register/ledger-core/split-register.c:2557
+#: ../gnucash/register/ledger-core/split-register.c:2590
+#: ../libgnucash/app-utils/prefs.scm:68 ../libgnucash/app-utils/prefs.scm:76
+#: ../libgnucash/app-utils/prefs.scm:77 ../libgnucash/app-utils/prefs.scm:84
+msgid "Decrease"
+msgstr "Decrementar"
 
-#: ../gnucash/gnome-utils/dialog-utils.c:640
-msgid "Don't tell me again this _session."
-msgstr "No recordarme otra vez esta _sesión."
+#. Action: Point Of Sale
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2868
+#: ../gnucash/register/ledger-core/split-register.c:2498
+msgid "POS"
+msgstr "PdV"
 
-#. create the button.
-#: ../gnucash/gnome-utils/gnc-account-sel.c:462
-msgid "New..."
-msgstr "Crear..."
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2869
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:470
+#: ../gnucash/register/ledger-core/split-register.c:2499
+#: ../gnucash/report/business-reports/aging.scm:714
+#: ../gnucash/report/business-reports/taxinvoice.eguile.scm:201
+msgid "Phone"
+msgstr "Teléfono"
 
-#: ../gnucash/gnome-utils/gnc-autosave.c:99
-msgid "Save file automatically?"
-msgstr "¿Guardo el fichero automáticamente?"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2870
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2896
+#: ../gnucash/register/ledger-core/split-register.c:2500
+#: ../gnucash/register/ledger-core/split-register.c:2526
+msgid "Online"
+msgstr "Conectado"
 
-#: ../gnucash/gnome-utils/gnc-autosave.c:106
-#, c-format
-msgid ""
-"Your data file needs to be saved to your hard disk to save your changes. GnuCash has a feature to save the file automatically every %d minute, just as if you had pressed the \"Save\" button each time. \n"
-"\n"
-"You can change the time interval or turn off this feature under Edit -> Preferences -> General -> Auto-save time interval. \n"
-"\n"
-"Should your file be saved automatically?"
-msgid_plural ""
-"Your data file needs to be saved to your hard disk to save your changes. GnuCash has a feature to save the file automatically every %d minutes, just as if you had pressed the \"Save\" button each time. \n"
-"\n"
-"You can change the time interval or turn off this feature under Edit -> Preferences -> General -> Auto-save time interval. \n"
-"\n"
-"Should your file be saved automatically?"
-msgstr[0] ""
-"Su fichero de datos necesita ser guardado en su disco duro para guardar sus cambios. GnuCash tiene una característica para guardar el fichero automáticamente cada %d minuto, tan solo si ha pulsado el botón \"Guardar\" cada vez. \n"
-"\n"
-"Puede cambiar el intervalo de tiempo o desactivar esta característica en Editar → Preferencias → General → Intervalo de tiempo de Autoguardar. \n"
-"\n"
-"¿Quiere que su fichero deba guardarse automáticamente?"
-msgstr[1] ""
-"Su fichero de datos necesita ser guardado en su disco duro para guardar sus cambios. GnuCash tiene una característica para guardar el fichero automáticamente cada %d minutos, tan solo si ha pulsado el botón \"Guardar\" cada vez. \n"
-"\n"
-"Puede cambiar el intervalo de tiempo o desactivar esta característica en Editar → Preferencias → General → Intervalo de tiempo de Autoguardar. \n"
-"\n"
-"¿Quiere que su fichero deba guardarse automáticamente?"
+#. Action: Automatic Deposit
+#. Action: Automatic Deposit ?!?
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2872
+#: ../gnucash/register/ledger-core/split-register.c:2502
+msgid "AutoDep"
+msgstr "AutoDep"
 
-#: ../gnucash/gnome-utils/gnc-autosave.c:121
-msgid "_Yes, this time"
-msgstr "_Sí, esta vez"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2873
+#: ../gnucash/register/ledger-core/split-register.c:2503
+msgid "Wire"
+msgstr "Corrección"
 
-#: ../gnucash/gnome-utils/gnc-autosave.c:122
-msgid "Yes, _always"
-msgstr "Sí, sie_mpre"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2875
+#: ../gnucash/register/ledger-core/split-register.c:2505
+msgid "Direct Debit"
+msgstr "Débito Directo"
 
-#: ../gnucash/gnome-utils/gnc-autosave.c:123
-msgid "No, n_ever"
-msgstr "No, n_unca"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2881
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2885
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2892
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2900
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2917
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2928
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2933
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2940
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2961
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3135
+#: ../gnucash/register/ledger-core/split-register.c:2511
+#: ../gnucash/register/ledger-core/split-register.c:2515
+#: ../gnucash/register/ledger-core/split-register.c:2522
+#: ../gnucash/register/ledger-core/split-register.c:2530
+#: ../gnucash/register/ledger-core/split-register.c:2547
+#: ../gnucash/register/ledger-core/split-register.c:2558
+#: ../gnucash/register/ledger-core/split-register.c:2563
+#: ../gnucash/register/ledger-core/split-register.c:2591
+#: ../libgnucash/app-utils/prefs.scm:69 ../libgnucash/app-utils/prefs.scm:70
+#: ../libgnucash/app-utils/prefs.scm:71
+msgid "Buy"
+msgstr "Compra"
 
-#: ../gnucash/gnome-utils/gnc-autosave.c:124
-msgid "_No, not this time"
-msgstr "_No, esta vez"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2882
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2886
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2897
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2901
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2918
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2929
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2934
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2941
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2962
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3055
+#: ../gnucash/register/ledger-core/split-register.c:2512
+#: ../gnucash/register/ledger-core/split-register.c:2516
+#: ../gnucash/register/ledger-core/split-register.c:2527
+#: ../gnucash/register/ledger-core/split-register.c:2531
+#: ../gnucash/register/ledger-core/split-register.c:2548
+#: ../gnucash/register/ledger-core/split-register.c:2559
+#: ../gnucash/register/ledger-core/split-register.c:2564
+#: ../gnucash/register/ledger-core/split-register.c:2592
+#: ../libgnucash/app-utils/prefs.scm:86 ../libgnucash/app-utils/prefs.scm:87
+#: ../libgnucash/app-utils/prefs.scm:88
+msgid "Sell"
+msgstr "Venta"
 
-#. CY (current year) Strings
-#: ../gnucash/gnome-utils/gnc-cell-renderer-date.c:165
-#: ../gnucash/gnome-utils/gnc-period-select.c:70
-#: ../gnucash/gnome-utils/gnc-period-select.c:86
-#: ../libgnucash/app-utils/date-utilities.scm:901
-msgid "Today"
-msgstr "Hoy"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2887
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2894
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2943
+#: ../gnucash/register/ledger-core/split-register.c:2517
+#: ../gnucash/register/ledger-core/split-register.c:2524
+#: ../gnucash/register/ledger-core/split-register.c:2573
+msgid "Fee"
+msgstr "Comisión"
 
-#: ../gnucash/gnome-utils/gnc-date-delta.c:224
-#: ../gnucash/report/standard-reports/price-scatter.scm:231
-msgid "Weeks"
-msgstr "Semanas"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2891
+msgid "ATM Withdraw"
+msgstr "Retirada en Cajero ATM"
 
-#: ../gnucash/gnome-utils/gnc-date-delta.c:252
-msgid "Ago"
-msgstr "Anterior"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2921
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3048
+#: ../gnucash/register/ledger-core/split-register.c:2551
+#: ../libgnucash/app-utils/prefs.scm:90
+msgid "Rebate"
+msgstr "Descuento"
 
-#: ../gnucash/gnome-utils/gnc-date-delta.c:254
-msgid "From Now"
-msgstr "Desde Ahora"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2922
+#: ../gnucash/register/ledger-core/split-register.c:2552
+msgid "Paycheck"
+msgstr "Sueldo"
 
-#. Calendar label, only shown if the date editor has a time field
-#: ../gnucash/gnome-utils/gnc-date-edit.c:922
-msgid "Calendar"
-msgstr "Calendario"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2935
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:72
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:76
+#: ../gnucash/register/ledger-core/split-register.c:2565
+#: ../gnucash/report/standard-reports/balance-sheet.scm:661
+#: ../gnucash/report/standard-reports/budget-balance-sheet.scm:813
+#: ../libgnucash/app-utils/gnc-ui-util.c:879
+#: ../libgnucash/engine/Account.cpp:4110
+msgid "Equity"
+msgstr "Patrimonio"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:251
-msgid "12 months"
-msgstr "12 meses"
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2942
+#: ../gnucash/gnome-utils/gnc-tree-view-price.c:454
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3003
+#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:62
+#: ../gnucash/register/ledger-core/split-register.c:2572
+#: ../gnucash/register/ledger-core/split-register-model.c:394
+#: ../gnucash/report/business-reports/easy-invoice.scm:268
+#: ../gnucash/report/business-reports/fancy-invoice.scm:278
+#: ../gnucash/report/business-reports/invoice.scm:263
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:1068
+#: ../gnucash/report/standard-reports/general-journal.scm:114
+#: ../gnucash/report/standard-reports/general-ledger.scm:89
+#: ../gnucash/report/standard-reports/general-ledger.scm:109
+#: ../gnucash/report/standard-reports/portfolio.scm:257
+#: ../gnucash/report/standard-reports/price-scatter.scm:39
+#: ../gnucash/report/standard-reports/price-scatter.scm:346
+#: ../gnucash/report/standard-reports/register.scm:160
+#: ../gnucash/report/standard-reports/register.scm:450
+#: ../gnucash/report/standard-reports/transaction.scm:804
+#: ../gnucash/report/standard-reports/transaction.scm:918
+#: ../gnucash/report/standard-reports/transaction.scm:1060
+msgid "Price"
+msgstr "Precio"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:252
-msgid "6 months"
-msgstr "6 meses"
+#. Action: Dividend
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2945
+#: ../gnucash/register/ledger-core/split-register.c:2575
+msgid "Dividend"
+msgstr "Dividendo"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:253
-msgid "4 months"
-msgstr "4 meses"
+#. Action: Long Term Capital Gains
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2948
+#: ../gnucash/register/ledger-core/split-register.c:2578
+msgid "LTCG"
+msgstr "GCLP"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:254
-msgid "3 months"
-msgstr "3 meses"
+#. Action: Short Term Capital Gains
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2950
+#: ../gnucash/register/ledger-core/split-register.c:2580
+msgid "STCG"
+msgstr "GCCP"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:255
-msgid "2 months"
-msgstr "2 meses"
+#. Action: Distribution
+#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2953
+#: ../gnucash/register/ledger-core/split-register.c:2583
+msgid "Dist"
+msgstr "Dist"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:256
-msgid "1 month"
-msgstr "1 mes"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
+#: ../gnucash/report/standard-reports/register.scm:251
+#: ../libgnucash/engine/Split.c:1572 ../libgnucash/engine/Split.c:1589
+msgid "-- Split Transaction --"
+msgstr "-- Transacción Desglosada --"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:291
-msgid "View:"
-msgstr "Vista:"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:46
+msgid "-- Stock Split --"
+msgstr "-- Desglose Reserva --"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:340
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:439
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:434
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:452
-msgid "Date: "
-msgstr "Fecha: "
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:435
+#: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:584
+#: ../gnucash/register/ledger-core/split-register-model.c:910
+msgid "%A %d %B %Y"
+msgstr "%A %d %B %Y"
 
-#: ../gnucash/gnome-utils/gnc-dense-cal.c:1239
-msgid "(unnamed)"
-msgstr "(sin nombre)"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:478
+#: ../gnucash/register/register-gnome/datecell-gnome.c:101
+msgid "The entered date of the new transaction is older than the \"Read-Only Threshold\" set for this book. This setting can be changed in File -> Properties -> Accounts."
+msgstr "La fecha introducida de la transacción nueva es más antigua que el \"Umbral de Solo Lectura\" establecido para este libro. Esta opción puede cambiarse en Archivo -> Propiedades -> Cuentas."
 
-#. File menu
-#. Menu Items
-#: ../gnucash/gnome-utils/gnc-file.c:106
-#: ../gnucash/gnome-utils/gnc-main-window.c:277
-#: ../gnucash/import-export/bi-import/gnc-plugin-bi-import.c:56
-#: ../gnucash/import-export/customer-import/gnc-plugin-customer-import.c:56
-msgid "_Import"
-msgstr "_Importar"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:860
+msgid "Exchange Rate Canceled, using existing rate or default 1 to 1 rate if this is a new transaction."
+msgstr "Tipo de Cambio Cancelado, empleando tipo existente o predeterminado 1 a 1 si esto es una transacción nueva."
 
-#: ../gnucash/gnome-utils/gnc-file.c:108 ../gnucash/gnome-utils/gnc-file.c:282
-msgid "Import"
-msgstr "Importar"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1122
+#: ../gnucash/register/ledger-core/split-register.c:1941
+msgid "Recalculate Transaction"
+msgstr "Recalcular Transacción"
 
-#: ../gnucash/gnome-utils/gnc-file.c:114 ../gnucash/gnome-utils/gnc-file.c:290
-#: ../gnucash/gnome-utils/gnc-file.c:1104
-#: ../gnucash/gnome-utils/gnc-file.c:1365
-msgid "Save"
-msgstr "Guardar"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1123
+#: ../gnucash/register/ledger-core/split-register.c:1942
+msgid "The values entered for this transaction are inconsistent. Which value would you like to have recalculated?"
+msgstr "Los valores introducidos para esta transacción son inconsistentes. ¿Qué valor quiere que sea recalculado?"
 
-#: ../gnucash/gnome-utils/gnc-file.c:118
-#: ../gnucash/gnome-utils/gnc-main-window.c:278
-msgid "_Export"
-msgstr "_Exportar"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1130
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1132
+#: ../gnucash/register/ledger-core/split-register.c:1948
+#: ../gnucash/register/ledger-core/split-register.c:1951
+msgid "_Shares"
+msgstr "_Mercancías"
 
-#: ../gnucash/gnome-utils/gnc-file.c:156
-msgid "All files"
-msgstr "Todos los ficheros"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1130
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1137
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1144
+#: ../gnucash/register/ledger-core/split-register.c:1949
+#: ../gnucash/register/ledger-core/split-register.c:1956
+#: ../gnucash/register/ledger-core/split-register.c:1963
+msgid "Changed"
+msgstr "Cambiado"
 
-#: ../gnucash/gnome-utils/gnc-file.c:208
-msgid "(null)"
-msgstr "(nulo)"
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1144
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1146
+#: ../gnucash/register/ledger-core/split-register.c:1962
+#: ../gnucash/register/ledger-core/split-register.c:1965
+msgid "_Value"
+msgstr "_Valor"
 
-#: ../gnucash/gnome-utils/gnc-file.c:227
-#, c-format
-msgid "No suitable backend was found for %s."
-msgstr "No se ha encontrado backend adecuado para %s."
+#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1166
+#: ../gnucash/register/ledger-core/split-register.c:1974
+msgid "_Recalculate"
+msgstr "_Recalcular"
 
-#: ../gnucash/gnome-utils/gnc-file.c:232
-#, c-format
-msgid "The URL %s is not supported by this version of GnuCash."
-msgstr "La URL %s no está soportada por esta versión de GnuCash."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:732
+#: ../gnucash/import-export/csv-exp/csv-transactions-export.c:611
+#: ../gnucash/import-export/csv-exp/csv-transactions-export.c:625
+#: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.glade.h:57
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:301
+#: ../gnucash/report/standard-reports/general-ledger.scm:82
+#: ../gnucash/report/standard-reports/general-ledger.scm:102
+#: ../gnucash/report/standard-reports/transaction.scm:141
+#: ../gnucash/report/standard-reports/transaction.scm:829
+#: ../gnucash/report/standard-reports/transaction.scm:914
+#: ../gnucash/report/standard-reports/trial-balance.scm:664
+msgid "Account Name"
+msgstr "Nombre de Cuenta"
 
-#: ../gnucash/gnome-utils/gnc-file.c:237
-#, c-format
-msgid "Can't parse the URL %s."
-msgstr "No pudo interpretar la URL %s."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:749
+#: ../gnucash/report/report-system/options-utilities.scm:242
+#: ../gnucash/report/standard-reports/account-summary.scm:104
+#: ../gnucash/report/standard-reports/general-ledger.scm:84
+#: ../gnucash/report/standard-reports/general-ledger.scm:104
+#: ../gnucash/report/standard-reports/sx-summary.scm:84
+#: ../gnucash/report/standard-reports/transaction.scm:147
+#: ../gnucash/report/standard-reports/transaction.scm:799
+#: ../gnucash/report/standard-reports/transaction.scm:932
+msgid "Account Code"
+msgstr "Código de Cuenta"
 
-#: ../gnucash/gnome-utils/gnc-file.c:242
-#, c-format
-msgid "Can't connect to %s. The host, username or password were incorrect."
-msgstr "No pudo conectar con %s. El servidor, el usuario o la clave son incorrectos."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:761
+msgid "Last Num"
+msgstr "Último Núm"
 
-#: ../gnucash/gnome-utils/gnc-file.c:248
-#, c-format
-msgid "Can't connect to %s. Connection was lost, unable to send data."
-msgstr "No pudo conectar con %s. Conexión perdida, imposible enviar datos."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:767
+msgid "Present"
+msgstr "Actual"
 
-#: ../gnucash/gnome-utils/gnc-file.c:254
-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."
-msgstr "El fichero/URL parece ser de una versión más reciente de GnuCash. Debe actualizar su versión de GnuCash para poder funcionar con este dato."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:774
+msgid "Present (Report)"
+msgstr "Presente (boletín)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:261
-#, c-format
-msgid "The database %s doesn't seem to exist. Do you want to create it?"
-msgstr "La base de datos %s no existe. ¿Quiere crearla?"
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:788
+msgid "Balance (Report)"
+msgstr "Balance (boletín)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:275
-#, c-format
-msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not open the database. Do you want to proceed with opening the database?"
-msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería abrir la base de datos. ¿Realmente quiere continuar abriendo la base de datos?"
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:795
+msgid "Balance (Period)"
+msgstr "Balance (periodo)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:283
-#, c-format
-msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not import the database. Do you want to proceed with importing the database?"
-msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería importar la base de datos. ¿Realmente quiere continuar importando la base de datos?"
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:809
+msgid "Cleared (Report)"
+msgstr "Punteado (boletín)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:291
-#, c-format
-msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not save the database. Do you want to proceed with saving the database?"
-msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería guardar la base de datos. ¿Realmente quiere continuar guardando la base de datos?"
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:823
+msgid "Reconciled (Report)"
+msgstr "Conciliado (boletín)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:299
-#, c-format
-msgid "GnuCash could not obtain the lock for %s. That database may be in use by another user, in which case you should not export the database. Do you want to proceed with exporting the database?"
-msgstr "GnuCash no pudo obtener el bloqueo para %s. La base de datos podría estar usándola otro usuario, en cuyo caso no debería exportar la base de datos. ¿Realmente quiere continuar exportando la base de datos?"
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:830
+msgid "Last Reconcile Date"
+msgstr "Última Fecha Conciliada"
 
-#: ../gnucash/gnome-utils/gnc-file.c:324
-#, c-format
-msgid "GnuCash could not write to %s. That database may be on a read-only file system, or you may not have write permission for the directory."
-msgstr "GnuCash no ha podido escribir a %s. Puede que esa base de datos esté en un sistema de ficheros de sólo lectura, o que no tenga permisos de escritura en ese directorio."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:836
+msgid "Future Minimum"
+msgstr "Mínimo Futuro"
 
-#: ../gnucash/gnome-utils/gnc-file.c:331
-#, c-format
-msgid "The file/URL %s does not contain GnuCash data or the data is corrupt."
-msgstr "El fichero/URL %s no contiene datos de GnuCash o los datos están corruptos."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:843
+msgid "Future Minimum (Report)"
+msgstr "Mínimo Futuro (boletín)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:337
-#, c-format
-msgid "The server at URL %s experienced an error or encountered bad or corrupt data."
-msgstr "El servidor en la URL %s tuvo un error o encontró datos incorrectos o corruptos."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:857
+msgid "Total (Report)"
+msgstr "Totales (boletín)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:343
-#, c-format
-msgid "You do not have permission to access %s."
-msgstr "No tiene permiso para acceder a %s."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:864
+msgid "Total (Period)"
+msgstr "Total (periodo)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:348
-#: ../gnucash/register/register-core/formulacell.c:118
-#: ../gnucash/register/register-core/pricecell.c:181
-#, c-format
-msgid "An error occurred while processing %s."
-msgstr "Ocurrió un error mientras se procesa %s."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:873
+msgid "C"
+msgstr "C"
 
-#: ../gnucash/gnome-utils/gnc-file.c:353
-msgid "There was an error reading the file. Do you want to continue?"
-msgstr "Hubo un error leeyendo el fichero. ¿Quiere continuar?"
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:881
+msgid "Account Color"
+msgstr "Color de Cuenta"
 
-#: ../gnucash/gnome-utils/gnc-file.c:362
-#, c-format
-msgid "There was an error parsing the file %s."
-msgstr "Hubo un error al interpretar el fichero %s."
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:890
+msgid "Tax Info"
+msgstr "Info. Imposición"
 
-#: ../gnucash/gnome-utils/gnc-file.c:367
+#. Translators: %s is a currency mnemonic.
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1716
 #, c-format
-msgid "The file %s is empty."
-msgstr "El fichero %s está vacío."
+msgid "Present (%s)"
+msgstr "Presente (%s)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:380
+#. Translators: %s is a currency mnemonic.
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1719
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:954
 #, c-format
-msgid ""
-"The file/URI %s could not be found.\n"
-"\n"
-"The file is in the history list, do you want to remove it?"
-msgstr ""
-"El fichero/URI %s no pudo ser encontrado.\n"
-"\n"
-"El fichero está en el historial, ¿quiere quitarlo?"
+msgid "Balance (%s)"
+msgstr "Balance (%s)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:386
+#. Translators: %s is a currency mnemonic.
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1722
 #, c-format
-msgid "The file/URI %s could not be found."
-msgstr "El fichero/URI %s no pudo ser encontrado."
-
-#: ../gnucash/gnome-utils/gnc-file.c:393
-msgid "This file is from an older version of GnuCash. Do you want to continue?"
-msgstr "Este fichero es de una versión anterior de GnuCash. ¿Quiere continuar?"
+msgid "Cleared (%s)"
+msgstr "Punteado (%s)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:402
+#. Translators: %s is a currency mnemonic.
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1725
 #, c-format
-msgid "The file type of file %s is unknown."
-msgstr "El tipo del fichero %s es desconocido."
+msgid "Reconciled (%s)"
+msgstr "Conciliado (%s)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:407
+#. Translators: %s is a currency mnemonic.
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1728
 #, c-format
-msgid "Could not make a backup of the file %s"
-msgstr "Error al hacer una respaldo del fichero %s"
+msgid "Future Minimum (%s)"
+msgstr "Mínimo futuro (%s)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:412
+#. Translators: %s is a currency mnemonic.
+#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1731
 #, c-format
-msgid "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 "No se puede escribir al fichero %s. Compruebe que tiene permiso para escribir a ese fichero y que hay suficiente espacio para crearlo."
+msgid "Total (%s)"
+msgstr "Total (%s)"
 
-#: ../gnucash/gnome-utils/gnc-file.c:419
-#, c-format
-msgid "No read permission to read from file %s."
-msgstr "Sin permiso de lectura para leer desde %s."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:385
+msgid "Namespace"
+msgstr "Espacio de nombres"
 
-#. Translators: the first %s is a path in the filesystem,
-#. * the second %s is PACKAGE_NAME, which by default is "GnuCash"
-#.
-#: ../gnucash/gnome-utils/gnc-file.c:427
-#, c-format
-msgid ""
-"You attempted to save in\n"
-"%s\n"
-"or a subdirectory thereof. This is not allowed as %s reserves that directory for internal use.\n"
-"\n"
-"Please try again in a different directory."
-msgstr ""
-"Intentó guardar en\n"
-"%s\n"
-"o su carpeta. Esto no está permitido como %s reservas que carpetas para uso interno.\n"
-"\n"
-"Intente otra vez en un directorio diferente."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:402
+msgid "Print Name"
+msgstr "Nombre Escrito"
 
-#: ../gnucash/gnome-utils/gnc-file.c:434
-msgid "This database is from an older version of GnuCash. Select OK to upgrade it to the current version, Cancel to mark it read-only."
-msgstr "Esta base de datos es de una versión anterior de GnuCash. Seleccione Aceptar para modernizarlo a la versión actual, Cancelar para marcarlo en solo lectura."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:408
+msgid "Display symbol"
+msgstr "Enseñar símbolo"
 
-#: ../gnucash/gnome-utils/gnc-file.c:443
-msgid "This database is from a newer version of GnuCash. This version can read it, but cannot safely save to it. It will be marked read-only until you do File>Save As, but data may be lost in writing to the old version."
-msgstr "Esta base de datos es de una versión más moderna de GnuCash. Esta versión puede leerlo, pero no puede guardarlo con seguridad. Será marcada como solo lectura hasta que haga “Archivo → Guardar como”, pero los datos pueden perderse al escribir en la versión antigua."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:414
+msgid "Unique Name"
+msgstr "Nombre Único"
 
-#: ../gnucash/gnome-utils/gnc-file.c:452
-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 the  documentation to learn how to clear out dangling login sessions."
-msgstr "La base de datos SQL está siendo empleada por otros usuarios y la actualización no puede realizarse hasta que salgan. Si no hay otros usuarios, consulte la documentación para saber cómo expulsa sesiones bloqueadas."
+#. Translators: Again replace CUSIP by the name of your
+#. National Securities Identifying Number.
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:421
+msgid "ISIN/CUSIP"
+msgstr "ISIN/CUSIP"
 
-#: ../gnucash/gnome-utils/gnc-file.c:462
-msgid "The library \"libdbi\" installed on your system doesn't correctly store large numbers. This means GnuCash cannot use SQL databases correctly. Gnucash will not open or save to SQL databases until this is fixed by installing a different version of \"libdbi\". Please see https://bugzilla.gnome.org/show_bug.cgi?id=611936 for more information."
-msgstr "La biblioteca “libdbi” instalada en su sistema no almacena correctamente los números largos. Esto significa que Gnucash no puede utilizar bases de datos SQL correctamente. Gnucash no abrirá ni guardará bases de datos SQL hasta que esto sea solucionado instalando un versión distinta de “libdb”. Vea https://bugzilla.gnome.org/show_bug.cgi?id=611936 para más información."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:427
+msgid "Fraction"
+msgstr "Fracción"
 
-#: ../gnucash/gnome-utils/gnc-file.c:474
-msgid "GnuCash could not complete a critical test for the presence of a bug in the \"libdbi\" library. This may be caused by a permissions misconfiguration of your SQL database. Please see https://bugzilla.gnome.org/show_bug.cgi?id=645216 for more information."
-msgstr "GnuCash no pudo completar una prueba crítica para la presencia de un bicho en la biblioteca \"libdbi\". Esto puede ser causado por una desconfiguración errónea de los permisos de su base de datos SQL. Por favor, vea  https://bugzilla.gnome.org/show_bug.cgi?id=645216 para mayor información."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:434
+msgid "Get Quotes"
+msgstr "Obtener Cotizaciones"
 
-#: ../gnucash/gnome-utils/gnc-file.c:484
-msgid "This file is from an older version of GnuCash and will be upgraded when saved by this version. You will not be able to read the saved file from the older version of Gnucash (it will report an \"error parsing the file\"). If you wish to preserve the old version, exit without saving."
-msgstr "Este fichero es de una versión antigua de GnuCash y será actualizado cuando se guarde con esta versión. No podrá leer el fichero guardado desde la versión anterior de GnuCash (boletinará un \"error al filtrar el fichero\"). Si desea conservar la versión antigua, salga sin guardarlo."
+#. Translators: This string has a context prefix; the translation
+#. must only contain the part after the | character.
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:437
+msgid "Column letter for 'Get Quotes'|Q"
+msgstr "C"
 
-#: ../gnucash/gnome-utils/gnc-file.c:495
-#, c-format
-msgid "An unknown I/O error (%d) occurred."
-msgstr "Ocurrió un error de E/S desconocido (%d)."
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:443
+#: ../gnucash/gnome-utils/gnc-tree-view-price.c:442
+msgid "Source"
+msgstr "Origen"
 
-#: ../gnucash/gnome-utils/gnc-file.c:589
-msgid "Save changes to the file?"
-msgstr "¿Guardar cambios al fichero?"
+#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:448
+msgid "Timezone"
+msgstr "Zona horaria"
 
-#: ../gnucash/gnome-utils/gnc-file.c:602
-#: ../gnucash/gnome-utils/gnc-main-window.c:1259
-#, c-format
-msgid "If you don't save, changes from the past %d minute will be discarded."
-msgid_plural "If you don't save, changes from the past %d minutes will be discarded."
-msgstr[0] "Si no guarda, los cambios del último minuto se perderán."
-msgstr[1] "Si no guarda, los cambios de los últimos %d minutos se perderán."
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:381
+msgid "Customer Number"
+msgstr "Número del Cliente"
 
-#: ../gnucash/gnome-utils/gnc-file.c:606
-msgid "Continue _Without Saving"
-msgstr "Continuar _sin guardar"
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:389
+msgid "Vendor Number"
+msgstr "Número del Proveedor"
 
-#: ../gnucash/gnome-utils/gnc-file.c:763
-#, c-format
-msgid "GnuCash could not obtain the lock for %s."
-msgstr "GnuCash no pudo obtener el bloqueo para %s."
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:393
+msgid "Employee Number"
+msgstr "Número del Operador"
 
-#: ../gnucash/gnome-utils/gnc-file.c:765
-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?"
-msgstr "Esa base de datos podría estar abierta por otro usuario, en cuyo caso no debería abrir la base de datos. ¿Qué quiere hacer?"
+#. Billing or Shipping addresses
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:445
+#: ../gnucash/report/business-reports/aging.scm:49
+#: ../gnucash/report/business-reports/aging.scm:704
+msgid "Address Name"
+msgstr "Nombre de Dirección"
 
-#: ../gnucash/gnome-utils/gnc-file.c:768
-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 changes. What would you like to do?"
-msgstr "Esa base de datos podría estar en un sistema de ficheros de sólo lectura, o no tiene permisos de escritura en el directorio. Si continúa es posible que no pueda guardar los cambios. ¿Qué quiere hacer?"
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:450
+#: ../gnucash/report/business-reports/aging.scm:50
+#: ../gnucash/report/business-reports/aging.scm:706
+msgid "Address 1"
+msgstr "Dirección 1"
 
-#: ../gnucash/gnome-utils/gnc-file.c:789
-msgid "_Open Read-Only"
-msgstr "_Abrir a solo lectura"
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:455
+#: ../gnucash/report/business-reports/aging.scm:51
+#: ../gnucash/report/business-reports/aging.scm:708
+msgid "Address 2"
+msgstr "Dirección 2"
 
-#: ../gnucash/gnome-utils/gnc-file.c:791
-msgid "_Create New File"
-msgstr "_Crear un fichero nuevo"
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:460
+#: ../gnucash/report/business-reports/aging.scm:52
+#: ../gnucash/report/business-reports/aging.scm:710
+msgid "Address 3"
+msgstr "Dirección 3"
 
-#: ../gnucash/gnome-utils/gnc-file.c:793
-msgid "Open _Anyway"
-msgstr "Abrir de _todas formas"
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:465
+#: ../gnucash/report/business-reports/aging.scm:53
+#: ../gnucash/report/business-reports/aging.scm:712
+msgid "Address 4"
+msgstr "Dirección 4"
 
-#: ../gnucash/gnome-utils/gnc-file.c:797
-#: ../gnucash/gnome-utils/gnc-main-window.c:302
-msgid "_Quit"
-msgstr "_Salir"
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:475
+#: ../gnucash/report/business-reports/aging.scm:716
+#: ../gnucash/report/business-reports/taxinvoice.eguile.scm:207
+msgid "Fax"
+msgstr "Fax"
 
-#. try to load once again
-#: ../gnucash/gnome-utils/gnc-file.c:871 ../gnucash/gnome-utils/gnc-file.c:891
-msgid "Loading user data..."
-msgstr "Cargando datos del usuario..."
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:480
+msgid "E-mail"
+msgstr "Correo-e"
 
-#: ../gnucash/gnome-utils/gnc-file.c:907
-msgid "Re-saving user data..."
-msgstr "Re-guardar datos del usuario..."
+#. Translators: This string has a context prefix; the translation
+#. must only contain the part after the | character.
+#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:509
+msgid "Column letter for 'Active'|A"
+msgstr "A"
 
-#: ../gnucash/gnome-utils/gnc-file.c:1228
-#: ../gnucash/gnome-utils/gnc-file.c:1464
-#: ../gnucash/import-export/csv-exp/assistant-csv-export.c:145
-#: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1582
-#, c-format
-msgid "The file %s already exists. Are you sure you want to overwrite it?"
-msgstr "El fichero %s ya existe. ¿Seguro que desea sobrescribirlo?"
+#: ../gnucash/gnome-utils/gnc-tree-view-price.c:424
+msgid "Security"
+msgstr "Garantía"
 
-#: ../gnucash/gnome-utils/gnc-file.c:1257
-msgid "Exporting file..."
-msgstr "Exportando fichero..."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:790
+msgid "Status Bar"
+msgstr "Barra de Estado"
 
-#. %s is the strerror(3) error string of the error that occurred.
-#: ../gnucash/gnome-utils/gnc-file.c:1270
-#, c-format
-msgid ""
-"There was an error saving the file.\n"
-"\n"
-"%s"
-msgstr ""
-"Hubo un error guardando el fichero.\n"
-"\n"
-"%s"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:1275
+#: ../gnucash/report/business-reports/balsheet-eg.scm:502
+#: ../libgnucash/engine/Scrub.c:364
+msgid "Imbalance"
+msgstr "Descuadre"
 
-#: ../gnucash/gnome-utils/gnc-file.c:1302
-msgid "The database was opened read-only. Do you want to save it to a different place?"
-msgstr "La base de datos fue abierta con solo lectura. ¿Quiere guardarlo en un lugar diferente?"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:1525
+msgid " Scheduled "
+msgstr " Programado "
 
-#: ../gnucash/gnome-utils/gnc-file.c:1593
-#, c-format
-msgid "Reverting will discard all unsaved changes to %s. Are you sure you want to proceed ?"
-msgstr "La reversión descartará todas los cambios no registrados a %s. ¿Seguro que quiere hacerlo?"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2381
+#: ../gnucash/register/ledger-core/split-register-control.c:1544
+msgid "Save the changed transaction?"
+msgstr "¿Guardar la transacción modificada?"
 
-#: ../gnucash/gnome-utils/gnc-file.c:1601
-#: ../gnucash/gnome-utils/gnc-main-window.c:1227
-msgid "<unknown>"
-msgstr "<desconocido>"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2383
+msgid "The current transaction has changed. Would you like to record the changes, or discard the changes?"
+msgstr "La transacción actual ha sido modificada. ¿Quiere registrar los cambios, o descartarlos?"
 
-#: ../gnucash/gnome-utils/gnc-general-select.c:224
-msgid "View..."
-msgstr "Vista..."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2421
+#: ../gnucash/register/ledger-core/split-register-control.c:1559
+msgid "_Discard Changes"
+msgstr "_Descartar cambios"
 
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:284
-msgid "GnuCash could not find the files for the help documentation. This is likely because the 'gnucash-docs' package is not installed"
-msgstr "GnuCash no pudo encontrar los ficheros para la documentación de ayuda. Esto se debe a que el paquete 'gnucash-docs' no está instalado"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2423
+#: ../gnucash/register/ledger-core/split-register-control.c:1561
+msgid "_Record Changes"
+msgstr "_Registrar cambios"
 
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:377
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:443
-msgid "GnuCash could not find the files for the help documentation. This is likely because the 'gnucash-docs' package is not installed."
-msgstr "GnuCash no pudo encontrar los ficheros para la documentación de ayuda. Esto se debe a que no está instalado el paquete 'gnucash-docs'."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2789
+msgid "Date Entered"
+msgstr "Fecha Introducida"
 
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:408
-msgid "GnuCash could not find the files for the help documentation."
-msgstr "GnuCash no pudo encontrar los ficheros para la documentación de ayuda."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2791
+msgid "Date Reconciled"
+msgstr "Fecha Conciliada"
 
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:467
-msgid "GnuCash could not find the associated file."
-msgstr "GnuCash no pudo encontrar el fichero asociado."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2793
+msgid "Date Posted / Entered / Reconciled"
+msgstr "Fecha Contabilizada / Introducida / Conciliada"
 
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:505
-msgid "GnuCash could not find the associated file"
-msgstr "GnuCash no pudo encontrar el fichero asociado"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2820
+msgid "Reference / Action"
+msgstr "Referencia / Operación"
 
-#: ../gnucash/gnome-utils/gnc-gnome-utils.c:536
-msgid "GnuCash could not open the associated URI:"
-msgstr "GnuCash no pudo abrir la URI asociada:"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2834
+msgid "T-Number"
+msgstr "I-Número"
 
-#. Translators: %s is a path to a database or any other url,
-#. like mysql://user@server.somewhere/somedb, http://www.somequotes.com/thequotes
-#: ../gnucash/gnome-utils/gnc-keyring.c:344
-#, c-format
-msgid "Enter a user name and password to connect to: %s"
-msgstr "Introduzca un nombre de usuario y contraseña para conectarse a: %s"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2840
+msgid "Number / Action"
+msgstr "Número / Operación"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:128
-#, c-format
-msgid "Changes will be saved automatically in %u seconds"
-msgstr "Los cambios se guardarán automáticamente en %u segundos"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2856
+msgid "Customer / Memo"
+msgstr "Cliente / Memorandum"
 
-#. Toplevel
-#: ../gnucash/gnome-utils/gnc-main-window.c:264
-msgid "_File"
-msgstr "_Archivo"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2867
+msgid "Vendor / Memo"
+msgstr "Proveedor / Memorándum"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:268
-msgid "Tra_nsaction"
-msgstr "_Transacción"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2885
+msgid "Description / Notes / Memo"
+msgstr "Descripción / Anotaciones / Memorandum"
 
-# Letra modificada_OK
-#: ../gnucash/gnome-utils/gnc-main-window.c:269
-msgid "_Reports"
-msgstr "_Boletines"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2915
+#: ../gnucash/import-export/csv-exp/csv-transactions-export.c:623
+#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:57
+msgid "Void Reason"
+msgstr "Razón Vacía"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:270
-msgid "_Tools"
-msgstr "_Herramientas"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2919
+msgid "Accounts / Void Reason"
+msgstr "Cuentas / Efectivo Vacío"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:271
-msgid "E_xtensions"
-msgstr "E_xtensiones"
+#. toggle column: mark existing transaction reconciled
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2929
+#: ../gnucash/import-export/import-main-matcher.c:492
+msgid "R"
+msgstr "C"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:272
-msgid "_Windows"
-msgstr "Ven_tanas"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2973
+msgid "Amount / Value"
+msgstr "Cantidad / Valor"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:280
-msgid "_Print..."
-msgstr "Im_primir..."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3015
+#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:61
+#: ../libgnucash/app-utils/prefs.scm:81
+msgid "Withdrawal"
+msgstr "Reducción"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:281
-msgid "Print the currently active page"
-msgstr "Imprime la página activa actual"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3020
+#: ../libgnucash/app-utils/prefs.scm:82
+msgid "Spend"
+msgstr "Desembolso"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:287
-msgid "Pa_ge Setup..."
-msgstr "Configurar _página..."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3070
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3077
+#: ../libgnucash/app-utils/prefs.scm:80
+msgid "Funds Out"
+msgstr "Retirada de Fondos"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:288
-msgid "Specify the page size and orientation for printing"
-msgstr "Especifique el tamaño y la orientación de la página para escribir"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3079
+#: ../gnucash/register/ledger-core/split-register-model.c:497
+msgid "Credit Formula"
+msgstr "Fórmula de Crédito"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:292
-msgid "Proper_ties"
-msgstr "P_ropiedades"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3100
+#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:60
+#: ../libgnucash/app-utils/prefs.scm:64
+msgid "Deposit"
+msgstr "Depósito"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:293
-msgid "Edit the properties of the current file"
-msgstr "Edita las propiedades del fichero actual"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3105
+#: ../libgnucash/app-utils/prefs.scm:65
+msgid "Receive"
+msgstr "Cobrar"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:298
-msgid "Close the currently active page"
-msgstr "Cierra la página activa actual"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3128
+#: ../gnucash/report/business-reports/customer-summary.scm:468
+#: ../gnucash/report/business-reports/customer-summary.scm:852
+#: ../gnucash/report/standard-reports/net-barchart.scm:367
+#: ../gnucash/report/standard-reports/net-barchart.scm:429
+#: ../gnucash/report/standard-reports/net-linechart.scm:410
+#: ../gnucash/report/standard-reports/net-linechart.scm:483
+#: ../libgnucash/app-utils/prefs.scm:73 ../libgnucash/engine/Account.cpp:4109
+#: ../libgnucash/engine/gncInvoice.c:986
+msgid "Expense"
+msgstr "Gasto"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:303
-msgid "Quit this application"
-msgstr "Sale de esta aplicación"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3151
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3158
+#: ../libgnucash/app-utils/prefs.scm:63
+msgid "Funds In"
+msgstr "Ingreso de Fondos"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:325
-msgid "Pr_eferences"
-msgstr "_Preferencias"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3160
+#: ../gnucash/register/ledger-core/split-register-model.c:490
+msgid "Debit Formula"
+msgstr "Fórmula de Débito"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:326
-msgid "Edit the global preferences of GnuCash"
-msgstr "Edita las preferencias globales de GnuCash"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3230
+msgid "Enter Due Date"
+msgstr "Introducir Fecha de Vencimiento"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:334
-msgid "Select sorting criteria for this page view"
-msgstr "Seleccione un criterio de ordenación para esta vista de página"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3241
+msgid "Enter the transaction reference, such as the invoice or check number"
+msgstr "Introduzca la referencia de transacción, tal como la factura o el número comprobante"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:338
-msgid "Select the account types that should be displayed."
-msgstr "Seleccione los tipos de cuentas que se deberían ser enseñados."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3243
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3250
+msgid "Enter the type of transaction, or choose one from the list"
+msgstr "Introduzca el tipo de transacción, o escoja uno desdel índice"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:350
-msgid "Reset _Warnings..."
-msgstr "Restablecer _advertencias..."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3248
+msgid "Enter the transaction number, such as the check number"
+msgstr "Introduzca el número de transacción, como el número de comprobación"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:351
-msgid "Reset the state of all warning messages so they will be shown again."
-msgstr "Restablecer el estado de todos los mensajes de advertencia, de forma que se vuelvan a mostrar."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3260
+#: ../gnucash/register/ledger-core/split-register-model.c:1042
+msgid "Enter the name of the Customer"
+msgstr "Introduzca el nombre del Cliente"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:355
-msgid "Re_name Page"
-msgstr "Re_nombrar página"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3262
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3271
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3280
+#: ../gnucash/register/ledger-core/split-register-model.c:1079
+msgid "Enter notes for the transaction"
+msgstr "Introduzca anotaciones para la transacción"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:356
-msgid "Rename this page."
-msgstr "Renombra esta página."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3264
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3273
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3282
+#: ../gnucash/register/ledger-core/split-register-model.c:1238
+msgid "Enter a description of the split"
+msgstr "Introduzca una descripción del desglose"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:363
-msgid "_New Window"
-msgstr "_Crear ventana"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3269
+#: ../gnucash/register/ledger-core/split-register-model.c:1045
+msgid "Enter the name of the Vendor"
+msgstr "Introduzca el nombre del Proveedor"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:364
-msgid "Open a new top-level GnuCash window."
-msgstr "Abre una ventana GnuCash de nivel cima."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3278
+#: ../gnucash/register/ledger-core/split-register-model.c:1048
+msgid "Enter a description of the transaction"
+msgstr "Introduzca una descripción de la transacción"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:368
-msgid "New Window with _Page"
-msgstr "Crear ventana con _página"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3292
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3296
+#: ../gnucash/register/ledger-core/split-register-model.c:1398
+#: ../gnucash/register/ledger-core/split-register-model.c:1465
+msgid "Enter the account to transfer from, or choose one from the list"
+msgstr "Introduzca la cuenta desde la que transferir, o elija una del índice"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:369
-msgid "Move the current page to a new top-level GnuCash window."
-msgstr "Mueve la página actual a una ventana de nivel-cima nueva de GnuCash."
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3294
+#: ../gnucash/register/ledger-core/split-register-model.c:1112
+msgid "Reason the transaction was voided"
+msgstr "Razón por la que la transacción se ha anulado"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:376
-msgid "Tutorial and Concepts _Guide"
-msgstr "_Tutorial y guía de conceptos"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3306
+msgid "Enter the reconcile type"
+msgstr "Introduzca el tipo de conciliación"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:377
-msgid "Open the GnuCash Tutorial"
-msgstr "Abre el tutorial de GnuCash"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3316
+msgid "Enter the type of transaction"
+msgstr "Introduzca el tipo de transacción"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:381
-msgid "_Contents"
-msgstr "Índi_ce"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3326
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3346
+msgid "Enter the value of shares bought or sold"
+msgstr "Introduzca el valor de mercancías compradas o vendidas"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:382
-msgid "Open the GnuCash Help"
-msgstr "Abrir la ayuda de GnuCash"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3336
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3348
+#: ../gnucash/register/ledger-core/split-register-model.c:1346
+msgid "Enter the number of shares bought or sold"
+msgstr "Introduzca el número de mercancías compradas o vendidas"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:386
-msgid "_About"
-msgstr "Acerca _de"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3358
+msgid "* Indicates the transaction Commodity."
+msgstr "* Indica la transacción de Mercancía."
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:387
-msgid "About GnuCash"
-msgstr "Acerca de GnuCash"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3368
+msgid "Enter the rate"
+msgstr "Introduzca el tipo"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:399
-msgid "_Toolbar"
-msgstr "Barra de _herramientas"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3378
+#: ../gnucash/register/ledger-core/split-register-model.c:1310
+msgid "Enter the effective share price"
+msgstr "Introduzca el precio efectivo mercantil"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:400
-msgid "Show/hide the toolbar on this window"
-msgstr "Mostrar/ocultar la barra de herramientas en esta ventana"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3388
+#: ../gnucash/register/ledger-core/split-register-model.c:2234
+msgid "Enter credit formula for real transaction"
+msgstr "Introduzca cálculo de crédito para transacción real"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:404
-msgid "Su_mmary Bar"
-msgstr "Barra de _resumen"
+#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3398
+#: ../gnucash/register/ledger-core/split-register-model.c:2200
+msgid "Enter debit formula for real transaction"
+msgstr "Introduzca cálculo del débito para transacción real"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:405
-msgid "Show/hide the summary bar on this window"
-msgstr "Mostrar/ocultar la barra de resumen en esta ventana"
+#. Translators: This string has a context prefix; the translation
+#. must only contain the part after the | character.
+#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:171
+msgid "Single-character short column-title form of 'Enabled'|E"
+msgstr "A"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:409
-msgid "Stat_us Bar"
-msgstr "Barra de _estado"
+#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:182
+msgid "Last Occur"
+msgstr "Última aparición"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:410
-msgid "Show/hide the status bar on this window"
-msgstr "Mostrar/ocultar la barra de estado en esta ventana"
+#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:187
+msgid "Next Occur"
+msgstr "Próxima Aparición"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:422
-msgid "Window _1"
-msgstr "Ventana _1"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:1
+msgid "Introduction placeholder"
+msgstr "Introducción a marcador"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:423
-msgid "Window _2"
-msgstr "Ventana _2"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:2
+msgid "Title placeholder"
+msgstr "Contenedor del título"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:424
-msgid "Window _3"
-msgstr "Ventana _3"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:3
+msgid "_Edit list of encodings"
+msgstr "_Editar índice de codificaciones"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:425
-msgid "Window _4"
-msgstr "Ventana _4"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:4
+msgid "Default encoding:"
+msgstr "Codificación predeterminada:"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:426
-msgid "Window _5"
-msgstr "Ventana _5"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:5
+msgid "Convert the file"
+msgstr "Convertir el fichero"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:427
-msgid "Window _6"
-msgstr "Ventana _6"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:6
+msgid "finish placeholder"
+msgstr "final de marcador"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:428
-msgid "Window _7"
-msgstr "Ventana _7"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:7
+msgid "Finish GnuCash Datafile Import"
+msgstr "Finalizar la importación de fichero de datos GnuCash"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:429
-msgid "Window _8"
-msgstr "Ventana _8"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:8
+msgid "Edit the list of encodings"
+msgstr "Edita la índice de codificaciones"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:430
-msgid "Window _9"
-msgstr "Ventana _9"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:11
+msgid "<b>S_ystem input encodings</b>"
+msgstr "<b>Codificaciones de entrada del _sistema</b>"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:431
-msgid "Window _0"
-msgstr "Ventana _0"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:12
+msgid "<b>_Custom encoding</b>"
+msgstr "<b>_Codificaciones personales</b>"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:1214
-#, c-format
-msgid "Save changes to file %s before closing?"
-msgstr "¿Guardar cambios en el fichero %s antes de cerrar?"
+#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:13
+msgid "<b>_Selected encodings</b>"
+msgstr "<b>_Codificaciones seleccionadas</b>"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:1217
-#, c-format
-msgid "If you don't save, changes from the past %d hours and %d minutes will be discarded."
-msgstr "Si no guarda, los cambios de las últimas %d horas y %d minutos se perderán."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:1
+msgid "Delete Account"
+msgstr "Borrar Cuenta"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:1219
-#, c-format
-msgid "If you don't save, changes from the past %d days and %d hours will be discarded."
-msgstr "Si no guarda, los cambios de los últimos %d días y %d horas se perderán."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:4
+msgid "<b>Transactions</b>"
+msgstr "<b>Transacciones</b>"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:1264
-msgid "Close _Without Saving"
-msgstr "Cerrar _sin guardar"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:5
+msgid "M_ove to:"
+msgstr "M_over a:"
 
-#. Translators: This string is shown in the window title if this
-#. document is, well, read-only.
-#: ../gnucash/gnome-utils/gnc-main-window.c:1489
-msgid "(read-only)"
-msgstr "(solo-lectura)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:6
+msgid "Delete all _transactions"
+msgstr "Borrar todas las _transacciones"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:1497
-msgid "Unsaved Book"
-msgstr "Libro No Guardado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:7
+msgid "This account contains transactions. What would you like to do with these transactions?"
+msgstr "Esta cuenta contiene transacciones. ¿Qué quisiera hacer para hacer con estas transacciones?"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:1658
-msgid "Last modified on %a, %b %d, %Y at %I:%M %p"
-msgstr "Última modificación en %a, %b, %d, %Y en %I%M%p"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:8
+msgid "This account contains read-only transactions which may not be deleted."
+msgstr "Esta cuenta contiene transacciones de sólo lectura que no pueden ser borrados."
 
-#. g_warning("got time %ld, str=%s\n", mtime, time_string);
-#. Translators: This message appears in the status bar after opening the file.
-#: ../gnucash/gnome-utils/gnc-main-window.c:1661
-#, c-format
-msgid "File %s opened. %s"
-msgstr "Fichero %s abierto. %s"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:9
+msgid "<b>Sub-accounts</b>"
+msgstr "<b>Subcuentas</b>"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:2712
-msgid "Unable to save to database."
-msgstr "Incapaz de guardar en la base de datos."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:10
+msgid "This account contains sub-accounts. What would you like to do with these sub-accounts?"
+msgstr "Esta cuenta contiene subcuentas. ¿Qué quiere hacer con esas subcuentas?"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:2714
-msgid "Unable to save to database: Book is marked read-only."
-msgstr "Incapaz de guardar en la base de datos: el libro está marcado como sólo lectura."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:11
+msgid "_Move to:"
+msgstr "_Mover a:"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:4092
-msgid "Book Options"
-msgstr "Opciones del Libro"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:12
+msgid "Delete all _subaccounts"
+msgstr "Borrar todas las _subcuentas"
 
-#. Translators: %s will be replaced with the current year
-#: ../gnucash/gnome-utils/gnc-main-window.c:4480
-#, c-format
-msgid "Copyright © 1997-%s The GnuCash contributors."
-msgstr "© 1997-%s Las contribuciones de GnuCash."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:13
+msgid "<b>Sub-account Transactions</b>"
+msgstr "<b>Transacciones por Subcuentas</b>"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:4503
-#: ../gnucash/gnome-utils/gnc-main-window.c:4507
-#: ../gnucash/gnome-utils/gnc-splash.c:106
-#: ../gnucash/gnome-utils/gnc-splash.c:109
-msgid "Version"
-msgstr "Versión"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:14
+msgid "One or more sub-accounts contain transactions. What would you like to do with these transactions?"
+msgstr "Una o más subcuentas contienen transacciones. ¿Qué quiere hacer con esas transacciones?"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:4504
-#: ../gnucash/gnome-utils/gnc-main-window.c:4508
-#: ../gnucash/gnome-utils/gnc-splash.c:107
-#: ../gnucash/gnome-utils/gnc-splash.c:110 ../gnucash/gnucash-bin.c:460
-#: ../gnucash/gnucash-bin.c:463
-msgid "Build ID"
-msgstr "ID de Compilación"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:15
+msgid "One or more sub-accounts contain read-only transactions which may not be deleted."
+msgstr "Una o más subcuentas de esta cuenta contienen asientos de sólo lectura que no se pueden borrar."
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:4514
-msgid "Accounting for personal and small business finance."
-msgstr "Contabilidad financiara personal y pequeños negocios."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:16
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:1
+#: ../gnucash/report/standard-reports/transaction.scm:58
+msgid "Filter By..."
+msgstr "Filtrar por..."
 
-#. Translators: the following string will be shown in Help->About->Credits
-#. * Enter your name or that of your team and an email contact for feedback.
-#. * The string can have multiple rows, so you can also add a list of
-#. * contributors.
-#: ../gnucash/gnome-utils/gnc-main-window.c:4523
-msgid "translator_credits"
-msgstr ""
-"Francisco Javier Serrador <fserrador at fserrador.com>  25-feb-2018\n"
-"Eneko Lacunza <enlar at enlar.net>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:19
+msgid "_Default"
+msgstr "_Predeterminado"
 
-#: ../gnucash/gnome-utils/gnc-main-window.c:4526
-msgid "Visit the GnuCash website."
-msgstr "Visite el sitio web GnuCash."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:20
+#: ../gnucash/report/standard-reports/account-summary.scm:106
+#: ../gnucash/report/standard-reports/sx-summary.scm:86
+msgid "Account Type"
+msgstr "Clasificación de Cuenta"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:71
-#: ../libgnucash/app-utils/date-utilities.scm:817
-msgid "Start of this month"
-msgstr "Inicio de este mes"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:21
+msgid "Show _hidden accounts"
+msgstr "Mostrar cuentas _ocultas"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:72
-#: ../libgnucash/app-utils/date-utilities.scm:831
-msgid "Start of previous month"
-msgstr "Inicio del mes anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:22
+msgid "Show accounts which have the option \"Hidden\" checked."
+msgstr "Muestra cuentas que fueron comprobadas como \"Ocultas\"."
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:73
-msgid "Start of this quarter"
-msgstr "Inicio de este trimestre"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:23
+msgid "Show _zero total accounts"
+msgstr "Mostrar cuentas con total a _cero"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:74
-#: ../libgnucash/app-utils/date-utilities.scm:873
-msgid "Start of previous quarter"
-msgstr "Inicio del trimestre anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:24
+msgid "Show accounts which have a zero total value."
+msgstr "Muestra cuentas que tengan un valor total a cero."
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:75
-#: ../libgnucash/app-utils/date-utilities.scm:761
-msgid "Start of this year"
-msgstr "Inicio de este año"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:25
+msgid "Show _unused accounts"
+msgstr "Mostrar cuentas _no utilizadas"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:76
-#: ../libgnucash/app-utils/date-utilities.scm:775
-msgid "Start of previous year"
-msgstr "Inicio del año anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:26
+msgid "Show accounts which do not have any transactions."
+msgstr "Mostrar cuentas las cuales no tenga ninguna transacción."
 
-#. FY (fiscal year) Strings
-#: ../gnucash/gnome-utils/gnc-period-select.c:79
-msgid "Start of this accounting period"
-msgstr "Inicio de este periodo contable"
+# clase
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:28
+msgid "Use Commodity Value"
+msgstr "Emplear valor mercantil"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:80
-msgid "Start of previous accounting period"
-msgstr "Inicio del período contable anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:30
+msgid "1/10"
+msgstr "1/10"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:87
-#: ../libgnucash/app-utils/date-utilities.scm:824
-msgid "End of this month"
-msgstr "Final de este mes"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:31
+msgid "1/100"
+msgstr "1/100"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:88
-#: ../libgnucash/app-utils/date-utilities.scm:838
-msgid "End of previous month"
-msgstr "Final del mes anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:32
+msgid "1/1000"
+msgstr "1/1000"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:89
-msgid "End of this quarter"
-msgstr "Final de este trimestre"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:33
+msgid "1/10000"
+msgstr "1/10000"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:90
-#: ../libgnucash/app-utils/date-utilities.scm:880
-msgid "End of previous quarter"
-msgstr "Final del trimestre anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:34
+msgid "1/100000"
+msgstr "1/100000"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:91
-#: ../libgnucash/app-utils/date-utilities.scm:768
-msgid "End of this year"
-msgstr "Final de este año"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:35
+msgid "1/1000000"
+msgstr "1/1000000"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:92
-#: ../libgnucash/app-utils/date-utilities.scm:782
-msgid "End of previous year"
-msgstr "Final del año anterior"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:38
+msgid "<b>Identification</b>"
+msgstr "<b>Identificación</b>"
 
-#. FY (fiscal year) Strings
-#: ../gnucash/gnome-utils/gnc-period-select.c:95
-msgid "End of this accounting period"
-msgstr "Final de este período contable"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:39
+msgid "Account _name:"
+msgstr "_Nombre de cuenta:"
 
-#: ../gnucash/gnome-utils/gnc-period-select.c:96
-msgid "End of previous accounting period"
-msgstr "Final del anterior período contable"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:40
+msgid "_Account code:"
+msgstr "Código de cuent_a:"
 
-#: ../gnucash/gnome-utils/gnc-splash.c:126
-msgid "Loading..."
-msgstr "Cargando..."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:41
+msgid "_Description:"
+msgstr "_Descripción:"
 
-#: ../gnucash/gnome-utils/gnc-sx-list-tree-model-adapter.c:490
-msgid "never"
-msgstr "nunca"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:43
+msgid "Smallest _fraction:"
+msgstr "_Fracción mínima:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:113
-msgid "You can not change this transaction, the Book or Register is set to Read Only."
-msgstr "No puede cambiar esta transacción, el Libro o Registro está establecido a Solo Lectura."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:44
+msgid "Account _Color:"
+msgstr "Color de _cuenta:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:131
-msgid "Save Transaction before proceeding?"
-msgstr "¿Guardar Transacciones antes de procesar?"
+#. instantiate a default style sheet
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:45
+#: ../gnucash/report/report-system/html-style-sheet.scm:291
+#: ../gnucash/report/report-system/report.scm:247
+#: ../gnucash/report/stylesheets/stylesheet-plain.scm:316
+msgid "Default"
+msgstr "Por omisión"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:133
-msgid "The current transaction has been changed. Would you like to record the changes before proceeding, or cancel?"
-msgstr "La transacción actual ha sido modificada. ¿Quiere registrar los cambios antes de proceder, o cancelar?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:46
+msgid "No_tes:"
+msgstr "Ano_taciones:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:149
-#: ../gnucash/register/ledger-core/gncEntryLedger.c:919
-#: ../gnucash/register/ledger-core/gncEntryLedgerControl.c:898
-#: ../gnucash/register/ledger-core/split-register.c:468
-msgid "_Record"
-msgstr "_Registrar"
-
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:185
-msgid "This transaction is being edited in a different register."
-msgstr "Esta transacción ya se está editando en un registro diferente."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:47
+msgid "Ta_x related"
+msgstr "Imposición _específico"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:205
-#: ../gnucash/register/ledger-core/split-register-control.c:59
-msgid "Rebalance Transaction"
-msgstr "Cuadro de Transacción"
+#. Translators: use the same words here as in
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:49
+msgid "Use Edit->Tax Report Options to set the tax-related flag and assign a tax code to this account."
+msgstr "Emplee “Editar → Opciones de Boletín de Imposición” para establecer el indicador relacionado con imposiciones y asignar un código de imposición para esta cuenta."
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:206
-#: ../gnucash/register/ledger-core/split-register-control.c:60
-msgid "The current transaction is not balanced."
-msgstr "La transacción actual no está cuadrada."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:50
+msgid "Placeholde_r"
+msgstr "Contenedo_r"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:287
-#: ../gnucash/register/ledger-core/split-register-control.c:138
-msgid "Balance it _manually"
-msgstr "Cuadrarlo _manualmente"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:51
+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 account."
+msgstr "Esta cuenta está únicamente como marcador en el plan de cuentas. Transacciones pueden no ser contabilizadas para esta cuenta, sólo a subcuentas de esta cuenta."
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:289
-#: ../gnucash/register/ledger-core/split-register-control.c:140
-msgid "Let GnuCash _add an adjusting split"
-msgstr "Permitir a GnuCash _añadir un desglose de ajuste"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:52
+msgid "H_idden"
+msgstr "_Oculto"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:294
-#: ../gnucash/register/ledger-core/split-register-control.c:145
-msgid "Adjust current account _split total"
-msgstr "Ajustar el total del de_sglose de la cuenta actual"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:53
+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 option, you will first need to open the \"Filter By...\" dialog for the account tree and check the \"show hidden accounts\" option. Doing so will allow you to select the account and reopen this dialog."
+msgstr "Esta cuenta (y cualquier subcuenta) estarán ocultos en el plan contable y no aparecerán en el índice desplegable de cuentas del registro. Para restablecer esta opción, primero tendrá que abrir el diálogo «Filtrar por...» del plan contable y marcar la opción «Mostrar cuentas ocultas». Al hacerlo podrá seleccionar la cuenta y reabrir este diálogo."
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:300
-#: ../gnucash/register/ledger-core/split-register-control.c:151
-msgid "Adjust _other account split total"
-msgstr "Ajustar el total del desglose de _otra cuenta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:54
+msgid "Smallest fraction of this commodity that can be referenced."
+msgstr "Fracción mínima de esta mercancía que puede ser referenciada."
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:311
-#: ../gnucash/register/ledger-core/split-register-control.c:162
-msgid "_Rebalance"
-msgstr "_Cuadrar"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:55
+msgid "<b>Acco_unt Type</b>"
+msgstr "<b>Tipo de _Cuenta</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:405
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:413
-#: ../gnucash/register/ledger-core/split-register-control.c:1329
-#: ../gnucash/register/ledger-core/split-register-control.c:1342
-msgid "This register does not support editing exchange rates."
-msgstr "Este registro no respalda la edición de los tipos de cambios."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:56
+msgid "<b>_Parent Account</b>"
+msgstr "<b>Cuenta _matriz</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:421
-#: ../gnucash/register/ledger-core/split-register-control.c:1383
-#: ../gnucash/register/ledger-core/split-register-control.c:1458
-msgid "You need to expand the transaction in order to modify its exchange rates."
-msgstr "Debe desglosar la Transacción para poder cambiar sus tipos de cambio."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:57
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:118
+#: ../gnucash/report/report-system/report.scm:68
+#: ../gnucash/report/standard-reports/equity-statement.scm:108
+#: ../gnucash/report/standard-reports/equity-statement.scm:112
+#: ../gnucash/report/standard-reports/register.scm:404
+#: ../gnucash/report/standard-reports/trial-balance.scm:147
+#: ../gnucash/report/standard-reports/trial-balance.scm:151
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:46
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:52
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:58
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:64
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:191
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:192
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:193
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:194
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:40
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:46
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:52
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:58
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:185
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:186
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:187
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:188
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:51
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:57
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:63
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:69
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:76
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:204
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:205
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:206
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:207
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:208
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:53
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:59
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:65
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:71
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:77
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:83
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:89
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:95
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:102
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:108
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:114
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:120
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:126
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:132
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:260
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:261
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:262
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:263
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:264
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:265
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:266
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:267
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:268
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:269
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:270
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:271
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:272
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:273
+#: ../gnucash/report/stylesheets/stylesheet-plain.scm:47
+#: ../gnucash/report/stylesheets/stylesheet-plain.scm:53
+#: ../gnucash/report/stylesheets/stylesheet-plain.scm:58
+#: ../gnucash/report/utility-reports/view-column.scm:54
+#: ../gnucash/report/utility-reports/view-column.scm:80
+msgid "General"
+msgstr "Común"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:461
-#: ../gnucash/register/ledger-core/split-register-control.c:1430
-#: ../gnucash/register/ledger-core/split-register-control.c:1443
-msgid "The two currencies involved equal each other."
-msgstr "Las dos monedas participan como iguales entre sí."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:58
+msgid "<b>Balance Information</b>"
+msgstr "<b>Información del Balance</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1253
-#: ../gnucash/register/ledger-core/split-register.c:509
-msgid "New Split Information"
-msgstr "Crear Información Desglosada"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:59
+msgid "<b>Initial Balance Transfer</b>"
+msgstr "<b>Saldo Inicial por Transferencia</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1303
-msgid "This is the split anchoring this transaction to the register. You can not duplicate it from this register window."
-msgstr "Esto es el ampliación del desglose de esta transacción al registro. No puede duplicarlo desde esta ventana del registro."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:60
+msgid "_Balance:"
+msgstr "_Balance:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1355
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:475
-#: ../gnucash/register/ledger-core/split-register.c:611
-#: ../gnucash/register/register-gnome/datecell-gnome.c:105
-msgid "Cannot store a transaction at this date"
-msgstr "No se puede almacenar una transacción en esta fecha"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:62
+msgid "_Use equity 'Opening Balances' account"
+msgstr "_Emplee «Saldos de apertura» desde cuenta de Patrimonio"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1357
-#: ../gnucash/register/ledger-core/split-register.c:613
-msgid "The entered date of the duplicated transaction is older than the \"Read-Only Threshold\" set for this book. This setting can be changed in File -> Properties -> Accounts."
-msgstr "La fecha introducida de la transacción duplicada es más antigua que el «Umbral de Solo Lectura» establecido para este libro. Esta opción puede cambiarse en Archivo → Propiedades → Cuentas."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:63
+msgid "_Select transfer account"
+msgstr "_Seleccionar cuenta de transferencia"
 
-#. Translators: This message will be presented when a user *
-#. * attempts to record a transaction without splits
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1715
-msgid "Not enough information for Blank Transaction?"
-msgstr "¿Sin información suficiente para Transacción Vacía?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:65
+msgid "Renumber sub-accounts"
+msgstr "Renumerar subcuentas"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1717
-msgid "The blank transaction does not have enough information to save it. Would you like to return to the transaction to update, or cancel the save?"
-msgstr "La transacción vacía no tiene suficiente información para guardarla. ¿Quiere volver a la transacción para actualizar o cancelar el guardado?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:66
+msgid "_Renumber"
+msgstr "_Renumerar"
 
-#. Translators: Return to the transaction to update
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1729
-msgid "_Return"
-msgstr "_Devolución"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:67
+msgid "Prefix:"
+msgstr "Prefijo:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1772
-#: ../gnucash/register/ledger-core/split-register-control.c:1847
-msgid "Mark split as unreconciled?"
-msgstr "¿Marcar desglose como no conciliado?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:68
+msgid "Examples:"
+msgstr "Ejemplos:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1774
-#: ../gnucash/register/ledger-core/split-register-control.c:1849
-msgid "You are about to mark a reconciled split as unreconciled. Doing so might make future reconciliation difficult! Continue with this change?"
-msgstr "Va a marcar este desglose conciliado como no conciliado. ¡Hacer esto puede dificultar la conciliación en el futuro! ¿Continúo con este cambio?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:69
+msgid "Interval:"
+msgstr "Intervalo:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1818
-#: ../gnucash/register/ledger-core/split-register-control.c:1866
-msgid "_Unreconcile"
-msgstr "_Desconciliar"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:6
+msgid "Income Total:"
+msgstr "Ingreso Total:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1903
-#: ../gnucash/register/ledger-core/split-register-model.c:2075
-msgid "Change reconciled split?"
-msgstr "¿Cambiar desglose conciliado?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:7
+msgid "Expense Total:"
+msgstr "Gasto total:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1905
-msgid "You are about to change a reconciled split. Doing so might make future reconciliation difficult! Continue with this change?"
-msgstr "Va a cambiar un desglose conciliado. ¡Hacerlo puede dificultar conciliaciones futuras! ¿Continuar con este cambio?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:8
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:6
+msgid "Description:"
+msgstr "Descripción:"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1910
-msgid "Change split linked to a reconciled split?"
-msgstr "¿Cambiar el enlace del desglose a un desglose conciliado?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:6
+msgid "Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple Computer, Inc."
+msgstr "Introduzca el nombre de las mercancías. Ejemplo: Cisco Sytems Inc., o Apple Computer Inc."
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1912
-msgid "You are about to change a split that is linked to a reconciled split. Doing so might make future reconciliation difficult! Continue with this change?"
-msgstr "Va a cambiar un desglose que está enlazado a un desglose conciliado. Hacerlo puede dificultar conciliaciones futuras. ¿Quiere continuar con este cambio?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:7
+msgid "Enter the ticker symbol for the commodity (e.g. CSCO or AAPL). If you are retrieving quotes online, this field must exactly match the ticker symbol used by the quote source (including case). "
+msgstr "Introduzca el símbolo abreviado para la mercancía (p.e. CSCO o AAPL). Si está obteniendo las cotizaciones por conexión, este campo debe cotejar exactamente al símbolo abreviado empleado por el origen de la cotización (incluyendo mayúsculas/minúsculas). "
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1926
-#: ../gnucash/register/ledger-core/split-register-model.c:2099
-msgid "Chan_ge Split"
-msgstr "Cambiar des_glose"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:8
+msgid "Enter a unique code used to identify the commodity. Or, you may safely leave this field blank."
+msgstr "Introduzca un código único usado para identificar la mercancía. Si no, puede dejar el campo en blanco con seguridad."
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:1951
-#: ../gnucash/register/ledger-core/gncEntryLedger.c:86
-#: ../gnucash/register/ledger-core/split-register.c:1849
-#, c-format
-msgid "The account %s does not exist. Would you like to create it?"
-msgstr "La cuenta %s no existe. ¿Quiere crearla?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:9
+msgid "1 /"
+msgstr "1 /"
 
-#: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:2113
-msgid "You can not paste from the general journal to a register."
-msgstr "No puede pegar desde el Libro Diario a un registro."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:10
+msgid "Enter the smallest fraction of the commodity which can be traded. For stocks which can only be traded in whole numbers, enter 1."
+msgstr "Introduzca la fracción menor de la mercancía la cual puede ser comerciada. Para reservas que no se pueden fraccionar, introduzca 1."
 
-#: ../gnucash/gnome-utils/gnc-tree-model-account.c:629
-msgid "New top level account"
-msgstr "Cuenta nueva de nivel principal"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:11
+msgid "<b>Quote Source Information</b>"
+msgstr "<b>Información de Cotización Origen</b>"
 
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2855
-#: ../gnucash/register/ledger-core/split-register.c:2485
-msgid "Action Column|Deposit"
-msgstr "Depósito"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:12
+msgid "Type of quote source:"
+msgstr "Tecleo de cotización origen:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2856
-#: ../gnucash/register/ledger-core/split-register.c:2486
-msgid "Withdraw"
-msgstr "Retirada"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:13
+msgid "_Full name:"
+msgstr "Nombre _completo:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2857
-#: ../gnucash/register/ledger-core/split-register.c:2487
-msgid "Check"
-msgstr "Comprobación"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:14
+msgid "_Symbol/abbreviation:"
+msgstr "_Símbolo/Abreviatura:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2859
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2890
-#: ../gnucash/register/ledger-core/split-register.c:2489
-#: ../gnucash/register/ledger-core/split-register.c:2520
-msgid "ATM Deposit"
-msgstr "Cajero ATM Depósito"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:16
+msgid "ISIN, CUSI_P or other code:"
+msgstr "ISIN, CUSI_P u otro código:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2860
-#: ../gnucash/register/ledger-core/split-register.c:2490
-#: ../gnucash/register/ledger-core/split-register.c:2521
-msgid "ATM Draw"
-msgstr "Cajero ATM Señal"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:17
+msgid "F_raction traded:"
+msgstr "F_racción comerciada:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2861
-#: ../gnucash/register/ledger-core/split-register.c:2491
-msgid "Teller"
-msgstr "Cajero"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:18
+msgid "Warning: Finance::Quote not installed properly."
+msgstr "Atención: Finance::Quote no está instalado correctamente."
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2862
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3037
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3123
-#: ../gnucash/register/ledger-core/gncEntryLedgerLoad.c:135
-#: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:533
-#: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:1099
-#: ../gnucash/register/ledger-core/split-register.c:2492
-#: ../gnucash/report/standard-reports/register.scm:851
-#: ../libgnucash/app-utils/prefs.scm:72 ../libgnucash/app-utils/prefs.scm:83
-msgid "Charge"
-msgstr "Cargo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:19
+msgid "_Get Online Quotes"
+msgstr "_Obtener cotizaciones por conexión"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2864
-#: ../gnucash/register/ledger-core/split-register.c:2494
-#: ../gnucash/report/business-reports/receipt.eguile.scm:297
-#: ../gnucash/report/business-reports/receipt.eguile.scm:304
-#: ../gnucash/report/business-reports/receipt.scm:265
-#: ../gnucash/report/business-reports/receipt.scm:267
-msgid "Receipt"
-msgstr "Recibo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:20
+msgid "Si_ngle:"
+msgstr "Ú_nico:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2865
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2879
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2915
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2926
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2959
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3032
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3110
-#: ../gnucash/register/ledger-core/split-register.c:2495
-#: ../gnucash/register/ledger-core/split-register.c:2509
-#: ../gnucash/register/ledger-core/split-register.c:2545
-#: ../gnucash/register/ledger-core/split-register.c:2556
-#: ../gnucash/register/ledger-core/split-register.c:2589
-#: ../libgnucash/app-utils/prefs.scm:67 ../libgnucash/app-utils/prefs.scm:85
-#: ../libgnucash/app-utils/prefs.scm:93 ../libgnucash/app-utils/prefs.scm:94
-msgid "Increase"
-msgstr "Incremento"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:21
+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 quotes."
+msgstr "Hay orígenes cotizados O::C que obtienen información de un único sitio en Internet. Si ese sitio no está disponible, no podrá obtener cotizaciones."
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2866
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2880
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2916
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2927
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2960
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3025
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3117
-#: ../gnucash/register/ledger-core/split-register.c:2496
-#: ../gnucash/register/ledger-core/split-register.c:2510
-#: ../gnucash/register/ledger-core/split-register.c:2546
-#: ../gnucash/register/ledger-core/split-register.c:2557
-#: ../gnucash/register/ledger-core/split-register.c:2590
-#: ../libgnucash/app-utils/prefs.scm:68 ../libgnucash/app-utils/prefs.scm:76
-#: ../libgnucash/app-utils/prefs.scm:77 ../libgnucash/app-utils/prefs.scm:84
-msgid "Decrease"
-msgstr "Decrementar"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:22
+msgid "_Multiple:"
+msgstr "_Múltiple:"
 
-#. Action: Point Of Sale
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2868
-#: ../gnucash/register/ledger-core/split-register.c:2498
-msgid "POS"
-msgstr "PdV"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:23
+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 retrieve the information from another site."
+msgstr "Hay orígenes cotizados O::C que obtienen información de múltiples sitios en Internet. Si uno de los sitios no está disponible, O::C intentará u obtener la información desde otro sitio."
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2869
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:470
-#: ../gnucash/register/ledger-core/split-register.c:2499
-#: ../gnucash/report/business-reports/aging.scm:705
-#: ../gnucash/report/business-reports/taxinvoice.eguile.scm:201
-msgid "Phone"
-msgstr "Teléfono"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:24
+msgid "_Unknown:"
+msgstr "_Desconocido:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2870
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2896
-#: ../gnucash/register/ledger-core/split-register.c:2500
-#: ../gnucash/register/ledger-core/split-register.c:2526
-msgid "Online"
-msgstr "Conectado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:25
+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 multiple sites on the internet."
+msgstr "Estas son orígenes cotizados que se han añadido recientemente a O::C. GnuCash no sabe si estos orígenes obtienen la información de un único sitio o de varios sitios de Internet."
 
-#. Action: Automatic Deposit
-#. Action: Automatic Deposit ?!?
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2872
-#: ../gnucash/register/ledger-core/split-register.c:2502
-msgid "AutoDep"
-msgstr "AutoDep"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:26
+msgid "Time_zone:"
+msgstr "_Zona horaria:"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2873
-#: ../gnucash/register/ledger-core/split-register.c:2503
-msgid "Wire"
-msgstr "Corrección"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:27
+msgid "Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used."
+msgstr "Introduzca un símbolo para ver. Esto con seguridad puede dejarse en blanco, en cuyo caso el símbolo del ticket o el código ISO de la moneda serán utilizados."
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2875
-#: ../gnucash/register/ledger-core/split-register.c:2505
-msgid "Direct Debit"
-msgstr "Débito Directo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:28
+msgid "_Display symbol"
+msgstr "_Enseñar símbolo"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2881
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2885
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2892
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2900
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2917
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2928
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2933
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2940
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2961
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3135
-#: ../gnucash/register/ledger-core/split-register.c:2511
-#: ../gnucash/register/ledger-core/split-register.c:2515
-#: ../gnucash/register/ledger-core/split-register.c:2522
-#: ../gnucash/register/ledger-core/split-register.c:2530
-#: ../gnucash/register/ledger-core/split-register.c:2547
-#: ../gnucash/register/ledger-core/split-register.c:2558
-#: ../gnucash/register/ledger-core/split-register.c:2563
-#: ../gnucash/register/ledger-core/split-register.c:2591
-#: ../libgnucash/app-utils/prefs.scm:69 ../libgnucash/app-utils/prefs.scm:70
-#: ../libgnucash/app-utils/prefs.scm:71
-msgid "Buy"
-msgstr "Compra"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:29
+msgid "Select security/currency "
+msgstr "Seleccionar garantía/moneda "
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2882
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2886
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2897
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2901
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2918
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2929
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2934
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2941
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2962
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3055
-#: ../gnucash/register/ledger-core/split-register.c:2512
-#: ../gnucash/register/ledger-core/split-register.c:2516
-#: ../gnucash/register/ledger-core/split-register.c:2527
-#: ../gnucash/register/ledger-core/split-register.c:2531
-#: ../gnucash/register/ledger-core/split-register.c:2548
-#: ../gnucash/register/ledger-core/split-register.c:2559
-#: ../gnucash/register/ledger-core/split-register.c:2564
-#: ../gnucash/register/ledger-core/split-register.c:2592
-#: ../libgnucash/app-utils/prefs.scm:86 ../libgnucash/app-utils/prefs.scm:87
-#: ../libgnucash/app-utils/prefs.scm:88
-msgid "Sell"
-msgstr "Venta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:31
+msgid "Select user information here..."
+msgstr "Seleccionar información del usuario aquí..."
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2887
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2894
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2943
-#: ../gnucash/register/ledger-core/split-register.c:2517
-#: ../gnucash/register/ledger-core/split-register.c:2524
-#: ../gnucash/register/ledger-core/split-register.c:2573
-msgid "Fee"
-msgstr "Comisión"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:3
+msgid "<b>Data Format:</b>"
+msgstr "<b>Formato de Datos:</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2891
-msgid "ATM Withdraw"
-msgstr "Retirada en Cajero ATM"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:4
+msgid "Open _Read-Only"
+msgstr "Abrir a _solo lectura"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2921
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3048
-#: ../gnucash/register/ledger-core/split-register.c:2551
-#: ../libgnucash/app-utils/prefs.scm:90
-msgid "Rebate"
-msgstr "Descuento"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:5
+msgid "<b>File</b>"
+msgstr "<b>Fichero</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2922
-#: ../gnucash/register/ledger-core/split-register.c:2552
-msgid "Paycheck"
-msgstr "Sueldo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:6
+msgid "Host"
+msgstr "Servidor"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2935
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:71
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:75
-#: ../gnucash/register/ledger-core/split-register.c:2565
-#: ../gnucash/report/standard-reports/balance-sheet.scm:661
-#: ../gnucash/report/standard-reports/budget-balance-sheet.scm:813
-#: ../libgnucash/app-utils/gnc-ui-util.c:873
-#: ../libgnucash/engine/Account.cpp:4110
-msgid "Equity"
-msgstr "Patrimonio"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:7
+msgid "Database"
+msgstr "Base de Datos"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:9
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:10
+msgid "<b>Database Connection</b>"
+msgstr "<b>Conexión a Base de Datos</b>"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade.h:1
+msgid "Object references"
+msgstr "Referencias a objetos"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade.h:3
+msgid "Explanation"
+msgstr "Descripción"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:1
+msgid "GnuCash Options"
+msgstr "Opciones GnuCash"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:4
+msgid "Close dialog and make no changes."
+msgstr "Cerrar dialogo y no hacer ninguna modificación."
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:6
+msgid "Apply changes but do not close dialog."
+msgstr "Aplicar cambios pero no cerrar diálogo."
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:8
+msgid "Apply changes and close dialog."
+msgstr "Aplicar cambios y cerrar diálogo."
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:1
+msgid "US"
+msgstr "US (EE. UU.)"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:2
+msgid "07/31/2013"
+msgstr "07/31/2015"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:3
+msgid "UK"
+msgstr "UK (Reino Unido)"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:4
+msgid "31/07/2013"
+msgstr "31/07/2015"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:5
+msgid "Europe"
+msgstr "Europa"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:6
+msgid "31.07.2013"
+msgstr "31.07.2015"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:7
+msgid "ISO"
+msgstr "ISO"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:8
+msgid "2013-07-31"
+msgstr "2015-07-31"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:9
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:5
+#: ../gnucash/import-export/csv-imp/gnc-price-import.cpp:50
+#: ../gnucash/import-export/csv-imp/gnc-tx-import.cpp:47
+msgid "Locale"
+msgstr "Local"
 
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2942
-#: ../gnucash/gnome-utils/gnc-tree-view-price.c:454
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3003
-#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:62
-#: ../gnucash/register/ledger-core/split-register.c:2572
-#: ../gnucash/register/ledger-core/split-register-model.c:394
-#: ../gnucash/report/business-reports/easy-invoice.scm:269
-#: ../gnucash/report/business-reports/fancy-invoice.scm:279
-#: ../gnucash/report/business-reports/invoice.scm:264
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:1068
-#: ../gnucash/report/standard-reports/general-journal.scm:114
-#: ../gnucash/report/standard-reports/general-ledger.scm:89
-#: ../gnucash/report/standard-reports/general-ledger.scm:109
-#: ../gnucash/report/standard-reports/portfolio.scm:259
-#: ../gnucash/report/standard-reports/price-scatter.scm:41
-#: ../gnucash/report/standard-reports/price-scatter.scm:348
-#: ../gnucash/report/standard-reports/register.scm:160
-#: ../gnucash/report/standard-reports/register.scm:450
-#: ../gnucash/report/standard-reports/transaction.scm:802
-#: ../gnucash/report/standard-reports/transaction.scm:905
-#: ../gnucash/report/standard-reports/transaction.scm:1048
-msgid "Price"
-msgstr "Precio"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:10
+msgid "GnuCash Preferences"
+msgstr "Preferencias GnuCash"
 
-#. Action: Dividend
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2945
-#: ../gnucash/register/ledger-core/split-register.c:2575
-msgid "Dividend"
-msgstr "Dividendo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:13
+msgid "<b>Summarybar Content</b>"
+msgstr "<b>Barra Contenedora Resumen</b>"
 
-#. Action: Long Term Capital Gains
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2948
-#: ../gnucash/register/ledger-core/split-register.c:2578
-msgid "LTCG"
-msgstr "GCLP"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:14
+msgid "Include _grand total"
+msgstr "Incluir _saldo"
 
-#. Action: Short Term Capital Gains
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2950
-#: ../gnucash/register/ledger-core/split-register.c:2580
-msgid "STCG"
-msgstr "GCCP"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:15
+msgid "Show a grand total of all accounts converted to the default report currency."
+msgstr "Muestra un saldo de todas las cuentas convertidas a boletín monetario predeterminada."
 
-#. Action: Distribution
-#: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2953
-#: ../gnucash/register/ledger-core/split-register.c:2583
-msgid "Dist"
-msgstr "Dist"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:16
+msgid "Include _non-currency totals"
+msgstr "Incluir totales _no-monetarios"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:45
-#: ../gnucash/report/standard-reports/register.scm:251
-#: ../libgnucash/engine/Split.c:1572 ../libgnucash/engine/Split.c:1589
-msgid "-- Split Transaction --"
-msgstr "-- Transacción Desglosada --"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:17
+msgid "If checked, non-currency commodities will be shown in the summary bar. If clear, only currencies will be shown."
+msgstr "Si está marcado, las mercancías no-monetarios serán mostrados en la barra de resumen. Si está vacío, sólo se mostrarán las monedas."
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:46
-msgid "-- Stock Split --"
-msgstr "-- Desglose Reserva --"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:18
+msgid "<b>Start Date</b>"
+msgstr "<b>Fecha de Inicio</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:434
-#: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:584
-#: ../gnucash/register/ledger-core/split-register-model.c:913
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:19
+msgid "<b>End Date</b>"
+msgstr "<b>Fecha Final</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:477
-#: ../gnucash/register/register-gnome/datecell-gnome.c:101
-msgid "The entered date of the new transaction is older than the \"Read-Only Threshold\" set for this book. This setting can be changed in File -> Properties -> Accounts."
-msgstr "La fecha introducida de la transacción nueva es más antigua que el \"Umbral de Solo Lectura\" establecido para este libro. Esta opción puede cambiarse en Archivo -> Propiedades -> Cuentas."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:20
+msgid "_Relative:"
+msgstr "_Relativo:"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:859
-msgid "Exchange Rate Canceled, using existing rate or default 1 to 1 rate if this is a new transaction."
-msgstr "Tipo de Cambio Cancelado, empleando tipo existente o predeterminado 1 a 1 si esto es una transacción nueva."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:21
+msgid "Use the specified relative starting date for profit/loss calculations."
+msgstr "Emplee la fecha de comienzo relativa especificada para cálculos de beneficio/pérdidas."
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1121
-#: ../gnucash/register/ledger-core/split-register.c:1941
-msgid "Recalculate Transaction"
-msgstr "Recalcular Transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:22
+msgid "_Absolute:"
+msgstr "_Absoluto:"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1122
-#: ../gnucash/register/ledger-core/split-register.c:1942
-msgid "The values entered for this transaction are inconsistent. Which value would you like to have recalculated?"
-msgstr "Los valores introducidos para esta transacción son inconsistentes. ¿Qué valor quiere que sea recalculado?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:23
+msgid "Use the specified absolute starting date for profit/loss calculations."
+msgstr "Emplee la fecha de comienzo absoluta especificada para cálculos de beneficio/pérdidas."
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1129
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1131
-#: ../gnucash/register/ledger-core/split-register.c:1948
-#: ../gnucash/register/ledger-core/split-register.c:1951
-msgid "_Shares"
-msgstr "_Mercancías"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:24
+msgid "Re_lative:"
+msgstr "Re_lativo:"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1129
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1136
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1143
-#: ../gnucash/register/ledger-core/split-register.c:1949
-#: ../gnucash/register/ledger-core/split-register.c:1956
-#: ../gnucash/register/ledger-core/split-register.c:1963
-msgid "Changed"
-msgstr "Cambiado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:25
+msgid "Use the specified relative ending date for profit/loss calculations. Also use this date for net assets calculations."
+msgstr "Emplee la fecha de final relativa especificada para cálculos de beneficio/pérdidas. También utilícelo para el cálculo del activo neto."
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1143
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1145
-#: ../gnucash/register/ledger-core/split-register.c:1962
-#: ../gnucash/register/ledger-core/split-register.c:1965
-msgid "_Value"
-msgstr "_Valor"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:26
+msgid "Ab_solute:"
+msgstr "Ab_soluto:"
 
-#: ../gnucash/gnome-utils/gnc-tree-util-split-reg.c:1165
-#: ../gnucash/register/ledger-core/split-register.c:1974
-msgid "_Recalculate"
-msgstr "_Recalcular"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:27
+msgid "Use the specified absolute ending date for profit/loss calculations. Also use this date for net assets calculations."
+msgstr "Emplee la fecha de final absoluta especificada para cálculos de beneficio/pérdidas. Utilícelo también esta fecha para el cálculo del activo neto."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:732
-#: ../gnucash/import-export/csv-exp/csv-transactions-export.c:611
-#: ../gnucash/import-export/csv-exp/csv-transactions-export.c:625
-#: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.glade.h:57
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:302
-#: ../gnucash/report/standard-reports/general-ledger.scm:82
-#: ../gnucash/report/standard-reports/general-ledger.scm:102
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:418
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:811
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:862
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1112
-#: ../gnucash/report/standard-reports/transaction.scm:148
-#: ../gnucash/report/standard-reports/transaction.scm:827
-#: ../gnucash/report/standard-reports/transaction.scm:901
-#: ../gnucash/report/standard-reports/trial-balance.scm:665
-msgid "Account Name"
-msgstr "Nombre de Cuenta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:28
+msgid "Accounting Period"
+msgstr "Periodo Contable"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:749
-#: ../gnucash/report/report-system/options-utilities.scm:242
-#: ../gnucash/report/standard-reports/account-summary.scm:104
-#: ../gnucash/report/standard-reports/general-ledger.scm:84
-#: ../gnucash/report/standard-reports/general-ledger.scm:104
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:437
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:815
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:866
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1073
-#: ../gnucash/report/standard-reports/sx-summary.scm:85
-#: ../gnucash/report/standard-reports/transaction.scm:154
-#: ../gnucash/report/standard-reports/transaction.scm:797
-#: ../gnucash/report/standard-reports/transaction.scm:919
-msgid "Account Code"
-msgstr "Código de Cuenta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:29
+msgid "<b>Separator Character</b>"
+msgstr "<b>Carácter de Separación</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:761
-msgid "Last Num"
-msgstr "Último Núm"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:30
+msgid "Use _formal accounting labels"
+msgstr "Emplee etiquetas contables _formales"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:767
-msgid "Present"
-msgstr "Actual"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:31
+msgid "Use only 'debit' and 'credit' instead of informal synonyms."
+msgstr "Emplee únicamente «débito» y «crédito» en lugar de sinónimos informales."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:774
-msgid "Present (Report)"
-msgstr "Presente (boletín)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:32
+msgid "<b>Labels</b>"
+msgstr "<b>Etiquetas</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:788
-msgid "Balance (Report)"
-msgstr "Balance (boletín)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:34
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:32
+msgid "Don't sign reverse any accounts."
+msgstr "No invertir el signo de ninguna cuenta."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:795
-msgid "Balance (Period)"
-msgstr "Balance (periodo)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:35
+msgid "C_redit accounts"
+msgstr "Cuentas de c_rédito"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:809
-msgid "Cleared (Report)"
-msgstr "Punteado (boletín)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:36
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:34
+msgid "Sign reverse balances on the following: Credit Card, Payable, Liability, Equity, and Income."
+msgstr "Invertir el signo de balances de las siguientes: Tarjeta de Crédito, Liquidables, Pasivo, Patrimonio e Ingresos."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:823
-msgid "Reconciled (Report)"
-msgstr "Conciliado (boletín)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:37
+msgid "_Income & expense"
+msgstr "_Ingresos y gastos"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:830
-msgid "Last Reconcile Date"
-msgstr "Última Fecha Conciliada"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:38
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:35
+msgid "Sign reverse balances on income and expense accounts."
+msgstr "Invertir el signo del saldo en cuentas de ingresos y gastos."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:836
-msgid "Future Minimum"
-msgstr "Mínimo Futuro"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:39
+msgid "<b>Reverse Balanced Accounts</b>"
+msgstr "<b>Balance de Reversión por Cuentas</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:843
-msgid "Future Minimum (Report)"
-msgstr "Mínimo Futuro (boletín)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:40
+msgid "<b>Default Currency</b>"
+msgstr "<b>Moneda Predeterminada</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:857
-msgid "Total (Report)"
-msgstr "Totales (boletín)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:41
+msgid "US Dollars (USD)"
+msgstr "Dólares EE. UU. (USD)"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:864
-msgid "Total (Period)"
-msgstr "Total (periodo)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:42
+msgid "Ch_oose:"
+msgstr "_Elegir:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:873
-msgid "C"
-msgstr "C"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:43
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:48
+msgid "Use the specified currency for all newly created accounts."
+msgstr "Emplee la moneda especificada para las cuentas nuevas."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:881
-msgid "Account Color"
-msgstr "Color de Cuenta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:44
+msgid "Character:"
+msgstr "Carácter:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:890
-msgid "Tax Info"
-msgstr "Info. Imposición"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:45
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:20
+msgid "Sample:"
+msgstr "Muestra:"
 
-#. Translators: %s is a currency mnemonic.
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1716
-#, c-format
-msgid "Present (%s)"
-msgstr "Presente (%s)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:46
+msgid "<b>Account Color</b>"
+msgstr "<b>Color de Cuenta</b>"
 
-#. Translators: %s is a currency mnemonic.
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1719
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:954
-#, c-format
-msgid "Balance (%s)"
-msgstr "Balance (%s)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:47
+msgid "Show the Account Color as background"
+msgstr "Muestra el Color de Cuenta como fondo"
 
-#. Translators: %s is a currency mnemonic.
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1722
-#, c-format
-msgid "Cleared (%s)"
-msgstr "Punteado (%s)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:48
+msgid "Show the Account Color as Account Name Background."
+msgstr "Muestra el Color de Cuenta como Fondo del Nombre de Cuenta."
 
-#. Translators: %s is a currency mnemonic.
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1725
-#, c-format
-msgid "Reconciled (%s)"
-msgstr "Conciliado (%s)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:49
+msgid "Show the Account Color on tabs"
+msgstr "Muestra el Color de Cuenta en las lengüetas"
 
-#. Translators: %s is a currency mnemonic.
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1728
-#, c-format
-msgid "Future Minimum (%s)"
-msgstr "Mínimo futuro (%s)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:50
+msgid "Show the Account Color as tab background."
+msgstr "Muestra el Color de Cuenta como fondo de lengüetas."
 
-#. Translators: %s is a currency mnemonic.
-#: ../gnucash/gnome-utils/gnc-tree-view-account.c:1731
-#, c-format
-msgid "Total (%s)"
-msgstr "Total (%s)"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:51
+msgid "Loc_ale:"
+msgstr "Loc_al:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:385
-msgid "Namespace"
-msgstr "Espacio de nombres"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:52
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:46
+msgid "Use the system locale currency for all newly created accounts."
+msgstr "Emplee la moneda del locale del sistema para las cuentas nuevas."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:402
-msgid "Print Name"
-msgstr "Nombre Escrito"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:53
+msgid "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 "El carácter que se usará entre los componentes del nombre de una cuenta. Es válido cualquier carácter excepto letras, números y cualquiera de las siguientes cadenas: «dos puntos» «barra izquierda», «barra derecha» y «guión»."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:408
-msgid "Display symbol"
-msgstr "Enseñar símbolo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:55
+msgid "<b>Fancy Date Format</b>"
+msgstr "<b>Formato de Fecha Decorado</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:414
-msgid "Unique Name"
-msgstr "Nombre Único"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:56
+msgid "<b>Date Format</b>"
+msgstr "<b>Formato de Fecha</b>"
 
-#. Translators: Again replace CUSIP by the name of your
-#. National Securities Identifying Number.
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:421
-msgid "ISIN/CUSIP"
-msgstr "ISIN/CUSIP"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:57
+msgid "<b>Time Format</b>"
+msgstr "<b>Formato de Hora</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:427
-msgid "Fraction"
-msgstr "Fracción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:58
+msgid "U_se 24-hour clock"
+msgstr "_Emplear 24 horas"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:434
-msgid "Get Quotes"
-msgstr "Obtener Cotizaciones"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:59
+msgid "Use a 24 hour (instead of a 12 hour) time format."
+msgstr "Emplee el formato temporal de 24 horas (en vez del de 12 horas)."
 
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:437
-msgid "Column letter for 'Get Quotes'|Q"
-msgstr "C"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:60
+msgid "<b>Date Completion</b>"
+msgstr "<b>Fecha de Terminación</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:443
-#: ../gnucash/gnome-utils/gnc-tree-view-price.c:442
-msgid "Source"
-msgstr "Origen"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:61
+msgid "When a date is entered without year, it should be taken:"
+msgstr "Cuando se introduce una fecha sin año, se tomerá:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-commodity.c:448
-msgid "Timezone"
-msgstr "Zona horaria"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:62
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:55
+msgid "In the current calendar year"
+msgstr "Primer día del presente actual año del calendario"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:381
-msgid "Customer Number"
-msgstr "Número del Cliente"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:63
+msgid "Dates will be completed so that they are within the current calendar year."
+msgstr "Las fechas serán completadas para que estén dentro del calendario de año actual."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:389
-msgid "Vendor Number"
-msgstr "Número del Proveedor"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:64
+msgid ""
+"In a sliding 12-month window starting this\n"
+"many months before the current month:"
+msgstr ""
+"Dentro de un plegamiento de 12 meses \n"
+"iniciando esta muchos meses \n"
+"anteriores al mes actual:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:393
-msgid "Employee Number"
-msgstr "Número del Operador"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:66
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:59
+msgid "Dates will be completed so that they are close to the current date. Enter the maximum number of months to go backwards in time when completing dates."
+msgstr "Las fechas serán completadas para que sean cerradas a la fecha actual. Introduzca el número máximo de meses para revertir en el tiempo cuando complete las fechas."
 
-#. Billing or Shipping addresses
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:445
-#: ../gnucash/report/business-reports/aging.scm:50
-#: ../gnucash/report/business-reports/aging.scm:695
-msgid "Address Name"
-msgstr "Nombre de Dirección"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:67
+msgid "Enter number of months."
+msgstr "Introduzca el número de meses."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:450
-#: ../gnucash/report/business-reports/aging.scm:51
-#: ../gnucash/report/business-reports/aging.scm:697
-msgid "Address 1"
-msgstr "Dirección 1"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:68
+msgid "Use the date format specified by the system locale."
+msgstr "Emplee el formato de fecha especificado por el sistema local."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:455
-#: ../gnucash/report/business-reports/aging.scm:52
-#: ../gnucash/report/business-reports/aging.scm:699
-msgid "Address 2"
-msgstr "Dirección 2"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:69
+msgid "Date/Time"
+msgstr "Fecha/Hora"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:460
-#: ../gnucash/report/business-reports/aging.scm:53
-#: ../gnucash/report/business-reports/aging.scm:701
-msgid "Address 3"
-msgstr "Dirección 3"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:72
+msgid "Perform account list _setup on new file"
+msgstr "Realizar una _configuración de plan contable al crear un fichero nuevo"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:465
-#: ../gnucash/report/business-reports/aging.scm:54
-#: ../gnucash/report/business-reports/aging.scm:703
-msgid "Address 4"
-msgstr "Dirección 4"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:73
+msgid "Present the new account list dialog when you choose File -> New File."
+msgstr "Presentar el diálogo de listado de cuenta nueva cuando seleccione Archivo → Crear fichero."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:475
-#: ../gnucash/report/business-reports/aging.scm:707
-#: ../gnucash/report/business-reports/taxinvoice.eguile.scm:207
-msgid "Fax"
-msgstr "Fax"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:74
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:76
+msgid "Set book option on new files to use split \"action\" field for \"Num\" field on registers/reports"
+msgstr "Establece la opción del ejercicio en ficheros nuevo para usar campos del desglose “Operación” y “Num” en los registros/boletines"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:480
-msgid "E-mail"
-msgstr "Correo-e"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:75
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:77
+msgid "If selected, the default book option for new files is set so that the 'Num' cell on registers shows/updates the split 'action' field and the transaction 'num' field is shown on the second line in double line mode (and is not visible in single line mode). Otherwise, the default book option for new files is set so that the 'Num' cell on registers shows/updates the transaction 'num' field."
+msgstr "Si está marcado, la opción predeterminada del libro para filas nuevas está establecida que la casilla 'Num' en los desgloses muestran/actualizan los campos de “Operación” de unión y el campo de 'num' de transacciones se muestra en la segunda línea en el modo de línea doble (y no es visible en el modo de línea simple). En otro caso, la opción del ejercicio predeterminado para ficheros nuevos se establece para que la casilla 'Num' en los registros mostrados / actualizados en el campo 'num' transaccional."
 
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: ../gnucash/gnome-utils/gnc-tree-view-owner.c:509
-msgid "Column letter for 'Active'|A"
-msgstr "A"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:76
+msgid "Display \"_tip of the day\" dialog"
+msgstr "Enseñar diálogo «_consejo del día»"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-price.c:424
-msgid "Security"
-msgstr "Garantía"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:77
+msgid "Display hints for using GnuCash at startup."
+msgstr "Enseñar consejos de uso de GnuCash al iniciar."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:790
-msgid "Status Bar"
-msgstr "Barra de Estado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:78
+msgid "How many days to keep old log/backup files."
+msgstr "Cuantos días para mantener los antiguos ficheros bitácora/respaldo."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:1275
-#: ../gnucash/report/business-reports/balsheet-eg.scm:502
-#: ../libgnucash/engine/Scrub.c:364
-msgid "Imbalance"
-msgstr "Descuadre"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:80
+msgid "<b>_Retain log/backup files:</b>"
+msgstr "<b>_Conservar bitácora/respaldo:</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:1525
-msgid " Scheduled "
-msgstr " Programado "
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:81
+msgid "Com_press files"
+msgstr "Com_primir ficheros"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2381
-#: ../gnucash/register/ledger-core/split-register-control.c:1543
-msgid "Save the changed transaction?"
-msgstr "¿Guardar la transacción modificada?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:82
+msgid "Compress the data file with gzip when saving it to disk."
+msgstr "Comprimir el fichero de datos con gzip al guardarlo en disco."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2383
-msgid "The current transaction has changed. Would you like to record the changes, or discard the changes?"
-msgstr "La transacción actual ha sido modificada. ¿Quiere registrar los cambios, o descartarlos?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:83
+msgid "<b>Files</b>"
+msgstr "<b>Ficheros</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2421
-#: ../gnucash/register/ledger-core/split-register-control.c:1558
-msgid "_Discard Changes"
-msgstr "_Descartar cambios"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:84
+msgid "_Decimal places:"
+msgstr "Lugares _decimales:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2423
-#: ../gnucash/register/ledger-core/split-register-control.c:1560
-msgid "_Record Changes"
-msgstr "_Registrar cambios"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:85
+msgid "How many automatic decimal places will be filled in."
+msgstr "Cuantos dígitos decimales automáticos se rellenarán."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2789
-msgid "Date Entered"
-msgstr "Fecha Introducida"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:86
+msgid "_Automatic decimal point"
+msgstr "Punto decimal _automático"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2791
-msgid "Date Reconciled"
-msgstr "Fecha Conciliada"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:87
+msgid "Automatically insert a decimal point into values that are entered without one."
+msgstr "Introduce un punto decimal automáticamente dentro de los valores que son introducidos sin uno."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2793
-msgid "Date Posted / Entered / Reconciled"
-msgstr "Fecha Contabilizada / Introducida / Conciliada"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:88
+msgid "Display ne_gative amounts in red"
+msgstr "Enseñar cantidades ne_gativas en rojo"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2820
-msgid "Reference / Action"
-msgstr "Referencia / Operación"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:89
+msgid "Display negative amounts in red."
+msgstr "Enseñar cantidades negativas en rojo."
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:90
+msgid "<b>Numbers</b>"
+msgstr "<b>Números</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2834
-msgid "T-Number"
-msgstr "I-Número"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:91
+msgid "<b>Search Dialog</b>"
+msgstr "<b>Diálogo de Búsqueda</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2840
-msgid "Number / Action"
-msgstr "Número / Operación"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:92
+msgid "New search _limit:"
+msgstr "_Límite de búsqueda nueva:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2856
-msgid "Customer / Memo"
-msgstr "Cliente / Memorandum"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:93
+msgid "Default to 'new search' if fewer than this number of items is returned."
+msgstr "Si se devuelven menos objetos que esta cantidad, cambiar a «nueva búsqueda»."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2867
-msgid "Vendor / Memo"
-msgstr "Proveedor / Memorándum"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:94
+msgid "Show splash scree_n"
+msgstr "Mostrar _pantalla de presentación"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2885
-msgid "Description / Notes / Memo"
-msgstr "Descripción / Anotaciones / Memorandum"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:95
+msgid "Show splash screen at startup."
+msgstr "Mostrar pantalla de presentación al inicio."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2915
-#: ../gnucash/import-export/csv-exp/csv-transactions-export.c:623
-#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:57
-msgid "Void Reason"
-msgstr "Razón Vacía"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:96
+msgid "Auto-save time _interval:"
+msgstr "_Intervalo de tiempo para auto-guardar:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2919
-msgid "Accounts / Void Reason"
-msgstr "Cuentas / Efectivo Vacío"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:97
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:14
+msgid "The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically."
+msgstr "El número de minutos hasta que guarden los datos al disco de forma automática. Si es cero, no se guardarán datos de forma automática."
 
-#. toggle column: mark existing transaction reconciled
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2929
-#: ../gnucash/import-export/import-main-matcher.c:492
-msgid "R"
-msgstr "C"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:98
+msgid "minutes"
+msgstr "minutos"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:2973
-msgid "Amount / Value"
-msgstr "Cantidad / Valor"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:99
+msgid "Show auto-save confirmation _question"
+msgstr "Mostrar la _pregunta de confirmación de autoguardado"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3015
-#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:61
-#: ../libgnucash/app-utils/prefs.scm:81
-msgid "Withdrawal"
-msgstr "Reducción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:100
+msgid "If active, GnuCash shows a confirmation question each time the auto-save feature is started. Otherwise no extra explanation is shown."
+msgstr "Si está activo, GnuCash muestra una pregunta de confirmación cada vez que se inicia la característica de auto-guardado. En otro caso no se muestra esta explicación."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3020
-#: ../libgnucash/app-utils/prefs.scm:82
-msgid "Spend"
-msgstr "Desembolso"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:102
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:26
+msgid "Do not create log/backup files."
+msgstr "No cree ficheros de bitácora/respaldo."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3070
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3077
-#: ../libgnucash/app-utils/prefs.scm:80
-msgid "Funds Out"
-msgstr "Retirada de Fondos"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:104
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:28
+msgid "Delete old log/backup files after this many days (0 = never)."
+msgstr "Borrar ficheros antiguos de bitácora/respaldo después de los días indicados (0 = nunca)."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3079
-#: ../gnucash/register/ledger-core/split-register-model.c:497
-msgid "Credit Formula"
-msgstr "Fórmula de Crédito"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:106
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:29
+msgid "Do not delete log/backup files."
+msgstr "No borre ficheros de bitácora/respaldo."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3100
-#: ../gnucash/import-export/csv-imp/gnc-trans-props.cpp:60
-#: ../libgnucash/app-utils/prefs.scm:64
-msgid "Deposit"
-msgstr "Depósito"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:107
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:15
+msgid "Enable timeout on \"Save changes on closing\" question"
+msgstr "Activa la terminación del tiempo «Guardar cambios al cerrar» como pregunta"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3105
-#: ../libgnucash/app-utils/prefs.scm:65
-msgid "Receive"
-msgstr "Cobrar"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:108
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:16
+msgid "If enabled, the \"Save changes on closing\" question will only wait a limited number of seconds for an answer. If the user didn't answer within that time, the changes will be saved automatically and the question window closed."
+msgstr "Si está activo, la pregunta «Guardar cambios al cerrar» sólo se esperará un número de segundos limitados para una respuesta. Si el usuario no responde en ese tiempo, los cambios se guardarán automáticamente y la ventana con la pregunta se cerrará."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3128
-#: ../gnucash/report/business-reports/customer-summary.scm:469
-#: ../gnucash/report/business-reports/customer-summary.scm:853
-#: ../gnucash/report/standard-reports/net-barchart.scm:368
-#: ../gnucash/report/standard-reports/net-barchart.scm:430
-#: ../gnucash/report/standard-reports/net-linechart.scm:411
-#: ../gnucash/report/standard-reports/net-linechart.scm:484
-#: ../libgnucash/app-utils/prefs.scm:73 ../libgnucash/engine/Account.cpp:4109
-#: ../libgnucash/engine/gncInvoice.c:986
-msgid "Expense"
-msgstr "Gasto"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:109
+msgid "Time to _wait for answer:"
+msgstr "Tiempo a _esperar una respuesta:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3151
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3158
-#: ../libgnucash/app-utils/prefs.scm:63
-msgid "Funds In"
-msgstr "Ingreso de Fondos"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:110
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:18
+msgid "The number of seconds to wait before the question window will be closed and the changes saved automatically."
+msgstr "El número de segundos a esperar antes de que la ventana de la pregunta se cierra y los cambios automáticamente guardados."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3160
-#: ../gnucash/register/ledger-core/split-register-model.c:490
-msgid "Debit Formula"
-msgstr "Fórmula de Débito"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:111
+msgid "seconds"
+msgstr "segundos"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3230
-msgid "Enter Due Date"
-msgstr "Introducir Fecha de Vencimiento"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:112
+msgid "Path head for Transaction Associated files "
+msgstr "Ruta cabecera para ficheros de Transacciones Asociadas "
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3241
-msgid "Enter the transaction reference, such as the invoice or check number"
-msgstr "Introduzca la referencia de transacción, tal como la factura o el número comprobante"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:113
+msgid "<b>Path head for Transaction Association Files</b>"
+msgstr "<b>Ruta cabecera para Ficheros de Asociación Transaccional</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3243
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3250
-msgid "Enter the type of transaction, or choose one from the list"
-msgstr "Introduzca el tipo de transacción, o escoja uno desdel índice"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:114
+msgid "Enable horizontal grid lines on table displays"
+msgstr "Activar líneas horizontales de rejilla en visores de lengüetas"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3248
-msgid "Enter the transaction number, such as the check number"
-msgstr "Introduzca el número de transacción, como el número de comprobación"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:115
+msgid "Enable horizontal grid lines on table displays. These will mainly be tree views like the Accounts page."
+msgstr "Activa líneas horizontales de rejilla en visores de lengüetas. Estos principalmente serán vistas arbóreas como la página de Cuentas."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3260
-#: ../gnucash/register/ledger-core/split-register-model.c:1045
-msgid "Enter the name of the Customer"
-msgstr "Introduzca el nombre del Cliente"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:116
+msgid "Enable vertical grid lines on table displays"
+msgstr "Activar líneas verticales de rejilla en visores de lengüetas"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3262
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3271
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3280
-#: ../gnucash/register/ledger-core/split-register-model.c:1082
-msgid "Enter notes for the transaction"
-msgstr "Introduzca anotaciones para la transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:117
+msgid "Enable vertical grid lines on table displays. These will mainly be tree views like the Accounts page."
+msgstr "Activa líneas verticales de rejilla en visores de lengüetas. Estos principalmente serán vistas arbóreas como la página de Cuentas."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3264
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3273
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3282
-#: ../gnucash/register/ledger-core/split-register-model.c:1241
-msgid "Enter a description of the split"
-msgstr "Introduzca una descripción del desglose"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:119
+msgid "<b>Checks</b>"
+msgstr "<b>Comprobaciones</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3269
-#: ../gnucash/register/ledger-core/split-register-model.c:1048
-msgid "Enter the name of the Vendor"
-msgstr "Introduzca el nombre del Proveedor"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:120
+msgid "Print _date format"
+msgstr "Formato de _fecha impresa"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3278
-#: ../gnucash/register/ledger-core/split-register-model.c:1051
-msgid "Enter a description of the transaction"
-msgstr "Introduzca una descripción de la transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:121
+msgid "Below the actual date, print the format of that date in 8 point type."
+msgstr "Debajo de las fechas efectivas, escribe el formato de esa fecha de tipo de 8 puntos."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3292
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3296
-#: ../gnucash/register/ledger-core/split-register-model.c:1400
-#: ../gnucash/register/ledger-core/split-register-model.c:1466
-msgid "Enter the account to transfer from, or choose one from the list"
-msgstr "Introduzca la cuenta desde la que transferir, o elija una del índice"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:122
+msgid "Default _font:"
+msgstr "Tipo de _letra predeterminada:"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3294
-#: ../gnucash/register/ledger-core/split-register-model.c:1115
-msgid "Reason the transaction was voided"
-msgstr "Razón por la que la transacción se ha anulado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:123
+msgid "The default check printing font."
+msgstr "El tipograma de escritura predeterminado para casillas."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3306
-msgid "Enter the reconcile type"
-msgstr "Introduzca el tipo de conciliación"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:124
+msgid "Print _blocking chars"
+msgstr "Escribir caracteres de _bloqueo"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3316
-msgid "Enter the type of transaction"
-msgstr "Introduzca el tipo de transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:125
+msgid "Print '***' before and after each text field on the check."
+msgstr "Escribir '***' antes y después de cada campo de texto en la comprobación."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3326
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3346
-msgid "Enter the value of shares bought or sold"
-msgstr "Introduzca el valor de mercancías compradas o vendidas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:126
+msgid "Printing"
+msgstr "Escribiendo"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3336
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3348
-#: ../gnucash/register/ledger-core/split-register-model.c:1349
-msgid "Enter the number of shares bought or sold"
-msgstr "Introduzca el número de mercancías compradas o vendidas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:127
+#: ../gnucash/import-export/dialog-import.glade.h:48
+msgid "<b>Actions</b>"
+msgstr "<b>Operaciones</b>"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3358
-msgid "* Indicates the transaction Commodity."
-msgstr "* Indica la transacción de Mercancía."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:128
+msgid "'_Enter' moves to blank transaction"
+msgstr "«_Introducir» mueve a transacción vacía"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3368
-msgid "Enter the rate"
-msgstr "Introduzca el tipo"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:129
+msgid "If checked, pressing the 'Enter' key will move to the location of the blank transaction in the register. If clear, pressing the 'Enter' key will move down one row."
+msgstr "Si está marcado, pulsando la tecla «Entrar» le llevará a la ubicación de la transacción en blanco dentro del registro. Si está vacío, pulsando la tecla «Introducir» le bajará una fila."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3378
-#: ../gnucash/register/ledger-core/split-register-model.c:1313
-msgid "Enter the effective share price"
-msgstr "Introduzca el precio efectivo mercantil"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:130
+msgid "_Auto-raise lists"
+msgstr "_Auto-desplegar listados"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3388
-#: ../gnucash/register/ledger-core/split-register-model.c:2235
-msgid "Enter credit formula for real transaction"
-msgstr "Introduzca cálculo de crédito para transacción real"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:131
+msgid "Automatically raise the list of accounts or actions during input."
+msgstr "Elevar automáticamente la lista de cuentas u operaciones durante entrada."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-split-reg.c:3398
-#: ../gnucash/register/ledger-core/split-register-model.c:2201
-msgid "Enter debit formula for real transaction"
-msgstr "Introduzca cálculo del débito para transacción real"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:132
+msgid "<b>Reconciling</b>"
+msgstr "<b>Conciliando...</b>"
 
-#. Translators: This string has a context prefix; the translation
-#. must only contain the part after the | character.
-#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:171
-msgid "Single-character short column-title form of 'Enabled'|E"
-msgstr "A"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:133
+msgid "Check cleared _transactions"
+msgstr "Comprobar _transacciones punteadas"
 
-#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:182
-msgid "Last Occur"
-msgstr "Última aparición"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:134
+msgid "Pre-check cleared transactions when creating a reconcile dialog."
+msgstr "Pre-comprobar transacciones punteadas cuando cree un diálogo de conciliación."
 
-#: ../gnucash/gnome-utils/gnc-tree-view-sx-list.c:187
-msgid "Next Occur"
-msgstr "Próxima Aparición"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:135
+msgid "Automatic _interest transfer"
+msgstr "Transferencia de _intereses automática"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in.h:1
-msgid "Number of files in history"
-msgstr "Número de ficheros dentro del historial"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:136
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:4
+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 only enabled for Bank, Credit, Mutual, Asset, Receivable, Payable, and Liability accounts."
+msgstr "Antes de conciliar una cuenta que carga o liquida intereses, solicitar al usuario que introduzca una transacción para la comisión de interés o liquidación. Actualmente solo se activa para cuentas de Banca, Crédito, Fondo, Activo, Recibos Pendientes, Liquidables y Pasivo."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in.h:2
-msgid "This setting contains the number of files to keep in the Recently Opened Files menu. This value may be set to zero to disable the file history. This number has a maximum value of 10."
-msgstr "Esta opción contiene el número de ficheros a mantener en el menú Archivos abiertos recientemente. Este valor puede ser cero para desactivar el histórico de ficheros. El valor máximo es 10."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:137
+msgid "Automatic credit card _payment"
+msgstr "Auto-_liquidación por tarjeta de crédito"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in.h:3
-msgid "Most recently opened file"
-msgstr "Fichero abierto más recientemente"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:138
+msgid "After reconciling a credit card statement, prompt the user to enter a credit card payment."
+msgstr "Después de conciliar una tarjeta de crédito declarada, solicite al usuario la introducción de una liquidación por tarjeta de crédito."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in.h:4
-msgid "This field contains the full path of the most recently opened file."
-msgstr "Este campo contiene la ruta completa al último fichero abierto."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:139
+msgid "Always reconcile to t_oday"
+msgstr "Siempre conciliar al día de h_oy"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in.h:5
-msgid "Next most recently opened file"
-msgstr "Siguiente fichero abierto más recientemente"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:140
+msgid "Always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations."
+msgstr "Si está activada, siempre abrirá el diálogo de conciliación usando la fecha del día para la fecha del declarada, a no ser que previno la conciliación."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.history.gschema.xml.in.in.h:6
-msgid "This field contains the full path of the next most recently opened file."
-msgstr "Este campo contiene la ruta completa al penúltimo fichero abierto."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:141
+msgid "Draw _vertical lines between columns"
+msgstr "Dibujar líneas _verticales entre columnas"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:1
-msgid "Print checks from multiple accounts"
-msgstr "Declarar comprobantes desde múltiples cuentas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:142
+msgid "Show vertical borders on the cells."
+msgstr "Mostrar bordes verticales sobre las casillas."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:2
-msgid "This dialog is presented if you try to print checks from multiple accounts at the same time."
-msgstr "Este diálogo se presente si intenta marcar los comprobaciones desde múltiples cuentas a la vez."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:143
+msgid "<b>Layout</b>"
+msgstr "<b>Apariencia</b>"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:3
-msgid "Commit changes to a invoice entry"
-msgstr "Efectuar modificaciones a un asiento facturante"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:144
+msgid "_Future transactions after blank transaction"
+msgstr "_Transacciones futuras tras transación vacía"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:4
-msgid "This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded."
-msgstr "Este diálogo es presentado cuando intentar salir de un asiento facturante modificado. Los datos modificados deben ser guardados o descartados."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:145
+msgid "If checked, transactions with a date in the future will be displayed at the bottom of the register after the blank transaction. If clear, the blank transaction will be at the bottom of the register after all transactions."
+msgstr "Si comprobó, transacciones con una fecha en el futuro serán enseñadas al fondo del registro tras la transacción en blanco. Si está vacío, la transacción en blanco estará al fondo del registro después de todas las transacciones."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:5
-msgid "Duplicating a changed invoice entry"
-msgstr "Duplicando un asiento facturante modificado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:146
+msgid "Draw hori_zontal lines between rows"
+msgstr "Dibujar líneas hori_zontales entre filas"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:6
-msgid "This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled."
-msgstr "Este diálogo es presentado cuando intente duplicar un asiento facturante modificado. Los datos modificados deben ser guardados o la duplicación cancelada."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:147
+msgid "Show horizontal borders on the cells."
+msgstr "Mostrar bordes horizontales en las casillas."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:7
-msgid "Delete a commodity"
-msgstr "Borra una mercancía"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:148
+msgid "Double _mode colors alternate with transactions"
+msgstr "Colores del _modo doble alternan con transacciones"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:8
-msgid "This dialog is presented before allowing you to delete a commodity."
-msgstr "Este diálogo es presentado antes de permitirle eliminar una mercancía."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:149
+msgid "Alternate the primary and secondary colors by transaction instead of by alternating by row."
+msgstr "Alternar color principal y secundario en cada  la transacción, en vez de alternarlo por fila."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:9
-msgid "Delete a commodity with price quotes"
-msgstr "Borra una mercancía con su precio cotizado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:150
+msgid "_Use GnuCash built-in color theme"
+msgstr "_Emplear tema de colores compilados en GnuCash"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:10
-msgid "This dialog is presented before allowing you to delete a commodity that has price quotes attached. Deleting the commodity will delete the quotes as well."
-msgstr "Este diálogo es presentado antes de permitirle eliminar una mercancía que contiene cotizaciones. Borrar la mercancía también eliminará las cotizaciones."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:151
+msgid "GnuCash uses a yellow/green theme by default for register windows. Uncheck this if you want to use the system color theme instead."
+msgstr "GnuCash por defecto utiliza un tema amarillo/verde para las ventanas del registro. Desmarque esto si quiere emplear el color del tema del sistema en su lugar."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:11
-msgid "Delete multiple price quotes"
-msgstr "Borrar múltiples precios cotizados"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:152
+msgid "<b>Graphics</b>"
+msgstr "<b>Gráficos</b>"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:12
-msgid "This dialog is presented before allowing you to delete multiple price quotes at one time."
-msgstr "Este diálogo es presentado antes de permitirle eliminar múltiples cotizaciones a la vez."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:153
+msgid "Tab order in_cludes Transfer on Memorised Transactions"
+msgstr "Lengüeta de Operación _incluye Transferencia sobre Transacciones Registradas"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:13
-msgid "Edit account payable/accounts receivable register"
-msgstr "Edita registro de cuenta liquidable / cuentas ingresable"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:154
+msgid "Move to Transfer field when memorised transaction auto filled."
+msgstr "Mover para Transferir campos cuando la transacción registrada sea autocompletada."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:14
-msgid "This dialog is presented before allowing you to edit an accounts payable/accounts receivable account. These account types are reserved for the business features and should rarely be manipulated manually."
-msgstr "Este diálogo es presentado antes de permitirle editar una cuenta liquidable/ingreso pendientes. Estos tipos de cuenta están reservados para características de negocio y raramente deberían modificarse manualmente."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:156
+msgid "<b>Default Style</b>"
+msgstr "<b>Estilo Predet.</b>"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:15
-msgid "Read only register"
-msgstr "Registro de sólo lectura"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:157
+msgid "<b>Other Defaults</b>"
+msgstr "<b>Otros Predet.</b>"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:16
-msgid "This dialog is presented when a read-only register is opened."
-msgstr "Este diálogo es presentado cuando un registro de solo-lectura está abierto."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:158
+msgid "_Basic ledger"
+msgstr "Libro _básico"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:17
-msgid "Change contents of reconciled split"
-msgstr "Cambiar contenidos del desglose conciliado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:159
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:97
+msgid "Show all transactions on one line. (Two in double line mode.)"
+msgstr "Mostrar todas las transacciones en una línea (Dos en el modo de doble línea)."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:18
-msgid "This dialog is presented before allowing you to change the contents of a reconciled split. Allowing these changes can make it hard to perform future reconciliations."
-msgstr "Este diálogo es presentado antes de permitirle cambiar el contenido de un desglose conciliado. Permitir estos cambios puede hacer difícil conciliar en el futuro."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:160
+msgid "_Auto-split ledger"
+msgstr "_Auto-desglosar libro"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:19
-msgid "Mark transaction split as unreconciled"
-msgstr "Marcar desglose de transacción como no conciliado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:161
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:99
+msgid "Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)"
+msgstr "Expanda automáticamente la transacción actual para mostrar todos los desgloses. Todas las demás transacciones se muestran en una línea. (Dos en el modo de doble línea)"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:20
-msgid "This dialog is presented before allowing you to mark a transaction split as unreconciled. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
-msgstr "Este diálogo es presentado antes de permitirle marcar un desglose de transacción como no conciliado. Hacerlo puede quitar la cantidad conciliada del registro y hacer más difícil conciliar en el futuro."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:163
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:100
+msgid "All transactions are expanded to show all splits."
+msgstr "Todas los transacciones se expanden para mostrar todos los desgloses."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:21
-msgid "Remove a split from a transaction"
-msgstr "Quitar un desglose de una transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:164
+msgid "Number of _transactions:"
+msgstr "Número de _transacciones:"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:22
-msgid "This dialog is presented before allowing you to remove a split from a transaction."
-msgstr "Este diálogo es presentado antes de permitirle retirar un desglose desde una transacción."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:165
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:114
+msgid "Show this many transactions in a register. A value of zero means show all transactions."
+msgstr "Muestra este cantidad de transacciones en un registro. Un valor cero indica que se muestren todas las transacciones."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:23
-msgid "Remove a reconciled split from a transaction"
-msgstr "Quitar un desglose conciliado desde una transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:166
+msgid "_Double line mode"
+msgstr "Modo línea _doble"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:24
-msgid "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 "Este diálogo es presentado antes de permitirle retirar un desglose conciliado desde una transacción. Hacerlo quitará la cantidad conciliada del registro y puede hacer más difícil conciliar en el futuro."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:167
+msgid "Show two lines of information for each transaction instead of one. Does not affect expanded transactions."
+msgstr "Mostrar dos líneas de información para cada  la transacción en vez de una. No afecta a las transacciones expandidos."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:25
-msgid "Remove all the splits from a transaction"
-msgstr "Quitar todos los desgloses desde una transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:168
+msgid "Register opens in a new _window"
+msgstr "El registro se abre en una _ventana nueva"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:26
-msgid "This dialog is presented before allowing you to remove all splits from a transaction."
-msgstr "Este diálogo es presentado antes de permitirle retirar todas los desgloses desde una transacción."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:169
+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."
+msgstr "Si está marcado, cada registro se abrirá en su propia ventana de nivel cima. Si está vacío, el registro será abierto en la ventana actual."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:27
-msgid "This dialog is presented before allowing you to remove all splits (including some reconciled splits) from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
-msgstr "Este diálogo es presentado antes de permitirle retirar todos los desgloses (incluyendo algunos conciliados) de una transacción. Hacerlo puede quitar la cantidad conciliada del registro y hacer más difícil conciliar en el futuro."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:170
+msgid "_Only display leaf account names"
+msgstr "_Sólo enseñar los nombres de rama de cuenta"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:28
-msgid "Delete a transaction"
-msgstr "Borra una transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:171
+msgid "If checked, only the names of the leaf accounts are displayed in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Checking this option implies that you use unique leaf names."
+msgstr "Si está marcada, sólo los nombres de las ramas de cuentas están enseñadas dentro de los registros y en la ventana emergente de selección. El comportamiento predeterminado es enseñar el nombre completo, incluyendo la ruta en el plan contable. Comprobar esta opción implica que usted utiliza nombres de ramas únicos."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:29
-msgid "This dialog is presented before allowing you to delete a transaction."
-msgstr "Este diálogo es presentado antes de permitirle eliminar una transacción."
+#. Register2 feature
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:173
+msgid "Number of _characters for auto complete:"
+msgstr "Número de _caracteres para autocompletado:"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:30
-msgid "Delete a transaction with reconciled splits"
-msgstr "Borra una transacción con desgloses conciliados"
+#. Register2 feature
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:175
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:116
+msgid "This sets the number of characters before auto complete starts for description, notes and memo fields."
+msgstr "Esto establece el número de caracteres antes de que inicie el auto-completado para los campos de descripción, anotaciones y memorándum."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:31
-msgid "This dialog is presented before allowing you to delete a transaction that contains reconciled splits. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
-msgstr "Este diálogo es presentado antes de permitirle eliminar una transacción que contiene desgloses conciliados. Hacerlo puede quitar la cantidad conciliada del registro y puede hacer difícil conciliar en el futuro."
+#. Register2 feature
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:177
+msgid "Show the _entered and reconcile dates"
+msgstr "Mostrar las _fechas introducidas y conciliadas"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:32
-msgid "Duplicating a changed transaction"
-msgstr "Duplicando una transacción modificada"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:178
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:106
+msgid "Show the date when the transaction was entered below the posted date and reconciled date on split row."
+msgstr "Muestra la fecha cuando la transacción fue introducida por debajo de la fecha de vencimiento y la fecha de conciliación en la fila del desglose."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:33
-msgid "This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled."
-msgstr "Este diálogo es presentado al intentar duplicar una transacción modificada. Los datos modificados deben ser guardados o la duplicación cancelada."
+#. Register2 feature
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:180
+msgid "Show the calendar b_uttons"
+msgstr "Mostrar los _botones del calendario"
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:34
-msgid "Commit changes to a transaction"
-msgstr "Efectuar cambios a una transacción"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:181
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:110
+msgid "Show the calendar buttons Cancel, Today and Select."
+msgstr "Muestra los botones Cancelar, Hoy y Seleccionar del calendario."
 
-#: ../gnucash/gnome-utils/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:35
-msgid "This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded."
-msgstr "Este diálogo es presentado cuando intenta salir de una transacción modificada. Los datos modificados deben ser guardados o descartados."
+#. Register2 feature
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:183
+msgid "_Move the selection to the blank split on expand"
+msgstr "_Mover la selección al desglose vacío al expandir"
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:1
-msgid "Introduction placeholder"
-msgstr "Introducción a marcador"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:184
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:112
+msgid "This will move the selection to the blank split when the transaction is expanded."
+msgstr "Esto moverá la selección al desglose vacío cuando la transacción esté expandida."
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:2
-msgid "Title placeholder"
-msgstr "Contenedor del título"
+#. Register2 feature
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:186
+msgid "_Show entered and reconciled dates on selection"
+msgstr "_Mostrar fechas introducidas y conciliadas en la selección"
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:3
-msgid "_Edit list of encodings"
-msgstr "_Editar índice de codificaciones"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:187
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:108
+msgid "Show the entered date and reconciled date on transaction selection."
+msgstr "Muestra la fecha introducida y la fecha de conciliación en la selección de transacción."
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:4
-msgid "Default encoding:"
-msgstr "Codificación predeterminada:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:188
+msgid "Register Defaults"
+msgstr "Registro Predeterminado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:5
-msgid "Convert the file"
-msgstr "Convertir el fichero"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:189
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:121
+msgid "Use the specified currency for all newly created reports."
+msgstr "Emplee la moneda especificada para los boletines nuevos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:6
-msgid "finish placeholder"
-msgstr "final de marcador"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:190
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:119
+msgid "Use the system locale currency for all newly created reports."
+msgstr "Emplee la moneda local del sistema para todos los boletines nuevos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:7
-msgid "Finish GnuCash Datafile Import"
-msgstr "Finalizar la importación de fichero de datos GnuCash"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:191
+msgid "<b>Default Report Currency</b>"
+msgstr "<b>Boletín Monetario Predeterminado</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:8
-msgid "Edit the list of encodings"
-msgstr "Edita la índice de codificaciones"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:192
+msgid "<b>Location</b>"
+msgstr "<b>Ubicación</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:11
-msgid "<b>S_ystem input encodings</b>"
-msgstr "<b>Codificaciones de entrada del _sistema</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:193
+msgid "Report opens in a new _window"
+msgstr "El boletín se abre en una _ventana nueva"
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:12
-msgid "<b>_Custom encoding</b>"
-msgstr "<b>_Codificaciones personales</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:194
+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."
+msgstr "Si está marcado, cada boletín se abrirá en su propia ventana de nivel cima. Si está vacío, el boletín se abrirá en la ventana actual."
 
-#: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:13
-msgid "<b>_Selected encodings</b>"
-msgstr "<b>_Codificaciones seleccionadas</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:195
+msgid "<b>Default zoom level</b>"
+msgstr "<b>Nivel de zoom Prederminado</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:1
-msgid "Delete Account"
-msgstr "Borrar Cuenta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:196
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:124
+msgid "On high resolution screens reports tend to be hard to read. This option allows you to scale reports up by the set factor. For example setting this to 2.0 will display reports at twice their typical size."
+msgstr "Los boletines en pantallas de alta resolución tienden a ser difíciles de leer. Esta opción permite escalar los boletines para establecer el factor. Por ejemplo aplicando esto al 2.0 enseñará boletines el doble que el tamaño típico."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:4
-msgid "<b>Transactions</b>"
-msgstr "<b>Transacciones</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:197
+msgid "Reports"
+msgstr "Boletines"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:5
-msgid "M_ove to:"
-msgstr "M_over a:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:198
+msgid "<b>Window Geometry</b>"
+msgstr "<b>Geometría de Ventana</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:6
-msgid "Delete all _transactions"
-msgstr "Borrar todas las _transacciones"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:199
+msgid "_Save window size and position"
+msgstr "_Guardar tamaños y posiciones de ventanas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:7
-msgid "This account contains transactions. What would you like to do with these transactions?"
-msgstr "Esta cuenta contiene transacciones. ¿Qué quisiera hacer para hacer con estas transacciones?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:200
+msgid "Save window size and location when it is closed."
+msgstr "Guarda tamaño y localización cuando está cerrado."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:8
-msgid "This account contains read-only transactions which may not be deleted."
-msgstr "Esta cuenta contiene transacciones de sólo lectura que no pueden ser borrados."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:201
+msgid "Bring the most _recent tab to the front"
+msgstr "Traer la lengüeta más _reciente al frente"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:9
-msgid "<b>Sub-accounts</b>"
-msgstr "<b>Subcuentas</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:202
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:74
+msgid "Closing a tab moves to the most recently visited tab."
+msgstr "El cierre de una lengüeta mueve a la última lengüeta visitada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:10
-msgid "This account contains sub-accounts. What would you like to do with these sub-accounts?"
-msgstr "Esta cuenta contiene subcuentas. ¿Qué quiere hacer con esas subcuentas?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:203
+msgid "<b>Tab Position</b>"
+msgstr "<b>Posición de Lengüeta</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:11
-msgid "_Move to:"
-msgstr "_Mover a:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:204
+msgid "To_p"
+msgstr "_Techo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:12
-msgid "Delete all _subaccounts"
-msgstr "Borrar todas las _subcuentas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:205
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:66
+msgid "Display the notebook tabs at the top of the window."
+msgstr "Enseña las lengüetas de anotaciones en la cima de la ventana."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:13
-msgid "<b>Sub-account Transactions</b>"
-msgstr "<b>Transacciones por Subcuentas</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:206
+msgid "B_ottom"
+msgstr "_Suelo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:14
-msgid "One or more sub-accounts contain transactions. What would you like to do with these transactions?"
-msgstr "Una o más subcuentas contienen transacciones. ¿Qué quiere hacer con esas transacciones?"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:207
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:68
+msgid "Display the notebook tabs at the bottom of the window."
+msgstr "Enseña las lengüetas de anotaciones al fondo de la ventana."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:15
-msgid "One or more sub-accounts contain read-only transactions which may not be deleted."
-msgstr "Una o más subcuentas de esta cuenta contienen asientos de sólo lectura que no se pueden borrar."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:208
+msgid "_Left"
+msgstr "_Izquierda"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:16
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:1
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:750
-#: ../gnucash/report/standard-reports/transaction.scm:61
-msgid "Filter By..."
-msgstr "Filtrar por..."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:209
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:69
+msgid "Display the notebook tabs at the left of the window."
+msgstr "Enseña las lengüetas de anotaciones en la parte izquierda de la ventana."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:19
-msgid "_Default"
-msgstr "_Predeterminado"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:210
+msgid "_Right"
+msgstr "_Derecha"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:20
-#: ../gnucash/report/standard-reports/account-summary.scm:106
-#: ../gnucash/report/standard-reports/sx-summary.scm:87
-msgid "Account Type"
-msgstr "Clasificación de Cuenta"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:211
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:70
+msgid "Display the notebook tabs at the right of the window."
+msgstr "Enseña las lengüetas de anotaciones en la parte derecha de la ventana."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:21
-msgid "Show _hidden accounts"
-msgstr "Mostrar cuentas _ocultas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:212
+msgid "<b>Summary Bar Position</b>"
+msgstr "<b>Posición a Barra de Resumen</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:22
-msgid "Show accounts which have the option \"Hidden\" checked."
-msgstr "Muestra cuentas que fueron comprobadas como \"Ocultas\"."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:214
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:71
+msgid "Display the summary bar at the top of the page."
+msgstr "Enseña la barra de resumen en la parte cima de la página."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:23
-msgid "Show _zero total accounts"
-msgstr "Mostrar cuentas con total a _cero"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:216
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:73
+msgid "Display the summary bar at the bottom of the page."
+msgstr "Enseña la barra de resumen en la parte fondo de la página."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:24
-msgid "Show accounts which have a zero total value."
-msgstr "Muestra cuentas que tengan un valor total a cero."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:217
+msgid "<b>Tabs</b>"
+msgstr "<b>Etiquetas</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:25
-msgid "Show _unused accounts"
-msgstr "Mostrar cuentas _no utilizadas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:218
+msgid "Show close button on _notebook tabs"
+msgstr "Mostrar botón cerrar en _pestañas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:26
-msgid "Show accounts which do not have any transactions."
-msgstr "Mostrar cuentas las cuales no tenga ninguna transacción."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:219
+msgid "Show a close button on each notebook tab. These function identically to the 'Close' menu item."
+msgstr "Mostrar un botón de cierre en cada lengüeta del cuaderno. Estas funcionan idénticamente al elemento del menú «Cerrar»."
 
-# clase
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:28
-msgid "Use Commodity Value"
-msgstr "Emplear valor mercantil"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:220
+msgid "_Width:"
+msgstr "A_nchura:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:30
-msgid "1/10"
-msgstr "1/10"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:221
+msgid "If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis."
+msgstr "Si el texto en la lengüeta es más larga que este valor (el resto es aproximado) entonces la etiqueta tendrá un corte en la mitad y remplazada con una elipsis."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:31
-msgid "1/100"
-msgstr "1/100"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:222
+msgid "characters"
+msgstr "caracteres"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:32
-msgid "1/1000"
-msgstr "1/1000"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:223
+msgid "Windows"
+msgstr "Ventanas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:33
-msgid "1/10000"
-msgstr "1/10000"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:224
+#: ../gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in.h:2
+msgid "To retrieve online quotes from Alphavantage, this key needs to be set. A key can be retrieved from the Alpha Vantage website."
+msgstr "Para obtener cotizaciones por conexión desde Alphavantage, esta clave necesita ser establecida. Una clave puede ser obtenida desde el sitio web Alpha Vantage."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:34
-msgid "1/100000"
-msgstr "1/100000"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:225
+#: ../gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in.h:1
+msgid "Alpha Vantage API key"
+msgstr "Clave API Alpha Vantage"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:35
-msgid "1/1000000"
-msgstr "1/1000000"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:226
+msgid "Online Quotes"
+msgstr "Conexión de Cotizaciones"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:38
-msgid "<b>Identification</b>"
-msgstr "<b>Identificación</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:1
+msgid "Reset Warnings"
+msgstr "Restablecer advertencias"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:39
-msgid "Account _name:"
-msgstr "_Nombre de cuenta:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:5
+msgid "You have requested that the following warning dialogs not be presented. To re-enable any of these dialogs, select the check box next to the dialog, then click OK."
+msgstr "Ha solicitado que los siguientes diálogos de advertencia no se muestren. Para reactivar cualquiera de estos diálogos, seleccione la casilla de marca siguiente al diálogo, y entonces pulse Aceptar."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:40
-msgid "_Account code:"
-msgstr "Código de cuent_a:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:7
+msgid "_Unselect All"
+msgstr "_Deseleccionar todo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:41
-msgid "_Description:"
-msgstr "_Descripción:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:8
+msgid "No warnings to reset."
+msgstr "Ninguna advertencia para restaurar."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:43
-msgid "Smallest _fraction:"
-msgstr "_Fracción mínima:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:9
+msgid "Permanent Warnings"
+msgstr "Advertencias permanentes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:44
-msgid "Account _Color:"
-msgstr "Color de _cuenta:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:10
+msgid "Temporary Warnings"
+msgstr "Advertencias Temporales"
 
-#. instantiate a default style sheet
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:45
-#: ../gnucash/report/report-system/html-style-sheet.scm:291
-#: ../gnucash/report/report-system/report.scm:248
-#: ../gnucash/report/stylesheets/stylesheet-plain.scm:316
-msgid "Default"
-msgstr "Por omisión"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:1
+msgid "Tax Tables"
+msgstr "Tablas Impositivas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:46
-msgid "No_tes:"
-msgstr "Ano_taciones:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:3
+msgid "<b>Tax Tables</b>"
+msgstr "<b>Lengüetas de Imposiciones</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:47
-msgid "Ta_x related"
-msgstr "Imposición _específico"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:6
+msgid "<b>Tax Table Entries</b>"
+msgstr "<b>Asientos de Lengüetas Impositivas</b>"
 
-#. Translators: use the same words here as in
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:49
-msgid "Use Edit->Tax Report Options to set the tax-related flag and assign a tax code to this account."
-msgstr "Emplee “Editar → Opciones de Boletín de Imposición” para establecer el indicador relacionado con imposiciones y asignar un código de imposición para esta cuenta."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:8
+msgid "De_lete"
+msgstr "B_orrar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:50
-msgid "Placeholde_r"
-msgstr "Contenedo_r"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:9
+msgid "Ne_w"
+msgstr "_Crear"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:51
-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 account."
-msgstr "Esta cuenta está únicamente como marcador en el plan de cuentas. Transacciones pueden no ser contabilizadas para esta cuenta, sólo a subcuentas de esta cuenta."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:10
+msgid "Value $"
+msgstr "Valor €"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:52
-msgid "H_idden"
-msgstr "_Oculto"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:12
+#, no-c-format
+msgid "Percent %"
+msgstr "Porcentaje %"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:53
-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 option, you will first need to open the \"Filter By...\" dialog for the account tree and check the \"show hidden accounts\" option. Doing so will allow you to select the account and reopen this dialog."
-msgstr "Esta cuenta (y cualquier subcuenta) estarán ocultos en el plan contable y no aparecerán en el índice desplegable de cuentas del registro. Para restablecer esta opción, primero tendrá que abrir el diálogo «Filtrar por...» del plan contable y marcar la opción «Mostrar cuentas ocultas». Al hacerlo podrá seleccionar la cuenta y reabrir este diálogo."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:15
+msgid "<b>Tax Table Entry</b>"
+msgstr "<b>Asiento de Lengüeta Impositiva</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:54
-msgid "Smallest fraction of this commodity that can be referenced."
-msgstr "Fracción mínima de esta mercancía que puede ser referenciada."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:16
+msgid "<b>Tax Table</b>"
+msgstr "<b>Lengüeta Impositiva</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:55
-msgid "<b>Acco_unt Type</b>"
-msgstr "<b>Tipo de _Cuenta</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:17
+msgid "_Account:"
+msgstr "_Cuenta:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:56
-msgid "<b>_Parent Account</b>"
-msgstr "<b>Cuenta _matriz</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:18
+msgid "_Value: "
+msgstr "_Valor: "
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:57
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:118
-#: ../gnucash/report/report-system/report.scm:69
-#: ../gnucash/report/standard-reports/equity-statement.scm:110
-#: ../gnucash/report/standard-reports/equity-statement.scm:114
-#: ../gnucash/report/standard-reports/register.scm:404
-#: ../gnucash/report/standard-reports/trial-balance.scm:148
-#: ../gnucash/report/standard-reports/trial-balance.scm:152
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:46
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:52
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:58
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:64
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:191
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:192
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:193
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:194
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:40
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:46
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:52
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:58
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:185
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:186
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:187
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:188
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:51
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:57
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:63
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:69
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:76
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:204
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:205
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:206
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:207
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:208
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:53
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:59
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:65
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:71
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:77
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:83
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:89
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:95
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:102
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:108
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:114
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:120
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:126
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:132
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:260
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:261
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:262
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:263
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:264
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:265
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:266
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:267
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:268
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:269
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:270
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:271
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:272
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:273
-#: ../gnucash/report/stylesheets/stylesheet-plain.scm:47
-#: ../gnucash/report/stylesheets/stylesheet-plain.scm:53
-#: ../gnucash/report/stylesheets/stylesheet-plain.scm:58
-#: ../gnucash/report/utility-reports/view-column.scm:56
-#: ../gnucash/report/utility-reports/view-column.scm:82
-msgid "General"
-msgstr "Común"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:19
+msgid "_Type: "
+msgstr "_Tipo: "
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:58
-msgid "<b>Balance Information</b>"
-msgstr "<b>Información del Balance</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:20
+msgid "_Name: "
+msgstr "_Nombre: "
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:59
-msgid "<b>Initial Balance Transfer</b>"
-msgstr "<b>Saldo Inicial por Transferencia</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:1
+msgid "GnuCash Tip Of The Day"
+msgstr "Consejo del día GnuCash"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:60
-msgid "_Balance:"
-msgstr "_Balance:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:2
+msgid "_Back"
+msgstr "_Atrás"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:62
-msgid "_Use equity 'Opening Balances' account"
-msgstr "_Emplee «Saldos de apertura» desde cuenta de Patrimonio"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:3
+msgid "_Forward"
+msgstr "_Avanzar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:63
-msgid "_Select transfer account"
-msgstr "_Seleccionar cuenta de transferencia"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:5
+msgid "<b>Tip of the Day:</b>"
+msgstr "<b>Consejo del día:</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:65
-msgid "Renumber sub-accounts"
-msgstr "Renumerar subcuentas"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:6
+msgid "_Show tips at startup"
+msgstr "_Mostrar consejos en el inicio"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:66
-msgid "_Renumber"
-msgstr "_Renumerar"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:1
+msgid "Transfer Funds"
+msgstr "Transferencia de Fondos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:67
-msgid "Prefix:"
-msgstr "Prefijo:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:2
+msgid "<b>Basic Information</b>"
+msgstr "<b>Información Básica</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:68
-msgid "Examples:"
-msgstr "Ejemplos:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:4
+msgid "Date:"
+msgstr "Fecha:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:69
-msgid "Interval:"
-msgstr "Intervalo:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:5
+msgid "Num:"
+msgstr "Número:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:6
-msgid "Income Total:"
-msgstr "Ingreso Total:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:7
+msgid "Memo:"
+msgstr "Memorandum:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:7
-msgid "Expense Total:"
-msgstr "Gasto total:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:8
+msgid "<b>Transfer From</b>"
+msgstr "<b>Transferencia Origen</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade.h:8
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:6
-msgid "Description:"
-msgstr "Descripción:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:9
+msgid "Currency:"
+msgstr "Moneda:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:6
-msgid "Enter the full name of the commodity. Example: Cisco Systems Inc., or Apple Computer, Inc."
-msgstr "Introduzca el nombre de las mercancías. Ejemplo: Cisco Sytems Inc., o Apple Computer Inc."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:10
+#: ../gnucash/report/standard-reports/net-barchart.scm:54
+#: ../gnucash/report/standard-reports/net-linechart.scm:50
+#: ../gnucash/report/standard-reports/price-scatter.scm:49
+msgid "Show Income/Expense"
+msgstr "Mostrar Ingreso/Gasto"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:7
-msgid "Enter the ticker symbol for the commodity (e.g. CSCO or AAPL). If you are retrieving quotes online, this field must exactly match the ticker symbol used by the quote source (including case). "
-msgstr "Introduzca el símbolo abreviado para la mercancía (p.e. CSCO o AAPL). Si está obteniendo las cotizaciones por conexión, este campo debe cotejar exactamente al símbolo abreviado empleado por el origen de la cotización (incluyendo mayúsculas/minúsculas). "
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:11
+msgid "<b>Transfer To</b>"
+msgstr "<b>Transferencia Destino</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:8
-msgid "Enter a unique code used to identify the commodity. Or, you may safely leave this field blank."
-msgstr "Introduzca un código único usado para identificar la mercancía. Si no, puede dejar el campo en blanco con seguridad."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:12
+msgid "<b>Currency Transfer</b>"
+msgstr "<b>Transferencia Monetaria</b>"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:9
-msgid "1 /"
-msgstr "1 /"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:13
+msgid "Exchange Rate:"
+msgstr "Tipo de cambio:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:10
-msgid "Enter the smallest fraction of the commodity which can be traded. For stocks which can only be traded in whole numbers, enter 1."
-msgstr "Introduzca la fracción menor de la mercancía la cual puede ser comerciada. Para reservas que no se pueden fraccionar, introduzca 1."
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:15
+msgid "_Fetch Rate"
+msgstr "_Obtener tipo"
+
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:1
+msgid "Username and Password"
+msgstr "Usuario y Contraseña"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:11
-msgid "<b>Quote Source Information</b>"
-msgstr "<b>Información de Cotización Origen</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:4
+msgid "Enter your username and password"
+msgstr "Introduzca usuario y contraseña"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:12
-msgid "Type of quote source:"
-msgstr "Tecleo de cotización origen:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:5
+msgid "_Username:"
+msgstr "_Usuario:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:13
-msgid "_Full name:"
-msgstr "Nombre _completo:"
+#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:6
+msgid "_Password:"
+msgstr "_Contraseña:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:14
-msgid "_Symbol/abbreviation:"
-msgstr "_Símbolo/Abreviatura:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:1
+msgid "US (12/31/2001)"
+msgstr "EE. UU. (12/31/2016)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:16
-msgid "ISIN, CUSI_P or other code:"
-msgstr "ISIN, CUSI_P u otro código:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:2
+msgid "UK (31/12/2001)"
+msgstr "UK (31/12/2016)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:17
-msgid "F_raction traded:"
-msgstr "F_racción comerciada:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:3
+msgid "Europe (31.12.2001)"
+msgstr "Europa (31.12.2016)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:18
-msgid "Warning: Finance::Quote not installed properly."
-msgstr "Atención: Finance::Quote no está instalado correctamente."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:4
+msgid "ISO (2001-12-31)"
+msgstr "ISO (2016-12-31)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:19
-msgid "_Get Online Quotes"
-msgstr "_Obtener cotizaciones por conexión"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:6
+msgid "UTC - Coordinated Universal Time"
+msgstr "UTC - Hora Universal Coordenado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:20
-msgid "Si_ngle:"
-msgstr "Ú_nico:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:8
+msgid "No Fancy Date Format"
+msgstr "Formato de Fecha No Adornado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:21
-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 quotes."
-msgstr "Hay orígenes cotizados O::C que obtienen información de un único sitio en Internet. Si ese sitio no está disponible, no podrá obtener cotizaciones."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:9
+#: ../gnucash/import-export/csv-imp/assistant-csv-price-import.glade.h:39
+#: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.glade.h:41
+msgid "Date Format"
+msgstr "Formato de Fecha"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:22
-msgid "_Multiple:"
-msgstr "_Múltiple:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:10
+msgid "December 31, 2000"
+msgstr "31 de diciembre de 2000"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:23
-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 retrieve the information from another site."
-msgstr "Hay orígenes cotizados O::C que obtienen información de múltiples sitios en Internet. Si uno de los sitios no está disponible, O::C intentará u obtener la información desde otro sitio."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:12
+#, no-c-format
+msgid "%Y-%m-%d"
+msgstr "%d-%m-%Y"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:24
-msgid "_Unknown:"
-msgstr "_Desconocido:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:13
+msgid "Include Century"
+msgstr "Incluir centuria"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:25
-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 multiple sites on the internet."
-msgstr "Estas son orígenes cotizados que se han añadido recientemente a O::C. GnuCash no sabe si estos orígenes obtienen la información de un único sitio o de varios sitios de Internet."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:15
+msgid "Abbreviation"
+msgstr "Abreviatura"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:26
-msgid "Time_zone:"
-msgstr "_Zona horaria:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:17
+msgid "Months:"
+msgstr "Meses:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:27
-msgid "Enter a display symbol. This can safely be left blank, in which case the ticker symbol or the currency ISO code will be used."
-msgstr "Introduzca un símbolo para ver. Esto con seguridad puede dejarse en blanco, en cuyo caso el símbolo del ticket o el código ISO de la moneda serán utilizados."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:18
+msgid "Years:"
+msgstr "Años:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:28
-msgid "_Display symbol"
-msgstr "_Enseñar símbolo"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:19
+#: ../gnucash/import-export/dialog-import.glade.h:7
+msgid "Format:"
+msgstr "Formato:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:29
-msgid "Select security/currency "
-msgstr "Seleccionar garantía/moneda "
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:21
+msgid "Date format:"
+msgstr "Formato de fecha:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade.h:31
-msgid "Select user information here..."
-msgstr "Seleccionar información del usuario aquí..."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:1
+#: ../libgnucash/engine/Recurrence.c:649
+msgid "1st"
+msgstr "1"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:3
-msgid "<b>Data Format:</b>"
-msgstr "<b>Formato de Datos:</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:2
+#: ../libgnucash/engine/Recurrence.c:649
+msgid "2nd"
+msgstr "2"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:4
-msgid "Open _Read-Only"
-msgstr "Abrir a _solo lectura"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:3
+#: ../libgnucash/engine/Recurrence.c:649
+msgid "3rd"
+msgstr "3"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:5
-msgid "<b>File</b>"
-msgstr "<b>Fichero</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:4
+#: ../libgnucash/engine/Recurrence.c:649
+msgid "4th"
+msgstr "4"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:6
-msgid "Host"
-msgstr "Servidor"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:5
+msgid "5th"
+msgstr "5"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:7
-msgid "Database"
-msgstr "Base de Datos"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:6
+msgid "6th"
+msgstr "6"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:9
-msgid "Password"
-msgstr "Contraseña"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:7
+msgid "7th"
+msgstr "7"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade.h:10
-msgid "<b>Database Connection</b>"
-msgstr "<b>Conexión a Base de Datos</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:8
+msgid "8th"
+msgstr "8"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade.h:1
-msgid "Object references"
-msgstr "Referencias a objetos"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:9
+msgid "9th"
+msgstr "9"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade.h:3
-msgid "Explanation"
-msgstr "Descripción"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:10
+msgid "10th"
+msgstr "10"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:1
-msgid "GnuCash Options"
-msgstr "Opciones GnuCash"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:11
+msgid "11th"
+msgstr "11"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:4
-msgid "Close dialog and make no changes."
-msgstr "Cerrar dialogo y no hacer ninguna modificación."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:12
+msgid "12th"
+msgstr "12"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:6
-msgid "Apply changes but do not close dialog."
-msgstr "Aplicar cambios pero no cerrar diálogo."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:13
+msgid "13th"
+msgstr "13"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-options.glade.h:8
-msgid "Apply changes and close dialog."
-msgstr "Aplicar cambios y cerrar diálogo."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:14
+msgid "14th"
+msgstr "14"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:1
-msgid "US"
-msgstr "US (EE. UU.)"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:15
+msgid "15th"
+msgstr "15"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:2
-msgid "07/31/2013"
-msgstr "07/31/2015"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:16
+msgid "16th"
+msgstr "16"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:3
-msgid "UK"
-msgstr "UK (Reino Unido)"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:17
+msgid "17th"
+msgstr "17"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:4
-msgid "31/07/2013"
-msgstr "31/07/2015"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:18
+msgid "18th"
+msgstr "18"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:5
-msgid "Europe"
-msgstr "Europa"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:19
+msgid "19th"
+msgstr "19"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:6
-msgid "31.07.2013"
-msgstr "31.07.2015"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:20
+msgid "20th"
+msgstr "20"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:7
-msgid "ISO"
-msgstr "ISO"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:21
+msgid "21st"
+msgstr "21"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:8
-msgid "2013-07-31"
-msgstr "2015-07-31"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:22
+msgid "22nd"
+msgstr "22"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:9
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:5
-#: ../gnucash/import-export/csv-imp/gnc-price-import.cpp:50
-#: ../gnucash/import-export/csv-imp/gnc-tx-import.cpp:47
-msgid "Locale"
-msgstr "Local"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:23
+msgid "23rd"
+msgstr "23"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:10
-msgid "GnuCash Preferences"
-msgstr "Preferencias GnuCash"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:24
+msgid "24th"
+msgstr "24"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:13
-msgid "<b>Summarybar Content</b>"
-msgstr "<b>Barra Contenedora Resumen</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:25
+msgid "25th"
+msgstr "25"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:14
-msgid "Include _grand total"
-msgstr "Incluir _saldo"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:26
+msgid "26th"
+msgstr "26"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:15
-msgid "Show a grand total of all accounts converted to the default report currency."
-msgstr "Muestra un saldo de todas las cuentas convertidas a boletín monetario predeterminada."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:27
+msgid "27th"
+msgstr "27"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:16
-msgid "Include _non-currency totals"
-msgstr "Incluir totales _no-monetarios"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:28
+msgid "28th"
+msgstr "28"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:17
-msgid "If checked, non-currency commodities will be shown in the summary bar. If clear, only currencies will be shown."
-msgstr "Si está marcado, las mercancías no-monetarios serán mostrados en la barra de resumen. Si está vacío, sólo se mostrarán las monedas."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:29
+msgid "29th"
+msgstr "29"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:18
-msgid "<b>Start Date</b>"
-msgstr "<b>Fecha de Inicio</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:30
+msgid "30th"
+msgstr "30"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:19
-msgid "<b>End Date</b>"
-msgstr "<b>Fecha Final</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:31
+msgid "31st"
+msgstr "31"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:20
-msgid "_Relative:"
-msgstr "_Relativo:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:32
+msgid "Last day of month"
+msgstr "Último día del mes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:21
-msgid "Use the specified relative starting date for profit/loss calculations."
-msgstr "Emplee la fecha de comienzo relativa especificada para cálculos de beneficio/pérdidas."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:33
+msgid "Last Monday"
+msgstr "Último lunes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:22
-msgid "_Absolute:"
-msgstr "_Absoluto:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:34
+msgid "Last Tuesday"
+msgstr "Último martes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:23
-msgid "Use the specified absolute starting date for profit/loss calculations."
-msgstr "Emplee la fecha de comienzo absoluta especificada para cálculos de beneficio/pérdidas."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:35
+msgid "Last Wednesday"
+msgstr "Último miércoles"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:24
-msgid "Re_lative:"
-msgstr "Re_lativo:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:36
+msgid "Last Thursday"
+msgstr "Último jueves"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:25
-msgid "Use the specified relative ending date for profit/loss calculations. Also use this date for net assets calculations."
-msgstr "Emplee la fecha de final relativa especificada para cálculos de beneficio/pérdidas. También utilícelo para el cálculo del activo neto."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:37
+msgid "Last Friday"
+msgstr "Último viernes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:26
-msgid "Ab_solute:"
-msgstr "Ab_soluto:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:38
+msgid "Last Saturday"
+msgstr "Último sábado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:27
-msgid "Use the specified absolute ending date for profit/loss calculations. Also use this date for net assets calculations."
-msgstr "Emplee la fecha de final absoluta especificada para cálculos de beneficio/pérdidas. Utilícelo también esta fecha para el cálculo del activo neto."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:39
+msgid "Last Sunday"
+msgstr "Último domingo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:28
-msgid "Accounting Period"
-msgstr "Periodo Contable"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:41
+#: ../libgnucash/engine/Recurrence.c:721
+msgid "Once"
+msgstr "Unitaria"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:29
-msgid "<b>Separator Character</b>"
-msgstr "<b>Carácter de Separación</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:44
+msgid "Semi-Monthly"
+msgstr "Quincenal"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:30
-msgid "Use _formal accounting labels"
-msgstr "Emplee etiquetas contables _formales"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:46
+msgid "No change"
+msgstr "Sin cambio"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:31
-msgid "Use only 'debit' and 'credit' instead of informal synonyms."
-msgstr "Emplee únicamente «débito» y «crédito» en lugar de sinónimos informales."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:47
+msgid "Use previous weekday"
+msgstr "Emplee el anterior fin del semana"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:32
-msgid "<b>Labels</b>"
-msgstr "<b>Etiquetas</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:48
+msgid "Use next weekday"
+msgstr "Emplee el siguiente fin de semana"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:35
-msgid "C_redit accounts"
-msgstr "Cuentas de c_rédito"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:49
+msgid "1st Mon"
+msgstr "1º lun"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:37
-msgid "_Income & expense"
-msgstr "_Ingresos y gastos"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:50
+msgid "1st Tue"
+msgstr "1º mar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:39
-msgid "<b>Reverse Balanced Accounts</b>"
-msgstr "<b>Balance de Reversión por Cuentas</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:51
+msgid "1st Wed"
+msgstr "1º mié"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:40
-msgid "<b>Default Currency</b>"
-msgstr "<b>Moneda Predeterminada</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:52
+msgid "1st Thu"
+msgstr "1º jue"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:41
-msgid "US Dollars (USD)"
-msgstr "Dólares EE. UU. (USD)"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:53
+msgid "1st Fri"
+msgstr "1º vie"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:42
-msgid "Ch_oose:"
-msgstr "_Elegir:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:54
+msgid "1st Sat"
+msgstr "1º sáb"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:44
-msgid "Character:"
-msgstr "Carácter:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:55
+msgid "1st Sun"
+msgstr "1º dom"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:45
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:20
-msgid "Sample:"
-msgstr "Muestra:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:56
+msgid "2nd Mon"
+msgstr "2º lun"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:46
-msgid "<b>Account Color</b>"
-msgstr "<b>Color de Cuenta</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:57
+msgid "2nd Tue"
+msgstr "2º mar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:47
-msgid "Show the Account Color as background"
-msgstr "Muestra el Color de Cuenta como fondo"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:58
+msgid "2nd Wed"
+msgstr "2º mié"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:48
-msgid "Show the Account Color as Account Name Background."
-msgstr "Muestra el Color de Cuenta como Fondo del Nombre de Cuenta."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:59
+msgid "2nd Thu"
+msgstr "2º jue"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:49
-msgid "Show the Account Color on tabs"
-msgstr "Muestra el Color de Cuenta en las lengüetas"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:60
+msgid "2nd Fri"
+msgstr "2º vie"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:50
-msgid "Show the Account Color as tab background."
-msgstr "Muestra el Color de Cuenta como fondo de lengüetas."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:61
+msgid "2nd Sat"
+msgstr "2º sáb"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:51
-msgid "Loc_ale:"
-msgstr "Loc_al:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:62
+msgid "2nd Sun"
+msgstr "2º dom"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:53
-msgid "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 "El carácter que se usará entre los componentes del nombre de una cuenta. Es válido cualquier carácter excepto letras, números y cualquiera de las siguientes cadenas: «dos puntos» «barra izquierda», «barra derecha» y «guión»."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:63
+msgid "3rd Mon"
+msgstr "3º lun"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:55
-msgid "<b>Fancy Date Format</b>"
-msgstr "<b>Formato de Fecha Decorado</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:64
+msgid "3rd Tue"
+msgstr "3º mar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:56
-msgid "<b>Date Format</b>"
-msgstr "<b>Formato de Fecha</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:65
+msgid "3rd Wed"
+msgstr "3º mié"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:57
-msgid "<b>Time Format</b>"
-msgstr "<b>Formato de Hora</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:66
+msgid "3rd Thu"
+msgstr "3º jue"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:58
-msgid "U_se 24-hour clock"
-msgstr "_Emplear 24 horas"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:67
+msgid "3rd Fri"
+msgstr "3º vie"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:59
-msgid "Use a 24 hour (instead of a 12 hour) time format."
-msgstr "Emplee el formato temporal de 24 horas (en vez del de 12 horas)."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:68
+msgid "3rd Sat"
+msgstr "3º sáb"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:60
-msgid "<b>Date Completion</b>"
-msgstr "<b>Fecha de Terminación</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:69
+msgid "3rd Sun"
+msgstr "3º dom"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:61
-msgid "When a date is entered without year, it should be taken:"
-msgstr "Cuando se introduce una fecha sin año, se tomerá:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:70
+msgid "4th Mon"
+msgstr "4º lun"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:63
-msgid "Dates will be completed so that they are within the current calendar year."
-msgstr "Las fechas serán completadas para que estén dentro del calendario de año actual."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:71
+msgid "4th Tue"
+msgstr "4º mar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:64
-msgid ""
-"In a sliding 12-month window starting this\n"
-"many months before the current month:"
-msgstr ""
-"Dentro de un plegamiento de 12 meses \n"
-"iniciando esta muchos meses \n"
-"anteriores al mes actual:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:72
+msgid "4th Wed"
+msgstr "4º mié"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:67
-msgid "Enter number of months."
-msgstr "Introduzca el número de meses."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:73
+msgid "4th Thu"
+msgstr "4º jue"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:68
-msgid "Use the date format specified by the system locale."
-msgstr "Emplee el formato de fecha especificado por el sistema local."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:74
+msgid "4th Fri"
+msgstr "4º vie"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:69
-msgid "Date/Time"
-msgstr "Fecha/Hora"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:75
+msgid "4th Sat"
+msgstr "4º sáb"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:72
-msgid "Perform account list _setup on new file"
-msgstr "Realizar una _configuración de plan contable al crear un fichero nuevo"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:76
+msgid "4th Sun"
+msgstr "4º dom"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:73
-msgid "Present the new account list dialog when you choose File -> New File."
-msgstr "Presentar el diálogo de listado de cuenta nueva cuando seleccione Archivo → Crear fichero."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:79
+msgid "Not scheduled"
+msgstr "Sin Programación"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:76
-msgid "Display \"_tip of the day\" dialog"
-msgstr "Enseñar diálogo «_consejo del día»"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:80
+msgid "Select occurrence date above."
+msgstr "Seleccione una fecha de operación arriba."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:77
-msgid "Display hints for using GnuCash at startup."
-msgstr "Enseñar consejos de uso de GnuCash al iniciar."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:85
+#: ../gnucash/report/standard-reports/daily-reports.scm:348
+msgid "Saturday"
+msgstr "sábado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:78
-msgid "How many days to keep old log/backup files."
-msgstr "Cuantos días para mantener los antiguos ficheros bitácora/respaldo."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:86
+#: ../gnucash/report/standard-reports/daily-reports.scm:348
+msgid "Friday"
+msgstr "viernes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:80
-msgid "<b>_Retain log/backup files:</b>"
-msgstr "<b>_Conservar bitácora/respaldo:</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:87
+#: ../gnucash/report/standard-reports/daily-reports.scm:347
+msgid "Wednesday"
+msgstr "miércoles"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:81
-msgid "Com_press files"
-msgstr "Com_primir ficheros"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:88
+#: ../gnucash/report/standard-reports/daily-reports.scm:348
+msgid "Thursday"
+msgstr "jueves"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:82
-msgid "Compress the data file with gzip when saving it to disk."
-msgstr "Comprimir el fichero de datos con gzip al guardarlo en disco."
+#. Note: the absolute-super-duper-i18n'ed solution
+#. would be to use the locale-using functions
+#. date->string of srfi-19, similar to get_wday_name()
+#. in src/engine/FreqSpeq.c. For now, we simply use
+#. the normal translations, which show up in the glade
+#. file src/gnome-utils/gtkbuilder/gnc-frequency.glade anyway.
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:89
+#: ../gnucash/report/standard-reports/daily-reports.scm:346
+msgid "Sunday"
+msgstr "domingo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:83
-msgid "<b>Files</b>"
-msgstr "<b>Ficheros</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:90
+#: ../gnucash/report/standard-reports/daily-reports.scm:346
+msgid "Monday"
+msgstr "lunes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:84
-msgid "_Decimal places:"
-msgstr "Lugares _decimales:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:91
+#: ../gnucash/report/standard-reports/daily-reports.scm:347
+msgid "Tuesday"
+msgstr "martes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:85
-msgid "How many automatic decimal places will be filled in."
-msgstr "Cuantos dígitos decimales automáticos se rellenarán."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:95
+msgid "First on the:"
+msgstr "Primero el:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:86
-msgid "_Automatic decimal point"
-msgstr "Punto decimal _automático"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:96
+msgid "except on weekends:"
+msgstr "excepto en fines de semana:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:87
-msgid "Automatically insert a decimal point into values that are entered without one."
-msgstr "Introduce un punto decimal automáticamente dentro de los valores que son introducidos sin uno."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:97
+msgid "then on the:"
+msgstr "entonces en el:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:88
-msgid "Display ne_gative amounts in red"
-msgstr "Enseñar cantidades ne_gativas en rojo"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:100
+msgid "On the"
+msgstr "En el"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:89
-msgid "Display negative amounts in red."
-msgstr "Enseñar cantidades negativas en rojo."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:1
+msgid "day(s)"
+msgstr "día(s)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:90
-msgid "<b>Numbers</b>"
-msgstr "<b>Números</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:2
+msgid "week(s)"
+msgstr "semana(s)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:91
-msgid "<b>Search Dialog</b>"
-msgstr "<b>Diálogo de Búsqueda</b>"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:3
+msgid "month(s)"
+msgstr "mes(es)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:92
-msgid "New search _limit:"
-msgstr "_Límite de búsqueda nueva:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:4
+msgid "year(s)"
+msgstr "año(s)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:93
-msgid "Default to 'new search' if fewer than this number of items is returned."
-msgstr "Si se devuelven menos objetos que esta cantidad, cambiar a «nueva búsqueda»."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:5
+msgid "Every "
+msgstr "Cada "
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:94
-msgid "Show splash scree_n"
-msgstr "Mostrar _pantalla de presentación"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:6
+msgid "Number of calendar units in the recurrence:  E.g. Biweekly = every 2 weeks; Quarterly = every 3 months"
+msgstr "Número de unidades de calendario en la repetición:  P.e. Bisemanal = cada 2 semanas, Trimestral = cada 3 meses"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:95
-msgid "Show splash screen at startup."
-msgstr "Mostrar pantalla de presentación al inicio."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:7
+msgid "beginning on: "
+msgstr "empezando el: "
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:96
-msgid "Auto-save time _interval:"
-msgstr "_Intervalo de tiempo para auto-guardar:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:8
+msgid "last of month"
+msgstr "último del mes"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:98
-msgid "minutes"
-msgstr "minutos"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:9
+msgid "Always use the last day (or day of week) in the month?"
+msgstr "¿Siempre emplear el último día (o día de la semana) dentro del mes?"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:99
-msgid "Show auto-save confirmation _question"
-msgstr "Mostrar la _pregunta de confirmación de autoguardado"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:10
+msgid "same week & day"
+msgstr "misma semana y día"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:100
-msgid "If active, GnuCash shows a confirmation question each time the auto-save feature is started. Otherwise no extra explanation is shown."
-msgstr "Si está activo, GnuCash muestra una pregunta de confirmación cada vez que se inicia la característica de auto-guardado. En otro caso no se muestra esta explicación."
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:11
+msgid "Match the \"day of week\" and \"week of month\"? (for example, the \"second Tuesday\" of every month)"
+msgstr "¿Coteja el «día de la semana» con la «semana del mes»? (por ejemplo, el «segundo martes» de cada mes)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:109
-msgid "Time to _wait for answer:"
-msgstr "Tiempo a _esperar una respuesta:"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:4
+msgid "Only show _active owners"
+msgstr "Mostrar únicamente los titulares _activos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:111
-msgid "seconds"
-msgstr "segundos"
+#: ../gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:5
+msgid "Show _zero balance owners"
+msgstr "Mostrar titulares de balance a _cero"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:112
-msgid "Path head for Transaction Associated files "
-msgstr "Ruta cabecera para ficheros de Transacciones Asociadas "
+#: ../gnucash/gnome-utils/window-main-summarybar.c:304
+#, c-format
+msgid "%s, Total:"
+msgstr "%s, total:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:113
-msgid "<b>Path head for Transaction Association Files</b>"
-msgstr "<b>Ruta cabecera para Ficheros de Asociación Transaccional</b>"
+#: ../gnucash/gnome-utils/window-main-summarybar.c:307
+#, c-format
+msgid "%s, Non Currency Commodities Total:"
+msgstr "%s, Sin Total de mercancías No Monetaria:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:114
-msgid "Enable horizontal grid lines on table displays"
-msgstr "Activar líneas horizontales de rejilla en visores de lengüetas"
+#: ../gnucash/gnome-utils/window-main-summarybar.c:310
+#, c-format
+msgid "%s, Grand Total:"
+msgstr "%s, Saldo:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:115
-msgid "Enable horizontal grid lines on table displays. These will mainly be tree views like the Accounts page."
-msgstr "Activa líneas horizontales de rejilla en visores de lengüetas. Estos principalmente serán vistas arbóreas como la página de Cuentas."
+#: ../gnucash/gnome-utils/window-main-summarybar.c:314
+#, c-format
+msgid "%s:"
+msgstr "%s:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:116
-msgid "Enable vertical grid lines on table displays"
-msgstr "Activar líneas verticales de rejilla en visores de lengüetas"
+#: ../gnucash/gnome-utils/window-main-summarybar.c:417
+msgid "Net Assets:"
+msgstr "Activos netos:"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:117
-msgid "Enable vertical grid lines on table displays. These will mainly be tree views like the Accounts page."
-msgstr "Activa líneas verticales de rejilla en visores de lengüetas. Estos principalmente serán vistas arbóreas como la página de Cuentas."
+#: ../gnucash/gnome-utils/window-main-summarybar.c:420
+msgid "Profits:"
+msgstr "Beneficios:"
+
+#: ../gnucash/gnucash-bin.c:96
+msgid "Show GnuCash version"
+msgstr "Mostrar versión de GnuCash"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:119
-msgid "<b>Checks</b>"
-msgstr "<b>Comprobaciones</b>"
+#: ../gnucash/gnucash-bin.c:101
+msgid ""
+"Enable debugging mode: provide deep detail in the logs.\n"
+"This is equivalent to: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
+msgstr ""
+"Activar modo de depuración: proporciona detalles internos dentro de las bitácoras.\n"
+"Esto es equivalente a: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:120
-msgid "Print _date format"
-msgstr "Formato de _fecha impresa"
+#: ../gnucash/gnucash-bin.c:106
+msgid "Enable extra/development/debugging features."
+msgstr "Activar características extra/desarrollo/depuración."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:121
-msgid "Below the actual date, print the format of that date in 8 point type."
-msgstr "Debajo de las fechas efectivas, escribe el formato de esa fecha de tipo de 8 puntos."
+#: ../gnucash/gnucash-bin.c:111
+msgid ""
+"Log level overrides, of the form \"modulename={debug,info,warn,crit,error}\"\n"
+"Examples: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
+"This can be invoked multiple times."
+msgstr ""
+"Nivel de bitácora sobrepasado, del formato  \"modulename={debug,info,warn,crit,error}\"\n"
+"Ejemplos: \"--log qof=debug\" o \"--log gnc.backend.file.sx=info\"\n"
+"boletínuede ser invocado múltiples veces."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:122
-msgid "Default _font:"
-msgstr "Tipo de _letra predeterminada:"
+#: ../gnucash/gnucash-bin.c:117
+msgid "File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or \"stdout\"."
+msgstr "El fichero bitácora interna; por defecto a «/tmp/gnucash.trace»; puede ser «stderr» o «stdout»."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:123
-msgid "The default check printing font."
-msgstr "El tipograma de escritura predeterminado para casillas."
+#: ../gnucash/gnucash-bin.c:123
+msgid "Do not load the last file opened"
+msgstr "No cargar el último fichero abierto"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:124
-msgid "Print _blocking chars"
-msgstr "Escribir caracteres de _bloqueo"
+#: ../gnucash/gnucash-bin.c:127
+msgid "Set the prefix for gsettings schemas for gsettings queries. This can be useful to have a different settings tree while debugging."
+msgstr "Establece el prefijo para los esquemas de ‘gsettings’ de peticiones ‘gsettings’. Esto puede ser útil tener una opción del plan mientras depura."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:125
-msgid "Print '***' before and after each text field on the check."
-msgstr "Escribir '***' antes y después de cada campo de texto en la comprobación."
+#. Translators: Argument description for autohelp; see
+#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
+#: ../gnucash/gnucash-bin.c:130
+msgid "GSETTINGSPREFIX"
+msgstr "GSETTINGSPREFIX"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:126
-msgid "Printing"
-msgstr "Escribiendo"
+#: ../gnucash/gnucash-bin.c:134
+msgid "Add price quotes to given GnuCash datafile"
+msgstr "Añade precios cotizados al fichero de datos de GnuCash indicado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:127
-#: ../gnucash/import-export/dialog-import.glade.h:48
-msgid "<b>Actions</b>"
-msgstr "<b>Operaciones</b>"
+#. Translators: Argument description for autohelp; see
+#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
+#: ../gnucash/gnucash-bin.c:137
+msgid "FILE"
+msgstr "FICHERO"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:128
-msgid "'_Enter' moves to blank transaction"
-msgstr "«_Introducir» mueve a transacción vacía"
+#: ../gnucash/gnucash-bin.c:141
+msgid "Regular expression determining which namespace commodities will be retrieved"
+msgstr "Expresión regular que determina qué mercancías se obtendrán"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:129
-msgid "If checked, pressing the 'Enter' key will move to the location of the blank transaction in the register. If clear, pressing the 'Enter' key will move down one row."
-msgstr "Si está marcado, pulsando la tecla «Entrar» le llevará a la ubicación de la transacción en blanco dentro del registro. Si está vacío, pulsando la tecla «Introducir» le bajará una fila."
+#. Translators: Argument description for autohelp; see
+#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
+#: ../gnucash/gnucash-bin.c:144
+msgid "REGEXP"
+msgstr "REGEXP"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:130
-msgid "_Auto-raise lists"
-msgstr "_Auto-desplegar listados"
+#: ../gnucash/gnucash-bin.c:147
+msgid "[datafile]"
+msgstr "[fichero-dato]"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:131
-msgid "Automatically raise the list of accounts or actions during input."
-msgstr "Elevar automáticamente la lista de cuentas u operaciones durante entrada."
+#: ../gnucash/gnucash-bin.c:159
+msgid "This is a development version. It may or may not work."
+msgstr "Esta es una versión de desarrollo. Puede que funcione, o puede que no."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:132
-msgid "<b>Reconciling</b>"
-msgstr "<b>Conciliando...</b>"
+#: ../gnucash/gnucash-bin.c:160
+msgid "Report bugs and other problems to gnucash-devel at gnucash.org"
+msgstr "Envíe todos los defectos y otros problemas a gnucash-devel at gnucash.org"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:133
-msgid "Check cleared _transactions"
-msgstr "Comprobar _transacciones punteadas"
+#: ../gnucash/gnucash-bin.c:161
+msgid "You can also lookup and file bug reports at http://bugzilla.gnome.org"
+msgstr "También puede ver y enviar boletines de defectos a http://bugzilla.gnome.org"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:134
-msgid "Pre-check cleared transactions when creating a reconcile dialog."
-msgstr "Pre-comprobar transacciones punteadas cuando cree un diálogo de conciliación."
+#: ../gnucash/gnucash-bin.c:162
+msgid "To find the last stable version, please refer to http://www.gnucash.org"
+msgstr "Para encontrar la última versión estable, vaya a http://www.gnucash.org"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:135
-msgid "Automatic _interest transfer"
-msgstr "Transferencia de _intereses automática"
+#: ../gnucash/gnucash-bin.c:423
+msgid "- GnuCash, accounting for personal and small business finance"
+msgstr "- GnuCash, para contabilidad financiera personal y pequeños negocios"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:137
-msgid "Automatic credit card _payment"
-msgstr "Auto-_liquidación por tarjeta de crédito"
+#: ../gnucash/gnucash-bin.c:429 ../gnucash/gnucash-bin.c:817
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Ejecute '%s --help' para ver un listado completa de opciones de línea de órdenes disponibles.\n"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:138
-msgid "After reconciling a credit card statement, prompt the user to enter a credit card payment."
-msgstr "Después de conciliar una tarjeta de crédito declarada, solicite al usuario la introducción de una liquidación por tarjeta de crédito."
+#: ../gnucash/gnucash-bin.c:440
+#, c-format
+msgid "GnuCash %s development version"
+msgstr "GnuCash %s versión de desarrollo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:139
-msgid "Always reconcile to t_oday"
-msgstr "Siempre conciliar al día de h_oy"
+#: ../gnucash/gnucash-bin.c:442
+#, c-format
+msgid "GnuCash %s"
+msgstr "GnuCash %s"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:140
-msgid "Always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations."
-msgstr "Si está activada, siempre abrirá el diálogo de conciliación usando la fecha del día para la fecha del declarada, a no ser que previno la conciliación."
+#: ../gnucash/gnucash-bin.c:552
+msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
+msgstr "Sin cotizaciones recuperadas. Financia::Cotización no está instalado correctamente.\n"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:141
-msgid "Draw _vertical lines between columns"
-msgstr "Dibujar líneas _verticales entre columnas"
+#. Install Price Quote Sources
+#: ../gnucash/gnucash-bin.c:633
+msgid "Checking Finance::Quote..."
+msgstr "Comprobando Finanzas::Cotizaciones..."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:142
-msgid "Show vertical borders on the cells."
-msgstr "Mostrar bordes verticales sobre las casillas."
+#: ../gnucash/gnucash-bin.c:641
+msgid "Loading data..."
+msgstr "Cargando datos..."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:143
-msgid "<b>Layout</b>"
-msgstr "<b>Apariencia</b>"
+#: ../gnucash/gnucash-bin.c:818
+msgid ""
+"Error: could not initialize graphical user interface and option add-price-quotes was not set.\n"
+"       Perhaps you need to set the $DISPLAY environment variable ?"
+msgstr ""
+"Error: no pude inicializar el interfaz gráfico de usuario y la opción ‘add-price-quotes’ no fue \n"
+"       establecida.\n"
+"       ¿Quizá necesita establecer la variable del entorno $DISPLAY ?"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:144
-msgid "_Future transactions after blank transaction"
-msgstr "_Transacciones futuras tras transación vacía"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:1
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:41
+#: ../gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in.h:2
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:1
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:9
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:1
+#: ../gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:2
+#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:1
+#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:1
+#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:1
+#: ../gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in.h:17
+#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:4
+msgid "Last window position and size"
+msgstr "Última posición y tamaño de la ventana"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:145
-msgid "If checked, transactions with a date in the future will be displayed at the bottom of the register after the blank transaction. If clear, the blank transaction will be at the bottom of the register after all transactions."
-msgstr "Si comprobó, transacciones con una fecha en el futuro serán enseñadas al fondo del registro tras la transacción en blanco. Si está vacío, la transacción en blanco estará al fondo del registro después de todas las transacciones."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:2
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:42
+#: ../gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in.h:3
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:2
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:10
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:2
+#: ../gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:3
+#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:2
+#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:2
+#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:2
+#: ../gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in.h:18
+#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:5
+msgid "This setting describes the size and position of the window when it was last closed. The numbers are the X and Y coordinates of the top left corner of the window followed by the width and height of the window."
+msgstr "Este opción describe el tamaño y posición de la ventana cuando se cerró la última vez. Los números son las coordenadas X e Y de la esquina cima izquierda de la ventana seguida por el ancho y alto de la ventana."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:146
-msgid "Draw hori_zontal lines between rows"
-msgstr "Dibujar líneas hori_zontales entre filas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:3
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:4
+msgid "Search only in active items"
+msgstr "Buscar sólo en objetos activos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:147
-msgid "Show horizontal borders on the cells."
-msgstr "Mostrar bordes horizontales en las casillas."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:4
+msgid "If active, only the 'active' items in the current class will be searched. Otherwise all items in the current class will be searched."
+msgstr "Si está activo, solo se buscarán los objetos «activos» dentro de la clase actual. En otro caso se buscarán todos los objetos en la clase actual."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:148
-msgid "Double _mode colors alternate with transactions"
-msgstr "Colores del _modo doble alternan con transacciones"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:5
+msgid "Is tax included in this type of business entry?"
+msgstr "¿Está incluida la imposición en este tipo de asiento de negocios?"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:149
-msgid "Alternate the primary and secondary colors by transaction instead of by alternating by row."
-msgstr "Alternar color principal y secundario en cada  la transacción, en vez de alternarlo por fila."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:6
+msgid "If set to active then tax is included by default in entries of this type. This setting is inherited by new customers and vendors."
+msgstr "Si se marca, entonces la imposición se incluye por omisión en las anotación de este tipo. Los clientes y proveedores nuevos heredan este valor."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:150
-msgid "_Use GnuCash built-in color theme"
-msgstr "_Emplear tema de colores compilados en GnuCash"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:7
+msgid "Auto pay when posting."
+msgstr "Auto-liquidar cuando venza."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:151
-msgid "GnuCash uses a yellow/green theme by default for register windows. Uncheck this if you want to use the system color theme instead."
-msgstr "GnuCash por defecto utiliza un tema amarillo/verde para las ventanas del registro. Desmarque esto si quiere emplear el color del tema del sistema en su lugar."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:9
+msgid "Show invoices due reminder at startup"
+msgstr "Mostrar recordatorio de facturaciones vencidas al inicio"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:152
-msgid "<b>Graphics</b>"
-msgstr "<b>Gráficos</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:10
+msgid "If active, at startup GnuCash will check to see whether any invoices will become due soon. If so, it will present the user with a reminder dialog. The definition of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash does not check for due invoices."
+msgstr "Si está activo, al iniciar GnuCash comprobará para ver si cualquiera de las facturaciones se convertirá pronto en vencimiento. Si esto ocurre, se presentará al usuario con un diálogo de recuerdo. La definición de «pronto» lo controla a través de la opción «Días de antelación». En caso contrario GnuCash no comprueba el vencimiento facturante."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:153
-msgid "Tab order in_cludes Transfer on Memorised Transactions"
-msgstr "Lengüeta de Operación _incluye Transferencia sobre Transacciones Registradas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:11
+msgid "Show invoices due within this many days"
+msgstr "Mostrar facturas vencidas dentro de estos cantidad de días"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:154
-msgid "Move to Transfer field when memorised transaction auto filled."
-msgstr "Mover para Transferir campos cuando la transacción registrada sea autocompletada."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:12
+msgid "This field defines the number of days in advance that GnuCash will check for due invoices. Its value is only used if the \"Notify when due\" setting is active."
+msgstr "Este campo define el número de días de antelación con la que GnuCash comprobará para facturaciones vencidas. Su valor está empleado únicamente si la opción «Notificar cuando venza» está activa."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:156
-msgid "<b>Default Style</b>"
-msgstr "<b>Estilo Predet.</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:13
+msgid "Enable extra toolbar buttons for business"
+msgstr "Activa la barra de botones adicional para negocios"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:157
-msgid "<b>Other Defaults</b>"
-msgstr "<b>Otros Predet.</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:16
+msgid "The name of the report to be used for invoice printing."
+msgstr "El nombre del boletín a ser utilizar para declarar facturas."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:158
-msgid "_Basic ledger"
-msgstr "Libro _básico"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:17
+msgid "Open new invoice in new window"
+msgstr "Abre una factura nueva dentro de una ventana nueva"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:160
-msgid "_Auto-split ledger"
-msgstr "_Auto-desglosar libro"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:18
+msgid "If active, each new invoice will be opened in a new window. Otherwise a new invoice will be opened as a tab in the main window."
+msgstr "Si está activo, cada factura nuevo se abrirá en una ventana nueva. En otro caso una factura nuevo será abierto como una lengüeta en la ventana principal."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:164
-msgid "Number of _transactions:"
-msgstr "Número de _transacciones:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:19
+msgid "Accumulate multiple splits into one"
+msgstr "Acumular múltiples desgloses en uno"
+
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:20
+msgid "If this field is active then multiple entries in an invoice that transfer to the same account will be accumulated into a single split. This field can be overridden per invoice in the Posting dialog."
+msgstr "Si este campo está activo entonces todos los asientos en una factura que se transfiere a la misma cuenta serán acumuladas en un único desglose. Este campo puede cambiarse en cada factura del diálogo de Contabilización."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:166
-msgid "_Double line mode"
-msgstr "Modo línea _doble"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:22
+msgid "Show bills due reminder at startup"
+msgstr "Mostrar recordatorio de recibos vencidos al inicio"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:167
-msgid "Show two lines of information for each transaction instead of one. Does not affect expanded transactions."
-msgstr "Mostrar dos líneas de información para cada  la transacción en vez de una. No afecta a las transacciones expandidos."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:23
+msgid "If active, at startup GnuCash will check to see whether any bills will become due soon. If so, it will present the user with a reminder dialog. The definition of \"soon\" is controlled by the \"Days in Advance\" setting. Otherwise GnuCash does not check for due bills."
+msgstr "Si está activo, al iniciar GnuCash comprobará para ver si cualquiera de los recibos se convertirá pronto en vencimiento. Si esto ocurre, se presentará al usuario con un diálogo recordatorio. La definición de «pronto» lo controla a través de opción «Días de antelación». En caso contrario GnuCash no comprueba el vencimiento de recibos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:168
-msgid "Register opens in a new _window"
-msgstr "El registro se abre en una _ventana nueva"
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:24
+msgid "Show bills due within this many days"
+msgstr "Mostrar recibos vencidos a lo largo de los siguientes días"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:169
-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."
-msgstr "Si está marcado, cada registro se abrirá en su propia ventana de nivel cima. Si está vacío, el registro será abierto en la ventana actual."
+#: ../gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:25
+msgid "This field defines the number of days in advance that GnuCash will check for due bills. Its value is only used if the \"Notify when due\" setting is active."
+msgstr "Este campo define el número de días de antelación con la que GnuCash comprobará recibos vencidos. Su valor se usa únicamente si la opción «Notificar vencimiento» está activa."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:170
-msgid "_Only display leaf account names"
-msgstr "_Sólo enseñar los nombres de rama de cuenta"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:1
+msgid "GUID of predefined check format to use"
+msgstr "GUID del formato de comprobación predefinido a emplear"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:171
-msgid "If checked, only the names of the leaf accounts are displayed in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Checking this option implies that you use unique leaf names."
-msgstr "Si está marcada, sólo los nombres de las ramas de cuentas están enseñadas dentro de los registros y en la ventana emergente de selección. El comportamiento predeterminado es enseñar el nombre completo, incluyendo la ruta en el plan contable. Comprobar esta opción implica que usted utiliza nombres de ramas únicos."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:2
+msgid "This value specifies the predefined check format to use. The number is the guid of a known check format."
+msgstr "Este valor especifica el formato de comprobación predefinido para emplear. El número es el guid de un formato de comprobación conocido."
 
-#. Register2 feature
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:173
-msgid "Number of _characters for auto complete:"
-msgstr "Número de _caracteres para autocompletado:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:3
+msgid "Which check position to print"
+msgstr "Cual posición de marca a escribir"
 
-#. Register2 feature
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:177
-msgid "Show the _entered and reconcile dates"
-msgstr "Mostrar las _fechas introducidas y conciliadas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:4
+msgid "On preprinted checks containing multiple checks per page, this setting specifies which check position to print. The possible values are 0, 1 and 2, corresponding to the top, middle and bottom checks on the page."
+msgstr "En comprobaciones anticipadas que contienen múltiples comprobaciones por página, esta opción especifica cual posición marcar. Los valores posibles son 0, 1 y 2, que corresponden a los comprobaciones ubicados a la cima, mitad y fondo de la página."
 
-#. Register2 feature
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:180
-msgid "Show the calendar b_uttons"
-msgstr "Mostrar los _botones del calendario"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:5
+msgid "Number of checks to print on the first page."
+msgstr "Número de comprobaciones a marcar en la primera página."
 
-#. Register2 feature
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:183
-msgid "_Move the selection to the blank split on expand"
-msgstr "_Mover la selección al desglose vacío al expandir"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:6
+msgid "Date format to use"
+msgstr "Formato de fecha a usar"
 
-#. Register2 feature
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:186
-msgid "_Show entered and reconciled dates on selection"
-msgstr "_Mostrar fechas introducidas y conciliadas en la selección"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:7
+msgid "This is the numerical identifier of the predefined date format to use."
+msgstr "Este es el identificador numérico del formato de fecha predefinido a usar."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:188
-msgid "Register Defaults"
-msgstr "Registro Predeterminado"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:8
+msgid "Custom date format"
+msgstr "Formato de fecha personalizado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:191
-msgid "<b>Default Report Currency</b>"
-msgstr "<b>Boletín Monetario Predeterminado</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:9
+msgid "If the date format is set to indicate a custom date format, this value is used as an argument to strftime to produce the date to be printed. It may be any valid strftime string; for more information about this format, read the manual page of strftime by \"man 3 strftime\"."
+msgstr "Si el formato de fecha está establecido para indicar un formato de fecha personalizado, este valor se usa como un argumento a “strftime” para producir la fecha que sea marcada. Puede ser cualquier cadena “strftime” válida; para más información sobre este formato, lea la página del manual de “strftime” con «man 3 strftime»."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:192
-msgid "<b>Location</b>"
-msgstr "<b>Ubicación</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:10
+msgid "Units in which the custom coordinates are expressed"
+msgstr "Unidades en las cuales las coordenadas personalizadas están expresadas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:193
-msgid "Report opens in a new _window"
-msgstr "El boletín se abre en una _ventana nueva"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:11
+msgid "Units in which the custom coordinates are expressed (inches, mm, ...)."
+msgstr "Unidades en las cuales las coordenadas personalizadas están expresadas (pulgadas, mm, ...)."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:194
-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."
-msgstr "Si está marcado, cada boletín se abrirá en su propia ventana de nivel cima. Si está vacío, el boletín se abrirá en la ventana actual."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:12
+msgid "Position of payee name"
+msgstr "Posición del portador"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:195
-msgid "<b>Default zoom level</b>"
-msgstr "<b>Nivel de zoom Prederminado</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:13
+msgid "This value contains the X,Y coordinates for the start of the payee line on the check."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de portador en la comprobación."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:197
-msgid "Reports"
-msgstr "Boletines"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:14
+msgid "Position of date line"
+msgstr "Posición de la línea de fecha"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:198
-msgid "<b>Window Geometry</b>"
-msgstr "<b>Geometría de Ventana</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:15
+msgid "This value contains the X,Y coordinates for the start of the date line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de fecha en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:199
-msgid "_Save window size and position"
-msgstr "_Guardar tamaños y posiciones de ventanas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:16
+msgid "Position of check amount in words"
+msgstr "Posición en la comprobación de la cantidad en palabras"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:200
-msgid "Save window size and location when it is closed."
-msgstr "Guarda tamaño y localización cuando está cerrado."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:17
+msgid "This value contains the X,Y coordinates for the start of the written amount line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de la cantidad escrita en la comprobación. Las coordenadas son respecto a la esquina superior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:201
-msgid "Bring the most _recent tab to the front"
-msgstr "Traer la lengüeta más _reciente al frente"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:18
+msgid "Position of check amount in numbers"
+msgstr "Posición de la cantidad en números de comprobación"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:203
-msgid "<b>Tab Position</b>"
-msgstr "<b>Posición de Lengüeta</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:19
+msgid "This value contains the X,Y coordinates for the start of the numerical amount line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de cantidad numérica en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:204
-msgid "To_p"
-msgstr "_Techo"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:20
+msgid "Position of payee address"
+msgstr "Posición de la dirección del portador"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:206
-msgid "B_ottom"
-msgstr "_Suelo"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:21
+msgid "This value contains the X,Y coordinates for the start of the payee address line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de dirección del portador en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:208
-msgid "_Left"
-msgstr "_Izquierda"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:22
+msgid "Position of notes line"
+msgstr "Posición de la línea de anotaciones"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:210
-msgid "_Right"
-msgstr "_Derecha"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:23
+msgid "This value contains the X,Y coordinates for the start of the notes line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de anotaciones en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:212
-msgid "<b>Summary Bar Position</b>"
-msgstr "<b>Posición a Barra de Resumen</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:24
+msgid "Position of memo line"
+msgstr "Posición de la línea de memorándum"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:217
-msgid "<b>Tabs</b>"
-msgstr "<b>Etiquetas</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:25
+msgid "This value contains the X,Y coordinates for the start of the memo line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de memorándum en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:218
-msgid "Show close button on _notebook tabs"
-msgstr "Mostrar botón cerrar en _pestañas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:26
+msgid "Offset for complete check"
+msgstr "Desplazamiento para comprobación completa"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:219
-msgid "Show a close button on each notebook tab. These function identically to the 'Close' menu item."
-msgstr "Mostrar un botón de cierre en cada lengüeta del cuaderno. Estas funcionan idénticamente al elemento del menú «Cerrar»."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:27
+msgid "This value contains the X,Y offset for the complete check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas el offset X,Y para la comprobación completa. Las coordenadas están desde la esquina inferior izquierda de la posición de compobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:220
-msgid "_Width:"
-msgstr "A_nchura:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:28
+msgid "Rotation angle"
+msgstr "Ángulo de rotación"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:221
-msgid "If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis."
-msgstr "Si el texto en la lengüeta es más larga que este valor (el resto es aproximado) entonces la etiqueta tendrá un corte en la mitad y remplazada con una elipsis."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:29
+msgid "Number of degrees to rotate the check."
+msgstr "Número de grados para rotar la comprobación."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:222
-msgid "characters"
-msgstr "caracteres"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:30
+msgid "Position of split's amount in numbers"
+msgstr "Posición del desglose de cantidad en números"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:223
-msgid "Windows"
-msgstr "Ventanas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:31
+msgid "This value contains the X,Y coordinates for the start of the split's amount line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de cantidad del desglose en la comprobación. Las coordenadas están desde la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:226
-msgid "Online Quotes"
-msgstr "Conexión de Cotizaciones"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:32
+msgid "Position of split's memo line"
+msgstr "Posición del desglose de la línea del memorándum"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:1
-msgid "Reset Warnings"
-msgstr "Restablecer advertencias"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:33
+msgid "This value contains the X,Y coordinates for the start of the split's memo line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de memorándum en la comprobación. Las coordenadas son respecto a la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:5
-msgid "You have requested that the following warning dialogs not be presented. To re-enable any of these dialogs, select the check box next to the dialog, then click OK."
-msgstr "Ha solicitado que los siguientes diálogos de advertencia no se muestren. Para reactivar cualquiera de estos diálogos, seleccione la casilla de marca siguiente al diálogo, y entonces pulse Aceptar."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:34
+msgid "Position of split's account line"
+msgstr "Posición del desglose de la línea de cuenta"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:7
-msgid "_Unselect All"
-msgstr "_Deseleccionar todo"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:35
+msgid "This value contains the X,Y coordinates for the start of the split's account line on the check. Coordinates are from the lower left corner of the specified check position."
+msgstr "Este valor contiene las coordenadas X,Y para el comienzo de la línea de desglose de cuenta en la comprobación. Las coordenadas están desde la esquina inferior izquierda de la posición de comprobación especificada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:8
-msgid "No warnings to reset."
-msgstr "Ninguna advertencia para restaurar."
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:36
+msgid "Print the date format below the date."
+msgstr "Escribir el formato de fecha debajo de la fecha."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:9
-msgid "Permanent Warnings"
-msgstr "Advertencias permanentes"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:37
+msgid "Each time the date is printed, print the date format immediately below in 8 point type using the characters Y, M, and D."
+msgstr "Cada vez que la fecha está escrita, escriba el formato de fecha inmediatamente debajo del tipo de 8 puntos empleando los caracteres A, M, y D."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade.h:10
-msgid "Temporary Warnings"
-msgstr "Advertencias Temporales"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:38
+msgid "The default check printing font"
+msgstr "El tipograma predeterminado para marcar casillas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:1
-msgid "Tax Tables"
-msgstr "Tablas Impositivas"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:39
+msgid "The default font to use when printing checks. This value will be overridden by any font specified in a check description file."
+msgstr "El tipo de letra por omisión para usar cuando declare comprobaciones. Este valor será sobrescrito por cualquier tipo de letra especificada en un fichero de descripción de comprobación."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:3
-msgid "<b>Tax Tables</b>"
-msgstr "<b>Lengüetas de Imposiciones</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in.h:40
+msgid "Print '***' before and after text."
+msgstr "Escribe '***' antes y después del texto."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:6
-msgid "<b>Tax Table Entries</b>"
-msgstr "<b>Asientos de Lengüetas Impositivas</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in.h:1
+msgid "Show currencies in this dialog"
+msgstr "Muestra monedas dentro de este diálogo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:8
-msgid "De_lete"
-msgstr "B_orrar"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:3
+msgid "Position of the horizontal pane divider."
+msgstr "Posición del panel divisor horizontal."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:9
-msgid "Ne_w"
-msgstr "_Crear"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:5
+msgid "This setting indicates whether to search in all items in the current class, or only in 'active' items in the current class."
+msgstr "Esta opción indica si se busca en todos los objetos de la clase actual, o sólo en los objetos «activos» de la familia actual."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:10
-msgid "Value $"
-msgstr "Valor €"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:6
+#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:19
+#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:3
+#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:3
+#: ../gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in.h:1
+#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:6
+msgid "Last pathname used"
+msgstr "Última ruta usada"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:12
-#, no-c-format
-msgid "Percent %"
-msgstr "Porcentaje %"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:7
+#: ../gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in.h:20
+#: ../gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in.h:4
+#: ../gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in.h:4
+#: ../gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in.h:2
+#: ../gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in.h:7
+msgid "This field contains the last pathname used by this window. It will be used as the initial filename/pathname the next time this window is opened."
+msgstr "Este campo contiene la última ruta usada por esta ventana. Se usará como el nombre de fichero/nombre de ruta inicial la próxima vez que se abra la ventana."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:15
-msgid "<b>Tax Table Entry</b>"
-msgstr "<b>Asiento de Lengüeta Impositiva</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:8
+msgid "Position of the vertical pane divider."
+msgstr "Posición del panel divisor vertical."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:16
-msgid "<b>Tax Table</b>"
-msgstr "<b>Lengüeta Impositiva</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:9
+msgid "Show the new user window"
+msgstr "Muestra la ventana del usuario nuevo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:17
-msgid "_Account:"
-msgstr "_Cuenta:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:10
+msgid "If active, the new user window will be shown. Otherwise it will not be shown."
+msgstr "Si está activo, se mostrará la ventana del usuario nuevo. De lo contrario, no se muestra."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:18
-msgid "_Value: "
-msgstr "_Valor: "
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:11
+msgid "New hierarchy window on \"New File\""
+msgstr "Nueva ventana de jerarquía en «Crear fichero»"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:19
-msgid "_Type: "
-msgstr "_Tipo: "
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:12
+msgid "If active, the \"New Hierarchy\" window will be shown whenever the \"New File\" menu item is chosen. Otherwise it will not be shown."
+msgstr "Si está activo, la ventana de «Nueva jerarquía» se mostrará siempre que se elija el «Nuevo fichero» del menú. En otro caso, no se mostrará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade.h:20
-msgid "_Name: "
-msgstr "_Nombre: "
+#: ../gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:13
+msgid "Default to 'new search' if fewer than this number of items is returned"
+msgstr "Predeterminar a 'nueva búsqueda' si menos  que este número de objetos es devuelto"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:1
-msgid "GnuCash Tip Of The Day"
-msgstr "Consejo del día GnuCash"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:1
+msgid "Pre-select cleared transactions"
+msgstr "Preseleccionar transacciones punteadas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:2
-msgid "_Back"
-msgstr "_Atrás"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:2
+msgid "If active, all transactions marked as cleared in the register will appear already selected in the reconcile dialog. Otherwise no transactions will be initially selected."
+msgstr "Si está activo, todas las transacciones marcadas como punteado en el registro aparecerán seleccionados en el diálogo de conciliación. En otro caso no se seleccionará inicialmente ninguna transacción."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:3
-msgid "_Forward"
-msgstr "_Avanzar"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:3
+msgid "Prompt for interest charges"
+msgstr "Pide para cargos de intereses"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:5
-msgid "<b>Tip of the Day:</b>"
-msgstr "<b>Consejo del día:</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:5
+msgid "Prompt for credit card payment"
+msgstr "Pide liquidación por tarjetas de crédito"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-totd.glade.h:6
-msgid "_Show tips at startup"
-msgstr "_Mostrar consejos en el inicio"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:6
+msgid "If active, after reconciling a credit card account, prompt the user to enter a credit card payment. Otherwise do not prompt the user for this."
+msgstr "Si activo, después de conciliar una liquidación de tarjeta de crédito, solicitar al usuario la introducción de una liquidación por tarjeta de crédito. En otro caso no solicite esto al usuario."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:1
-msgid "Transfer Funds"
-msgstr "Transferencia de Fondos"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:7
+msgid "Always reconcile to today"
+msgstr "Siempre conciliar al día de hoy"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:2
-msgid "<b>Basic Information</b>"
-msgstr "<b>Información Básica</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in.h:8
+msgid "If active, always open the reconcile dialog using today's date for the statement date, regardless of previous reconciliations."
+msgstr "Si está activo, siempre abrirá el diálogo de conciliación usando la fecha del día para la fecha declarada, sin importar anteriores conciliaciones."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:4
-msgid "Date:"
-msgstr "Fecha:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:3
+msgid "Run \"since last run\" dialog when a file is opened."
+msgstr "Inicio del diálogo «desde la última ejecución» cuando se abra un fichero."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:5
-msgid "Num:"
-msgstr "Número:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:4
+msgid "This setting controls whether the scheduled transactions \"since last run\" processing is run automatically when a data file is opened. This includes the initial opening of the data file when GnuCash starts. If this setting is active, run the \"since last run\" process, otherwise it is not run."
+msgstr "Este opción controla si la transacción programada procesándose «desde la última ejecución» se ejecuta automáticamente cuando el fichero de datos se abre. Esto incluye la apertura inicial del fichero de datos cuando se inicia GnuCash. Si esta opción está activa, se ejecuta el proceso «desde última ejecución», en otro caso no se ejecuta."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:7
-msgid "Memo:"
-msgstr "Memorandum:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:5
+msgid "Show \"since last run\" notification dialog when a file is opened."
+msgstr "Muestra el diálogo de notificación «desde la última ejecución» cuando se abre un fichero."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:8
-msgid "<b>Transfer From</b>"
-msgstr "<b>Transferencia Origen</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:6
+msgid "This setting controls whether the scheduled transactions notification-only \"since last run\" dialog is shown when a data file is opened (if \"since last run\" processing is enabled on file open). 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 "Esta opción controla si la notificación-única de transacción programada del diálogo \"desde la última ejecución\" será mostrada cuando un fichero de datos está abierto (si el proceso de \"desde última ejecución\" está activado en un fichero abierta). Esto incluye la apertura inicial del fichero de datos cuando se inicia GnuCash. Si esta opción está activa, muestra el diálogo, en otro caso no lo muestra."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:9
-msgid "Currency:"
-msgstr "Moneda:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:7
+msgid "Set the \"auto create\" flag by default"
+msgstr "Activa la marca “autocrear” predeterminada"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:10
-#: ../gnucash/report/standard-reports/net-barchart.scm:55
-#: ../gnucash/report/standard-reports/net-linechart.scm:51
-#: ../gnucash/report/standard-reports/price-scatter.scm:51
-msgid "Show Income/Expense"
-msgstr "Mostrar Ingreso/Gasto"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:8
+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 "Si está activo, cualquier transacción programado nuevo tendrá el valor «autocrear» activo por omisión. El usuario puede cambiar este valor durante la creación de la transacción, o en cualquier momento editando el transacción programado."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:11
-msgid "<b>Transfer To</b>"
-msgstr "<b>Transferencia Destino</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:9
+msgid "How many days in advance to notify the user."
+msgstr "Cuantos días de antelación para notificar al usuario."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:12
-msgid "<b>Currency Transfer</b>"
-msgstr "<b>Transferencia Monetaria</b>"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:10
+msgid "Set the \"notify\" flag by default"
+msgstr "Activa la marca “notificar” predeterminada"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:13
-msgid "Exchange Rate:"
-msgstr "Tipo de cambio:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:11
+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 "Si está activo, cualquier transacción programada nueva tendrá el valor «notificar» activo por omisión. El usuario puede cambiar este valor durante la creación de la transacción, o en cualquier momento editando la transacción programada. Este valor solo tiene significado si el valor autocrear está activo."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade.h:15
-msgid "_Fetch Rate"
-msgstr "_Obtener tipo"
+#: ../gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in.h:12
+msgid "How many days in advance to remind the user."
+msgstr "Cuantos días de antelación para recordar al usuario."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:1
-msgid "Username and Password"
-msgstr "Usuario y Contraseña"
+#: ../gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:1
+msgid "The next tip to show."
+msgstr "Próximo consejo a mostrar."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:4
-msgid "Enter your username and password"
-msgstr "Introduzca usuario y contraseña"
+#: ../gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:4
+msgid "Show \"Tip Of The Day\" at GnuCash start"
+msgstr "Mostrar «Consejo del día» al iniciar GnuCash"
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:5
-msgid "_Username:"
-msgstr "_Usuario:"
+#: ../gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in.h:5
+msgid "Enables the \"Tip Of The Day\" when GnuCash starts up. If active, the dialog will be shown. Otherwise it will not be shown."
+msgstr "Activa el «Consejo del día» cuando se inicia GnuCash. Si está activo, se mostrará el diálogo. En otro caso, no se mostrará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade.h:6
-msgid "_Password:"
-msgstr "_Contraseña:"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:1
+msgid "The version of these settings"
+msgstr "La versión de estas opciones"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:1
-msgid "US (12/31/2001)"
-msgstr "EE. UU. (12/31/2016)"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:2
+msgid "This is used internally to determine whether some preferences may need conversion when switching to a newer version of GnuCash."
+msgstr "Esto se ha empleado internamente para determinar si algunas preferencias quizá requieran una conversión cuando cambia a una versión más moderna de GnuCash."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:2
-msgid "UK (31/12/2001)"
-msgstr "UK (31/12/2016)"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:3
+msgid "Save window sizes and locations"
+msgstr "Guarda tamaño y localización"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:3
-msgid "Europe (31.12.2001)"
-msgstr "Europa (31.12.2016)"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:4
+msgid "If active, the size and location of each dialog window will be saved when it is closed. The sizes and locations of content windows will be remembered when you quit GnuCash. Otherwise the sizes will not be saved."
+msgstr "Si está activo, se guardará el tamaño y ubicación de cada ventana del diálogo cuando ésta se cierre. Los tamaños y ubicaciones del contenido de las ventanas serán recordados cuando salga de GnuCash. En otro caso los tamaños no se guardarán."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:4
-msgid "ISO (2001-12-31)"
-msgstr "ISO (2016-12-31)"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:5
+msgid "Character to use as separator between account names"
+msgstr "El carácter para usar como separador entre nombres de cuentas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:6
-msgid "UTC - Coordinated Universal Time"
-msgstr "UTC - Hora Universal Coordenado"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:6
+msgid "This setting determines the character that will be used between components of an account name. Possible values are any single non-alphanumeric unicode character, or any of the following strings: \"colon\" \"slash\", \"backslash\", \"dash\" and \"period\"."
+msgstr "Esta opción determina el carácter que se usará entre los componentes de un nombre de cuenta. Los valores aceptados son cualquier carácter unicode no-alfanumérico, o cualquiera de las siguientes cadenas: «coma», «barra», «barra invertida», «guión» y «punto»."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:8
-msgid "No Fancy Date Format"
-msgstr "Formato de Fecha No Adornado"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:7
+msgid "Transaction Associations head path"
+msgstr "Cabecera de Transacciones Asociadas por ruta"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:9
-#: ../gnucash/import-export/csv-imp/assistant-csv-price-import.glade.h:39
-#: ../gnucash/import-export/csv-imp/assistant-csv-trans-import.glade.h:41
-msgid "Date Format"
-msgstr "Formato de Fecha"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:8
+msgid "This is the path head for the Transaction file Associations"
+msgstr "Este esta es la ruta de cabecera para Asociaciones del fichero de Transacción por ruta"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:10
-msgid "December 31, 2000"
-msgstr "31 de diciembre de 2000"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:9
+msgid "Compress the data file"
+msgstr "Comprimir el fichero de datos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:12
-#, no-c-format
-msgid "%Y-%m-%d"
-msgstr "%d-%m-%Y"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:10
+msgid "Enables file compression when writing the data file."
+msgstr "Activa la compresión cuando se escribe el fichero de datos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:13
-msgid "Include Century"
-msgstr "Incluir centuria"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:11
+msgid "Show auto-save explanation"
+msgstr "Mostrar explicación de auto-guardar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:15
-msgid "Abbreviation"
-msgstr "Abreviatura"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:12
+msgid "If active, GnuCash shows an explanation of the auto-save feature the first time that feature is started. Otherwise no extra explanation is shown."
+msgstr "Si está activo, Gnucash muestra una explicación de la característica de auto-guardar la primera vez que se ejecuta la misma. En otro caso, no se muestran explicaciones adicionales."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:17
-msgid "Months:"
-msgstr "Meses:"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:13
+msgid "Auto-save time interval"
+msgstr "Intervalo de tiempo para auto-guardar"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:18
-msgid "Years:"
-msgstr "Años:"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:17
+msgid "Time to wait for answer"
+msgstr "Tiempo de espera para la respuesta"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:19
-#: ../gnucash/import-export/dialog-import.glade.h:7
-msgid "Format:"
-msgstr "Formato:"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:19
+msgid "Display negative amounts in red"
+msgstr "Enseñar cantidades negativas en rojo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade.h:21
-msgid "Date format:"
-msgstr "Formato de fecha:"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:20
+msgid "Automatically insert a decimal point"
+msgstr "Introduce un punto decimal automáticamente"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:1
-#: ../libgnucash/engine/Recurrence.c:649
-msgid "1st"
-msgstr "1"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:21
+msgid "If active, GnuCash will automatically insert a decimal point into values that are entered without one. Otherwise GnuCash will not modify entered numbers."
+msgstr "Si está activo, GnuCash insertará automáticamente el separador decimal en cantidades que se introduzcan sin uno. En otro caso GnuCash no modificará los números introducidos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:2
-#: ../libgnucash/engine/Recurrence.c:649
-msgid "2nd"
-msgstr "2"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:22
+msgid "Number of automatic decimal places"
+msgstr "Número de lugares decimales automáticos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:3
-#: ../libgnucash/engine/Recurrence.c:649
-msgid "3rd"
-msgstr "3"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:23
+msgid "This field specifies the number of automatic decimal places that will be filled in."
+msgstr "Este campo especifica el número de dígitos decimales automáticos que se rellenarán."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:4
-#: ../libgnucash/engine/Recurrence.c:649
-msgid "4th"
-msgstr "4"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:24
+msgid "Tool to migrate preferences from old backend (CGonf) to new one (GSettings) has run successfully."
+msgstr "La herramienta para migrar preferencias desde la reserva antigua (CGonf) a la nueva (GSetting) ha sido ejecutada correctamente."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:5
-msgid "5th"
-msgstr "5"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:25
+msgid "GnuCash switched to another backend to store user preferences between 2.4 and 2.6. To smooth the transition, most preferences will be migrated the first time a 2.6 version of GnuCash is run. This migration should only run once. This preference keeps track whether or not this migration tool has run successfully."
+msgstr "GnuCash intercambió a otro apoyo para almacenar preferencias usadas entre 2.4 y 2.6. Para morder la transición, muchas preferencias serán emigradas la primera vez a la versión 2.6 está correr. Esta migracion debería ejecutarse únicamente una vez. Esta preferencia conserva los cambios si o no esta herramienta de migración ha ejecutado correctamente."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:6
-msgid "6th"
-msgstr "6"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:27
+msgid "This setting specifies what to do with old log/backups files. \"forever\" means keep all old files. \"never\" means no old log/backup files are kept. Each time you save, older versions of the file are removed. \"days\" means keep old files for a number of days. How many days is defined in key 'retain-days'"
+msgstr "Esta opción especifica que hacer con los ficheros antiguos de bitácora/respaldo. \"forever\" quiere decir conservar todos los ficheros antiguos. \"never\" significa no conservar los ficheros de bitácora/respaldo más antiguos. Cada vez que guarda, las versiones más antiguas del fichero se eliminan. \"days\" significa conservar los ficheros antiguos por un número de días. Cuanta cantidad de días está especificado en la clave 'retain-days' (días de conservación)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:7
-msgid "7th"
-msgstr "7"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:30
+msgid "Delete old log/backup files after this many days (0 = never)"
+msgstr "Borrar ficheros antiguos de bitácora/respaldo después de los días indicados (0 = nunca)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:8
-msgid "8th"
-msgstr "8"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:31
+msgid "This setting specifies the number of days after which old log/backup files will be deleted (0 = never)."
+msgstr "Esta opción especifica después de qué cantidad de días se eliminan los ficheros antiguos de bitácora/respaldo (0 = nunca)."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:9
-msgid "9th"
-msgstr "9"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:33
+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 for users who like to see negative expenses and positive income. The setting of \"credit\" is for users who want to see balances reflect the debit/credit status of the account. The setting \"none\" doesn't reverse the sign on any balances."
+msgstr "Esta opción permite invertir el signo algunas cuentas de positivo a negativo, o viceversa. La configuración «ingreso-gasto» es para usuarios que quieren ver gastos negativos e ingresos positivos. El valor «crédito» es para usuarios que quieren ver balances reflejados del estado de débito/crédito de la cuenta. El valor «ninguno» no invierte el signo en ningún balance."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:10
-msgid "10th"
-msgstr "10"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:36
+msgid "Use account colors in the account hierarchy"
+msgstr "Emplee los colores dentro de la jerarquía de las cuentas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:11
-msgid "11th"
-msgstr "11"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:37
+msgid "If active the account hierarchy will colorize the account using the account's custom color if set. This can serve as a visual aid to quickly identify accounts."
+msgstr "Si activa la jerarquía de cuenta coloreará la cuenta utilizando el color de cuenta personalizado si se estatablece. Esto puede servir como una ayuda visual para identificar cuentas rápidamente."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:12
-msgid "12th"
-msgstr "12"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:38
+msgid "Use account colors in the tabs of open account registers"
+msgstr "Emplee colores de cuenta en las lengüetas de los registros de cuenta abiertos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:13
-msgid "13th"
-msgstr "13"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:39
+msgid "If active the account register tabs will be colored using the account's custom color if set. This can serve as a visual aid to quickly identify accounts."
+msgstr "Si activa las lengüetas de registro de cuenta serán coloreadas utilizando el color personal de cuentas si se establece. Esto puede servir como una ayuda visual para identificar las cuentas rápidamente."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:14
-msgid "14th"
-msgstr "14"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:40
+msgid "Use formal account labels"
+msgstr "Emplee las etiquetas de cuenta formales"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:15
-msgid "15th"
-msgstr "15"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:41
+msgid "If active, formal accounting labels \"Credit\" and \"Debit\" will be used when designating fields on screen. Otherwise, informal labels such as Increase/Decrease, \"Funds In\"/\"Funds Out\", etc. will be used."
+msgstr "Si está activo, se usarán etiquetas de contabilidad formal «Crédito» y «Débito» para los campos mostrados en pantalla. En otro caso, se usarán etiquetas informales como «Incrementar» / «Decrementar», «Ingreso de Fondos» / «Retirada de Fondos», etc."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:16
-msgid "16th"
-msgstr "16"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:42
+msgid "Show close buttons on notebook tabs"
+msgstr "Mostrar botones de cierre en pestañas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:17
-msgid "17th"
-msgstr "17"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:43
+msgid "If active, a \"close\" button will be displayed on any notebook tab that may be closed. Otherwise, no such button will be shown on the tab. Regardless of this setting, pages can always be closed via the \"close\" menu item or the \"close\" button on toolbar."
+msgstr "Si está activo, se mostrará un botón «cerrar» en cualquier lengüeta del cuaderno que pueda ser cerrada. Si no, no se mostrará el botón en la lengüeta. A pesar de esta selección, las páginas siempre pueden cerrarse a través del elemento del menú “cerrar” o el botón “cerrar” en la barra de herramientas."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:18
-msgid "18th"
-msgstr "18"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:44
+msgid "Width of notebook tabs"
+msgstr "Ancho de pestañas de anotación"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:19
-msgid "19th"
-msgstr "19"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:45
+msgid "This key specifies the maximum width of notebook tabs. If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis."
+msgstr "Este valor especifica el ancho máximo de las pestañas de anotaciones. Si el texto en la lengüeta es aproximadamente más largo que el valor, la etiqueta de la lengüeta tendrá un corte y puntos suspensivos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:20
-msgid "20th"
-msgstr "20"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:47
+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 the user's locale setting. If set to \"other\", GnuCash will use the setting specified by the currency-other key."
+msgstr "Esta opción controla el origen de la moneda predeterminada para las cuentas creadas. Si se establece a \"local\" entonces GnuCash obtendrá la moneda predeterminada desde la opción local del usuario. Si establece a \"otro\", GnuCash empleará las opciones especificadas por la clave ‘currentcy-other’ (otras-monedas)."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:21
-msgid "21st"
-msgstr "21"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:49
+msgid "Default currency for new accounts"
+msgstr "Moneda por omisión para cuentas nuevas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:22
-msgid "22nd"
-msgstr "22"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:50
+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)."
+msgstr "Esta opción especifica la moneda utilizada para las cuentas nuevas si la especificación del cambio de moneda está establecida a \"otro\". Este campo contiene las tres letras de código ISO 4217 para una moneda (ej. USD, GEP, RUB)."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:23
-msgid "23rd"
-msgstr "23"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:51
+msgid "Use 24 hour time format"
+msgstr "Utiliza el formato de 24 horas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:24
-msgid "24th"
-msgstr "24"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:52
+msgid "If active, use a 24 hour time format. Otherwise use a 12 hour time format."
+msgstr "Si está activo, emplear formato de 24 horas para la hora. En otro caso, usar formato hora de 12 horas."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:25
-msgid "25th"
-msgstr "25"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:53
+msgid "Date format choice"
+msgstr "Elección del formato de fecha"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:26
-msgid "26th"
-msgstr "26"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:54
+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 Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" for United Kingdom style dates, and \"us\" for United States style dates."
+msgstr "Esta opción elige la forma en la que se muestran las fecha en GnuCash. Los valores posibles son «local» para utilizar el valor del local del sistema,«ce» para fechas con formato de Europa Continental, «ISO» para formato ISO 8601 común, «uk» para formato del Reino Unido, y «us» para formato de los EE. UU."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:27
-msgid "27th"
-msgstr "27"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:56
+msgid "When a date is entered without year it can be completed so that it will be within the current calendar year or close to the current date based on a sliding window starting a set number of months backwards in time."
+msgstr "Cuando se entregue una fecha sin el año, puede completarse para que esté dentro del calendario actual o cerrar a la fecha actual basada en una ventana deslizante empezando un número establecido de meses hacia atrás en el tiempo."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:28
-msgid "28th"
-msgstr "28"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:57
+msgid "In a sliding 12-month window starting a configurable number of months before the current month"
+msgstr "En una intervalo de 12 meses inciando un número de opción de meses antes del mes actual"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:29
-msgid "29th"
-msgstr "29"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:58
+msgid "Maximum number of months to go back."
+msgstr "Número máximo de meses para retroceder."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:30
-msgid "30th"
-msgstr "30"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:60
+msgid "Show Horizontal Grid Lines"
+msgstr "Mostrar Líneas Horizontales de Cuadrícula"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:31
-msgid "31st"
-msgstr "31"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:61
+msgid "If active, horizontal grid lines will be shown on table displays. Otherwise no horizontal grid lines will be shown."
+msgstr "Si está activo, será mostradas las líneas horizontales de la rejilla en la vista de lengüeta. En otro caso, ninguna línea horizontal de rejilla se mostrará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:32
-msgid "Last day of month"
-msgstr "Último día del mes"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:62
+msgid "Show Vertical Grid Lines"
+msgstr "Mostrar Líneas Verticales de Cuadrícula"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:33
-msgid "Last Monday"
-msgstr "Último lunes"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:63
+msgid "If active, vertical grid lines will be shown on table displays. Otherwise no vertical grid lines will be shown."
+msgstr "Si está activo, será mostradas líneas verticales de la rejilla en la vista de lengüeta. En otro caso, ninguna línea de reja vertical se mostrará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:34
-msgid "Last Tuesday"
-msgstr "Último martes"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:64
+msgid "Show splash screen"
+msgstr "Mostrar pantalla de presentación"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:35
-msgid "Last Wednesday"
-msgstr "Último miércoles"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:65
+msgid "If active, a splash screen will be shown at startup. Otherwise no splash screen will be shown."
+msgstr "Si está activo, se mostrará la pantalla de inicio. En otro caso, la pantalla no se mostrará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:36
-msgid "Last Thursday"
-msgstr "Último jueves"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:67
+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 "Este opción determina el borde en el cual se elaboran las etiquetas para el cambio de las páginas de las anotaciones. Los valores posibles son «cima», «izquierda», «fondo» y «derecho». Por defecto es «cima»."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:37
-msgid "Last Friday"
-msgstr "Último viernes"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:72
+msgid "This setting determines the edge at which the summary bar for various pages is drawn. Possible values are \"top\" and \"bottom\". It defaults to \"bottom\"."
+msgstr "Este opción determina el borde en el cual la barra de resumen para varias páginas está dibujada. Los posibles valores son «cima» y «fondo». Por defecto es «fondo»."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:38
-msgid "Last Saturday"
-msgstr "Último sábado"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:75
+msgid "If active, closing a tab moves to the most recently visited tab. Otherwise closing a tab moves one tab to the left."
+msgstr "Si está activo, cerrar una lengüeta hace que se muestre la última lengüeta visitada. En otro caso cerrando una lengüeta mueve una lengüeta de la izquierda."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:39
-msgid "Last Sunday"
-msgstr "Último domingo"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:78
+msgid "Color the register using a gnucash specific color theme"
+msgstr "Colorear el registro tal como lo especifica el tema del sistema"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:41
-#: ../libgnucash/engine/Recurrence.c:721
-msgid "Once"
-msgstr "Unitaria"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:79
+msgid "When enabled the register will use a GnuCash specific color theme (green/yellow). Otherwise it will use the system color theme. Regardless of this setting the user can always override the color theme via a gnucash specific css file to be stored in the gnucash used config directory. More information can be found in the gnucash FAQ."
+msgstr "Cuando activó el registro empleará un tema de color especifico de GnuCash (verde/amarillo). En otro caso empleará el tema del color del sistema. A pesar de esta configuración el usuario puede siempre puede anular el tema del color por medio del fichero css específico para ser almacenado en el directorio de configuración de gnucash. Más información puede encontrarse en la P+F de gnucash."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:44
-msgid "Semi-Monthly"
-msgstr "Quincenal"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:80
+msgid "Superseded by \"use-gnucash-color-theme\""
+msgstr "Suplantado por \"use-gnucash-color-theme\""
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:46
-msgid "No change"
-msgstr "Sin cambio"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:81
+msgid "This option is temporarily kept around for backwards compatibility. It will be removed in a future version."
+msgstr "Esta opción está conservada temporalmente debido a compatibilidad anterior. Será quitado en una versión futura."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:47
-msgid "Use previous weekday"
-msgstr "Emplee el anterior fin del semana"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:82
+msgid "\"Enter\" key moves to bottom of register"
+msgstr "La tecla «Intro» mueve al fondo del registro"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:48
-msgid "Use next weekday"
-msgstr "Emplee el siguiente fin de semana"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:83
+msgid "If active, pressing the enter key will move to the bottom of the register. Otherwise pressing the enter key will move to the next transaction line."
+msgstr "Si está activo, pulsar la tecla Entrar mueve al último del registro. En otro caso, pulsando la tecla Entrar mueve a la siguiente línea de transacción."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:49
-msgid "1st Mon"
-msgstr "1º lun"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:84
+msgid "Automatically raise the list of accounts or actions during input"
+msgstr "Elevar automáticamente la lista de cuentas u operaciones durante entrada"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:50
-msgid "1st Tue"
-msgstr "1º mar"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:85
+msgid "Move to Transfer field when memorised transaction auto filled"
+msgstr "Mover al campo de Transferencia cuando se auto-completa el memorándum de la transacción"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:51
-msgid "1st Wed"
-msgstr "1º mié"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:86
+msgid "If active then after a memorised transaction is automatically filled in the cursor will move to the Transfer field. If not active then it skips to the value field."
+msgstr "Si está activo, entonces tras un memorándum de la transacción se rellena automáticamente el cursor se moverá al campo de transferencia. Si no está activa, entonces omite al campo del valor."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:52
-msgid "1st Thu"
-msgstr "1º jue"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:87
+msgid "Create a new window for each new register"
+msgstr "Crea una ventana nueva para cada registro nuevo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:53
-msgid "1st Fri"
-msgstr "1º vie"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:88
+msgid "If active, each new register will be opened in a new window. Otherwise each new register will be opened as a tab in the main window."
+msgstr "Si está activo, cada registro nuevo se abrirá en una ventana nueva. En otro caso, cada registro nuevo será abierto como una lengüeta en la ventana principal."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:54
-msgid "1st Sat"
-msgstr "1º sáb"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:89
+msgid "Color all lines of a transaction the same"
+msgstr "Rellenar todas las líneas de una transacción con el mismo color"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:55
-msgid "1st Sun"
-msgstr "1º dom"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:90
+msgid "If active all lines that make up a single transaction will use the same color for their background. Otherwise the background colors are alternated on each line."
+msgstr "Si está activo, todas las líneas que conforman una transacción emplearán el mismo color de fondo. en otro caso los colores del fondo son alternados en cada línea."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:56
-msgid "2nd Mon"
-msgstr "2º lun"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:91
+msgid "Show horizontal borders in a register"
+msgstr "Mostrar bordes horizontales en el registro"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:57
-msgid "2nd Tue"
-msgstr "2º mar"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:92
+msgid "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 "Mostrar bordes horizontales entre filas en el registro. Si está activo el borde entre las casillas se mostrará con una línea gruesa. En otro caso el borde entre casillas no se marcará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:58
-msgid "2nd Wed"
-msgstr "2º mié"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:93
+msgid "Show vertical borders in a register"
+msgstr "Mostrar bordes verticales en el registro"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:59
-msgid "2nd Thu"
-msgstr "2º jue"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:94
+msgid "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 "Mostrar bordes verticales entre las columnas en un registro. Si está activo, el borde entre las casillas se mostrará con una línea gruesa. En otro caso, el borde entre casillas no se marcará."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:60
-msgid "2nd Fri"
-msgstr "2º vie"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:95
+msgid "Show future transactions after the blank transaction in a register"
+msgstr "Mostrar transacciones futuras tras la transacción en blanco dentro de un registro"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:61
-msgid "2nd Sat"
-msgstr "2º sáb"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:96
+msgid "Show future transactions after the blank transaction in a register. If active then transactions with a date in the future will be displayed at the bottom of the register after the blank transaction. Otherwise the blank transaction will be at the bottom of the register after all transactions."
+msgstr "Muestra transacciones futuras tras la transacción en blanco dentro de un registro. Si activa entonces las transacciones con una fecha en el futuro será enseñada en el fondo del registro tras la transacción en blanco. En otro caso la transacción en blanco estará en el fondo del registro después de todas las transacciones."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:62
-msgid "2nd Sun"
-msgstr "2º dom"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:98
+msgid "This field specifies the default view style when opening a new register window. Possible values are \"ledger\", \"auto-ledger\" and \"journal\". The \"ledger\" setting says to show each transaction on one or two lines. The \"auto-ledger\" setting does the same, but also expands only the current transaction to show all splits. The \"journal\" setting shows all transactions in expanded form."
+msgstr "Este campo especifica el estilo de vista por omisión al abrir una ventana de registro nueva. Los valores posibles son «libro», «auto-libro» y «diario». La opción «libro» indica que cada  la transacción debe mostrarse en una o dos líneas. La opción «auto-libro» hace lo mismo, pero expande además la transacción actual para mostrar todos los desgloses. La opción «diario» muestra todas las transacciones expandidas."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:63
-msgid "3rd Mon"
-msgstr "3º lun"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:102
+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 changed at any time via the \"View->Double Line\" menu item."
+msgstr "Muestra dos líneas de información para cada transacción dentro de un registro. Esta es la opción predeterminada para cuando un registro se abra primero. La opción se puede cambiar en cualquier tiempo a través del elemento del menú \"Vista->Línea doble\"."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:64
-msgid "3rd Tue"
-msgstr "3º mar"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:103
+msgid "Only display leaf account names."
+msgstr "Sólo enseñar nombres de la lengüeta de cuenta."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:65
-msgid "3rd Wed"
-msgstr "3º mié"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:104
+msgid "Show only the names of the leaf accounts in the register and in the account selection popup. The default behaviour is to display the full name, including the path in the account tree. Activating this option implies that you use unique leaf names."
+msgstr "Mostrar sólo los nombres de las hojas de las cuentas en el registro y en la selección automática de la cuenta. Por defecto el comportamiento es visualizar el nombre completo, incluyendo la ruta en el plan contable. La activación de esta opción implica que usted utiliza nombres de rama únicos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:66
-msgid "3rd Thu"
-msgstr "3º jue"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:105
+msgid "Show the entered and reconcile dates"
+msgstr "Muestra la fechas introducidas y conciliadas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:67
-msgid "3rd Fri"
-msgstr "3º vie"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:107
+msgid "Show entered and reconciled dates on selection"
+msgstr "Muestra fechas introducudas y conciliadas en la selección"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:68
-msgid "3rd Sat"
-msgstr "3º sáb"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:109
+msgid "Show the calendar buttons"
+msgstr "Muestra los botones del calendario"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:69
-msgid "3rd Sun"
-msgstr "3º dom"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:111
+msgid "Move the selection to the blank split on expand"
+msgstr "Mueve la selección al desglose vacío al expandir"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:70
-msgid "4th Mon"
-msgstr "4º lun"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:113
+msgid "Number of transactions to show in a register."
+msgstr "Número de transacciones que mostrar dentro de un registro."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:71
-msgid "4th Tue"
-msgstr "4º mar"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:115
+msgid "Number of characters for auto complete."
+msgstr "Número de carácteres para autocompletado."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:72
-msgid "4th Wed"
-msgstr "4º mié"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:117
+msgid "Create a new window for each new report"
+msgstr "Crea una ventana nueva para cada boletín nuevo"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:73
-msgid "4th Thu"
-msgstr "4º jue"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:118
+msgid "If active, each new report will be opened in its own window. Otherwise new reports will be opened as tabs in the main window."
+msgstr "Si está activo, cada boletín creado será abierto en su propia ventana. En otro caso, los boletines nuevos serán abiertos como lengüetas en la ventana principal."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:74
-msgid "4th Fri"
-msgstr "4º vie"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:120
+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 locale setting. If set to \"other\", GnuCash will use the setting specified by the currency-other key."
+msgstr "Esta opción controla la moneda por omisión usada en los boletines. Si se establece a «local» GnuCash obtendrá la moneda predeterminada desde las opciones locales del usuario. Si se establece a «otro», GnuCash empleará la opción especificado por la clave “currency-other”."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:75
-msgid "4th Sat"
-msgstr "4º sáb"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:122
+msgid "Default currency for new reports"
+msgstr "Moneda por omisión para boletines nuevos"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:76
-msgid "4th Sun"
-msgstr "4º dom"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:123
+msgid "Zoom factor to use by default for reports."
+msgstr "Factor de ampliación predefinido para boletines."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:79
-msgid "Not scheduled"
-msgstr "Sin Programación"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:125
+msgid "PDF export file name format"
+msgstr "Nombre del formato de exportación en PDF"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:80
-msgid "Select occurrence date above."
-msgstr "Seleccione una fecha de operación arriba."
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:127
+#, no-c-format
+msgid "This setting chooses the file name for PDF export. This is a sprintf(3) string with three arguments: \"%1$s\" is the report name such as \"Invoice\". \"%2$s\" is the number of the report, which for an invoice report is the invoice number. \"%3$s\" is the date of the report, formatted according to the filename-date-format setting. (Note: Any characters that are not allowed in filenames, such as '/', will be replaced with underscores '_' in the resulting file name.)"
+msgstr "Esta opción elige el nombre del fichero para exportar como PDF. Esto es una cadena sprint(3) con tres argumentos: \"%1$s\" es el nombre del boletín como «Factura». «%2$s» es el número del boletín, al cual para un boletín facturante es el número de la factura. «%3$s» es la fecha del boletín, formateado de acuerdo a la opción de nombre-fichero-fecha-formato. (Nota: cualquier carácter que sea no permitido en nombres de ficheros, como '/', serán remplazados con guiones bajos '_' en el nombre del fichero resultante.)"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:81
-msgctxt "Daily"
-msgid "Every"
-msgstr "Cada"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:128
+msgid "PDF export file name date format choice"
+msgstr "Elección del nombre del formato de exportación en PDF"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:82
-msgctxt "Daily"
-msgid "days."
-msgstr "días."
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:129
+msgid "This setting chooses the way dates are used in the filename of PDF export. Possible values for this setting are \"locale\" to use the system locale setting, \"ce\" for Continental Europe style dates, \"iso\" for ISO 8601 standard dates , \"uk\" for United Kingdom style dates, and \"us\" for United States style dates."
+msgstr "Esta opción elige la forma en que se utilizan las fechas en el nombre del fichero de exportación PDF. Los valores posibles para estas opciones son \"local\" para emplear el sistema local, \"ce\" para el estilo de datos de Europa Continental, \"iso\" para las fechas comunes ISO 8601, \"uk\" para el estilo de fechas del Reino Unido, y \"us\" para el estilo de fechas de Estados Unidos."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:83
-msgctxt "Weekly"
-msgid "Every"
-msgstr "Cada"
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:130
+msgid "Allow file incompatibility with older versions."
+msgstr "Permitir incompatibilidad de ficheros con versiones anteriores."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:84
-msgctxt "Weekly"
-msgid "weeks."
-msgstr "semanas."
+#: ../gnucash/gschemas/org.gnucash.gschema.xml.in.in.h:131
+msgid "If active, gnucash will be allowed to intentionally break file compatibility with older versions, so that a data file saved in this version cannot be read by an older version again. Otherwise gnucash will write data files only in formats that can be read by older versions as well."
+msgstr "Si está activo, se permite que GnuCash rompa de forma intencionada la compatibilidad de ficheros con versiones anteriores, de forma que los datos guardados con esta versión no se podrán abrir con las anteriores. En otro caso, GnuCash guardará los datos de forma que se puedan leen con versiones anteriores."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:85
-#: ../gnucash/report/standard-reports/daily-reports.scm:350
-msgid "Saturday"
-msgstr "sábado"
+#: ../gnucash/gschemas/org.gnucash.history.gschema.xml.in.in.h:1
+msgid "Number of files in history"
+msgstr "Número de ficheros dentro del historial"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:86
-#: ../gnucash/report/standard-reports/daily-reports.scm:350
-msgid "Friday"
-msgstr "viernes"
+#: ../gnucash/gschemas/org.gnucash.history.gschema.xml.in.in.h:2
+msgid "This setting contains the number of files to keep in the Recently Opened Files menu. This value may be set to zero to disable the file history. This number has a maximum value of 10."
+msgstr "Esta opción contiene el número de ficheros a mantener en el menú Archivos abiertos recientemente. Este valor puede ser cero para desactivar el histórico de ficheros. El valor máximo es 10."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:87
-#: ../gnucash/report/standard-reports/daily-reports.scm:349
-msgid "Wednesday"
-msgstr "miércoles"
+#: ../gnucash/gschemas/org.gnucash.history.gschema.xml.in.in.h:3
+msgid "Most recently opened file"
+msgstr "Fichero abierto más recientemente"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:88
-#: ../gnucash/report/standard-reports/daily-reports.scm:350
-msgid "Thursday"
-msgstr "jueves"
+#: ../gnucash/gschemas/org.gnucash.history.gschema.xml.in.in.h:4
+msgid "This field contains the full path of the most recently opened file."
+msgstr "Este campo contiene la ruta completa al último fichero abierto."
 
-#. Note: the absolute-super-duper-i18n'ed solution
-#. would be to use the locale-using functions
-#. date->string of srfi-19, similar to get_wday_name()
-#. in src/engine/FreqSpeq.c. For now, we simply use
-#. the normal translations, which show up in the glade
-#. file src/gnome-utils/gtkbuilder/gnc-frequency.glade anyway.
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:89
-#: ../gnucash/report/standard-reports/daily-reports.scm:348
-msgid "Sunday"
-msgstr "domingo"
+#: ../gnucash/gschemas/org.gnucash.history.gschema.xml.in.in.h:5
+msgid "Next most recently opened file"
+msgstr "Siguiente fichero abierto más recientemente"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:90
-#: ../gnucash/report/standard-reports/daily-reports.scm:348
-msgid "Monday"
-msgstr "lunes"
+#: ../gnucash/gschemas/org.gnucash.history.gschema.xml.in.in.h:6
+msgid "This field contains the full path of the next most recently opened file."
+msgstr "Este campo contiene la ruta completa al penúltimo fichero abierto."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:91
-#: ../gnucash/report/standard-reports/daily-reports.scm:349
-msgid "Tuesday"
-msgstr "martes"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:1
+msgid "Print checks from multiple accounts"
+msgstr "Declarar comprobantes desde múltiples cuentas"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:93
-msgctxt "Semimonthly"
-msgid "Every"
-msgstr "Cada"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:2
+msgid "This dialog is presented if you try to print checks from multiple accounts at the same time."
+msgstr "Este diálogo se presente si intenta marcar los comprobaciones desde múltiples cuentas a la vez."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:94
-msgctxt "Semimonthly"
-msgid "months."
-msgstr "meses."
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:3
+msgid "Commit changes to a invoice entry"
+msgstr "Efectuar modificaciones a un asiento facturante"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:95
-msgid "First on the:"
-msgstr "Primero el:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:4
+msgid "This dialog is presented when you attempt to move out of a modified invoice entry. The changed data must be either saved or discarded."
+msgstr "Este diálogo es presentado cuando intentar salir de un asiento facturante modificado. Los datos modificados deben ser guardados o descartados."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:96
-msgid "except on weekends:"
-msgstr "excepto en fines de semana:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:5
+msgid "Duplicating a changed invoice entry"
+msgstr "Duplicando un asiento facturante modificado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:97
-msgid "then on the:"
-msgstr "entonces en el:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:6
+msgid "This dialog is presented when you attempt to duplicate a modified invoice entry. The changed data must be saved or the duplication canceled."
+msgstr "Este diálogo es presentado cuando intente duplicar un asiento facturante modificado. Los datos modificados deben ser guardados o la duplicación cancelada."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:98
-msgctxt "Monthly"
-msgid "Every"
-msgstr "Cada"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:7
+msgid "Delete a commodity"
+msgstr "Borra una mercancía"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:99
-msgctxt "Monthly"
-msgid "months."
-msgstr "meses."
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:8
+msgid "This dialog is presented before allowing you to delete a commodity."
+msgstr "Este diálogo es presentado antes de permitirle eliminar una mercancía."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade.h:100
-msgid "On the"
-msgstr "En el"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:9
+msgid "Delete a commodity with price quotes"
+msgstr "Borra una mercancía con su precio cotizado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:1
-msgid "day(s)"
-msgstr "día(s)"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:10
+msgid "This dialog is presented before allowing you to delete a commodity that has price quotes attached. Deleting the commodity will delete the quotes as well."
+msgstr "Este diálogo es presentado antes de permitirle eliminar una mercancía que contiene cotizaciones. Borrar la mercancía también eliminará las cotizaciones."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:2
-msgid "week(s)"
-msgstr "semana(s)"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:11
+msgid "Delete multiple price quotes"
+msgstr "Borrar múltiples precios cotizados"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:3
-msgid "month(s)"
-msgstr "mes(es)"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:12
+msgid "This dialog is presented before allowing you to delete multiple price quotes at one time."
+msgstr "Este diálogo es presentado antes de permitirle eliminar múltiples cotizaciones a la vez."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:4
-msgid "year(s)"
-msgstr "año(s)"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:13
+msgid "Edit account payable/accounts receivable register"
+msgstr "Edita registro de cuenta liquidable / cuentas ingresable"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:5
-msgid "Every "
-msgstr "Cada "
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:14
+msgid "This dialog is presented before allowing you to edit an accounts payable/accounts receivable account. These account types are reserved for the business features and should rarely be manipulated manually."
+msgstr "Este diálogo es presentado antes de permitirle editar una cuenta liquidable/ingreso pendientes. Estos tipos de cuenta están reservados para características de negocio y raramente deberían modificarse manualmente."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:6
-msgid "Number of calendar units in the recurrence:  E.g. Biweekly = every 2 weeks; Quarterly = every 3 months"
-msgstr "Número de unidades de calendario en la repetición:  P.e. Bisemanal = cada 2 semanas, Trimestral = cada 3 meses"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:15
+msgid "Read only register"
+msgstr "Registro de sólo lectura"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:7
-msgid "beginning on: "
-msgstr "empezando el: "
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:16
+msgid "This dialog is presented when a read-only register is opened."
+msgstr "Este diálogo es presentado cuando un registro de solo-lectura está abierto."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:8
-msgid "last of month"
-msgstr "último del mes"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:17
+msgid "Change contents of reconciled split"
+msgstr "Cambiar contenidos del desglose conciliado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:9
-msgid "Always use the last day (or day of week) in the month?"
-msgstr "¿Siempre emplear el último día (o día de la semana) dentro del mes?"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:18
+msgid "This dialog is presented before allowing you to change the contents of a reconciled split. Allowing these changes can make it hard to perform future reconciliations."
+msgstr "Este diálogo es presentado antes de permitirle cambiar el contenido de un desglose conciliado. Permitir estos cambios puede hacer difícil conciliar en el futuro."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:10
-msgid "same week & day"
-msgstr "misma semana y día"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:19
+msgid "Mark transaction split as unreconciled"
+msgstr "Marcar desglose de transacción como no conciliado"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade.h:11
-msgid "Match the \"day of week\" and \"week of month\"? (for example, the \"second Tuesday\" of every month)"
-msgstr "¿Coteja el «día de la semana» con la «semana del mes»? (por ejemplo, el «segundo martes» de cada mes)"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:20
+msgid "This dialog is presented before allowing you to mark a transaction split as unreconciled. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
+msgstr "Este diálogo es presentado antes de permitirle marcar un desglose de transacción como no conciliado. Hacerlo puede quitar la cantidad conciliada del registro y hacer más difícil conciliar en el futuro."
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:4
-msgid "Only show _active owners"
-msgstr "Mostrar únicamente los titulares _activos"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:21
+msgid "Remove a split from a transaction"
+msgstr "Quitar un desglose de una transacción"
 
-#: ../gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade.h:5
-msgid "Show _zero balance owners"
-msgstr "Mostrar titulares de balance a _cero"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:22
+msgid "This dialog is presented before allowing you to remove a split from a transaction."
+msgstr "Este diálogo es presentado antes de permitirle retirar un desglose desde una transacción."
 
-#: ../gnucash/gnome-utils/window-main-summarybar.c:304
-#, c-format
-msgid "%s, Total:"
-msgstr "%s, total:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:23
+msgid "Remove a reconciled split from a transaction"
+msgstr "Quitar un desglose conciliado desde una transacción"
 
-#: ../gnucash/gnome-utils/window-main-summarybar.c:307
-#, c-format
-msgid "%s, Non Currency Commodities Total:"
-msgstr "%s, Sin Total de mercancías No Monetaria:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:24
+msgid "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 "Este diálogo es presentado antes de permitirle retirar un desglose conciliado desde una transacción. Hacerlo quitará la cantidad conciliada del registro y puede hacer más difícil conciliar en el futuro."
 
-#: ../gnucash/gnome-utils/window-main-summarybar.c:310
-#, c-format
-msgid "%s, Grand Total:"
-msgstr "%s, Saldo:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:25
+msgid "Remove all the splits from a transaction"
+msgstr "Quitar todos los desgloses desde una transacción"
 
-#: ../gnucash/gnome-utils/window-main-summarybar.c:314
-#, c-format
-msgid "%s:"
-msgstr "%s:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:26
+msgid "This dialog is presented before allowing you to remove all splits from a transaction."
+msgstr "Este diálogo es presentado antes de permitirle retirar todas los desgloses desde una transacción."
+
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:27
+msgid "This dialog is presented before allowing you to remove all splits (including some reconciled splits) from a transaction. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
+msgstr "Este diálogo es presentado antes de permitirle retirar todos los desgloses (incluyendo algunos conciliados) de una transacción. Hacerlo puede quitar la cantidad conciliada del registro y hacer más difícil conciliar en el futuro."
 
-#: ../gnucash/gnome-utils/window-main-summarybar.c:417
-msgid "Net Assets:"
-msgstr "Activos netos:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:28
+msgid "Delete a transaction"
+msgstr "Borra una transacción"
 
-#: ../gnucash/gnome-utils/window-main-summarybar.c:420
-msgid "Profits:"
-msgstr "Beneficios:"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:29
+msgid "This dialog is presented before allowing you to delete a transaction."
+msgstr "Este diálogo es presentado antes de permitirle eliminar una transacción."
 
-#: ../gnucash/gnucash-bin.c:96
-msgid "Show GnuCash version"
-msgstr "Mostrar versión de GnuCash"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:30
+msgid "Delete a transaction with reconciled splits"
+msgstr "Borra una transacción con desgloses conciliados"
 
-#: ../gnucash/gnucash-bin.c:101
-msgid ""
-"Enable debugging mode: provide deep detail in the logs.\n"
-"This is equivalent to: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
-msgstr ""
-"Activar modo de depuración: proporciona detalles internos dentro de las bitácoras.\n"
-"Esto es equivalente a: --log \"=info\" --log \"qof=info\" --log \"gnc=info\""
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:31
+msgid "This dialog is presented before allowing you to delete a transaction that contains reconciled splits. Doing so will throw off the reconciled value of the register and can make it hard to perform future reconciliations."
+msgstr "Este diálogo es presentado antes de permitirle eliminar una transacción que contiene desgloses conciliados. Hacerlo puede quitar la cantidad conciliada del registro y puede hacer difícil conciliar en el futuro."
 
-#: ../gnucash/gnucash-bin.c:106
-msgid "Enable extra/development/debugging features."
-msgstr "Activar características extra/desarrollo/depuración."
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:32
+msgid "Duplicating a changed transaction"
+msgstr "Duplicando una transacción modificada"
 
-#: ../gnucash/gnucash-bin.c:111
-msgid ""
-"Log level overrides, of the form \"modulename={debug,info,warn,crit,error}\"\n"
-"Examples: \"--log qof=debug\" or \"--log gnc.backend.file.sx=info\"\n"
-"This can be invoked multiple times."
-msgstr ""
-"Nivel de bitácora sobrepasado, del formato  \"modulename={debug,info,warn,crit,error}\"\n"
-"Ejemplos: \"--log qof=debug\" o \"--log gnc.backend.file.sx=info\"\n"
-"boletínuede ser invocado múltiples veces."
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:33
+msgid "This dialog is presented when you attempt to duplicate a modified transaction. The changed data must be saved or the duplication canceled."
+msgstr "Este diálogo es presentado al intentar duplicar una transacción modificada. Los datos modificados deben ser guardados o la duplicación cancelada."
 
-#: ../gnucash/gnucash-bin.c:117
-msgid "File to log into; defaults to \"/tmp/gnucash.trace\"; can be \"stderr\" or \"stdout\"."
-msgstr "El fichero bitácora interna; por defecto a «/tmp/gnucash.trace»; puede ser «stderr» o «stdout»."
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:34
+msgid "Commit changes to a transaction"
+msgstr "Efectuar cambios a una transacción"
 
-#: ../gnucash/gnucash-bin.c:123
-msgid "Do not load the last file opened"
-msgstr "No cargar el último fichero abierto"
+#: ../gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in.h:35
+msgid "This dialog is presented when you attempt to move out of a modified transaction. The changed data must be either saved or discarded."
+msgstr "Este diálogo es presentado cuando intenta salir de una transacción modificada. Los datos modificados deben ser guardados o descartados."
 
-#: ../gnucash/gnucash-bin.c:127
-msgid "Set the prefix for gsettings schemas for gsettings queries. This can be useful to have a different settings tree while debugging."
-msgstr "Establece el prefijo para los esquemas de ‘gsettings’ de peticiones ‘gsettings’. Esto puede ser útil tener una opción del plan mientras depura."
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:1
+msgid "Show a grand total of all accounts converted to the default report currency"
+msgstr "Muestra un saldo de todas las cuentas convertida a boletín monetario predeterminado"
 
-#. Translators: Argument description for autohelp; see
-#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../gnucash/gnucash-bin.c:130
-msgid "GSETTINGSPREFIX"
-msgstr "GSETTINGSPREFIX"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:2
+msgid "Show non currency commodities"
+msgstr "Mostrar mercancías no monetarios"
 
-#: ../gnucash/gnucash-bin.c:134
-msgid "Add price quotes to given GnuCash datafile"
-msgstr "Añade precios cotizados al fichero de datos de GnuCash indicado"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:3
+msgid "If active, non currency commodities (stocks) will be shown. Otherwise they will be hidden."
+msgstr "Si está activo, se mostrarán los mercancías no-monetarias (reservas). En otro caso se ocultarán."
 
-#. Translators: Argument description for autohelp; see
-#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../gnucash/gnucash-bin.c:137
-msgid "FILE"
-msgstr "FICHERO"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:4
+msgid "Use relative profit/loss starting date"
+msgstr "Emplee la fecha de apertura relativa de beneficio/pérdidas"
 
-#: ../gnucash/gnucash-bin.c:141
-msgid "Regular expression determining which namespace commodities will be retrieved"
-msgstr "Expresión regular que determina qué mercancías se obtendrán"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:5
+msgid "This setting controls the type of starting date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the starting date specified by the start-date key. If set to anything else, GnuCash will retrieve the starting date specified by the start-period key."
+msgstr "Esta opción controla el tipo de fecha de inicio utilizando en los cálculos de beneficio/pérdidas. Si se establece a \"absoluto\" entonces GnuCash obtendrá la fecha inicial especificada por la clave “start-date”. Si establece a cualquier otra cosa, GnuCash obtendrá la fecha especificada por la clave “start-period”."
 
-#. Translators: Argument description for autohelp; see
-#. http://developer.gnome.org/doc/API/2.0/glib/glib-Commandline-option-parser.html
-#: ../gnucash/gnucash-bin.c:144
-msgid "REGEXP"
-msgstr "REGEXP"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:6
+msgid "Use absolute profit/loss starting date"
+msgstr "Emplee la fecha de apertura absoluta de beneficio/pérdidas"
 
-#: ../gnucash/gnucash-bin.c:147
-msgid "[datafile]"
-msgstr "[fichero-dato]"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:7
+msgid "Starting date (in seconds from Jan 1, 1970)"
+msgstr "Fecha de comienzo (en segundos desde el 1 de ene de 1970)"
 
-#: ../gnucash/gnucash-bin.c:160
-msgid "This is a development version. It may or may not work."
-msgstr "Esta es una versión de desarrollo. Puede que funcione, o puede que no."
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:8
+msgid "This setting controls the starting date set in profit/loss calculations if the start-choice setting is set to \"absolute\". This field should contain a date as represented in seconds from January 1st, 1970."
+msgstr "Esta opción controla la fecha de inicio establecida en cálculos de beneficios/pérdidas si la opción de inicio establecido a \"absoluto\". Este campo debería contener una fecha como la representada en segundos desde el 1 de enero de 1970."
 
-#: ../gnucash/gnucash-bin.c:161
-msgid "Report bugs and other problems to gnucash-devel at gnucash.org"
-msgstr "Envíe todos los defectos y otros problemas a gnucash-devel at gnucash.org"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:9
+msgid "Starting time period identifier"
+msgstr "Identificador del periodo que comienza"
 
-#: ../gnucash/gnucash-bin.c:162
-msgid "You can also lookup and file bug reports at http://bugzilla.gnome.org"
-msgstr "También puede ver y enviar boletines de defectos a http://bugzilla.gnome.org"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:10
+msgid "This setting controls the starting date set in profit/loss calculations if the start-choice setting is set to anything other than \"absolute\". This field should contain a value between 0 and 8."
+msgstr "Esta opción controla la fecha de inicio establecida en cálculos de beneficios/pérdidas si la opción de ‘start-choice’ está establecida a cualquier otra cosa cualquiera cuyo valor no sea «absoluto». Este campo debe contener un valor entre 0 y 8."
 
-#: ../gnucash/gnucash-bin.c:163
-msgid "To find the last stable version, please refer to http://www.gnucash.org"
-msgstr "Para encontrar la última versión estable, vaya a http://www.gnucash.org"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:11
+msgid "Use relative profit/loss ending date"
+msgstr "Emplee la fecha de cierre relativo de beneficio/pérdidas"
 
-#: ../gnucash/gnucash-bin.c:429
-msgid "- GnuCash, accounting for personal and small business finance"
-msgstr "- GnuCash, para contabilidad financiera personal y pequeños negocios"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:12
+msgid "This setting controls the type of ending date used in profit/loss calculations. If set to \"absolute\" then GnuCash will retrieve the ending date specified by the end-date key. If set to anything else, GnuCash will retrieve the ending date specified by the end-period key."
+msgstr "Esta opción controla el tipo de fecha de final utilizando en los cálculos de beneficios/pérdidas. Si se establece a \"absoluto\" entonces GnuCash obtendrá la fecha final especificada por la clave ‘end-date’. Si ese establece a cualquier otra cosa, GnuCash obtendrá la fecha final por la clave ’end-period’."
 
-#: ../gnucash/gnucash-bin.c:435 ../gnucash/gnucash-bin.c:828
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Ejecute '%s --help' para ver un listado completa de opciones de línea de órdenes disponibles.\n"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:13
+msgid "Use absolute profit/loss ending date"
+msgstr "Emplee la fecha de cierre absoluta de beneficio/pérdidas"
 
-#: ../gnucash/gnucash-bin.c:446
-#, c-format
-msgid "GnuCash %s development version"
-msgstr "GnuCash %s versión de desarrollo"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:14
+msgid "Ending date (in seconds from Jan 1, 1970)"
+msgstr "Fecha de finalización (en segundos desde el 1 de ene de 1970)"
 
-#: ../gnucash/gnucash-bin.c:448
-#, c-format
-msgid "GnuCash %s"
-msgstr "GnuCash %s"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:15
+msgid "This setting controls the ending date set in profit/loss calculations if the end-choice setting is set to \"absolute\". This field should contain a date as represented in seconds from January 1st, 1970."
+msgstr "Esta opción controla la fecha de fin establecida para cálculos de beneficios/pérdidas cuando el valor de elección_fin se establece a «absoluto». Este campo debe contener una fecha representada en forma de segundos desde el 1 de enero de 1970."
 
-#: ../gnucash/gnucash-bin.c:558
-msgid "No quotes retrieved. Finance::Quote isn't installed properly.\n"
-msgstr "Sin cotizaciones recuperadas. Financia::Cotización no está instalado correctamente.\n"
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:16
+msgid "Ending time period identifier"
+msgstr "Identificador del periodo que finalizado"
 
-#. Install Price Quote Sources
-#: ../gnucash/gnucash-bin.c:639
-msgid "Checking Finance::Quote..."
-msgstr "Comprobando Finanzas::Cotizaciones..."
+#: ../gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in.h:17
+msgid "This setting controls the ending date set in profit/loss calculations if the end-choice setting is set to anything other than \"absolute\". This field should contain a value between 0 and 8."
+msgstr "Esta opción controla la fecha final establecida en cálculos de beneficio/pérdidas si las opciones selección final está establecido a cualquier cosa distinta que \"absoluto\". Este campo debería contener un valor entre 0 y 8."
 
-#: ../gnucash/gnucash-bin.c:647
-msgid "Loading data..."
-msgstr "Cargando datos..."
+#: ../gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:1
+msgid "Display this column"
+msgstr "Enseña esta columna"
 
-#: ../gnucash/gnucash-bin.c:797
-#, c-format
-msgid ""
-"Notice\n"
-"\n"
-"Your gnucash metadata has been migrated.\n"
-"\n"
-"Old location: %s%s\n"
-"New location: %s\n"
-"\n"
-"If you no longer intend to run "
-msgstr ""
-"Notificación\n"
-"\n"
-"Sus metadatos de Gnucash han sido migrados.\n"
-"\n"
-"Ubicación anterior: %s%s\n"
-"Ubicación nueva: %s\n"
-"\n"
-"Si no intente después ejecutar "
+#: ../gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:2
+msgid "This setting controls whether the given column will be visible in the view. TRUE means visible, FALSE means hidden."
+msgstr "Esta opción controla si la columna dada será invisible en la vista. CIERTO significa visible, FALSO significa oculto."
 
-#: ../gnucash/gnucash-bin.c:829
-msgid ""
-"Error: could not initialize graphical user interface and option add-price-quotes was not set.\n"
-"       Perhaps you need to set the $DISPLAY environment variable ?"
-msgstr ""
-"Error: no pude inicializar el interfaz gráfico de usuario y la opción ‘add-price-quotes’ no fue \n"
-"       establecida.\n"
-"       ¿Quizá necesita establecer la variable del entorno $DISPLAY ?"
+#: ../gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:3
+msgid "Width of this column"
+msgstr "Ancho de esta columna"
+
+#: ../gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in.h:4
+msgid "This setting stores the width of the given column in pixels."
+msgstr "Esta opción almacena la anchura de la columna dada en píxeles."
 
 #: ../gnucash/html/gnc-html-webkit1.c:80 ../gnucash/html/gnc-html-webkit2.c:88
 msgid "Not found"
@@ -14649,12 +14531,12 @@ msgstr ""
 "¿Quiere introducir la operación otra vez?"
 
 #: ../gnucash/import-export/aqb/gnc-ab-utils.c:422
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:89
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:90
 msgid "Unspecified"
 msgstr "Sin especificar"
 
 #: ../gnucash/import-export/aqb/gnc-ab-utils.c:473
-#: ../gnucash/report/report-system/report-utilities.scm:109
+#: ../gnucash/report/report-system/report-utilities.scm:108
 #: ../libgnucash/engine/Account.cpp:4100
 msgid "Bank"
 msgstr "Banco"
@@ -16655,19 +16537,19 @@ msgstr "Enseñar u ocultar cotejos conciliados"
 msgid "Shows or hides transactions from the match picker which are already of some reconciled state."
 msgstr "Muestra u oculta transacciones desde el cotejo fijado el cual ya es de algo de estado conciliado."
 
-#: ../gnucash/import-export/import-account-matcher.c:193
-#: ../gnucash/import-export/import-account-matcher.c:370
+#: ../gnucash/import-export/import-account-matcher.c:196
+#: ../gnucash/import-export/import-account-matcher.c:373
 #, c-format
 msgid "The account %s is a placeholder account and does not allow transactions. Please choose a different account."
 msgstr "La cuenta %s es un marcador de cuenta y no permite transacciones. Por favor, seleccione otra cuenta."
 
-#: ../gnucash/import-export/import-account-matcher.c:328
-#: ../gnucash/import-export/import-account-matcher.c:515
+#: ../gnucash/import-export/import-account-matcher.c:331
+#: ../gnucash/import-export/import-account-matcher.c:518
 msgid "(Full account ID: "
 msgstr "(ID de cuenta completo: "
 
 #. Add the New Account Button
-#: ../gnucash/import-export/import-account-matcher.c:447
+#: ../gnucash/import-export/import-account-matcher.c:450
 msgid "_New Account"
 msgstr "_Crear cuenta"
 
@@ -16817,7 +16699,7 @@ msgstr "Reproducir un fichero bitácora de GnuCash después de una caída. Esto
 #. name. It MUST NOT contain the
 #. character ':' anywhere in it or
 #. in any translations.
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:581
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:583
 #, c-format
 msgid "Stock account for security \"%s\""
 msgstr "Cuenta de reserva por garantía «%s»"
@@ -16826,45 +16708,45 @@ msgstr "Cuenta de reserva por garantía «%s»"
 #. name. It MUST NOT contain the
 #. character ':' anywhere in it or
 #. in any translations.
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:747
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:750
 #, c-format
 msgid "Income account for security \"%s\""
 msgstr "Cuenta de ingresos por garantía «%s»"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:860
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:863
 msgid "Unknown OFX account"
 msgstr "Cuenta OFX desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:883
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:886
 msgid "Unknown OFX checking account"
 msgstr "Cuenta OFX corriente desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:887
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:890
 msgid "Unknown OFX savings account"
 msgstr "Cuenta OFX para ahorro desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:891
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:894
 msgid "Unknown OFX money market account"
 msgstr "Cuenta OFX de mercado de moneda desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:895
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:898
 msgid "Unknown OFX credit line account"
 msgstr "Cuenta OFX de línea de crédito desconocida"
 
 #. Cash Management Account
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:900
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:903
 msgid "Unknown OFX CMA account"
 msgstr "Cuenta OFX CMA desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:904
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:907
 msgid "Unknown OFX credit card account"
 msgstr "Cuenta OFX de tarjeta de crédito desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:908
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:911
 msgid "Unknown OFX investment account"
 msgstr "Cuenta OFX de inversión desconocida"
 
-#: ../gnucash/import-export/ofx/gnc-ofx-import.c:992
+#: ../gnucash/import-export/ofx/gnc-ofx-import.c:995
 msgid "Select an OFX/QFX file to process"
 msgstr "Seleccione fichero OFX/QFX a procesar"
 
@@ -17410,39 +17292,39 @@ msgstr "Estado predeterminado para transacciones QIF cuando no se especificaron
 msgid "Show documentation"
 msgstr "Mostrar documentación"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:33
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:34
 msgid "Dividends"
 msgstr "Dividendos"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:48
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:49
 msgid "Cap Return"
 msgstr "Retorno de Capital"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:54
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:55
 msgid "Cap. gain (long)"
 msgstr "Gan. cap. (a largo)"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:60
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:61
 msgid "Cap. gain (mid)"
 msgstr "Gan. cap. (a medio)"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:66
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:67
 msgid "Cap. gain (short)"
 msgstr "Gan. cap. (a corto)"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:72
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:76
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:73
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:77
 #: ../gnucash/report/business-reports/balsheet-eg.eguile.scm:200
 #: ../gnucash/report/standard-reports/balance-sheet.scm:673
-#: ../libgnucash/app-utils/gnc-ui-util.c:801
+#: ../libgnucash/app-utils/gnc-ui-util.c:807
 msgid "Retained Earnings"
 msgstr "Ganancias Retenidas"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:80
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:81
 msgid "Commissions"
 msgstr "Comisiones"
 
-#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:85
+#: ../gnucash/import-export/qif-imp/qif-dialog-utils.scm:86
 msgid "Margin Interest"
 msgstr "Margen de Interés"
 
@@ -17584,46 +17466,50 @@ msgid "Parse ambiguity between formats"
 msgstr "Analizar la ambigüedad entre los formatos"
 
 #: ../gnucash/import-export/qif-imp/qif-file.scm:1031
-msgid "Value '%s' could be %s or %s."
-msgstr "El valor «%s» podría ser %s o %s."
+#, scheme-format
+msgid "Value '~a' could be ~a or ~a."
+msgstr "El valor «~a» podría ser ~a o ~a."
 
 #: ../gnucash/import-export/qif-imp/qif-merge-groups.scm:113
 msgid "Finding duplicate transactions"
 msgstr "Encontrando transacciones duplicadas"
 
-#: ../gnucash/import-export/qif-imp/qif-parse.scm:191
-msgid "Unrecognized account type '%s'. Defaulting to Bank."
-msgstr "Tipo de cuenta «%s» no conocido. Cambiando al Banco."
+#: ../gnucash/import-export/qif-imp/qif-parse.scm:190
+#, scheme-format
+msgid "Unrecognized account type '~s'. Defaulting to Bank."
+msgstr "Tipo de cuenta «~s» no conocido. Cambiando al Banco."
 
-#: ../gnucash/import-export/qif-imp/qif-parse.scm:298
-msgid "Unrecognized action '%s'."
-msgstr "Operación «%s» no reconocida."
+#: ../gnucash/import-export/qif-imp/qif-parse.scm:297
+#, scheme-format
+msgid "Unrecognized action '~a'."
+msgstr "Operación «~a» no reconocida."
 
-#: ../gnucash/import-export/qif-imp/qif-parse.scm:323
-msgid "Unrecognized status '%s'. Defaulting to uncleared."
-msgstr "El estado no reconocido «%s». Por defecto a no punteado."
+#: ../gnucash/import-export/qif-imp/qif-parse.scm:322
+#, scheme-format
+msgid "Unrecognized status '~a'. Defaulting to uncleared."
+msgstr "El estado no reconocido «~a». Por defecto a despunteado."
 
-#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:190
+#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:189
 msgid "QIF import: Name conflict with another account."
 msgstr "Importar QIF: conflicto de nombre con otra cuenta."
 
-#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:275
+#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:274
 msgid "Preparing to convert your QIF data"
 msgstr "Preparando para convertir su dato QIF"
 
-#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:326
+#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:325
 msgid "Creating accounts"
 msgstr "Creando cuentas"
 
-#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:375
+#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:374
 msgid "Matching transfers between accounts"
 msgstr "Cotejando de las transferencias entre cuentas"
 
-#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:393
+#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:392
 msgid "Converting"
 msgstr "Convirtiendo"
 
-#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:478
+#: ../gnucash/import-export/qif-imp/qif-to-gnc.scm:477
 msgid "Missing transaction date."
 msgstr "Falta fecha de transacción."
 
@@ -17769,7 +17655,7 @@ msgstr ">"
 #: ../gnucash/register/ledger-core/gncEntryLedgerLoad.c:132
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:531
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:1097
-#: ../gnucash/report/report-system/report-utilities.scm:110
+#: ../gnucash/report/report-system/report-utilities.scm:109
 #: ../libgnucash/engine/Account.cpp:4101
 msgid "Cash"
 msgstr "Efectivo"
@@ -17783,12 +17669,12 @@ msgid "Expense Account"
 msgstr "Cuenta de Gastos"
 
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:72
-#: ../gnucash/report/business-reports/easy-invoice.scm:120
-#: ../gnucash/report/business-reports/easy-invoice.scm:274
-#: ../gnucash/report/business-reports/fancy-invoice.scm:138
-#: ../gnucash/report/business-reports/fancy-invoice.scm:284
-#: ../gnucash/report/business-reports/invoice.scm:114
-#: ../gnucash/report/business-reports/invoice.scm:269
+#: ../gnucash/report/business-reports/easy-invoice.scm:119
+#: ../gnucash/report/business-reports/easy-invoice.scm:273
+#: ../gnucash/report/business-reports/fancy-invoice.scm:137
+#: ../gnucash/report/business-reports/fancy-invoice.scm:283
+#: ../gnucash/report/business-reports/invoice.scm:113
+#: ../gnucash/report/business-reports/invoice.scm:268
 msgid "Discount"
 msgstr "Descuento"
 
@@ -17801,9 +17687,9 @@ msgid "Discount How"
 msgstr "Forma de Descuento"
 
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:87
-#: ../gnucash/report/business-reports/easy-invoice.scm:118
-#: ../gnucash/report/business-reports/fancy-invoice.scm:136
-#: ../gnucash/report/business-reports/invoice.scm:112
+#: ../gnucash/report/business-reports/easy-invoice.scm:117
+#: ../gnucash/report/business-reports/fancy-invoice.scm:135
+#: ../gnucash/report/business-reports/invoice.scm:111
 #: ../gnucash/report/business-reports/receipt.scm:92
 #: ../gnucash/report/business-reports/receipt.scm:169
 #: ../gnucash/report/business-reports/taxinvoice.scm:117
@@ -17812,12 +17698,12 @@ msgid "Unit Price"
 msgstr "Precio Unitario"
 
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:92
-#: ../gnucash/report/business-reports/easy-invoice.scm:116
-#: ../gnucash/report/business-reports/easy-invoice.scm:264
-#: ../gnucash/report/business-reports/fancy-invoice.scm:134
-#: ../gnucash/report/business-reports/fancy-invoice.scm:274
-#: ../gnucash/report/business-reports/invoice.scm:110
-#: ../gnucash/report/business-reports/invoice.scm:259
+#: ../gnucash/report/business-reports/easy-invoice.scm:115
+#: ../gnucash/report/business-reports/easy-invoice.scm:263
+#: ../gnucash/report/business-reports/fancy-invoice.scm:133
+#: ../gnucash/report/business-reports/fancy-invoice.scm:273
+#: ../gnucash/report/business-reports/invoice.scm:109
+#: ../gnucash/report/business-reports/invoice.scm:258
 msgid "Quantity"
 msgstr "Inventario"
 
@@ -17838,15 +17724,15 @@ msgid "Invoiced?"
 msgstr "¿Facturado?"
 
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:117
-#: ../gnucash/report/business-reports/easy-invoice.scm:319
+#: ../gnucash/report/business-reports/easy-invoice.scm:318
 #: ../gnucash/report/report-system/options-utilities.scm:266
 msgid "Subtotal"
 msgstr "Subtotal"
 
 #: ../gnucash/register/ledger-core/gncEntryLedgerModel.c:122
-#: ../gnucash/report/business-reports/easy-invoice.scm:472
-#: ../gnucash/report/business-reports/fancy-invoice.scm:510
-#: ../gnucash/report/business-reports/invoice.scm:448
+#: ../gnucash/report/business-reports/easy-invoice.scm:471
+#: ../gnucash/report/business-reports/fancy-invoice.scm:509
+#: ../gnucash/report/business-reports/invoice.scm:447
 #: ../gnucash/report/business-reports/owner-report.scm:57
 #: ../libgnucash/tax/us/de_DE.scm:52
 msgid "Tax"
@@ -17984,19 +17870,19 @@ msgstr "Está a punto de sobrescribir un desglose existente. ¿Está seguro que
 msgid "You are about to overwrite an existing transaction. Are you sure you want to do that?"
 msgstr "Va a sobrescribir una transacción existente. ¿Seguro que quiere hacer esto?"
 
-#: ../gnucash/register/ledger-core/split-register-control.c:1368
+#: ../gnucash/register/ledger-core/split-register-control.c:1369
 msgid "You need to select a split in order to modify its exchange rate."
 msgstr "Debe seleccionar una desglose con el fin de modificar sus tipos de cambio."
 
-#: ../gnucash/register/ledger-core/split-register-control.c:1395
+#: ../gnucash/register/ledger-core/split-register-control.c:1396
 msgid "The entered account could not be found."
 msgstr "La cuenta introducida no pudo ser encontrada."
 
-#: ../gnucash/register/ledger-core/split-register-control.c:1494
+#: ../gnucash/register/ledger-core/split-register-control.c:1495
 msgid "The split's amount is zero, so no exchange rate is needed."
 msgstr "La cantidad del desglose es cero, así que no se necesita tipo de cambio."
 
-#: ../gnucash/register/ledger-core/split-register-control.c:1545
+#: ../gnucash/register/ledger-core/split-register-control.c:1546
 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 to the changed transaction?"
 msgstr "La transacción actual ha sido modificada. ¿Quisiera registrar los cambios antes de moverse a una transacción nueva, descartar los cambios, o volver a la transacción modificada?"
 
@@ -18107,51 +17993,51 @@ msgstr "Tot Mercantil"
 
 #. This seems to be the one that initially gets used, the InactiveDateCell
 #. is set to, and subsequently displayed.
-#: ../gnucash/register/ledger-core/split-register-model.c:926
+#: ../gnucash/register/ledger-core/split-register-model.c:923
 msgid "Scheduled"
 msgstr "Programado"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:975
+#: ../gnucash/register/ledger-core/split-register-model.c:972
 msgid "Enter a reference, such as an invoice or check number, common to all entry lines (splits)"
 msgstr "Introduzca una referencia, p. ej. una factura o número comprobante, común a todas las líneas de asiento (desgloses)"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:977
+#: ../gnucash/register/ledger-core/split-register-model.c:974
 msgid "Enter a reference, such as an invoice or check number, unique to each entry line (split)"
 msgstr "Introduzca una referencia, p. ej. una factura o número comprobante, único para cada línea de asiento (desglose)"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:982
+#: ../gnucash/register/ledger-core/split-register-model.c:979
 msgid "Enter a reference, such as a check number, common to all entry lines (splits)"
 msgstr "Introduzca una referencia, p. ej. número comprobante, común a todas las líneas de asiento (desgloses)"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:984
+#: ../gnucash/register/ledger-core/split-register-model.c:981
 msgid "Enter a reference, such as a check number, unique to each entry line (split)"
 msgstr "Introduzca una referencia, p. ej. número comprobante, único para cada línea de asiento (desglose)"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1005
+#: ../gnucash/register/ledger-core/split-register-model.c:1002
 msgid "Enter a transaction reference, such as an invoice or check number, common to all entry lines (splits)"
 msgstr "Introduzca una referencia de transacción, p. ej. una factura o número comprobante, común a todas las líneas de asiento (desgloses)"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1009
+#: ../gnucash/register/ledger-core/split-register-model.c:1006
 msgid "Enter a transaction reference that will be common to all entry lines (splits)"
 msgstr "Introduzca una referencia de transacción que será común a todas las líneas de asiento (desgloses)"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1212
+#: ../gnucash/register/ledger-core/split-register-model.c:1209
 msgid "Enter an action type, or choose one from the list"
 msgstr "Introduzca un tipo de operación, o elija uno desde el índice"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1213
+#: ../gnucash/register/ledger-core/split-register-model.c:1210
 msgid "Enter a reference number, such as the next check number, or choose an action type from the list"
 msgstr "Introduzca el número de referencia, como el número comprobante siguiente, o elija un tipo de operación desde el índice"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1476
+#: ../gnucash/register/ledger-core/split-register-model.c:1475
 msgid "This transaction has multiple splits; press the Split button to see them all"
 msgstr "Esta transacción tiene múltiples desgloses; pulse el botón «Desglosar» para ver todas"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1479
+#: ../gnucash/register/ledger-core/split-register-model.c:1478
 msgid "This transaction is a stock split; press the Split button to see details"
 msgstr "Esta transacción es un desglose de reservas; pulse el botón «Desglosar» para ver detalles"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:1966
+#: ../gnucash/register/ledger-core/split-register-model.c:1965
 #, c-format
 msgid ""
 "Cannot modify or delete this transaction. This transaction is marked read-only because:\n"
@@ -18162,11 +18048,11 @@ msgstr ""
 "\n"
 "«%s»"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:2063
+#: ../gnucash/register/ledger-core/split-register-model.c:2062
 msgid "Change transaction containing a reconciled split?"
 msgstr "¿Modificar transacción conteniendo un desglose conciliado?"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:2065
+#: ../gnucash/register/ledger-core/split-register-model.c:2064
 #, c-format
 msgid ""
 "The transaction you are about to change is protected because it contains reconciled splits in the following accounts:\n"
@@ -18179,11 +18065,11 @@ msgstr ""
 "\n"
 "Si continúa editando esta transacción todos los desgloses no conciliados serán no conciliados. Esto puede ser difícil conciliar futuras conciliaciones. ¿Quiere continuar con este cambio?"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:2077
+#: ../gnucash/register/ledger-core/split-register-model.c:2076
 msgid "You are about to change a protected field of a reconciled split. If you continue editing this split it will be unreconciled. This might make future reconciliation difficult! Continue with this change?"
 msgstr "Va a cambiar un campo protegido de un desglose conciliado. Si continúa editando este desglose será desconciliado. ¡Hacerlo puede dificultar conciliaciones futuras! ¿Quiere continuar con este cambio?"
 
-#: ../gnucash/register/ledger-core/split-register-model.c:2102
+#: ../gnucash/register/ledger-core/split-register-model.c:2101
 msgid "Chan_ge Transaction"
 msgstr "Ca_mbiar transacción"
 
@@ -18191,261 +18077,263 @@ msgstr "Ca_mbiar transacción"
 msgid "List"
 msgstr "Índice"
 
-#: ../gnucash/report/business-reports/aging.scm:39
-#: ../gnucash/report/business-reports/customer-summary.scm:43
-#: ../gnucash/report/business-reports/job-report.scm:379
-#: ../gnucash/report/business-reports/job-report.scm:554
+#: ../gnucash/report/business-reports/aging.scm:38
+#: ../gnucash/report/business-reports/customer-summary.scm:42
+#: ../gnucash/report/business-reports/job-report.scm:378
+#: ../gnucash/report/business-reports/job-report.scm:553
 #: ../gnucash/report/business-reports/owner-report.scm:41
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:149
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:170
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:148
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:169
 msgid "To"
 msgstr "Destino"
 
-#: ../gnucash/report/business-reports/aging.scm:40
+#: ../gnucash/report/business-reports/aging.scm:39
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: ../gnucash/report/business-reports/aging.scm:41
-#: ../gnucash/report/business-reports/customer-summary.scm:96
+#: ../gnucash/report/business-reports/aging.scm:40
+#: ../gnucash/report/business-reports/customer-summary.scm:95
 msgid "Sort Order"
 msgstr "Orden de operación"
 
-#: ../gnucash/report/business-reports/aging.scm:42
+#. if a common currency was specified,
+#: ../gnucash/report/business-reports/aging.scm:41
 #: ../gnucash/report/business-reports/balsheet-eg.scm:282
-#: ../gnucash/report/standard-reports/account-piecharts.scm:69
+#: ../gnucash/report/standard-reports/account-piecharts.scm:67
 #: ../gnucash/report/standard-reports/account-summary.scm:114
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:71
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:69
 #: ../gnucash/report/standard-reports/average-balance.scm:41
 #: ../gnucash/report/standard-reports/balance-sheet.scm:138
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:103
-#: ../gnucash/report/standard-reports/budget-flow.scm:48
+#: ../gnucash/report/standard-reports/budget-flow.scm:46
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:117
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:61
+#: ../gnucash/report/standard-reports/cash-flow.scm:52
+#: ../gnucash/report/standard-reports/category-barchart.scm:76
+#: ../gnucash/report/standard-reports/daily-reports.scm:57
+#: ../gnucash/report/standard-reports/equity-statement.scm:77
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:152
+#: ../gnucash/report/standard-reports/income-statement.scm:110
+#: ../gnucash/report/standard-reports/net-barchart.scm:49
+#: ../gnucash/report/standard-reports/net-linechart.scm:45
+#: ../gnucash/report/standard-reports/portfolio.scm:54
+#: ../gnucash/report/standard-reports/price-scatter.scm:40
+#: ../gnucash/report/standard-reports/sx-summary.scm:94
+#: ../gnucash/report/standard-reports/transaction.scm:87
+#: ../gnucash/report/standard-reports/trial-balance.scm:129
+msgid "Report's currency"
+msgstr "Moneda del boletín"
+
+#: ../gnucash/report/business-reports/aging.scm:42
+#: ../gnucash/report/business-reports/balsheet-eg.scm:283
+#: ../gnucash/report/standard-reports/account-piecharts.scm:68
+#: ../gnucash/report/standard-reports/account-summary.scm:115
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:39
+#: ../gnucash/report/standard-reports/average-balance.scm:42
+#: ../gnucash/report/standard-reports/balance-sheet.scm:139
+#: ../gnucash/report/standard-reports/budget-balance-sheet.scm:104
+#: ../gnucash/report/standard-reports/budget-flow.scm:43
 #: ../gnucash/report/standard-reports/budget-income-statement.scm:118
+#: ../gnucash/report/standard-reports/budget.scm:53
 #: ../gnucash/report/standard-reports/cashflow-barchart.scm:62
 #: ../gnucash/report/standard-reports/cash-flow.scm:53
-#: ../gnucash/report/standard-reports/category-barchart.scm:78
-#: ../gnucash/report/standard-reports/daily-reports.scm:59
-#: ../gnucash/report/standard-reports/equity-statement.scm:79
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:70
+#: ../gnucash/report/standard-reports/category-barchart.scm:77
+#: ../gnucash/report/standard-reports/daily-reports.scm:58
+#: ../gnucash/report/standard-reports/equity-statement.scm:78
 #: ../gnucash/report/standard-reports/income-statement.scm:111
 #: ../gnucash/report/standard-reports/net-barchart.scm:50
 #: ../gnucash/report/standard-reports/net-linechart.scm:46
-#: ../gnucash/report/standard-reports/portfolio.scm:56
+#: ../gnucash/report/standard-reports/portfolio.scm:35
 #: ../gnucash/report/standard-reports/price-scatter.scm:42
 #: ../gnucash/report/standard-reports/sx-summary.scm:95
-#: ../gnucash/report/standard-reports/transaction.scm:90
 #: ../gnucash/report/standard-reports/trial-balance.scm:130
-msgid "Report's currency"
-msgstr "Moneda del boletín"
-
-#: ../gnucash/report/business-reports/aging.scm:43
-#: ../gnucash/report/business-reports/balsheet-eg.scm:283
-#: ../gnucash/report/standard-reports/account-piecharts.scm:70
-#: ../gnucash/report/standard-reports/account-summary.scm:115
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:41
-#: ../gnucash/report/standard-reports/average-balance.scm:42
-#: ../gnucash/report/standard-reports/balance-sheet.scm:139
-#: ../gnucash/report/standard-reports/budget-balance-sheet.scm:104
-#: ../gnucash/report/standard-reports/budget-flow.scm:45
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:119
-#: ../gnucash/report/standard-reports/budget.scm:54
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:63
-#: ../gnucash/report/standard-reports/cash-flow.scm:54
-#: ../gnucash/report/standard-reports/category-barchart.scm:79
-#: ../gnucash/report/standard-reports/daily-reports.scm:60
-#: ../gnucash/report/standard-reports/equity-statement.scm:80
-#: ../gnucash/report/standard-reports/income-statement.scm:112
-#: ../gnucash/report/standard-reports/net-barchart.scm:51
-#: ../gnucash/report/standard-reports/net-linechart.scm:47
-#: ../gnucash/report/standard-reports/portfolio.scm:37
-#: ../gnucash/report/standard-reports/price-scatter.scm:44
-#: ../gnucash/report/standard-reports/sx-summary.scm:96
-#: ../gnucash/report/standard-reports/trial-balance.scm:131
 msgid "Price Source"
 msgstr "Precio Origen"
 
-#: ../gnucash/report/business-reports/aging.scm:44
+#: ../gnucash/report/business-reports/aging.scm:43
 msgid "Show Multi-currency Totals"
 msgstr "Mostrar totales en monedas múltiples"
 
-#: ../gnucash/report/business-reports/aging.scm:45
+#: ../gnucash/report/business-reports/aging.scm:44
 msgid "Show zero balance items"
 msgstr "Mostrar los ítemes de balances a cero"
 
-#: ../gnucash/report/business-reports/aging.scm:46
+#: ../gnucash/report/business-reports/aging.scm:45
 #: ../gnucash/report/business-reports/owner-report.scm:42
 msgid "Due or Post Date"
 msgstr "Fecha de Vencimiento o Contabilización"
 
 #. Display tab options
-#: ../gnucash/report/business-reports/aging.scm:49
+#: ../gnucash/report/business-reports/aging.scm:48
 #: ../gnucash/report/business-reports/receivables.scm:40
 msgid "Address Source"
 msgstr "Dirección Origen"
 
-#: ../gnucash/report/business-reports/aging.scm:55
+#: ../gnucash/report/business-reports/aging.scm:54
 msgid "Address Phone"
 msgstr "Dirección Telefónica"
 
-#: ../gnucash/report/business-reports/aging.scm:56
+#: ../gnucash/report/business-reports/aging.scm:55
 msgid "Address Fax"
 msgstr "Dirección Fax"
 
-#: ../gnucash/report/business-reports/aging.scm:57
+#: ../gnucash/report/business-reports/aging.scm:56
 msgid "Address Email"
 msgstr "Dirección Correo-e"
 
-#: ../gnucash/report/business-reports/aging.scm:226
-msgid "Transactions relating to '%s' contain more than one currency. This report is not designed to cope with this possibility."
-msgstr "Las transacciones relacionados con «%s» contienen más de una moneda. Este boletín no está diseñado para contemplar esta posibilidad."
+#: ../gnucash/report/business-reports/aging.scm:225
+#, scheme-format
+msgid "Transactions relating to '~a' contain more than one currency. This report is not designed to cope with this possibility."
+msgstr "Las transacciones relacionados con «~a» contienen más de una moneda. Este boletín no está diseñado para contemplar esta posibilidad."
 
-#: ../gnucash/report/business-reports/aging.scm:361
+#: ../gnucash/report/business-reports/aging.scm:370
 msgid "Sort companies by."
 msgstr "Ordenar compañias por."
 
-#: ../gnucash/report/business-reports/aging.scm:364
+#: ../gnucash/report/business-reports/aging.scm:373
 msgid "Name of the company."
 msgstr "Nombre de la sociedad/autónomo."
 
-#: ../gnucash/report/business-reports/aging.scm:365
+#: ../gnucash/report/business-reports/aging.scm:374
 msgid "Total Owed"
 msgstr "Total Titulado"
 
-#: ../gnucash/report/business-reports/aging.scm:365
+#: ../gnucash/report/business-reports/aging.scm:374
 msgid "Total amount owed to/from Company."
 msgstr "Cantidad total debida de inicio/destino Sociedad."
 
-#: ../gnucash/report/business-reports/aging.scm:366
+#: ../gnucash/report/business-reports/aging.scm:375
 msgid "Bracket Total Owed"
 msgstr "Deuda Total del Periodo"
 
-#: ../gnucash/report/business-reports/aging.scm:366
+#: ../gnucash/report/business-reports/aging.scm:375
 msgid "Amount owed in oldest bracket - if same go to next oldest."
 msgstr "Cantidad debida en el periodo más antiguo; si es la misma ir al siguiente más antigua."
 
-#: ../gnucash/report/business-reports/aging.scm:373
+#: ../gnucash/report/business-reports/aging.scm:382
 msgid "Sort order."
 msgstr "Ordenar operaciones."
 
-#: ../gnucash/report/business-reports/aging.scm:376
+#: ../gnucash/report/business-reports/aging.scm:385
 msgid "Increasing"
 msgstr "Aumentando"
 
-#: ../gnucash/report/business-reports/aging.scm:376
+#: ../gnucash/report/business-reports/aging.scm:385
 msgid "0 -> $999,999.99, A->Z."
 msgstr "0€ → 999.999,99€, A→Z."
 
-#: ../gnucash/report/business-reports/aging.scm:377
+#: ../gnucash/report/business-reports/aging.scm:386
 msgid "Decreasing"
 msgstr "Disminuyendo"
 
-#: ../gnucash/report/business-reports/aging.scm:377
+#: ../gnucash/report/business-reports/aging.scm:386
 msgid "$999,999.99 -> $0, Z->A."
 msgstr "999.999,99€ → 0€, Z→A."
 
-#: ../gnucash/report/business-reports/aging.scm:384
+#: ../gnucash/report/business-reports/aging.scm:393
 msgid "Show multi-currency totals. If not selected, convert all totals to report currency."
 msgstr "Muestra totales en múltiples monedas. Si no se selecciona, convertir todos los totales a la moneda del boletín."
 
-#: ../gnucash/report/business-reports/aging.scm:393
+#: ../gnucash/report/business-reports/aging.scm:402
 msgid "Show all vendors/customers even if they have a zero balance."
 msgstr "Mostrar todos los proveedores/clientes incluso aunque tengan el saldo a cero."
 
-#: ../gnucash/report/business-reports/aging.scm:401
+#: ../gnucash/report/business-reports/aging.scm:410
 #: ../gnucash/report/business-reports/owner-report.scm:621
 msgid "Leading date."
 msgstr "Fecha vencimiento."
 
-#: ../gnucash/report/business-reports/aging.scm:404
+#: ../gnucash/report/business-reports/aging.scm:413
 #: ../gnucash/report/business-reports/owner-report.scm:624
 msgid "Due date is leading."
 msgstr "Está llegando un vencimiento."
 
-#: ../gnucash/report/business-reports/aging.scm:405
+#: ../gnucash/report/business-reports/aging.scm:414
 #: ../gnucash/report/business-reports/owner-report.scm:625
 msgid "Post date is leading."
 msgstr "Fecha contabilizante acercándose."
 
-#: ../gnucash/report/business-reports/aging.scm:417
+#: ../gnucash/report/business-reports/aging.scm:426
 msgid "Display Address Name. This, and other fields, may be useful if copying this report to a spreadsheet for use in a mail merge."
 msgstr "Enseñar Nombre de Dirección. Esto, y otros campos, quizá es útil si copia este boletín a una hoja de cálculo para emplear dentro de una unión de correo-e."
 
-#: ../gnucash/report/business-reports/aging.scm:426
+#: ../gnucash/report/business-reports/aging.scm:435
 msgid "Display Address 1."
 msgstr "Enseñar dirección 1."
 
-#: ../gnucash/report/business-reports/aging.scm:434
+#: ../gnucash/report/business-reports/aging.scm:443
 msgid "Display Address 2."
 msgstr "Enseñar dirección 2."
 
-#: ../gnucash/report/business-reports/aging.scm:442
+#: ../gnucash/report/business-reports/aging.scm:451
 msgid "Display Address 3."
 msgstr "Enseñar dirección 3."
 
-#: ../gnucash/report/business-reports/aging.scm:450
+#: ../gnucash/report/business-reports/aging.scm:459
 msgid "Display Address 4."
 msgstr "Enseñar dirección 4."
 
-#: ../gnucash/report/business-reports/aging.scm:458
+#: ../gnucash/report/business-reports/aging.scm:467
 msgid "Display Phone."
 msgstr "Enseñar teléfono."
 
-#: ../gnucash/report/business-reports/aging.scm:466
+#: ../gnucash/report/business-reports/aging.scm:475
 msgid "Display Fax."
 msgstr "Enseñar fax."
 
-#: ../gnucash/report/business-reports/aging.scm:474
+#: ../gnucash/report/business-reports/aging.scm:483
 msgid "Display Email."
 msgstr "Enseñar correo-e."
 
-#: ../gnucash/report/business-reports/aging.scm:482
+#: ../gnucash/report/business-reports/aging.scm:491
 msgid "Display Active status."
 msgstr "Enseñar estado Activo."
 
-#: ../gnucash/report/business-reports/aging.scm:555
+#: ../gnucash/report/business-reports/aging.scm:564
 #: ../gnucash/report/business-reports/owner-report.scm:270
-#: ../gnucash/report/standard-reports/budget.scm:127
+#: ../gnucash/report/standard-reports/budget.scm:126
 msgid "Current"
 msgstr "Actual"
 
-#: ../gnucash/report/business-reports/aging.scm:556
-#: ../gnucash/report/business-reports/job-report.scm:173
+#: ../gnucash/report/business-reports/aging.scm:565
+#: ../gnucash/report/business-reports/job-report.scm:172
 #: ../gnucash/report/business-reports/owner-report.scm:271
 msgid "0-30 days"
 msgstr "0-30 días"
 
-#: ../gnucash/report/business-reports/aging.scm:557
-#: ../gnucash/report/business-reports/job-report.scm:174
+#: ../gnucash/report/business-reports/aging.scm:566
+#: ../gnucash/report/business-reports/job-report.scm:173
 #: ../gnucash/report/business-reports/owner-report.scm:272
 msgid "31-60 days"
 msgstr "31-60 días"
 
-#: ../gnucash/report/business-reports/aging.scm:558
-#: ../gnucash/report/business-reports/job-report.scm:175
+#: ../gnucash/report/business-reports/aging.scm:567
+#: ../gnucash/report/business-reports/job-report.scm:174
 #: ../gnucash/report/business-reports/owner-report.scm:273
 msgid "61-90 days"
 msgstr "61-90 días"
 
-#: ../gnucash/report/business-reports/aging.scm:559
-#: ../gnucash/report/business-reports/job-report.scm:176
+#: ../gnucash/report/business-reports/aging.scm:568
+#: ../gnucash/report/business-reports/job-report.scm:175
 #: ../gnucash/report/business-reports/owner-report.scm:274
 msgid "91+ days"
 msgstr "91+ días"
 
-#: ../gnucash/report/business-reports/aging.scm:709
+#: ../gnucash/report/business-reports/aging.scm:718
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:213
 msgid "Email"
 msgstr "Correo-e"
 
-#: ../gnucash/report/business-reports/aging.scm:787
+#: ../gnucash/report/business-reports/aging.scm:796
 msgid "Y"
 msgstr "S"
 
-#: ../gnucash/report/business-reports/aging.scm:787
+#: ../gnucash/report/business-reports/aging.scm:796
 msgid "N"
 msgstr "N"
 
-#: ../gnucash/report/business-reports/aging.scm:854
-#: ../gnucash/report/business-reports/job-report.scm:605
+#: ../gnucash/report/business-reports/aging.scm:863
+#: ../gnucash/report/business-reports/job-report.scm:604
 msgid "No valid account selected. Click on the Options button and select the account to use."
 msgstr "No se ha seleccionado una cuenta válida. Pulse en el botón de Opciones y seleccione la cuenta a usar."
 
@@ -18462,7 +18350,7 @@ msgid "Equity Accounts"
 msgstr "Cuentas Patrimoniales"
 
 #: ../gnucash/report/business-reports/balsheet-eg.eguile.scm:193
-#: ../gnucash/report/report-system/report-utilities.scm:126
+#: ../gnucash/report/report-system/report-utilities.scm:125
 msgid "Trading Accounts"
 msgstr "Cuentas Mercantiles"
 
@@ -18495,11 +18383,11 @@ msgstr "Hoja de Balance (eguile)"
 #: ../gnucash/report/standard-reports/account-summary.scm:66
 #: ../gnucash/report/standard-reports/balance-sheet.scm:76
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:42
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:53
-#: ../gnucash/report/standard-reports/equity-statement.scm:61
-#: ../gnucash/report/standard-reports/income-statement.scm:54
-#: ../gnucash/report/standard-reports/sx-summary.scm:47
-#: ../gnucash/report/standard-reports/trial-balance.scm:65
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:52
+#: ../gnucash/report/standard-reports/equity-statement.scm:59
+#: ../gnucash/report/standard-reports/income-statement.scm:53
+#: ../gnucash/report/standard-reports/sx-summary.scm:46
+#: ../gnucash/report/standard-reports/trial-balance.scm:64
 msgid "Report Title"
 msgstr "Título del Boletín"
 
@@ -18507,11 +18395,11 @@ msgstr "Título del Boletín"
 #: ../gnucash/report/standard-reports/account-summary.scm:67
 #: ../gnucash/report/standard-reports/balance-sheet.scm:77
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:43
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:54
-#: ../gnucash/report/standard-reports/equity-statement.scm:62
-#: ../gnucash/report/standard-reports/income-statement.scm:55
-#: ../gnucash/report/standard-reports/sx-summary.scm:48
-#: ../gnucash/report/standard-reports/trial-balance.scm:66
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:53
+#: ../gnucash/report/standard-reports/equity-statement.scm:60
+#: ../gnucash/report/standard-reports/income-statement.scm:54
+#: ../gnucash/report/standard-reports/sx-summary.scm:47
+#: ../gnucash/report/standard-reports/trial-balance.scm:65
 msgid "Title for this report."
 msgstr "Título para este boletín."
 
@@ -18532,11 +18420,11 @@ msgstr "La hoja de balance puede enseñarse con 1 o 2 columnas. 'auto' significa
 #: ../gnucash/report/standard-reports/account-summary.scm:78
 #: ../gnucash/report/standard-reports/balance-sheet.scm:91
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:56
-#: ../gnucash/report/standard-reports/budget-barchart.scm:55
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:80
-#: ../gnucash/report/standard-reports/income-statement.scm:67
-#: ../gnucash/report/standard-reports/sx-summary.scm:59
-#: ../gnucash/report/standard-reports/trial-balance.scm:80
+#: ../gnucash/report/standard-reports/budget-barchart.scm:53
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:79
+#: ../gnucash/report/standard-reports/income-statement.scm:66
+#: ../gnucash/report/standard-reports/sx-summary.scm:58
+#: ../gnucash/report/standard-reports/trial-balance.scm:79
 msgid "Levels of Subaccounts"
 msgstr "Niveles de subcuentas"
 
@@ -18544,29 +18432,29 @@ msgstr "Niveles de subcuentas"
 #: ../gnucash/report/standard-reports/account-summary.scm:80
 #: ../gnucash/report/standard-reports/balance-sheet.scm:93
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:58
-#: ../gnucash/report/standard-reports/budget-barchart.scm:57
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:82
-#: ../gnucash/report/standard-reports/income-statement.scm:69
-#: ../gnucash/report/standard-reports/sx-summary.scm:61
-#: ../gnucash/report/standard-reports/trial-balance.scm:82
+#: ../gnucash/report/standard-reports/budget-barchart.scm:55
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:81
+#: ../gnucash/report/standard-reports/income-statement.scm:68
+#: ../gnucash/report/standard-reports/sx-summary.scm:60
+#: ../gnucash/report/standard-reports/trial-balance.scm:81
 msgid "Maximum number of levels in the account tree displayed."
 msgstr "Número máximo de niveles vistos en el plan contable que se enseña."
 
 #: ../gnucash/report/business-reports/balsheet-eg.scm:254
 #: ../gnucash/report/standard-reports/balance-sheet.scm:94
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:59
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:83
-#: ../gnucash/report/standard-reports/budget.scm:96
-#: ../gnucash/report/standard-reports/income-statement.scm:70
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:82
+#: ../gnucash/report/standard-reports/budget.scm:95
+#: ../gnucash/report/standard-reports/income-statement.scm:69
 msgid "Flatten list to depth limit"
 msgstr "Aplanar lista hasta el límite de profundidad"
 
 #: ../gnucash/report/business-reports/balsheet-eg.scm:256
 #: ../gnucash/report/standard-reports/balance-sheet.scm:96
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:61
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:85
-#: ../gnucash/report/standard-reports/budget.scm:98
-#: ../gnucash/report/standard-reports/income-statement.scm:72
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:84
+#: ../gnucash/report/standard-reports/budget.scm:97
+#: ../gnucash/report/standard-reports/income-statement.scm:71
 msgid "Displays accounts which exceed the depth limit at the depth limit."
 msgstr "Enseñar cuentas que exceden los límites de profundidad en el límite de profundidad."
 
@@ -18582,10 +18470,10 @@ msgstr "Excluye cuentas de nivel inferior a la cima con saldo a cero y ninguna s
 #: ../gnucash/report/standard-reports/account-summary.scm:99
 #: ../gnucash/report/standard-reports/balance-sheet.scm:112
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:77
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:101
-#: ../gnucash/report/standard-reports/income-statement.scm:88
-#: ../gnucash/report/standard-reports/sx-summary.scm:80
-#: ../gnucash/report/standard-reports/trial-balance.scm:126
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:100
+#: ../gnucash/report/standard-reports/income-statement.scm:87
+#: ../gnucash/report/standard-reports/sx-summary.scm:79
+#: ../gnucash/report/standard-reports/trial-balance.scm:125
 msgid "Display accounts as hyperlinks"
 msgstr "Enseñar cuentas como hipervínculos"
 
@@ -18593,10 +18481,10 @@ msgstr "Enseñar cuentas como hipervínculos"
 #: ../gnucash/report/standard-reports/account-summary.scm:100
 #: ../gnucash/report/standard-reports/balance-sheet.scm:113
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:78
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:102
-#: ../gnucash/report/standard-reports/income-statement.scm:89
-#: ../gnucash/report/standard-reports/sx-summary.scm:81
-#: ../gnucash/report/standard-reports/trial-balance.scm:127
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:101
+#: ../gnucash/report/standard-reports/income-statement.scm:88
+#: ../gnucash/report/standard-reports/sx-summary.scm:80
+#: ../gnucash/report/standard-reports/trial-balance.scm:126
 msgid "Shows each account in the table as a hyperlink to its register window."
 msgstr "Muestra cada cuenta dentro de la tipo como un hipervínculo a su ventana de registro."
 
@@ -18645,9 +18533,9 @@ msgid "The file name of the CSS stylesheet to use with this report. If specified
 msgstr "El nombre del fichero de la hoja de estilo CSS para emplear con este boletín. Si lo especificó, este fichero debe estar en su carpeta .gnucash, o bien en su propio lugar dentro de las carpetas de instalación de GnuCash."
 
 #: ../gnucash/report/business-reports/balsheet-eg.scm:279
-#: ../gnucash/report/business-reports/easy-invoice.scm:355
-#: ../gnucash/report/business-reports/fancy-invoice.scm:345
-#: ../gnucash/report/business-reports/invoice.scm:330
+#: ../gnucash/report/business-reports/easy-invoice.scm:354
+#: ../gnucash/report/business-reports/fancy-invoice.scm:344
+#: ../gnucash/report/business-reports/invoice.scm:329
 msgid "Extra Notes"
 msgstr "Anotaciones Adicionales"
 
@@ -18660,11 +18548,11 @@ msgstr "Anotaciones añadidas al final de la factura -- puede contener código d
 #: ../gnucash/report/standard-reports/account-summary.scm:116
 #: ../gnucash/report/standard-reports/balance-sheet.scm:140
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:105
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:120
-#: ../gnucash/report/standard-reports/equity-statement.scm:81
-#: ../gnucash/report/standard-reports/income-statement.scm:113
-#: ../gnucash/report/standard-reports/sx-summary.scm:97
-#: ../gnucash/report/standard-reports/trial-balance.scm:132
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:119
+#: ../gnucash/report/standard-reports/equity-statement.scm:79
+#: ../gnucash/report/standard-reports/income-statement.scm:112
+#: ../gnucash/report/standard-reports/sx-summary.scm:96
+#: ../gnucash/report/standard-reports/trial-balance.scm:131
 msgid "Show Foreign Currencies"
 msgstr "Mostrar monedas extranjeras"
 
@@ -18672,11 +18560,11 @@ msgstr "Mostrar monedas extranjeras"
 #: ../gnucash/report/standard-reports/account-summary.scm:118
 #: ../gnucash/report/standard-reports/balance-sheet.scm:142
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:107
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:122
-#: ../gnucash/report/standard-reports/equity-statement.scm:83
-#: ../gnucash/report/standard-reports/income-statement.scm:115
-#: ../gnucash/report/standard-reports/sx-summary.scm:99
-#: ../gnucash/report/standard-reports/trial-balance.scm:134
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:121
+#: ../gnucash/report/standard-reports/equity-statement.scm:81
+#: ../gnucash/report/standard-reports/income-statement.scm:114
+#: ../gnucash/report/standard-reports/sx-summary.scm:98
+#: ../gnucash/report/standard-reports/trial-balance.scm:133
 msgid "Display any foreign currency amount in an account."
 msgstr "Enseñar cualquier cantidad en moneda extranjera en una cuenta."
 
@@ -18684,11 +18572,11 @@ msgstr "Enseñar cualquier cantidad en moneda extranjera en una cuenta."
 #: ../gnucash/report/standard-reports/account-summary.scm:113
 #: ../gnucash/report/standard-reports/balance-sheet.scm:137
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:102
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:117
-#: ../gnucash/report/standard-reports/equity-statement.scm:78
-#: ../gnucash/report/standard-reports/income-statement.scm:110
-#: ../gnucash/report/standard-reports/sx-summary.scm:94
-#: ../gnucash/report/standard-reports/trial-balance.scm:129
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:116
+#: ../gnucash/report/standard-reports/equity-statement.scm:76
+#: ../gnucash/report/standard-reports/income-statement.scm:109
+#: ../gnucash/report/standard-reports/sx-summary.scm:93
+#: ../gnucash/report/standard-reports/trial-balance.scm:128
 msgid "Commodities"
 msgstr "Mercancías"
 
@@ -18746,12 +18634,12 @@ msgid "Display a balance sheet (using eguile template)"
 msgstr "Enseña una hoja de balance (empleando plantilla eguile)"
 
 #. Option names
-#: ../gnucash/report/business-reports/customer-summary.scm:42
-#: ../gnucash/report/business-reports/job-report.scm:379
-#: ../gnucash/report/business-reports/job-report.scm:551
+#: ../gnucash/report/business-reports/customer-summary.scm:41
+#: ../gnucash/report/business-reports/job-report.scm:378
+#: ../gnucash/report/business-reports/job-report.scm:550
 #: ../gnucash/report/business-reports/owner-report.scm:40
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:149
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:170
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:148
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:169
 msgid "From"
 msgstr "Origen"
 
@@ -18759,76 +18647,76 @@ msgstr "Origen"
 #. The names here are used 1. for internal identification, 2. as
 #. tab labels, 3. as default for the 'Report name' option which
 #. in turn is used for the printed report title.
+#: ../gnucash/report/business-reports/customer-summary.scm:49
 #: ../gnucash/report/business-reports/customer-summary.scm:50
-#: ../gnucash/report/business-reports/customer-summary.scm:51
-#: ../gnucash/report/standard-reports/account-piecharts.scm:61
+#: ../gnucash/report/standard-reports/account-piecharts.scm:59
 msgid "Income Accounts"
 msgstr "Cuentas de Ingresos"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:53
+#: ../gnucash/report/business-reports/customer-summary.scm:52
 msgid "The income accounts where the sales and income was recorded."
 msgstr "Las cuentas de ingresos donde las ventas e ingresos fueron registrados."
 
+#: ../gnucash/report/business-reports/customer-summary.scm:57
 #: ../gnucash/report/business-reports/customer-summary.scm:58
-#: ../gnucash/report/business-reports/customer-summary.scm:59
-#: ../gnucash/report/standard-reports/account-piecharts.scm:62
+#: ../gnucash/report/standard-reports/account-piecharts.scm:60
 msgid "Expense Accounts"
 msgstr "Cuentas de Gastos"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:63
+#: ../gnucash/report/business-reports/customer-summary.scm:62
 msgid "The expense accounts where the expenses are recorded which are subtracted from the sales to give the profit."
 msgstr "Las cuentas de gastos donde se registran los gastos los cuales son restados desde las ventas para dar la ganancia."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:65
+#: ../gnucash/report/business-reports/customer-summary.scm:64
 msgid "Show Expense Column"
 msgstr "Mostrar Columna de Gastos"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:66
+#: ../gnucash/report/business-reports/customer-summary.scm:65
 msgid "Show the column with the expenses per customer."
 msgstr "Muestra la columna con los gastos por cliente."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:67
+#: ../gnucash/report/business-reports/customer-summary.scm:66
 msgid "Show Company Address"
 msgstr "Mostrar la dirección de la sociedad"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:68
+#: ../gnucash/report/business-reports/customer-summary.scm:67
 msgid "Show your own company's address and the date of printing."
 msgstr "Muestra su propia dirección de sociedad y la fecha para escribir."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:70
-#: ../gnucash/report/business-reports/easy-invoice.scm:249
-#: ../gnucash/report/business-reports/easy-invoice.scm:254
-#: ../gnucash/report/business-reports/easy-invoice.scm:259
-#: ../gnucash/report/business-reports/easy-invoice.scm:264
-#: ../gnucash/report/business-reports/easy-invoice.scm:269
-#: ../gnucash/report/business-reports/easy-invoice.scm:274
-#: ../gnucash/report/business-reports/easy-invoice.scm:279
-#: ../gnucash/report/business-reports/easy-invoice.scm:284
-#: ../gnucash/report/business-reports/easy-invoice.scm:289
-#: ../gnucash/report/business-reports/fancy-invoice.scm:259
-#: ../gnucash/report/business-reports/fancy-invoice.scm:264
-#: ../gnucash/report/business-reports/fancy-invoice.scm:269
-#: ../gnucash/report/business-reports/fancy-invoice.scm:274
-#: ../gnucash/report/business-reports/fancy-invoice.scm:279
-#: ../gnucash/report/business-reports/fancy-invoice.scm:284
-#: ../gnucash/report/business-reports/fancy-invoice.scm:289
-#: ../gnucash/report/business-reports/fancy-invoice.scm:294
-#: ../gnucash/report/business-reports/fancy-invoice.scm:299
-#: ../gnucash/report/business-reports/invoice.scm:244
-#: ../gnucash/report/business-reports/invoice.scm:249
-#: ../gnucash/report/business-reports/invoice.scm:254
-#: ../gnucash/report/business-reports/invoice.scm:259
-#: ../gnucash/report/business-reports/invoice.scm:264
-#: ../gnucash/report/business-reports/invoice.scm:269
-#: ../gnucash/report/business-reports/invoice.scm:274
-#: ../gnucash/report/business-reports/invoice.scm:279
-#: ../gnucash/report/business-reports/invoice.scm:284
-#: ../gnucash/report/business-reports/job-report.scm:383
-#: ../gnucash/report/business-reports/job-report.scm:388
-#: ../gnucash/report/business-reports/job-report.scm:393
-#: ../gnucash/report/business-reports/job-report.scm:398
-#: ../gnucash/report/business-reports/job-report.scm:403
-#: ../gnucash/report/business-reports/job-report.scm:408
+#: ../gnucash/report/business-reports/customer-summary.scm:69
+#: ../gnucash/report/business-reports/easy-invoice.scm:248
+#: ../gnucash/report/business-reports/easy-invoice.scm:253
+#: ../gnucash/report/business-reports/easy-invoice.scm:258
+#: ../gnucash/report/business-reports/easy-invoice.scm:263
+#: ../gnucash/report/business-reports/easy-invoice.scm:268
+#: ../gnucash/report/business-reports/easy-invoice.scm:273
+#: ../gnucash/report/business-reports/easy-invoice.scm:278
+#: ../gnucash/report/business-reports/easy-invoice.scm:283
+#: ../gnucash/report/business-reports/easy-invoice.scm:288
+#: ../gnucash/report/business-reports/fancy-invoice.scm:258
+#: ../gnucash/report/business-reports/fancy-invoice.scm:263
+#: ../gnucash/report/business-reports/fancy-invoice.scm:268
+#: ../gnucash/report/business-reports/fancy-invoice.scm:273
+#: ../gnucash/report/business-reports/fancy-invoice.scm:278
+#: ../gnucash/report/business-reports/fancy-invoice.scm:283
+#: ../gnucash/report/business-reports/fancy-invoice.scm:288
+#: ../gnucash/report/business-reports/fancy-invoice.scm:293
+#: ../gnucash/report/business-reports/fancy-invoice.scm:298
+#: ../gnucash/report/business-reports/invoice.scm:243
+#: ../gnucash/report/business-reports/invoice.scm:248
+#: ../gnucash/report/business-reports/invoice.scm:253
+#: ../gnucash/report/business-reports/invoice.scm:258
+#: ../gnucash/report/business-reports/invoice.scm:263
+#: ../gnucash/report/business-reports/invoice.scm:268
+#: ../gnucash/report/business-reports/invoice.scm:273
+#: ../gnucash/report/business-reports/invoice.scm:278
+#: ../gnucash/report/business-reports/invoice.scm:283
+#: ../gnucash/report/business-reports/job-report.scm:382
+#: ../gnucash/report/business-reports/job-report.scm:387
+#: ../gnucash/report/business-reports/job-report.scm:392
+#: ../gnucash/report/business-reports/job-report.scm:397
+#: ../gnucash/report/business-reports/job-report.scm:402
+#: ../gnucash/report/business-reports/job-report.scm:407
 #: ../gnucash/report/business-reports/owner-report.scm:568
 #: ../gnucash/report/business-reports/owner-report.scm:573
 #: ../gnucash/report/business-reports/owner-report.scm:578
@@ -18842,147 +18730,147 @@ msgstr "Muestra su propia dirección de sociedad y la fecha para escribir."
 msgid "Display Columns"
 msgstr "Enseñar columnas"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:89
+#: ../gnucash/report/business-reports/customer-summary.scm:88
 msgid "Show Lines with All Zeros"
 msgstr "Mostrar líneas con todos ceros"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:90
+#: ../gnucash/report/business-reports/customer-summary.scm:89
 msgid "Show the table lines with customers which did not have any transactions in the reporting period, hence would show all zeros in the columns."
 msgstr "Muestra las líneas de lengüetas con los clientes que no tienen ninguna transacción en el periodo del boletín, por lo tanto sería mostrar todos los ceros en las columnas."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:91
+#: ../gnucash/report/business-reports/customer-summary.scm:90
 msgid "Show Inactive Customers"
 msgstr "Mostrar Clientes Inactivos"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:92
+#: ../gnucash/report/business-reports/customer-summary.scm:91
 msgid "Include customers that have been marked inactive."
 msgstr "Incluir clientes que han sido marcados como inactivos."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:94
+#: ../gnucash/report/business-reports/customer-summary.scm:93
 msgid "Sort Column"
 msgstr "Ordenación de columna"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:95
+#: ../gnucash/report/business-reports/customer-summary.scm:94
 msgid "Choose the column by which the result table is sorted."
 msgstr "Escoja la columna por la cual la lengüeta del resultado está ordenada."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:97
+#: ../gnucash/report/business-reports/customer-summary.scm:96
 msgid "Choose the ordering of the column sort: Either ascending or descending."
 msgstr "Escoja la ordenación de la columna: O ascendente o descendente."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:456
+#: ../gnucash/report/business-reports/customer-summary.scm:455
 msgid "Customer Name"
 msgstr "Nombre del cliente"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:457
+#: ../gnucash/report/business-reports/customer-summary.scm:456
 msgid "Sort alphabetically by customer name."
 msgstr "Ordenar alfabéticamente por nombre de cliente."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:459
-#: ../gnucash/report/business-reports/customer-summary.scm:843
+#: ../gnucash/report/business-reports/customer-summary.scm:458
+#: ../gnucash/report/business-reports/customer-summary.scm:842
 #: ../gnucash/report/standard-reports/average-balance.scm:128
 #: ../gnucash/report/standard-reports/average-balance.scm:149
 msgid "Profit"
 msgstr "Beneficio"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:460
+#: ../gnucash/report/business-reports/customer-summary.scm:459
 msgid "Sort by profit amount."
 msgstr "Ordenar por cantidad de beneficio."
 
 #. Translators: "Markup" is profit amount divided by sales amount
-#: ../gnucash/report/business-reports/customer-summary.scm:463
-#: ../gnucash/report/business-reports/customer-summary.scm:845
+#: ../gnucash/report/business-reports/customer-summary.scm:462
+#: ../gnucash/report/business-reports/customer-summary.scm:844
 msgid "Markup"
 msgstr "Marcar"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:464
+#: ../gnucash/report/business-reports/customer-summary.scm:463
 msgid "Sort by markup (which is profit amount divided by sales)."
 msgstr "Ordenar por marcado (el cual es la cantidad de beneficio dividida entre las ventas)."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:466
-#: ../gnucash/report/business-reports/customer-summary.scm:845
+#: ../gnucash/report/business-reports/customer-summary.scm:465
+#: ../gnucash/report/business-reports/customer-summary.scm:844
 msgid "Sales"
 msgstr "Ventas"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:467
+#: ../gnucash/report/business-reports/customer-summary.scm:466
 msgid "Sort by sales amount."
 msgstr "Ordenar por cantidad de ventas."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:470
+#: ../gnucash/report/business-reports/customer-summary.scm:469
 msgid "Sort by expense amount."
 msgstr "Ordenar por cantidad de gastos."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:479
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:908
-#: ../gnucash/report/standard-reports/transaction.scm:352
+#: ../gnucash/report/business-reports/customer-summary.scm:478
+#: ../gnucash/report/standard-reports/transaction.scm:345
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:480
+#: ../gnucash/report/business-reports/customer-summary.scm:479
 msgid "A to Z, smallest to largest."
 msgstr "De A - Z, de menor a mayor."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:482
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:911
-#: ../gnucash/report/standard-reports/transaction.scm:355
+#: ../gnucash/report/business-reports/customer-summary.scm:481
+#: ../gnucash/report/standard-reports/transaction.scm:348
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:483
+#: ../gnucash/report/business-reports/customer-summary.scm:482
 msgid "Z to A, largest to smallest."
 msgstr "De Z - A, de mayor a menor."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:524
-#: ../gnucash/report/business-reports/job-report.scm:429
+#: ../gnucash/report/business-reports/customer-summary.scm:523
+#: ../gnucash/report/business-reports/job-report.scm:428
 msgid "Expense Report"
 msgstr "Boletín de Gastos"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:740
+#: ../gnucash/report/business-reports/customer-summary.scm:739
 #: ../gnucash/report/business-reports/owner-report.scm:769
 #: ../gnucash/report/report-gnome/dialog-report-column-view.c:366
-#: ../gnucash/report/report-gnome/report-gnome.scm:53
+#: ../gnucash/report/report-gnome/report-gnome.scm:51
 msgid "Report"
 msgstr "Boletín"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:929
+#: ../gnucash/report/business-reports/customer-summary.scm:928
 msgid "No Customer"
 msgstr "Ningún cliente"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:1004
-msgid "%s %s - %s"
-msgstr "%s %s - %s"
+#: ../gnucash/report/business-reports/customer-summary.scm:1003
+#, scheme-format
+msgid "~a ~a - ~a"
+msgstr "~a ~a - ~a"
 
-#: ../gnucash/report/business-reports/customer-summary.scm:1024
-#: ../gnucash/report/business-reports/job-report.scm:636
-msgid "No valid %s selected. Click on the Options button to select a company."
-msgstr "No se ha seleccionado un %s válido. Pulse en el botón Opciones para seleccionar una sociedad."
+#: ../gnucash/report/business-reports/customer-summary.scm:1023
+#: ../gnucash/report/business-reports/job-report.scm:635
+#, scheme-format
+msgid "No valid ~a selected. Click on the Options button to select a company."
+msgstr "No se ha seleccionado un ~a válido. Pulse en el botón Opciones para seleccionar una sociedad."
 
-#: ../gnucash/report/business-reports/customer-summary.scm:1037
+#: ../gnucash/report/business-reports/customer-summary.scm:1036
 msgid "Customer Summary"
 msgstr "Resumen Cliente"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:114
-#: ../gnucash/report/business-reports/easy-invoice.scm:259
-#: ../gnucash/report/business-reports/fancy-invoice.scm:132
-#: ../gnucash/report/business-reports/invoice.scm:108
+#: ../gnucash/report/business-reports/easy-invoice.scm:113
+#: ../gnucash/report/business-reports/easy-invoice.scm:258
+#: ../gnucash/report/business-reports/fancy-invoice.scm:131
+#: ../gnucash/report/business-reports/invoice.scm:107
 msgid "Charge Type"
 msgstr "Tipo de Cargo"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:122
-#: ../gnucash/report/business-reports/easy-invoice.scm:279
-#: ../gnucash/report/business-reports/fancy-invoice.scm:140
-#: ../gnucash/report/business-reports/fancy-invoice.scm:289
-#: ../gnucash/report/business-reports/invoice.scm:116
-#: ../gnucash/report/business-reports/invoice.scm:274
+#: ../gnucash/report/business-reports/easy-invoice.scm:121
+#: ../gnucash/report/business-reports/easy-invoice.scm:278
+#: ../gnucash/report/business-reports/fancy-invoice.scm:139
+#: ../gnucash/report/business-reports/fancy-invoice.scm:288
+#: ../gnucash/report/business-reports/invoice.scm:115
+#: ../gnucash/report/business-reports/invoice.scm:273
 msgid "Taxable"
 msgstr "Imponible"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:124
-#: ../gnucash/report/business-reports/easy-invoice.scm:284
-#: ../gnucash/report/business-reports/fancy-invoice.scm:142
-#: ../gnucash/report/business-reports/fancy-invoice.scm:294
-#: ../gnucash/report/business-reports/invoice.scm:118
-#: ../gnucash/report/business-reports/invoice.scm:279
+#: ../gnucash/report/business-reports/easy-invoice.scm:123
+#: ../gnucash/report/business-reports/easy-invoice.scm:283
+#: ../gnucash/report/business-reports/fancy-invoice.scm:141
+#: ../gnucash/report/business-reports/fancy-invoice.scm:293
+#: ../gnucash/report/business-reports/invoice.scm:117
+#: ../gnucash/report/business-reports/invoice.scm:278
 #: ../gnucash/report/business-reports/receipt.scm:97
 #: ../gnucash/report/business-reports/receipt.scm:179
 #: ../gnucash/report/business-reports/taxinvoice.scm:122
@@ -18991,122 +18879,120 @@ msgid "Tax Amount"
 msgstr "Cantidad Impositiva"
 
 #. Translators: This "T" is displayed in the taxable column, if this entry contains tax
-#: ../gnucash/report/business-reports/easy-invoice.scm:211
-#: ../gnucash/report/business-reports/fancy-invoice.scm:219
-#: ../gnucash/report/business-reports/invoice.scm:206
+#: ../gnucash/report/business-reports/easy-invoice.scm:210
+#: ../gnucash/report/business-reports/fancy-invoice.scm:218
+#: ../gnucash/report/business-reports/invoice.scm:205
 msgid "T"
 msgstr "A"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:243
-#: ../gnucash/report/business-reports/fancy-invoice.scm:253
-#: ../gnucash/report/business-reports/invoice.scm:238
+#: ../gnucash/report/business-reports/easy-invoice.scm:242
+#: ../gnucash/report/business-reports/fancy-invoice.scm:252
+#: ../gnucash/report/business-reports/invoice.scm:237
 msgid "Custom Title"
 msgstr "Título personalizado"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:244
-#: ../gnucash/report/business-reports/fancy-invoice.scm:254
-#: ../gnucash/report/business-reports/invoice.scm:239
+#: ../gnucash/report/business-reports/easy-invoice.scm:243
+#: ../gnucash/report/business-reports/fancy-invoice.scm:253
+#: ../gnucash/report/business-reports/invoice.scm:238
 msgid "A custom string to replace Invoice, Bill or Expense Voucher."
 msgstr "Una cadena personalizada para remplazar Factura, Recibo o Comprobante de Gasto."
 
 #. Elements page options
-#: ../gnucash/report/business-reports/easy-invoice.scm:250
-#: ../gnucash/report/business-reports/fancy-invoice.scm:260
-#: ../gnucash/report/business-reports/invoice.scm:245
+#: ../gnucash/report/business-reports/easy-invoice.scm:249
+#: ../gnucash/report/business-reports/fancy-invoice.scm:259
+#: ../gnucash/report/business-reports/invoice.scm:244
 #: ../gnucash/report/business-reports/taxinvoice.scm:161
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1064
 #: ../gnucash/report/standard-reports/register.scm:411
-#: ../gnucash/report/standard-reports/transaction.scm:788
+#: ../gnucash/report/standard-reports/transaction.scm:790
 msgid "Display the date?"
 msgstr "¿Enseñar la fecha?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:255
-#: ../gnucash/report/business-reports/fancy-invoice.scm:265
-#: ../gnucash/report/business-reports/invoice.scm:250
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1069
+#: ../gnucash/report/business-reports/easy-invoice.scm:254
+#: ../gnucash/report/business-reports/fancy-invoice.scm:264
+#: ../gnucash/report/business-reports/invoice.scm:249
 #: ../gnucash/report/standard-reports/register.scm:426
-#: ../gnucash/report/standard-reports/transaction.scm:793
+#: ../gnucash/report/standard-reports/transaction.scm:795
 msgid "Display the description?"
 msgstr "¿Enseñar la descripción?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:260
+#: ../gnucash/report/business-reports/easy-invoice.scm:259
 msgid "Display the charge type?"
 msgstr "¿Enseñar el tipo de cargo?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:265
-#: ../gnucash/report/business-reports/fancy-invoice.scm:275
-#: ../gnucash/report/business-reports/invoice.scm:260
+#: ../gnucash/report/business-reports/easy-invoice.scm:264
+#: ../gnucash/report/business-reports/fancy-invoice.scm:274
+#: ../gnucash/report/business-reports/invoice.scm:259
 msgid "Display the quantity of items?"
 msgstr "¿Enseñar el inventario de objetos?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:270
-#: ../gnucash/report/business-reports/fancy-invoice.scm:280
-#: ../gnucash/report/business-reports/invoice.scm:265
+#: ../gnucash/report/business-reports/easy-invoice.scm:269
+#: ../gnucash/report/business-reports/fancy-invoice.scm:279
+#: ../gnucash/report/business-reports/invoice.scm:264
 msgid "Display the price per item?"
 msgstr "¿Enseñar el precio por elemento?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:275
-#: ../gnucash/report/business-reports/fancy-invoice.scm:285
-#: ../gnucash/report/business-reports/invoice.scm:270
+#: ../gnucash/report/business-reports/easy-invoice.scm:274
+#: ../gnucash/report/business-reports/fancy-invoice.scm:284
+#: ../gnucash/report/business-reports/invoice.scm:269
 msgid "Display the entry's discount?"
 msgstr "¿Enseñar el descuento del asiento?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:280
-#: ../gnucash/report/business-reports/fancy-invoice.scm:290
-#: ../gnucash/report/business-reports/invoice.scm:275
+#: ../gnucash/report/business-reports/easy-invoice.scm:279
+#: ../gnucash/report/business-reports/fancy-invoice.scm:289
+#: ../gnucash/report/business-reports/invoice.scm:274
 msgid "Display the entry's taxable status?"
 msgstr "¿Enseñar el estado de cargos del asiento?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:285
-#: ../gnucash/report/business-reports/fancy-invoice.scm:295
-#: ../gnucash/report/business-reports/invoice.scm:280
+#: ../gnucash/report/business-reports/easy-invoice.scm:284
+#: ../gnucash/report/business-reports/fancy-invoice.scm:294
+#: ../gnucash/report/business-reports/invoice.scm:279
 msgid "Display each entry's total total tax?"
 msgstr "¿Enseñar cada asiento total por cada imposición total?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:290
-#: ../gnucash/report/business-reports/fancy-invoice.scm:300
-#: ../gnucash/report/business-reports/invoice.scm:285
+#: ../gnucash/report/business-reports/easy-invoice.scm:289
+#: ../gnucash/report/business-reports/fancy-invoice.scm:299
+#: ../gnucash/report/business-reports/invoice.scm:284
 msgid "Display the entry's value?"
 msgstr "¿Enseñar el valor del asiento?"
 
 #. (define filespage    (N_ "Files"))
-#: ../gnucash/report/business-reports/easy-invoice.scm:294
-#: ../gnucash/report/business-reports/easy-invoice.scm:299
-#: ../gnucash/report/business-reports/easy-invoice.scm:304
-#: ../gnucash/report/business-reports/easy-invoice.scm:309
-#: ../gnucash/report/business-reports/easy-invoice.scm:314
-#: ../gnucash/report/business-reports/easy-invoice.scm:319
-#: ../gnucash/report/business-reports/easy-invoice.scm:324
-#: ../gnucash/report/business-reports/easy-invoice.scm:329
-#: ../gnucash/report/business-reports/easy-invoice.scm:334
-#: ../gnucash/report/business-reports/easy-invoice.scm:339
-#: ../gnucash/report/business-reports/easy-invoice.scm:344
-#: ../gnucash/report/business-reports/easy-invoice.scm:349
-#: ../gnucash/report/business-reports/fancy-invoice.scm:304
-#: ../gnucash/report/business-reports/fancy-invoice.scm:309
-#: ../gnucash/report/business-reports/fancy-invoice.scm:314
-#: ../gnucash/report/business-reports/fancy-invoice.scm:319
-#: ../gnucash/report/business-reports/fancy-invoice.scm:324
-#: ../gnucash/report/business-reports/fancy-invoice.scm:329
-#: ../gnucash/report/business-reports/fancy-invoice.scm:334
-#: ../gnucash/report/business-reports/fancy-invoice.scm:339
-#: ../gnucash/report/business-reports/fancy-invoice.scm:345
-#: ../gnucash/report/business-reports/fancy-invoice.scm:351
-#: ../gnucash/report/business-reports/fancy-invoice.scm:358
-#: ../gnucash/report/business-reports/fancy-invoice.scm:364
-#: ../gnucash/report/business-reports/fancy-invoice.scm:371
-#: ../gnucash/report/business-reports/invoice.scm:289
-#: ../gnucash/report/business-reports/invoice.scm:294
-#: ../gnucash/report/business-reports/invoice.scm:299
-#: ../gnucash/report/business-reports/invoice.scm:304
-#: ../gnucash/report/business-reports/invoice.scm:309
-#: ../gnucash/report/business-reports/invoice.scm:314
-#: ../gnucash/report/business-reports/invoice.scm:319
-#: ../gnucash/report/business-reports/invoice.scm:324
-#: ../gnucash/report/business-reports/invoice.scm:330
+#: ../gnucash/report/business-reports/easy-invoice.scm:293
+#: ../gnucash/report/business-reports/easy-invoice.scm:298
+#: ../gnucash/report/business-reports/easy-invoice.scm:303
+#: ../gnucash/report/business-reports/easy-invoice.scm:308
+#: ../gnucash/report/business-reports/easy-invoice.scm:313
+#: ../gnucash/report/business-reports/easy-invoice.scm:318
+#: ../gnucash/report/business-reports/easy-invoice.scm:323
+#: ../gnucash/report/business-reports/easy-invoice.scm:328
+#: ../gnucash/report/business-reports/easy-invoice.scm:333
+#: ../gnucash/report/business-reports/easy-invoice.scm:338
+#: ../gnucash/report/business-reports/easy-invoice.scm:343
+#: ../gnucash/report/business-reports/easy-invoice.scm:348
+#: ../gnucash/report/business-reports/fancy-invoice.scm:303
+#: ../gnucash/report/business-reports/fancy-invoice.scm:308
+#: ../gnucash/report/business-reports/fancy-invoice.scm:313
+#: ../gnucash/report/business-reports/fancy-invoice.scm:318
+#: ../gnucash/report/business-reports/fancy-invoice.scm:323
+#: ../gnucash/report/business-reports/fancy-invoice.scm:328
+#: ../gnucash/report/business-reports/fancy-invoice.scm:333
+#: ../gnucash/report/business-reports/fancy-invoice.scm:338
+#: ../gnucash/report/business-reports/fancy-invoice.scm:344
+#: ../gnucash/report/business-reports/fancy-invoice.scm:350
+#: ../gnucash/report/business-reports/fancy-invoice.scm:357
+#: ../gnucash/report/business-reports/fancy-invoice.scm:363
+#: ../gnucash/report/business-reports/fancy-invoice.scm:370
+#: ../gnucash/report/business-reports/invoice.scm:288
+#: ../gnucash/report/business-reports/invoice.scm:293
+#: ../gnucash/report/business-reports/invoice.scm:298
+#: ../gnucash/report/business-reports/invoice.scm:303
+#: ../gnucash/report/business-reports/invoice.scm:308
+#: ../gnucash/report/business-reports/invoice.scm:313
+#: ../gnucash/report/business-reports/invoice.scm:318
+#: ../gnucash/report/business-reports/invoice.scm:323
+#: ../gnucash/report/business-reports/invoice.scm:329
 #: ../gnucash/report/business-reports/receipt.scm:77
 #: ../gnucash/report/business-reports/taxinvoice.scm:84
-#: ../gnucash/report/report-system/report.scm:71
+#: ../gnucash/report/report-system/report.scm:70
 #: ../gnucash/report/standard-reports/register.scm:410
 #: ../gnucash/report/standard-reports/register.scm:416
 #: ../gnucash/report/standard-reports/register.scm:420
@@ -19123,147 +19009,142 @@ msgstr "¿Enseñar el valor del asiento?"
 msgid "Display"
 msgstr "Enseñar"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:294
+#: ../gnucash/report/business-reports/easy-invoice.scm:293
 msgid "My Company"
 msgstr "Mi Sociedad"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:295
+#: ../gnucash/report/business-reports/easy-invoice.scm:294
 msgid "Display my company name and address?"
 msgstr "¿Enseñar el nombre y dirección de mi sociedad?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:299
+#: ../gnucash/report/business-reports/easy-invoice.scm:298
 msgid "My Company ID"
 msgstr "El código de Mi Sociedad"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:300
+#: ../gnucash/report/business-reports/easy-invoice.scm:299
 msgid "Display my company ID?"
 msgstr "¿Enseñar el código de mi sociedad?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:305
+#: ../gnucash/report/business-reports/easy-invoice.scm:304
 msgid "Display due date?"
 msgstr "¿Enseñar fecha de vencimiento?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:309
-#: ../gnucash/report/business-reports/fancy-invoice.scm:304
-#: ../gnucash/report/business-reports/invoice.scm:289
+#: ../gnucash/report/business-reports/easy-invoice.scm:308
+#: ../gnucash/report/business-reports/fancy-invoice.scm:303
+#: ../gnucash/report/business-reports/invoice.scm:288
 msgid "Individual Taxes"
 msgstr "Cargo individual"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:310
-#: ../gnucash/report/business-reports/fancy-invoice.scm:305
-#: ../gnucash/report/business-reports/invoice.scm:290
+#: ../gnucash/report/business-reports/easy-invoice.scm:309
+#: ../gnucash/report/business-reports/fancy-invoice.scm:304
+#: ../gnucash/report/business-reports/invoice.scm:289
 msgid "Display all the individual taxes?"
 msgstr "¿Enseñar todos los cargos individualmente?"
 
-#. (list (N_ "Shares")                       "k"  (N_ "Display the number of shares?") #f)
-#. (list (N_ "Price")                        "l"  (N_ "Display the shares price?") #f)
-#. note the "Amount" multichoice option in between here
-#: ../gnucash/report/business-reports/easy-invoice.scm:314
-#: ../gnucash/report/business-reports/fancy-invoice.scm:309
-#: ../gnucash/report/business-reports/invoice.scm:294
+#: ../gnucash/report/business-reports/easy-invoice.scm:313
+#: ../gnucash/report/business-reports/fancy-invoice.scm:308
+#: ../gnucash/report/business-reports/invoice.scm:293
 #: ../gnucash/report/standard-reports/general-journal.scm:118
 #: ../gnucash/report/standard-reports/general-ledger.scm:93
 #: ../gnucash/report/standard-reports/general-ledger.scm:113
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1080
 #: ../gnucash/report/standard-reports/register.scm:474
-#: ../gnucash/report/standard-reports/transaction.scm:805
+#: ../gnucash/report/standard-reports/transaction.scm:807
 msgid "Totals"
 msgstr "Totales"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:315
-#: ../gnucash/report/business-reports/fancy-invoice.scm:310
-#: ../gnucash/report/business-reports/invoice.scm:295
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1080
+#: ../gnucash/report/business-reports/easy-invoice.scm:314
+#: ../gnucash/report/business-reports/fancy-invoice.scm:309
+#: ../gnucash/report/business-reports/invoice.scm:294
 #: ../gnucash/report/standard-reports/register.scm:475
-#: ../gnucash/report/standard-reports/transaction.scm:805
+#: ../gnucash/report/standard-reports/transaction.scm:807
 msgid "Display the totals?"
 msgstr "¿Enseñar los totales?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:320
+#: ../gnucash/report/business-reports/easy-invoice.scm:319
 msgid "Display the subtotals?"
 msgstr "¿Enseñar los subtotales?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:324
-#: ../gnucash/report/business-reports/fancy-invoice.scm:314
-#: ../gnucash/report/business-reports/invoice.scm:299
+#: ../gnucash/report/business-reports/easy-invoice.scm:323
+#: ../gnucash/report/business-reports/fancy-invoice.scm:313
+#: ../gnucash/report/business-reports/invoice.scm:298
 msgid "References"
 msgstr "Referencias"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:325
-#: ../gnucash/report/business-reports/fancy-invoice.scm:315
-#: ../gnucash/report/business-reports/invoice.scm:300
+#: ../gnucash/report/business-reports/easy-invoice.scm:324
+#: ../gnucash/report/business-reports/fancy-invoice.scm:314
+#: ../gnucash/report/business-reports/invoice.scm:299
 msgid "Display the invoice references?"
 msgstr "¿Enseñar las referencias de la factura?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:329
-#: ../gnucash/report/business-reports/fancy-invoice.scm:319
-#: ../gnucash/report/business-reports/invoice.scm:304
+#: ../gnucash/report/business-reports/easy-invoice.scm:328
+#: ../gnucash/report/business-reports/fancy-invoice.scm:318
+#: ../gnucash/report/business-reports/invoice.scm:303
 msgid "Billing Terms"
 msgstr "Condiciones de Recibiente"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:330
-#: ../gnucash/report/business-reports/fancy-invoice.scm:320
-#: ../gnucash/report/business-reports/invoice.scm:305
+#: ../gnucash/report/business-reports/easy-invoice.scm:329
+#: ../gnucash/report/business-reports/fancy-invoice.scm:319
+#: ../gnucash/report/business-reports/invoice.scm:304
 msgid "Display the invoice billing terms?"
 msgstr "¿Enseñar la factura de condiciones recibientes?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:335
-#: ../gnucash/report/business-reports/fancy-invoice.scm:325
-#: ../gnucash/report/business-reports/invoice.scm:310
+#: ../gnucash/report/business-reports/easy-invoice.scm:334
+#: ../gnucash/report/business-reports/fancy-invoice.scm:324
+#: ../gnucash/report/business-reports/invoice.scm:309
 msgid "Display the billing id?"
 msgstr "¿Enseñar el id de recibiente?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:340
-#: ../gnucash/report/business-reports/fancy-invoice.scm:330
-#: ../gnucash/report/business-reports/invoice.scm:315
+#: ../gnucash/report/business-reports/easy-invoice.scm:339
+#: ../gnucash/report/business-reports/fancy-invoice.scm:329
+#: ../gnucash/report/business-reports/invoice.scm:314
 msgid "Display the invoice notes?"
 msgstr "¿Enseñar las anotaciones de la factura?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:344
-#: ../gnucash/report/business-reports/fancy-invoice.scm:334
-#: ../gnucash/report/business-reports/invoice.scm:319
+#: ../gnucash/report/business-reports/easy-invoice.scm:343
+#: ../gnucash/report/business-reports/fancy-invoice.scm:333
+#: ../gnucash/report/business-reports/invoice.scm:318
 msgid "Payments"
 msgstr "Liquidaciones"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:345
-#: ../gnucash/report/business-reports/fancy-invoice.scm:335
-#: ../gnucash/report/business-reports/invoice.scm:320
+#: ../gnucash/report/business-reports/easy-invoice.scm:344
+#: ../gnucash/report/business-reports/fancy-invoice.scm:334
+#: ../gnucash/report/business-reports/invoice.scm:319
 msgid "Display the payments applied to this invoice?"
 msgstr "¿Enseñar las liquidaciones aplicadas a esta factura?"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:349
+#: ../gnucash/report/business-reports/easy-invoice.scm:348
 msgid "Invoice Width"
 msgstr "Anchura de Factura"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:350
+#: ../gnucash/report/business-reports/easy-invoice.scm:349
 msgid "The minimum width of the invoice."
 msgstr "El ancho mínimo de la factura."
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:355
+#: ../gnucash/report/business-reports/easy-invoice.scm:354
 msgid "Text"
 msgstr "Texto"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:356
+#: ../gnucash/report/business-reports/easy-invoice.scm:355
 msgid "Extra notes to put on the invoice (simple HTML is accepted)."
 msgstr "Anotaciones adicionales para ponerlo en la factura (se acepta HTML simple)."
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:357
-#: ../gnucash/report/business-reports/fancy-invoice.scm:347
-#: ../gnucash/report/business-reports/invoice.scm:332
+#: ../gnucash/report/business-reports/easy-invoice.scm:356
+#: ../gnucash/report/business-reports/fancy-invoice.scm:346
+#: ../gnucash/report/business-reports/invoice.scm:331
 #: ../gnucash/report/business-reports/taxinvoice.scm:239
 msgid "Thank you for your patronage!"
 msgstr "¡Gracias por su patrocinio!"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:432
-#: ../gnucash/report/business-reports/fancy-invoice.scm:461
-#: ../gnucash/report/business-reports/invoice.scm:410
-#: ../gnucash/report/business-reports/job-report.scm:254
+#: ../gnucash/report/business-reports/easy-invoice.scm:431
+#: ../gnucash/report/business-reports/fancy-invoice.scm:460
+#: ../gnucash/report/business-reports/invoice.scm:409
+#: ../gnucash/report/business-reports/job-report.scm:253
 msgid "Payment, thank you"
 msgstr "Liquidado, gracias"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:457
-#: ../gnucash/report/business-reports/fancy-invoice.scm:494
-#: ../gnucash/report/business-reports/invoice.scm:433
+#: ../gnucash/report/business-reports/easy-invoice.scm:456
+#: ../gnucash/report/business-reports/fancy-invoice.scm:493
+#: ../gnucash/report/business-reports/invoice.scm:432
 #: ../gnucash/report/business-reports/receipt.scm:95
 #: ../gnucash/report/business-reports/receipt.scm:175
 #: ../gnucash/report/business-reports/taxinvoice.scm:120
@@ -19271,9 +19152,9 @@ msgstr "Liquidado, gracias"
 msgid "Net Price"
 msgstr "Precio Neto"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:475
-#: ../gnucash/report/business-reports/fancy-invoice.scm:513
-#: ../gnucash/report/business-reports/invoice.scm:451
+#: ../gnucash/report/business-reports/easy-invoice.scm:474
+#: ../gnucash/report/business-reports/fancy-invoice.scm:512
+#: ../gnucash/report/business-reports/invoice.scm:450
 #: ../gnucash/report/business-reports/receipt.scm:98
 #: ../gnucash/report/business-reports/receipt.scm:181
 #: ../gnucash/report/business-reports/taxinvoice.scm:123
@@ -19281,9 +19162,9 @@ msgstr "Precio Neto"
 msgid "Total Price"
 msgstr "Precio Total"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:492
-#: ../gnucash/report/business-reports/fancy-invoice.scm:532
-#: ../gnucash/report/business-reports/invoice.scm:469
+#: ../gnucash/report/business-reports/easy-invoice.scm:491
+#: ../gnucash/report/business-reports/fancy-invoice.scm:531
+#: ../gnucash/report/business-reports/invoice.scm:468
 #: ../gnucash/report/business-reports/receipt.scm:100
 #: ../gnucash/report/business-reports/receipt.scm:185
 #: ../gnucash/report/business-reports/taxinvoice.scm:125
@@ -19292,188 +19173,191 @@ msgid "Amount Due"
 msgstr "Cantidad Vencida"
 
 #. This string is supposed to be an abbrev. for "Reference"?
-#: ../gnucash/report/business-reports/easy-invoice.scm:601
-#: ../gnucash/report/business-reports/fancy-invoice.scm:650
-#: ../gnucash/report/business-reports/invoice.scm:577
+#: ../gnucash/report/business-reports/easy-invoice.scm:600
+#: ../gnucash/report/business-reports/fancy-invoice.scm:649
+#: ../gnucash/report/business-reports/invoice.scm:576
 msgid "REF"
 msgstr "REF"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:717
-#: ../gnucash/report/business-reports/invoice.scm:690
-msgid "%s #%d"
-msgstr "%s nº%d"
+#: ../gnucash/report/business-reports/easy-invoice.scm:716
+#: ../gnucash/report/business-reports/invoice.scm:689
+#, scheme-format
+msgid "~a #~d"
+msgstr "~a #~d"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:791
+#: ../gnucash/report/business-reports/easy-invoice.scm:790
 msgid "INVOICE NOT POSTED"
 msgstr "FACTURA NO CONTABILIZADA"
 
-#: ../gnucash/report/business-reports/easy-invoice.scm:856
-#: ../gnucash/report/business-reports/fancy-invoice.scm:977
-#: ../gnucash/report/business-reports/invoice.scm:808
+#: ../gnucash/report/business-reports/easy-invoice.scm:855
+#: ../gnucash/report/business-reports/fancy-invoice.scm:976
+#: ../gnucash/report/business-reports/invoice.scm:807
 msgid "No valid invoice selected. Click on the Options button and select the invoice to use."
 msgstr "No se ha seleccionado una factura válida. Pulse en el botón de Opciones y seleccione la factura a emplear."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:270
-#: ../gnucash/report/business-reports/invoice.scm:255
+#: ../gnucash/report/business-reports/fancy-invoice.scm:269
+#: ../gnucash/report/business-reports/invoice.scm:254
 msgid "Display the action?"
 msgstr "¿Enseñar la operación?"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:339
+#: ../gnucash/report/business-reports/fancy-invoice.scm:338
 msgid "Minimum # of entries"
 msgstr "Núm. mínimo de asientos"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:340
+#: ../gnucash/report/business-reports/fancy-invoice.scm:339
 msgid "The minimum number of invoice entries to display."
 msgstr "El número mínimo de asientos facturantes para enseñar."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:346
-#: ../gnucash/report/business-reports/invoice.scm:331
+#: ../gnucash/report/business-reports/fancy-invoice.scm:345
+#: ../gnucash/report/business-reports/invoice.scm:330
 msgid "Extra notes to put on the invoice."
 msgstr "Anotaciones adicionales para ponerlo en la factura."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:351
+#: ../gnucash/report/business-reports/fancy-invoice.scm:350
 msgid "Payable to"
 msgstr "Liquidable a nombre de"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:352
+#: ../gnucash/report/business-reports/fancy-invoice.scm:351
 msgid "Display the Payable to: information."
 msgstr "Información del Liquidable a: a enseñar."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:358
+#: ../gnucash/report/business-reports/fancy-invoice.scm:357
 msgid "Payable to string"
 msgstr "‘A nombre de’ a cadena de texto"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:359
+#: ../gnucash/report/business-reports/fancy-invoice.scm:358
 msgid "The phrase for specifying to whom payments should be made."
 msgstr "La frase para la especificación por cuyas liquidaciones deberían ser realizadas."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:360
+#: ../gnucash/report/business-reports/fancy-invoice.scm:359
 msgid "Make all cheques Payable to"
 msgstr "Hacer todos los cheques Liquidable a"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:364
+#: ../gnucash/report/business-reports/fancy-invoice.scm:363
 msgid "Company contact"
 msgstr "Contacto en la sociedad"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:365
+#: ../gnucash/report/business-reports/fancy-invoice.scm:364
 msgid "Display the Company contact information."
 msgstr "Enseña la información del contacto en la sociedad."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:371
+#: ../gnucash/report/business-reports/fancy-invoice.scm:370
 msgid "Company contact string"
 msgstr "Texto del contacto en la sociedad"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:372
+#: ../gnucash/report/business-reports/fancy-invoice.scm:371
 msgid "The phrase used to introduce the company contact."
 msgstr "La frase empleada para introducir el contacto de la sociedad."
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:373
+#: ../gnucash/report/business-reports/fancy-invoice.scm:372
 msgid "Direct all inquiries to"
 msgstr "Dirigir cualquier pregunta a"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:729
+#: ../gnucash/report/business-reports/fancy-invoice.scm:728
 msgid "Phone:"
 msgstr "Teléfono:"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:732
+#: ../gnucash/report/business-reports/fancy-invoice.scm:731
 msgid "Fax:"
 msgstr "Fax:"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:735
+#: ../gnucash/report/business-reports/fancy-invoice.scm:734
 msgid "Web:"
 msgstr "Web:"
 
 #. Translators: %s below is "Invoice" or "Bill" or even the
 #. custom title from the options. The next column contains
 #. the number of the document.
-#: ../gnucash/report/business-reports/fancy-invoice.scm:870
-msgid "%s #"
-msgstr "%s #"
+#: ../gnucash/report/business-reports/fancy-invoice.scm:869
+#, scheme-format
+msgid "~s #"
+msgstr "~s #"
 
 #. Translators: The first %s below is "Invoice" or
 #. "Bill" or even the custom title from the
 #. options. This string sucks for i18n, but I don't
 #. have a better solution right now without breaking
 #. other people's invoices.
-#: ../gnucash/report/business-reports/fancy-invoice.scm:876
-msgid "%s Date"
-msgstr "%s Fecha"
+#: ../gnucash/report/business-reports/fancy-invoice.scm:875
+#, scheme-format
+msgid "~s Date"
+msgstr "~s Fecha"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:877
+#: ../gnucash/report/business-reports/fancy-invoice.scm:876
 msgid "Due Date"
 msgstr "Vence y Fecha"
 
-#: ../gnucash/report/business-reports/fancy-invoice.scm:881
-#: ../gnucash/report/business-reports/invoice.scm:722
+#: ../gnucash/report/business-reports/fancy-invoice.scm:880
+#: ../gnucash/report/business-reports/invoice.scm:721
 #: ../gnucash/report/business-reports/taxinvoice.eguile.scm:251
 msgid "Invoice in progress..."
 msgstr "Factura en proceso..."
 
-#: ../gnucash/report/business-reports/invoice.scm:324
+#: ../gnucash/report/business-reports/invoice.scm:323
 msgid "Job Details"
 msgstr "Ejercicio Detallado"
 
-#: ../gnucash/report/business-reports/invoice.scm:325
+#: ../gnucash/report/business-reports/invoice.scm:324
 msgid "Display the job name for this invoice?"
 msgstr "¿Enseñar el nombre del ejercicio para esta factura?"
 
-#: ../gnucash/report/business-reports/invoice.scm:770
+#: ../gnucash/report/business-reports/invoice.scm:769
 #: ../libgnucash/app-utils/business-prefs.scm:52
 msgid "Job number"
 msgstr "Número de ejercicio"
 
-#: ../gnucash/report/business-reports/invoice.scm:777
+#: ../gnucash/report/business-reports/invoice.scm:776
 msgid "Job name"
 msgstr "Nombre de ejercicio"
 
-#: ../gnucash/report/business-reports/job-report.scm:332
+#: ../gnucash/report/business-reports/job-report.scm:331
 #: ../gnucash/report/business-reports/owner-report.scm:516
 msgid "Total Credit"
 msgstr "Total Crédito"
 
-#: ../gnucash/report/business-reports/job-report.scm:333
+#: ../gnucash/report/business-reports/job-report.scm:332
 #: ../gnucash/report/business-reports/owner-report.scm:517
 msgid "Total Due"
 msgstr "Total Vencida"
 
-#: ../gnucash/report/business-reports/job-report.scm:366
+#: ../gnucash/report/business-reports/job-report.scm:365
 msgid "The job for this report."
 msgstr "El ejercicio para este boletín."
 
-#: ../gnucash/report/business-reports/job-report.scm:374
+#: ../gnucash/report/business-reports/job-report.scm:373
 #: ../gnucash/report/business-reports/owner-report.scm:554
 msgid "The account to search for transactions."
 msgstr "La cuenta para la búsqueda de transacciones."
 
-#: ../gnucash/report/business-reports/job-report.scm:384
-#: ../gnucash/report/business-reports/job-report.scm:389
+#: ../gnucash/report/business-reports/job-report.scm:383
+#: ../gnucash/report/business-reports/job-report.scm:388
 #: ../gnucash/report/business-reports/owner-report.scm:569
 #: ../gnucash/report/business-reports/owner-report.scm:574
 msgid "Display the transaction date?"
 msgstr "¿Enseñar la fecha de la transacción?"
 
-#: ../gnucash/report/business-reports/job-report.scm:394
+#: ../gnucash/report/business-reports/job-report.scm:393
 #: ../gnucash/report/business-reports/owner-report.scm:579
 msgid "Display the transaction reference?"
 msgstr "¿Enseñar la referencia de la transacción?"
 
-#: ../gnucash/report/business-reports/job-report.scm:399
+#: ../gnucash/report/business-reports/job-report.scm:398
 #: ../gnucash/report/business-reports/owner-report.scm:584
 msgid "Display the transaction type?"
 msgstr "¿Enseñar tipo de la transacción?"
 
-#: ../gnucash/report/business-reports/job-report.scm:404
+#: ../gnucash/report/business-reports/job-report.scm:403
 #: ../gnucash/report/business-reports/owner-report.scm:589
 msgid "Display the transaction description?"
 msgstr "¿Enseñar la descripción de la transacción?"
 
-#: ../gnucash/report/business-reports/job-report.scm:409
+#: ../gnucash/report/business-reports/job-report.scm:408
 #: ../gnucash/report/business-reports/owner-report.scm:614
 msgid "Display the transaction amount?"
 msgstr "¿Enseñar la cantidad de la transacción?"
 
-#: ../gnucash/report/business-reports/job-report.scm:566
-#: ../gnucash/report/business-reports/job-report.scm:678
+#: ../gnucash/report/business-reports/job-report.scm:565
+#: ../gnucash/report/business-reports/job-report.scm:677
 msgid "Job Report"
 msgstr "Boletín de Ejercicio"
 
@@ -19630,7 +19514,7 @@ msgstr "Ancho del pie del logotipo"
 #: ../gnucash/report/business-reports/receipt.scm:165
 #: ../gnucash/report/business-reports/taxinvoice.scm:115
 #: ../gnucash/report/business-reports/taxinvoice.scm:201
-#: ../gnucash/report/standard-reports/portfolio.scm:258
+#: ../gnucash/report/standard-reports/portfolio.scm:256
 msgid "Units"
 msgstr "Unidades"
 
@@ -20012,302 +19896,303 @@ msgstr "Imposición de Facturación Australiana"
 msgid "Display an Australian customer invoice with tax columns (using eguile template)"
 msgstr "Enseñar una factura de cliente australiana con columnas impositivas (utilizando plantilla de eguile)"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:81
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:80
 msgid "Tax Report / TXF Export"
 msgstr "Boletín impositivo / Exportar a TXF"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:153
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:174
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:152
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:173
 msgid "Alternate Period"
 msgstr "Periodo Alterno"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:154
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:175
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:153
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:174
 msgid "Override or modify From: & To:."
 msgstr "Ignorar o modificando Origen: Y Destino:."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:157
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:178
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:156
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:177
 msgid "Use From - To"
 msgstr "Emplee origen - destino"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:157
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:178
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:156
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:177
 msgid "Use From - To period."
 msgstr "Emplee periodo `Origen - Destino´."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:159
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:180
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:158
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:179
 msgid "1st Est Tax Quarter"
 msgstr "1º Trim. Imponible Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:159
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:180
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:158
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:179
 msgid "Jan 1 - Mar 31."
 msgstr "1 ene - 31 mar."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:161
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:182
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:160
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:181
 msgid "2nd Est Tax Quarter"
 msgstr "2º Trim. Imponible Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:161
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:182
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:160
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:181
 msgid "Apr 1 - May 31."
 msgstr "1 abr - 31 may."
 
 #. Translators: The US tax quarters are different from
 #. actual year's quarters! See the definition of
 #. tax-qtr-real-qtr-year variable above.
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:166
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:187
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:165
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:186
 msgid "3rd Est Tax Quarter"
 msgstr "3º Trim. Imponible Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:166
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:187
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:165
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:186
 msgid "Jun 1 - Aug 31."
 msgstr "1 jun - 31 ago."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:168
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:189
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:167
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:188
 msgid "4th Est Tax Quarter"
 msgstr "4º Trim. Imponible Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:168
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:189
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:167
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:188
 msgid "Sep 1 - Dec 31."
 msgstr "1 sep - 31 dic."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:170
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:191
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:169
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:190
 msgid "Last Year"
 msgstr "Último año"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:170
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:191
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:169
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:190
 msgid "Last Year."
 msgstr "Último año."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:172
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:193
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:171
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:192
 msgid "Last Yr 1st Est Tax Qtr"
 msgstr "Ult. año 1º Trim. Imp. Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:173
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:194
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:172
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:193
 msgid "Jan 1 - Mar 31, Last year."
 msgstr "1 ene - 31 mar, últ. año."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:175
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:196
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:174
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:195
 msgid "Last Yr 2nd Est Tax Qtr"
 msgstr "Ult. año 2º Trim. Imp. Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:176
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:197
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:175
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:196
 msgid "Apr 1 - May 31, Last year."
 msgstr "1 abr - 31 may, últ año."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:178
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:199
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:177
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:198
 msgid "Last Yr 3rd Est Tax Qtr"
 msgstr "Ult. año 3º Trim. Imp. Estimado"
 
 #. Translators: The US tax quarters are different from
 #. actual year's quarters! See the definition of
 #. tax-qtr-real-qtr-year variable above.
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:179
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:203
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:178
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:202
 msgid "Jun 1 - Aug 31, Last year."
 msgstr "1 jun - 31 ago, últ. año."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:181
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:205
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:180
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:204
 msgid "Last Yr 4th Est Tax Qtr"
 msgstr "Ult. año 4º Trim. Imp. Estimado"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:182
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:206
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:181
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:205
 msgid "Sep 1 - Dec 31, Last year."
 msgstr "1 sep - 31 dic, últ. año."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:186
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:210
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:185
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:209
 msgid "Select Accounts (none = all)"
 msgstr "Seleccionar cuentas (ninguna = todas)"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:187
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:211
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:186
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:210
 msgid "Select accounts."
 msgstr "Seleccionar cuentas."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:193
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:217
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:192
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:216
 msgid "Suppress $0.00 values"
 msgstr "Suprimir valores 0'00€"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:194
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:193
 msgid "$0.00 valued Accounts won't be printed."
 msgstr "Las Cuentas con valor 0'00€ no serán impresas."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:198
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:197
 msgid "Print Full account names"
 msgstr "Escribir nombres de cuenta completos"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:199
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:198
 msgid "Print all Parent account names."
 msgstr "Escribe todos los nombres de la cuenta Matriz."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:277
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:276
 msgid "WARNING: There are duplicate TXF codes assigned to some accounts. Only TXF codes with payer sources may be repeated."
 msgstr "ATENCIÓN: Hay códigos TXF duplicados asignados a algunas cuentas. Sólo pueden repetirse códigos TXF con la fuente del pagador."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:848
-msgid "Period from %s to %s"
-msgstr "Periodo desde %s a %s"
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:853
+#, scheme-format
+msgid "Period from ~a to ~a"
+msgstr "Periodo desde ~a hasta ~a"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:885
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:890
 msgid "Tax Report & XML Export"
 msgstr "Boletín impositivo y exportación a XML"
 
 #. 'menu-path (list gnc:menuname-taxes)
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:887
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:892
 msgid "Taxable Income / Deductible Expenses / Export to .XML file"
 msgstr "Ingresos imponibles / Gastos deducibles / Exportar a fichero .XML"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:891
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:900
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:896
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:905
 msgid "Taxable Income / Deductible Expenses"
 msgstr "Ingresos imponibles / Gastos deducibles"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:892
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:897
 msgid "This report shows your Taxable Income and Deductible Expenses."
 msgstr "Este boletín muestra sus Ingresos Imponibles y los Gastos Deducibles."
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:897
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:902
 msgid "XML"
 msgstr "XML"
 
-#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:901
+#: ../gnucash/report/locale-specific/us/taxtxf-de_DE.scm:906
 msgid "This page shows your Taxable Income and Deductible Expenses."
 msgstr "Esta página muestra sus Ingresos Imponibles y Gastos Deducibles."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:112
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:111
 msgid "Tax Schedule Report/TXF Export"
 msgstr "Boletín del Calendario Impositivo/Exportar a TXF"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:218
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:217
 msgid "$0.00 valued Tax codes won't be printed."
 msgstr "No escribir códigos impositivos valorados a 0'00€."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:222
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:221
 msgid "Do not print full account names"
 msgstr "No escribir los nombres completos de la cuenta"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:223
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:222
 msgid "Do not print all Parent account names."
 msgstr "No escribir ningún nombre de cuenta Matriz."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:227
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:226
 msgid "Print all Transfer To/From Accounts"
 msgstr "Escribir todas las Cuentas de Origen/Destino de Transferencias"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:228
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:227
 msgid "Print all split details for multi-split transactions."
 msgstr "Escribir todos los detalles de desgloses para transacciones multidesglosadas."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:232
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:231
 msgid "Print TXF export parameters"
 msgstr "Escriba los parámetros de exportación TXF"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:233
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:232
 msgid "Show TXF export parameters for each TXF code/account on report."
 msgstr "Muestra parámetros de exportación TXF para cada código/cuenta TXF en el boletín."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:238
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:237
 msgid "Do not print T-Num:Memo data"
 msgstr "No escribir datos T-Num:Memorandum"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:239
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:238
 msgid "Do not print T-Num:Memo data for transactions."
 msgstr "No escribir los datos T-Num:Memorandum para transacciones."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:242
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:241
 msgid "Do not print Action:Memo data"
 msgstr "No escribir datos Operación:Memorandum"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:243
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:242
 msgid "Do not print Action:Memo data for transactions."
 msgstr "No escribir datos Operación:Memorandum para transacciones."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:247
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:246
 msgid "Do not print transaction detail"
 msgstr "No escribir detalles de transacción"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:248
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:247
 msgid "Do not print transaction detail for accounts."
 msgstr "No escribe detalles de transacción para cuentas."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:252
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:251
 msgid "Do not use special date processing"
 msgstr "No emplee el procesamiento de datos especial"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:253
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:252
 msgid "Do not print transactions out of specified dates."
 msgstr "No escribir transacciones externas de fechas especificadas."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:257
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:256
 msgid "Currency conversion date"
 msgstr "Fecha del cambio de monedas"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:258
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:257
 msgid "Select date to use for PriceDB lookups."
 msgstr "Seleccione una fecha para las búsquedas en PriceDB."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:261
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:260
 msgid "Nearest transaction date"
 msgstr "Fecha de la transacción más cercana"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:261
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:260
 msgid "Use nearest to transaction date."
 msgstr "Emplee una fecha de transacción más cercana."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:263
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:262
 msgid "Nearest report date"
 msgstr "Fecha boletinada más cercano"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:263
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:262
 msgid "Use nearest to report date."
 msgstr "Emplee una fecha boletinada más cercana."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:270
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:269
 msgid "Shade alternate transactions"
 msgstr "Sombrear transacciones alternas"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:271
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:270
 msgid "Shade background of alternate transactions, if more than one displayed."
 msgstr "Ensombrecer el fondo o alternar transacciones, si se enseñar más de una."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:3529
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:3528
 msgid "Tax Schedule Report & TXF Export"
 msgstr "Boletín del Calendario Imponible y Exportación TXF"
 
 #. 'menu-path (list gnc:menuname-taxes)
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:3531
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:3530
 msgid "Taxable Income/Deductible Expenses with Transaction Detail/Export to .TXF file"
 msgstr "Ingresos Imponibles/Gastos Deducibles con Detalle de Transacción/Exportación al fichero .TXF"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:3535
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:3544
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:3534
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:3543
 msgid "Taxable Income/Deductible Expenses"
 msgstr "Ingresos Imponibles/Gastos Deducibles"
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:3536
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:3535
 msgid "This report shows transaction detail for your accounts related to Income Taxes."
 msgstr "Este boletín muestra transacción detallada para sus cuentas relacionadas para Cargos sobre Ingresos."
 
-#: ../gnucash/report/locale-specific/us/taxtxf.scm:3545
+#: ../gnucash/report/locale-specific/us/taxtxf.scm:3544
 msgid "This page shows transaction detail for relevant Income Tax accounts."
 msgstr "Esta página muestra los detalles de las transacciones para cuentas relevantes de Imposiciones sobre Ingresos."
 
@@ -20346,7 +20231,7 @@ msgid "Delete report configuration"
 msgstr "Borrar configuración boletinada"
 
 #: ../gnucash/report/report-gnome/dialog-custom-report.glade.h:1
-#: ../gnucash/report/report-gnome/report-gnome.scm:116
+#: ../gnucash/report/report-gnome/report-gnome.scm:114
 msgid "Saved Report Configurations"
 msgstr "Boletín de Configuraciones Guardadas"
 
@@ -20527,7 +20412,7 @@ msgid "_Report Options"
 msgstr "Opciones de _boletín"
 
 #: ../gnucash/report/report-gnome/gnc-plugin-page-report.c:1222
-#: ../gnucash/report/report-system/html-utilities.scm:813
+#: ../gnucash/report/report-system/html-utilities.scm:811
 msgid "Edit report options"
 msgstr "Editar opciones boletinadas"
 
@@ -20607,19 +20492,20 @@ msgstr "No se pudo abrir el fichero %s. El error es: %s"
 msgid "GnuCash-Report"
 msgstr "Boletín-GnuCash"
 
-#: ../gnucash/report/report-gnome/report-gnome.scm:70
-msgid "Display the %s report"
-msgstr "Enseñar el %s boletín"
+#: ../gnucash/report/report-gnome/report-gnome.scm:68
+#, scheme-format
+msgid "Display the ~a report"
+msgstr "Enseña el ~a boletín"
 
-#: ../gnucash/report/report-gnome/report-gnome.scm:118
+#: ../gnucash/report/report-gnome/report-gnome.scm:116
 msgid "Manage and run saved report configurations"
 msgstr "Gestionar y ejecutar configuraciones de boletines guardados"
 
-#: ../gnucash/report/report-gnome/report-gnome.scm:139
+#: ../gnucash/report/report-gnome/report-gnome.scm:137
 msgid "Welcome Sample Report"
 msgstr "Bienvenido al Boletín de Muestra"
 
-#: ../gnucash/report/report-gnome/report-gnome.scm:141
+#: ../gnucash/report/report-gnome/report-gnome.scm:139
 msgid "Welcome-to-GnuCash report screen"
 msgstr "Pantalla del boletín Bienvenido a GnuCash"
 
@@ -20632,12 +20518,12 @@ msgid "There are no options for this report."
 msgstr "No hay opciones para este boletín."
 
 #: ../gnucash/report/report-gnome/window-report.c:279
-#: ../gnucash/report/utility-reports/view-column.scm:147
+#: ../gnucash/report/utility-reports/view-column.scm:145
 msgid "Report error"
 msgstr "Boletinar error"
 
 #: ../gnucash/report/report-gnome/window-report.c:280
-#: ../gnucash/report/utility-reports/view-column.scm:148
+#: ../gnucash/report/utility-reports/view-column.scm:146
 msgid "An error occurred while running the report."
 msgstr "Ocurrió un error mientras se ejecuta el boletín."
 
@@ -20652,16 +20538,17 @@ msgstr "Relleno de opciones URL equivocada: %s"
 msgid "Badly-formed report id: %s"
 msgstr "Formato del ID de boletín equivocado: %s"
 
-#: ../gnucash/report/report-system/eguile-gnc.scm:198
+#: ../gnucash/report/report-system/eguile-gnc.scm:197
 msgid "An error occurred when processing the template:"
 msgstr "Ocurrió un error al procesar la plantilla:"
 
-#: ../gnucash/report/report-system/eguile-gnc.scm:247
-msgid "Template file \"%s\" can not be read"
-msgstr "El fichero de la plantilla «%s» no puede leerse"
+#: ../gnucash/report/report-system/eguile-gnc.scm:246
+#, scheme-format
+msgid "Template file \"~a\" can not be read"
+msgstr "El fichero de la plantilla «~a» no puede leerse"
 
 #: ../gnucash/report/report-system/html-acct-table.scm:638
-#: ../gnucash/report/standard-reports/trial-balance.scm:244
+#: ../gnucash/report/standard-reports/trial-balance.scm:243
 msgid "Adjusting Entries"
 msgstr "Ajuste de Asientos"
 
@@ -20749,40 +20636,40 @@ msgstr "Inf. de tipografía para etiquetas de casillas centradas."
 msgid "Can't save style sheet"
 msgstr "No pudo guardar estilo de hoja"
 
-#: ../gnucash/report/report-system/html-utilities.scm:722
+#: ../gnucash/report/report-system/html-utilities.scm:720
 msgid "Account name"
 msgstr "Nombre de cuenta"
 
-#: ../gnucash/report/report-system/html-utilities.scm:784
+#: ../gnucash/report/report-system/html-utilities.scm:782
 msgid "Exchange rate"
 msgstr "Tipo de cambio"
 
-#: ../gnucash/report/report-system/html-utilities.scm:785
+#: ../gnucash/report/report-system/html-utilities.scm:783
 msgid "Exchange rates"
 msgstr "Tipos de cambio"
 
-#: ../gnucash/report/report-system/html-utilities.scm:793
+#: ../gnucash/report/report-system/html-utilities.scm:791
 msgid "No budgets exist. You must create at least one budget."
 msgstr "No existen presupuestos. Debe crear al menos un presupuesto."
 
-#: ../gnucash/report/report-system/html-utilities.scm:833
+#: ../gnucash/report/report-system/html-utilities.scm:831
 msgid "This report requires you to specify certain report options."
 msgstr "Este boletín requiere que se especifiquen ciertas opciones del boletín."
 
-#: ../gnucash/report/report-system/html-utilities.scm:840
+#: ../gnucash/report/report-system/html-utilities.scm:838
 msgid "No accounts selected"
 msgstr "Ninguna cuenta seleccionada"
 
-#: ../gnucash/report/report-system/html-utilities.scm:841
+#: ../gnucash/report/report-system/html-utilities.scm:839
 msgid "This report requires accounts to be selected in the report options."
 msgstr "Este boletín requiere que se seleccionen cuentas en las opciones del boletín."
 
-#: ../gnucash/report/report-system/html-utilities.scm:848
-#: ../gnucash/report/standard-reports/price-scatter.scm:332
+#: ../gnucash/report/report-system/html-utilities.scm:846
+#: ../gnucash/report/standard-reports/price-scatter.scm:330
 msgid "No data"
 msgstr "Sin datos"
 
-#: ../gnucash/report/report-system/html-utilities.scm:849
+#: ../gnucash/report/report-system/html-utilities.scm:847
 msgid "The selected accounts contain no data/transactions (or only zeroes) for the selected time period"
 msgstr "Las cuentas seleccionadas no tienen datos/transacciones (o solo ceros) para el periodo de tiempo elegido"
 
@@ -20859,7 +20746,7 @@ msgid "One Year."
 msgstr "Un año."
 
 #: ../gnucash/report/report-system/options-utilities.scm:74
-#: ../gnucash/report/standard-reports/transaction.scm:333
+#: ../gnucash/report/standard-reports/transaction.scm:326
 msgid "All"
 msgstr "Todo"
 
@@ -20903,9 +20790,9 @@ msgstr "¿Ignorar la selección de cuenta y mostrar subcuentas de todas las cuen
 #: ../gnucash/report/standard-reports/account-summary.scm:77
 #: ../gnucash/report/standard-reports/balance-sheet.scm:90
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:55
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:79
-#: ../gnucash/report/standard-reports/income-statement.scm:66
-#: ../gnucash/report/standard-reports/sx-summary.scm:58
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:78
+#: ../gnucash/report/standard-reports/income-statement.scm:65
+#: ../gnucash/report/standard-reports/sx-summary.scm:57
 msgid "Report on these accounts, if display depth allows."
 msgstr "Boletinar estas cuentas, si la profundidad de colores de la pantalla lo permite."
 
@@ -20926,8 +20813,8 @@ msgid "Display the account's foreign currency amount?"
 msgstr "¿Enseñar la cantidad en divisas de la cuenta?"
 
 #: ../gnucash/report/report-system/options-utilities.scm:174
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:76
-#: ../gnucash/report/standard-reports/price-scatter.scm:89
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:74
+#: ../gnucash/report/standard-reports/price-scatter.scm:87
 msgid "The source of price information."
 msgstr "El origen de la información del precio."
 
@@ -20940,32 +20827,32 @@ msgid "The volume-weighted average cost of purchases."
 msgstr "El costo promedio ponderado por volumen de adquisiciones."
 
 #: ../gnucash/report/report-system/options-utilities.scm:179
-#: ../gnucash/report/standard-reports/price-scatter.scm:92
+#: ../gnucash/report/standard-reports/price-scatter.scm:90
 msgid "Weighted Average"
 msgstr "Promedio ponderado"
 
 #: ../gnucash/report/report-system/options-utilities.scm:180
-#: ../gnucash/report/standard-reports/price-scatter.scm:93
+#: ../gnucash/report/standard-reports/price-scatter.scm:91
 msgid "The weighted average of all currency transactions of the past."
 msgstr "El promedio ponderado de todas las transacciones monetarias en el pasado."
 
 #: ../gnucash/report/report-system/options-utilities.scm:182
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:78
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:76
 msgid "Most recent"
 msgstr "Más reciente"
 
 #: ../gnucash/report/report-system/options-utilities.scm:183
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:79
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:77
 msgid "The most recent recorded price."
 msgstr "El precio más reciente registrado."
 
 #: ../gnucash/report/report-system/options-utilities.scm:185
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:81
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:79
 msgid "Nearest in time"
 msgstr "El más cercano en el tiempo"
 
 #: ../gnucash/report/report-system/options-utilities.scm:186
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:82
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:80
 msgid "The price recorded nearest in time to the report date."
 msgstr "El precio registrado más cercano en el tiempo a la fecha del boletín."
 
@@ -21067,7 +20954,7 @@ msgstr "Cómo mostrar los balances de las cuentas matrices."
 
 #: ../gnucash/report/report-system/options-utilities.scm:263
 #: ../gnucash/report/standard-reports/account-summary.scm:102
-#: ../gnucash/report/standard-reports/sx-summary.scm:83
+#: ../gnucash/report/standard-reports/sx-summary.scm:82
 msgid "Account Balance"
 msgstr "Balance de Cuenta"
 
@@ -21113,170 +21000,172 @@ msgstr "Estilo de texto del libro (experimental)"
 msgid "Show parent account subtotals, indented per accounting text book practice (experimental)."
 msgstr "Muestra subtotales de cuenta matriz, indentados por práctica de ejercicios de texto contables (experimental)."
 
-#: ../gnucash/report/report-system/report.scm:63
+#: ../gnucash/report/report-system/report.scm:62
 msgid "_Assets & Liabilities"
 msgstr "_Activos y pasivos"
 
-#: ../gnucash/report/report-system/report.scm:64
+#: ../gnucash/report/report-system/report.scm:63
 msgid "_Income & Expense"
 msgstr "_Ingresos y gastos"
 
-#: ../gnucash/report/report-system/report.scm:66
+#: ../gnucash/report/report-system/report.scm:65
 msgid "_Taxes"
 msgstr "_Imposiciones"
 
-#: ../gnucash/report/report-system/report.scm:67
+#: ../gnucash/report/report-system/report.scm:66
 msgid "_Sample & Custom"
 msgstr "_Ejemplos y personalizados"
 
-#: ../gnucash/report/report-system/report.scm:68
+#: ../gnucash/report/report-system/report.scm:67
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../gnucash/report/report-system/report.scm:72
+#: ../gnucash/report/report-system/report.scm:71
 msgid "Report name"
 msgstr "Nombre boletinado"
 
-#: ../gnucash/report/report-system/report.scm:73
+#: ../gnucash/report/report-system/report.scm:72
 msgid "Stylesheet"
 msgstr "Hoja de Estilo"
 
-#: ../gnucash/report/report-system/report.scm:75
+#: ../gnucash/report/report-system/report.scm:74
 msgid "Invoice Number"
 msgstr "Número Facturante"
 
-#: ../gnucash/report/report-system/report.scm:144
+#: ../gnucash/report/report-system/report.scm:143
 msgid "One of your reports has a report-guid that is a duplicate. Please check the report system, especially your saved reports, for a report with this report-guid: "
 msgstr "Uno de tus boletines tiene un boletín-guid que es un duplicado. Por favor comprueba el sistema boletinado, especialmente tus boletines guardadas, para una boletín con este boletín-guid: "
 
-#: ../gnucash/report/report-system/report.scm:177
+#: ../gnucash/report/report-system/report.scm:176
 msgid "The GnuCash report system has been upgraded. Your old saved reports have been transferred into a new format. If you experience trouble with saved reports, please contact the GnuCash development team."
 msgstr "Se ha actualizado el boletín GnuCash del sistema. Sus boletines antiguos guardados han sido transferidos a un formato nuevo. Si tiene algún problema con los boletines guardados, contacte con el equipo de desarrolladores de GnuCash."
 
-#: ../gnucash/report/report-system/report.scm:242
+#: ../gnucash/report/report-system/report.scm:241
 msgid "Enter a descriptive name for this report."
 msgstr "Introducir una descripción para este boletín."
 
-#: ../gnucash/report/report-system/report.scm:247
+#: ../gnucash/report/report-system/report.scm:246
 msgid "Select a stylesheet for the report."
 msgstr "Selecciona una hoja de estilo para el boletín."
 
-#: ../gnucash/report/report-system/report.scm:255
+#: ../gnucash/report/report-system/report.scm:254
 msgid "stylesheet."
 msgstr "hoja-estilo."
 
-#: ../gnucash/report/report-system/report.scm:858
+#: ../gnucash/report/report-system/report.scm:857
 msgid "Some reports stored in a legacy format were found. This format is not supported anymore so these reports may not have been restored properly."
 msgstr "Se han encontrado almacenados algunos boletines en un formato antiguo. Este formato no está apoyado más por lo que estos boletines pueden no haberse restaurados correctamente."
 
-#: ../gnucash/report/report-system/report-utilities.scm:112
-#: ../gnucash/report/standard-reports/account-piecharts.scm:63
+#: ../gnucash/report/report-system/report-utilities.scm:111
+#: ../gnucash/report/standard-reports/account-piecharts.scm:61
 #: ../gnucash/report/standard-reports/balance-sheet.scm:638
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:754
-#: ../gnucash/report/standard-reports/net-barchart.scm:369
-#: ../gnucash/report/standard-reports/net-barchart.scm:431
-#: ../gnucash/report/standard-reports/net-linechart.scm:412
-#: ../gnucash/report/standard-reports/net-linechart.scm:485
+#: ../gnucash/report/standard-reports/net-barchart.scm:368
+#: ../gnucash/report/standard-reports/net-barchart.scm:430
+#: ../gnucash/report/standard-reports/net-linechart.scm:411
+#: ../gnucash/report/standard-reports/net-linechart.scm:484
 msgid "Assets"
 msgstr "Activos"
 
-#: ../gnucash/report/report-system/report-utilities.scm:113
-#: ../gnucash/report/standard-reports/account-piecharts.scm:65
+#: ../gnucash/report/report-system/report-utilities.scm:112
+#: ../gnucash/report/standard-reports/account-piecharts.scm:63
 #: ../gnucash/report/standard-reports/balance-sheet.scm:439
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:784
-#: ../gnucash/report/standard-reports/net-barchart.scm:369
-#: ../gnucash/report/standard-reports/net-barchart.scm:431
-#: ../gnucash/report/standard-reports/net-linechart.scm:412
-#: ../gnucash/report/standard-reports/net-linechart.scm:485
+#: ../gnucash/report/standard-reports/net-barchart.scm:368
+#: ../gnucash/report/standard-reports/net-barchart.scm:430
+#: ../gnucash/report/standard-reports/net-linechart.scm:411
+#: ../gnucash/report/standard-reports/net-linechart.scm:484
 msgid "Liabilities"
 msgstr "Pasivos"
 
-#: ../gnucash/report/report-system/report-utilities.scm:114
+#: ../gnucash/report/report-system/report-utilities.scm:113
 msgid "Stocks"
 msgstr "Reservas/Acciones"
 
-#: ../gnucash/report/report-system/report-utilities.scm:115
+#: ../gnucash/report/report-system/report-utilities.scm:114
 msgid "Mutual Funds"
 msgstr "Fondos de Inversión"
 
-#: ../gnucash/report/report-system/report-utilities.scm:116
+#: ../gnucash/report/report-system/report-utilities.scm:115
 msgid "Currencies"
 msgstr "Monedas"
 
-#: ../gnucash/report/report-system/report-utilities.scm:119
+#: ../gnucash/report/report-system/report-utilities.scm:118
 msgid "Equities"
 msgstr "Patrimonios"
 
-#: ../gnucash/report/report-system/report-utilities.scm:120
+#: ../gnucash/report/report-system/report-utilities.scm:119
 msgid "Checking"
 msgstr "Corriente"
 
-#: ../gnucash/report/report-system/report-utilities.scm:121
+#: ../gnucash/report/report-system/report-utilities.scm:120
 msgid "Savings"
 msgstr "Ahorros"
 
-#: ../gnucash/report/report-system/report-utilities.scm:122
+#: ../gnucash/report/report-system/report-utilities.scm:121
 msgid "Money Market"
 msgstr "Mercado Monetario"
 
-#: ../gnucash/report/report-system/report-utilities.scm:123
+#: ../gnucash/report/report-system/report-utilities.scm:122
 msgid "Accounts Receivable"
 msgstr "Cuentas Cobrables"
 
-#: ../gnucash/report/report-system/report-utilities.scm:124
+#: ../gnucash/report/report-system/report-utilities.scm:123
 msgid "Accounts Payable"
 msgstr "Cuentas Liquidables"
 
-#: ../gnucash/report/report-system/report-utilities.scm:125
+#: ../gnucash/report/report-system/report-utilities.scm:124
 msgid "Credit Lines"
 msgstr "Líneas de Crédito"
 
-#: ../gnucash/report/report-system/report-utilities.scm:690
-msgid "Building '%s' report ..."
-msgstr "Creando boletín «%s»..."
+#: ../gnucash/report/report-system/report-utilities.scm:689
+#, scheme-format
+msgid "Building '~a' report ..."
+msgstr "Creando boletín «~a»..."
 
-#: ../gnucash/report/report-system/report-utilities.scm:696
-msgid "Rendering '%s' report ..."
-msgstr "Renderizando boletín «%s»..."
+#: ../gnucash/report/report-system/report-utilities.scm:695
+#, scheme-format
+msgid "Rendering '~a' report ..."
+msgstr "Renderizando boletín «~a»..."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:38
+#: ../gnucash/report/standard-reports/account-piecharts.scm:36
 msgid "Income Piechart"
 msgstr "Porción de Ingresos"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:39
+#: ../gnucash/report/standard-reports/account-piecharts.scm:37
 msgid "Expense Piechart"
 msgstr "Porción de Gastos"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:40
+#: ../gnucash/report/standard-reports/account-piecharts.scm:38
 msgid "Asset Piechart"
 msgstr "Porción de Activo"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:41
+#: ../gnucash/report/standard-reports/account-piecharts.scm:39
 msgid "Security Piechart"
 msgstr "Trozo de Garantía"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:42
+#: ../gnucash/report/standard-reports/account-piecharts.scm:40
 msgid "Liability Piechart"
 msgstr "Porción de Pasivos"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:47
+#: ../gnucash/report/standard-reports/account-piecharts.scm:45
 msgid "Shows a piechart with the Income per given time interval"
 msgstr "Muestra una porción con los Ingresos por cada intervalo de tiempo indicado"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:49
+#: ../gnucash/report/standard-reports/account-piecharts.scm:47
 msgid "Shows a piechart with the Expenses per given time interval"
 msgstr "Muestra una porción con los gastos por cada intervalo de tiempo indicado"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:51
+#: ../gnucash/report/standard-reports/account-piecharts.scm:49
 msgid "Shows a piechart with the Assets balance at a given time"
 msgstr "Muestra una porción con los balance de Activos por tiempo"
 
 # activos o acciones
-#: ../gnucash/report/standard-reports/account-piecharts.scm:53
+#: ../gnucash/report/standard-reports/account-piecharts.scm:51
 msgid "Shows a piechart with distribution of assets over securities"
 msgstr "Muestra una porción con distribución de activos sobre garantías"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:55
+#: ../gnucash/report/standard-reports/account-piecharts.scm:53
 msgid "Shows a piechart with the Liabilities balance at a given time"
 msgstr "Muestra una porción con los pasivos por cada tiempo indicado"
 
@@ -21285,199 +21174,198 @@ msgstr "Muestra una porción con los pasivos por cada tiempo indicado"
 #. in *one* place.
 #. Option names
 #. General
-#: ../gnucash/report/standard-reports/account-piecharts.scm:67
+#: ../gnucash/report/standard-reports/account-piecharts.scm:65
 #: ../gnucash/report/standard-reports/average-balance.scm:38
-#: ../gnucash/report/standard-reports/budget-barchart.scm:52
+#: ../gnucash/report/standard-reports/budget-barchart.scm:50
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:58
+#: ../gnucash/report/standard-reports/cash-flow.scm:45
+#: ../gnucash/report/standard-reports/category-barchart.scm:73
+#: ../gnucash/report/standard-reports/daily-reports.scm:55
+#: ../gnucash/report/standard-reports/equity-statement.scm:65
+#: ../gnucash/report/standard-reports/income-statement.scm:59
+#: ../gnucash/report/standard-reports/net-barchart.scm:46
+#: ../gnucash/report/standard-reports/net-linechart.scm:42
+#: ../gnucash/report/standard-reports/price-scatter.scm:35
+#: ../gnucash/report/standard-reports/sx-summary.scm:52
+#: ../gnucash/report/standard-reports/transaction.scm:82
+msgid "Start Date"
+msgstr "Fecha Inicial"
+
+#: ../gnucash/report/standard-reports/account-piecharts.scm:66
+#: ../gnucash/report/standard-reports/average-balance.scm:39
+#: ../gnucash/report/standard-reports/budget-barchart.scm:51
 #: ../gnucash/report/standard-reports/cashflow-barchart.scm:59
 #: ../gnucash/report/standard-reports/cash-flow.scm:46
-#: ../gnucash/report/standard-reports/category-barchart.scm:75
-#: ../gnucash/report/standard-reports/daily-reports.scm:57
-#: ../gnucash/report/standard-reports/equity-statement.scm:67
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:651
+#: ../gnucash/report/standard-reports/category-barchart.scm:74
+#: ../gnucash/report/standard-reports/daily-reports.scm:56
+#: ../gnucash/report/standard-reports/equity-statement.scm:66
 #: ../gnucash/report/standard-reports/income-statement.scm:60
 #: ../gnucash/report/standard-reports/net-barchart.scm:47
 #: ../gnucash/report/standard-reports/net-linechart.scm:43
-#: ../gnucash/report/standard-reports/price-scatter.scm:37
+#: ../gnucash/report/standard-reports/price-scatter.scm:36
 #: ../gnucash/report/standard-reports/sx-summary.scm:53
-#: ../gnucash/report/standard-reports/transaction.scm:85
-msgid "Start Date"
-msgstr "Fecha Inicial"
-
-#: ../gnucash/report/standard-reports/account-piecharts.scm:68
-#: ../gnucash/report/standard-reports/average-balance.scm:39
-#: ../gnucash/report/standard-reports/budget-barchart.scm:53
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:60
-#: ../gnucash/report/standard-reports/cash-flow.scm:47
-#: ../gnucash/report/standard-reports/category-barchart.scm:76
-#: ../gnucash/report/standard-reports/daily-reports.scm:58
-#: ../gnucash/report/standard-reports/equity-statement.scm:68
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:651
-#: ../gnucash/report/standard-reports/income-statement.scm:61
-#: ../gnucash/report/standard-reports/net-barchart.scm:48
-#: ../gnucash/report/standard-reports/net-linechart.scm:44
-#: ../gnucash/report/standard-reports/price-scatter.scm:38
-#: ../gnucash/report/standard-reports/sx-summary.scm:54
-#: ../gnucash/report/standard-reports/transaction.scm:86
+#: ../gnucash/report/standard-reports/transaction.scm:83
 msgid "End Date"
 msgstr "Fecha Final"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:73
-#: ../gnucash/report/standard-reports/category-barchart.scm:82
-#: ../gnucash/report/standard-reports/daily-reports.scm:63
+#: ../gnucash/report/standard-reports/account-piecharts.scm:71
+#: ../gnucash/report/standard-reports/category-barchart.scm:80
+#: ../gnucash/report/standard-reports/daily-reports.scm:61
 msgid "Show Accounts until level"
 msgstr "Mostrar Cuentas hasta nivel"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:75
+#: ../gnucash/report/standard-reports/account-piecharts.scm:73
 msgid "Show long names"
 msgstr "Mostrar nombres largos"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:76
-#: ../gnucash/report/standard-reports/daily-reports.scm:67
+#: ../gnucash/report/standard-reports/account-piecharts.scm:74
+#: ../gnucash/report/standard-reports/daily-reports.scm:65
 msgid "Show Totals"
 msgstr "Mostrar Totales"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:77
+#: ../gnucash/report/standard-reports/account-piecharts.scm:75
 msgid "Show Percents"
 msgstr "Mostrar Porcentajes"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:78
-#: ../gnucash/report/standard-reports/daily-reports.scm:68
+#: ../gnucash/report/standard-reports/account-piecharts.scm:76
+#: ../gnucash/report/standard-reports/daily-reports.scm:66
 msgid "Maximum Slices"
 msgstr "Porciones Máximas"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:79
+#: ../gnucash/report/standard-reports/account-piecharts.scm:77
 #: ../gnucash/report/standard-reports/average-balance.scm:45
-#: ../gnucash/report/standard-reports/budget-barchart.scm:50
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:56
-#: ../gnucash/report/standard-reports/category-barchart.scm:90
-#: ../gnucash/report/standard-reports/daily-reports.scm:69
-#: ../gnucash/report/standard-reports/net-barchart.scm:61
-#: ../gnucash/report/standard-reports/net-linechart.scm:57
-#: ../gnucash/report/standard-reports/price-scatter.scm:59
+#: ../gnucash/report/standard-reports/budget-barchart.scm:48
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:55
+#: ../gnucash/report/standard-reports/category-barchart.scm:88
+#: ../gnucash/report/standard-reports/daily-reports.scm:67
+#: ../gnucash/report/standard-reports/net-barchart.scm:60
+#: ../gnucash/report/standard-reports/net-linechart.scm:56
+#: ../gnucash/report/standard-reports/price-scatter.scm:57
 msgid "Plot Width"
 msgstr "Anchura de Trazo"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:80
+#: ../gnucash/report/standard-reports/account-piecharts.scm:78
 #: ../gnucash/report/standard-reports/average-balance.scm:46
-#: ../gnucash/report/standard-reports/budget-barchart.scm:51
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:57
-#: ../gnucash/report/standard-reports/category-barchart.scm:91
-#: ../gnucash/report/standard-reports/daily-reports.scm:70
-#: ../gnucash/report/standard-reports/net-barchart.scm:62
-#: ../gnucash/report/standard-reports/net-linechart.scm:58
-#: ../gnucash/report/standard-reports/price-scatter.scm:60
+#: ../gnucash/report/standard-reports/budget-barchart.scm:49
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:56
+#: ../gnucash/report/standard-reports/category-barchart.scm:89
+#: ../gnucash/report/standard-reports/daily-reports.scm:68
+#: ../gnucash/report/standard-reports/net-barchart.scm:61
+#: ../gnucash/report/standard-reports/net-linechart.scm:57
+#: ../gnucash/report/standard-reports/price-scatter.scm:58
 msgid "Plot Height"
 msgstr "Altura de Trazo"
-
-#: ../gnucash/report/standard-reports/account-piecharts.scm:81
-#: ../gnucash/report/standard-reports/category-barchart.scm:93
-#: ../gnucash/report/standard-reports/daily-reports.scm:71
+
+#: ../gnucash/report/standard-reports/account-piecharts.scm:79
+#: ../gnucash/report/standard-reports/category-barchart.scm:91
+#: ../gnucash/report/standard-reports/daily-reports.scm:69
 msgid "Sort Method"
 msgstr "Método de ordenación"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:83
-#: ../gnucash/report/standard-reports/category-barchart.scm:95
+#: ../gnucash/report/standard-reports/account-piecharts.scm:81
+#: ../gnucash/report/standard-reports/category-barchart.scm:93
 msgid "Show Average"
 msgstr "Mostrar Promedio"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:84
-#: ../gnucash/report/standard-reports/category-barchart.scm:96
+#: ../gnucash/report/standard-reports/account-piecharts.scm:82
+#: ../gnucash/report/standard-reports/category-barchart.scm:94
 msgid "Select whether the amounts should be shown over the full time period or rather as the average e.g. per month."
 msgstr "Selecciona si las cantidades deben mostrarse sobre el periodo de tiempo completo o mejor como la media por ej: por mes."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:120
-#: ../gnucash/report/standard-reports/category-barchart.scm:130
+#: ../gnucash/report/standard-reports/account-piecharts.scm:118
+#: ../gnucash/report/standard-reports/category-barchart.scm:128
 msgid "No Averaging"
 msgstr "Sin promedio"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:121
-#: ../gnucash/report/standard-reports/category-barchart.scm:131
+#: ../gnucash/report/standard-reports/account-piecharts.scm:119
+#: ../gnucash/report/standard-reports/category-barchart.scm:129
 msgid "Just show the amounts, without any averaging."
 msgstr "Sólo muestra las cantidades, sin ninguna media."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:124
+#: ../gnucash/report/standard-reports/account-piecharts.scm:122
 msgid "Show the average yearly amount during the reporting period."
 msgstr "Muestra la cantidad media anual durante el periodo del boletín."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:127
-#: ../gnucash/report/standard-reports/category-barchart.scm:134
+#: ../gnucash/report/standard-reports/account-piecharts.scm:125
+#: ../gnucash/report/standard-reports/category-barchart.scm:132
 msgid "Show the average monthly amount during the reporting period."
 msgstr "Muestra la cantidad media mensual durante el periodo del boletín."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:130
-#: ../gnucash/report/standard-reports/category-barchart.scm:137
+#: ../gnucash/report/standard-reports/account-piecharts.scm:128
+#: ../gnucash/report/standard-reports/category-barchart.scm:135
 msgid "Show the average weekly amount during the reporting period."
 msgstr "Muestra la cantidad media semanal durante el periodo del boletín."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:139
-#: ../gnucash/report/standard-reports/category-barchart.scm:151
-#: ../gnucash/report/standard-reports/daily-reports.scm:102
-#: ../gnucash/report/standard-reports/net-barchart.scm:92
-#: ../gnucash/report/standard-reports/net-linechart.scm:98
+#: ../gnucash/report/standard-reports/account-piecharts.scm:137
+#: ../gnucash/report/standard-reports/category-barchart.scm:149
+#: ../gnucash/report/standard-reports/daily-reports.scm:100
+#: ../gnucash/report/standard-reports/net-barchart.scm:91
+#: ../gnucash/report/standard-reports/net-linechart.scm:97
 msgid "Report on these accounts, if chosen account level allows."
 msgstr "Boletín sobre esas cuentas, si el nivel de cuenta elegido lo permite."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:154
-#: ../gnucash/report/standard-reports/category-barchart.scm:163
-#: ../gnucash/report/standard-reports/daily-reports.scm:116
+#: ../gnucash/report/standard-reports/account-piecharts.scm:152
+#: ../gnucash/report/standard-reports/category-barchart.scm:161
+#: ../gnucash/report/standard-reports/daily-reports.scm:114
 msgid "Show accounts to this depth and not further."
 msgstr "Muestra cuentas cuentas a esta profundidad y no posterior."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:162
-#: ../gnucash/report/standard-reports/category-barchart.scm:170
+#: ../gnucash/report/standard-reports/account-piecharts.scm:160
+#: ../gnucash/report/standard-reports/category-barchart.scm:168
 msgid "Show the full account name in legend?"
 msgstr "¿Mostrar el nombre de cuenta completo en la leyenda?"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:163
+#: ../gnucash/report/standard-reports/account-piecharts.scm:161
 msgid "Show the full security name in the legend?"
 msgstr "¿Mostrar el nombre de garantía completo en la leyenda?"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:169
-#: ../gnucash/report/standard-reports/daily-reports.scm:122
+#: ../gnucash/report/standard-reports/account-piecharts.scm:167
+#: ../gnucash/report/standard-reports/daily-reports.scm:120
 msgid "Show the total balance in legend?"
 msgstr "¿Mostrar el saldo total en la leyenda?"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:175
+#: ../gnucash/report/standard-reports/account-piecharts.scm:173
 msgid "Show the percentage in legend?"
 msgstr "¿Muestra el saldo total en la leyenda?"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:181
+#: ../gnucash/report/standard-reports/account-piecharts.scm:179
 msgid "Maximum number of slices in pie."
 msgstr "Número máximo de porciones en la tarta."
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:453
+#: ../gnucash/report/standard-reports/account-piecharts.scm:451
 msgid "Yearly Average"
 msgstr "Promedio anual"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:454
-#: ../gnucash/report/standard-reports/category-barchart.scm:336
+#: ../gnucash/report/standard-reports/account-piecharts.scm:452
+#: ../gnucash/report/standard-reports/category-barchart.scm:334
 msgid "Monthly Average"
 msgstr "Promedio mensual"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:455
-#: ../gnucash/report/standard-reports/category-barchart.scm:337
+#: ../gnucash/report/standard-reports/account-piecharts.scm:453
+#: ../gnucash/report/standard-reports/category-barchart.scm:335
 msgid "Weekly Average"
 msgstr "Promedio semanal"
 
-#: ../gnucash/report/standard-reports/account-piecharts.scm:568
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:313
-#: ../gnucash/report/standard-reports/cash-flow.scm:167
-#: ../gnucash/report/standard-reports/category-barchart.scm:537
-#: ../gnucash/report/standard-reports/category-barchart.scm:563
-#: ../gnucash/report/standard-reports/daily-reports.scm:479
-#: ../gnucash/report/standard-reports/equity-statement.scm:347
-#: ../gnucash/report/standard-reports/income-statement.scm:475
-#: ../gnucash/report/standard-reports/net-barchart.scm:337
-#: ../gnucash/report/standard-reports/net-linechart.scm:380
-#: ../gnucash/report/standard-reports/price-scatter.scm:204
-#: ../gnucash/report/standard-reports/trial-balance.scm:391
-#: ../libgnucash/app-utils/date-utilities.scm:95
-msgid "%s to %s"
-msgstr "%s a %s"
-
-#: ../gnucash/report/standard-reports/account-piecharts.scm:572
-msgid "Balance at %s"
-msgstr "Balance el %s"
+#: ../gnucash/report/standard-reports/account-piecharts.scm:566
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:312
+#: ../gnucash/report/standard-reports/cash-flow.scm:166
+#: ../gnucash/report/standard-reports/category-barchart.scm:535
+#: ../gnucash/report/standard-reports/category-barchart.scm:561
+#: ../gnucash/report/standard-reports/daily-reports.scm:477
+#: ../gnucash/report/standard-reports/equity-statement.scm:345
+#: ../gnucash/report/standard-reports/income-statement.scm:474
+#: ../gnucash/report/standard-reports/net-barchart.scm:336
+#: ../gnucash/report/standard-reports/net-linechart.scm:379
+#: ../gnucash/report/standard-reports/price-scatter.scm:202
+#: ../gnucash/report/standard-reports/trial-balance.scm:390
+#, scheme-format
+msgid "~a to ~a"
+msgstr "~a para ~a"
+
+#: ../gnucash/report/standard-reports/account-piecharts.scm:570
+#, scheme-format
+msgid "Balance at ~a"
+msgstr "Balance a ~a"
 
 #. account summary report prints a table of account information,
 #. optionally with clickable links to open the corresponding register
@@ -21489,50 +21377,50 @@ msgstr "Resumen de Cuenta"
 #: ../gnucash/report/standard-reports/account-summary.scm:69
 #: ../gnucash/report/standard-reports/balance-sheet.scm:79
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:45
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:56
-#: ../gnucash/report/standard-reports/equity-statement.scm:64
-#: ../gnucash/report/standard-reports/income-statement.scm:57
-#: ../gnucash/report/standard-reports/sx-summary.scm:50
-#: ../gnucash/report/standard-reports/trial-balance.scm:68
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:55
+#: ../gnucash/report/standard-reports/equity-statement.scm:62
+#: ../gnucash/report/standard-reports/income-statement.scm:56
+#: ../gnucash/report/standard-reports/sx-summary.scm:49
+#: ../gnucash/report/standard-reports/trial-balance.scm:67
 msgid "Company name"
 msgstr "Nombre de sociedad"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:70
 #: ../gnucash/report/standard-reports/balance-sheet.scm:80
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:46
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:57
-#: ../gnucash/report/standard-reports/equity-statement.scm:65
-#: ../gnucash/report/standard-reports/income-statement.scm:58
-#: ../gnucash/report/standard-reports/sx-summary.scm:51
-#: ../gnucash/report/standard-reports/trial-balance.scm:69
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:56
+#: ../gnucash/report/standard-reports/equity-statement.scm:63
+#: ../gnucash/report/standard-reports/income-statement.scm:57
+#: ../gnucash/report/standard-reports/sx-summary.scm:50
+#: ../gnucash/report/standard-reports/trial-balance.scm:68
 msgid "Name of company/individual."
 msgstr "Nombre de Sociedad/Autónomo."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:81
-#: ../gnucash/report/standard-reports/sx-summary.scm:62
+#: ../gnucash/report/standard-reports/sx-summary.scm:61
 msgid "Depth limit behavior"
 msgstr "Comportamiento del límite de profundidad"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:83
-#: ../gnucash/report/standard-reports/sx-summary.scm:64
+#: ../gnucash/report/standard-reports/sx-summary.scm:63
 msgid "How to treat accounts which exceed the specified depth limit (if any)."
 msgstr "Cómo tratar cuentas que exceden los límites de profundidad especificados (si hay)."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:85
 #: ../gnucash/report/standard-reports/balance-sheet.scm:98
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:63
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:87
-#: ../gnucash/report/standard-reports/income-statement.scm:74
-#: ../gnucash/report/standard-reports/sx-summary.scm:66
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:86
+#: ../gnucash/report/standard-reports/income-statement.scm:73
+#: ../gnucash/report/standard-reports/sx-summary.scm:65
 msgid "Parent account balances"
 msgstr "Saldos de las cuentas matriz"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:86
 #: ../gnucash/report/standard-reports/balance-sheet.scm:99
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:64
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:88
-#: ../gnucash/report/standard-reports/income-statement.scm:75
-#: ../gnucash/report/standard-reports/sx-summary.scm:67
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:87
+#: ../gnucash/report/standard-reports/income-statement.scm:74
+#: ../gnucash/report/standard-reports/sx-summary.scm:66
 msgid "Parent account subtotals"
 msgstr "Subtotales de las cuentas matriz"
 
@@ -21544,294 +21432,294 @@ msgstr "Subtotales de las cuentas matriz"
 #: ../gnucash/report/standard-reports/account-summary.scm:88
 #: ../gnucash/report/standard-reports/balance-sheet.scm:101
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:66
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:90
-#: ../gnucash/report/standard-reports/income-statement.scm:77
-#: ../gnucash/report/standard-reports/sx-summary.scm:69
-#: ../gnucash/report/standard-reports/trial-balance.scm:122
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:89
+#: ../gnucash/report/standard-reports/income-statement.scm:76
+#: ../gnucash/report/standard-reports/sx-summary.scm:68
+#: ../gnucash/report/standard-reports/trial-balance.scm:121
 msgid "Include accounts with zero total balances"
 msgstr "Incluir las cuentas con saldos totales a cero"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:90
 #: ../gnucash/report/standard-reports/balance-sheet.scm:103
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:68
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:92
-#: ../gnucash/report/standard-reports/income-statement.scm:79
-#: ../gnucash/report/standard-reports/sx-summary.scm:71
-#: ../gnucash/report/standard-reports/trial-balance.scm:124
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:91
+#: ../gnucash/report/standard-reports/income-statement.scm:78
+#: ../gnucash/report/standard-reports/sx-summary.scm:70
+#: ../gnucash/report/standard-reports/trial-balance.scm:123
 msgid "Include accounts with zero total (recursive) balances in this report."
 msgstr "Incluir cuentas con balances totales a cero (recursivos) dentro de este boletín."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:91
 #: ../gnucash/report/standard-reports/balance-sheet.scm:104
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:69
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:93
-#: ../gnucash/report/standard-reports/income-statement.scm:80
-#: ../gnucash/report/standard-reports/sx-summary.scm:72
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:92
+#: ../gnucash/report/standard-reports/income-statement.scm:79
+#: ../gnucash/report/standard-reports/sx-summary.scm:71
 msgid "Omit zero balance figures"
 msgstr "Omitir figuras con balance a cero"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:93
 #: ../gnucash/report/standard-reports/balance-sheet.scm:106
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:71
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:95
-#: ../gnucash/report/standard-reports/income-statement.scm:82
-#: ../gnucash/report/standard-reports/sx-summary.scm:74
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:94
+#: ../gnucash/report/standard-reports/income-statement.scm:81
+#: ../gnucash/report/standard-reports/sx-summary.scm:73
 msgid "Show blank space in place of any zero balances which would be shown."
 msgstr "Muestra espacios vacíos en cualquier saldo a cero que se debería mostrar."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:95
 #: ../gnucash/report/standard-reports/balance-sheet.scm:108
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:73
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:97
-#: ../gnucash/report/standard-reports/equity-statement.scm:74
-#: ../gnucash/report/standard-reports/income-statement.scm:84
-#: ../gnucash/report/standard-reports/sx-summary.scm:76
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:96
+#: ../gnucash/report/standard-reports/equity-statement.scm:72
+#: ../gnucash/report/standard-reports/income-statement.scm:83
+#: ../gnucash/report/standard-reports/sx-summary.scm:75
 msgid "Show accounting-style rules"
 msgstr "Mostrar líneas al estilo contable"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:97
 #: ../gnucash/report/standard-reports/balance-sheet.scm:110
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:75
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:99
-#: ../gnucash/report/standard-reports/equity-statement.scm:76
-#: ../gnucash/report/standard-reports/income-statement.scm:86
-#: ../gnucash/report/standard-reports/sx-summary.scm:78
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:98
+#: ../gnucash/report/standard-reports/equity-statement.scm:74
+#: ../gnucash/report/standard-reports/income-statement.scm:85
+#: ../gnucash/report/standard-reports/sx-summary.scm:77
 msgid "Use rules beneath columns of added numbers like accountants do."
 msgstr "Emplee reglas entre columnas de números añadidos como lo hacen en contabilidad."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:103
-#: ../gnucash/report/standard-reports/sx-summary.scm:84
+#: ../gnucash/report/standard-reports/sx-summary.scm:83
 msgid "Show an account's balance."
 msgstr "Muestra un balance de cuenta."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:105
-#: ../gnucash/report/standard-reports/sx-summary.scm:86
+#: ../gnucash/report/standard-reports/sx-summary.scm:85
 msgid "Show an account's account code."
 msgstr "Muestra un código de cuenta."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:107
-#: ../gnucash/report/standard-reports/sx-summary.scm:88
+#: ../gnucash/report/standard-reports/sx-summary.scm:87
 msgid "Show an account's account type."
 msgstr "Muestra un tipo de cuenta de cuenta."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:108
-#: ../gnucash/report/standard-reports/sx-summary.scm:89
+#: ../gnucash/report/standard-reports/sx-summary.scm:88
 msgid "Account Description"
 msgstr "Descripción de Cuenta"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:109
-#: ../gnucash/report/standard-reports/sx-summary.scm:90
+#: ../gnucash/report/standard-reports/sx-summary.scm:89
 msgid "Show an account's description."
 msgstr "Muestra una descripción de cuenta."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:110
-#: ../gnucash/report/standard-reports/sx-summary.scm:91
+#: ../gnucash/report/standard-reports/sx-summary.scm:90
 msgid "Account Notes"
 msgstr "Anotaciones de Cuenta"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:111
-#: ../gnucash/report/standard-reports/sx-summary.scm:92
+#: ../gnucash/report/standard-reports/sx-summary.scm:91
 msgid "Show an account's notes."
 msgstr "Muestra unas anotaciones de cuenta."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:119
 #: ../gnucash/report/standard-reports/balance-sheet.scm:143
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:108
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:123
-#: ../gnucash/report/standard-reports/budget.scm:55
-#: ../gnucash/report/standard-reports/cash-flow.scm:55
-#: ../gnucash/report/standard-reports/equity-statement.scm:84
-#: ../gnucash/report/standard-reports/income-statement.scm:116
-#: ../gnucash/report/standard-reports/sx-summary.scm:100
-#: ../gnucash/report/standard-reports/trial-balance.scm:135
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:122
+#: ../gnucash/report/standard-reports/budget.scm:54
+#: ../gnucash/report/standard-reports/cash-flow.scm:54
+#: ../gnucash/report/standard-reports/equity-statement.scm:82
+#: ../gnucash/report/standard-reports/income-statement.scm:115
+#: ../gnucash/report/standard-reports/sx-summary.scm:99
+#: ../gnucash/report/standard-reports/trial-balance.scm:134
 msgid "Show Exchange Rates"
 msgstr "Mostrar Tipo de Cambio"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:120
 #: ../gnucash/report/standard-reports/balance-sheet.scm:144
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:109
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:124
-#: ../gnucash/report/standard-reports/cash-flow.scm:81
-#: ../gnucash/report/standard-reports/equity-statement.scm:85
-#: ../gnucash/report/standard-reports/income-statement.scm:117
-#: ../gnucash/report/standard-reports/sx-summary.scm:101
-#: ../gnucash/report/standard-reports/trial-balance.scm:136
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:123
+#: ../gnucash/report/standard-reports/cash-flow.scm:80
+#: ../gnucash/report/standard-reports/equity-statement.scm:83
+#: ../gnucash/report/standard-reports/income-statement.scm:116
+#: ../gnucash/report/standard-reports/sx-summary.scm:100
+#: ../gnucash/report/standard-reports/trial-balance.scm:135
 msgid "Show the exchange rates used."
 msgstr "Muestra los tipos de cambio usados."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:175
-#: ../gnucash/report/standard-reports/sx-summary.scm:155
+#: ../gnucash/report/standard-reports/sx-summary.scm:154
 msgid "Recursive Balance"
 msgstr "Saldo recursivo"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:176
-#: ../gnucash/report/standard-reports/sx-summary.scm:156
+#: ../gnucash/report/standard-reports/sx-summary.scm:155
 msgid "Show the total balance, including balances in subaccounts, of any account at the depth limit."
 msgstr "Muestra el saldo total, incluyendo balances dentro de subcuentas, o cualquier cuenta en el límite de profundidad."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:178
-#: ../gnucash/report/standard-reports/sx-summary.scm:158
+#: ../gnucash/report/standard-reports/sx-summary.scm:157
 msgid "Raise Accounts"
 msgstr "Alzar Cuentas"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:179
-#: ../gnucash/report/standard-reports/sx-summary.scm:159
+#: ../gnucash/report/standard-reports/sx-summary.scm:158
 msgid "Shows accounts deeper than the depth limit at the depth limit."
 msgstr "Muestra cuentas profundísimas que el límite de profundidad limita la profundidad."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:181
-#: ../gnucash/report/standard-reports/sx-summary.scm:161
+#: ../gnucash/report/standard-reports/sx-summary.scm:160
 msgid "Omit Accounts"
 msgstr "Omitir Cuentas"
 
 #: ../gnucash/report/standard-reports/account-summary.scm:182
-#: ../gnucash/report/standard-reports/sx-summary.scm:162
+#: ../gnucash/report/standard-reports/sx-summary.scm:161
 msgid "Disregard completely any accounts deeper than the depth limit."
 msgstr "Rechazar completamente cualquier cuenta a más profundidad que el límite de profundidad."
 
 #: ../gnucash/report/standard-reports/account-summary.scm:445
-#: ../gnucash/report/standard-reports/sx-summary.scm:448
+#: ../gnucash/report/standard-reports/sx-summary.scm:447
 msgid "Account title"
 msgstr "Título de cuenta"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:39
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:37
 msgid "Advanced Portfolio"
 msgstr "Cartera Avanzada"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:42
-#: ../gnucash/report/standard-reports/portfolio.scm:38
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:40
+#: ../gnucash/report/standard-reports/portfolio.scm:36
 msgid "Share decimal places"
 msgstr "Lugares decimales de mercancía"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:43
-#: ../gnucash/report/standard-reports/portfolio.scm:39
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:41
+#: ../gnucash/report/standard-reports/portfolio.scm:37
 msgid "Include accounts with no shares"
 msgstr "Incluir cuentas sin mercancías"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:44
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:42
 msgid "Show ticker symbols"
 msgstr "Mostrar símbolos abreviados"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:45
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:43
 msgid "Show listings"
 msgstr "Mostrar índices"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:46
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:44
 msgid "Show prices"
 msgstr "Mostrar precios"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:47
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:45
 msgid "Show number of shares"
 msgstr "Mostrar número de mercancías"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:48
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:46
 msgid "Basis calculation method"
 msgstr "Método de cálculo de la base"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:49
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:47
 msgid "Set preference for price list data"
 msgstr "Establecer preferencia para datos de índices de precios"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:50
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:48
 msgid "How to report brokerage fees"
 msgstr "Cómo dar el boletín de comisiones de corretaje"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:88
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:86
 msgid "Basis calculation method."
 msgstr "Método de cálculo de la base."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:90
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:88
 #: ../gnucash/report/standard-reports/average-balance.scm:127
 #: ../gnucash/report/standard-reports/average-balance.scm:147
 #: ../libgnucash/engine/policy.c:58
 msgid "Average"
 msgstr "Promedio"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:91
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:89
 msgid "Use average cost of all shares for basis."
 msgstr "Emplee un coste promedio de todas las mercancías como base."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:93
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:91
 msgid "FIFO"
 msgstr "FIFO"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:94
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:92
 msgid "Use first-in first-out method for basis."
 msgstr "Emplear el método primero-en-entrar primero-en-salir (FIFO) como base."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:96
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:94
 msgid "LIFO"
 msgstr "LIFO"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:97
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:95
 msgid "Use last-in first-out method for basis."
 msgstr "Utiliza el método último-en-entrar primero-en-entrar como base."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:103
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:101
 msgid "Prefer use of price editor pricing over transactions, where applicable."
 msgstr "Preferir emplear del editor de precios de precio sobre transacciones, donde sea aplicable."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:109
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:107
 msgid "How to report commissions and other brokerage fees."
 msgstr "Cómo dar el boletín de adelantos y otras comisiones de corretajes."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:111
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:109
 msgid "Include in basis"
 msgstr "Incluir en base"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:112
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:110
 msgid "Include brokerage fees in the basis for the asset."
 msgstr "Incluir comisiones de corretaje en la base para los activos."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:114
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:112
 msgid "Include in gain"
 msgstr "Incluir en ganancias"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:115
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:113
 msgid "Include brokerage fees in the gain and loss but not in the basis."
 msgstr "Incluir comisiones de corretajes en la ganancia y pérdida pero no en la base."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:117
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:115
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:118
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:116
 msgid "Ignore brokerage fees entirely."
 msgstr "Ignore completamente comisiones de corretajes.."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:125
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:123
 msgid "Display the ticker symbols."
 msgstr "Enseña los símbolos abreviados."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:132
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:130
 msgid "Display exchange listings."
 msgstr "Enseña índices de intercambio."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:139
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:137
 msgid "Display numbers of shares in accounts."
 msgstr "Enseña números de mercancías en las cuentas."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:145
-#: ../gnucash/report/standard-reports/portfolio.scm:65
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:143
+#: ../gnucash/report/standard-reports/portfolio.scm:63
 msgid "The number of decimal places to use for share numbers."
 msgstr "El número de lugares decimales a emplear para los números de mercancías."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:152
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:150
 msgid "Display share prices."
 msgstr "Enseñar precios de mercancías."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:160
-#: ../gnucash/report/standard-reports/portfolio.scm:73
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:158
+#: ../gnucash/report/standard-reports/portfolio.scm:71
 msgid "Stock Accounts to report on."
 msgstr "Cuentas de Reservas a boletinar."
 
-#: ../gnucash/report/standard-reports/advanced-portfolio.scm:172
-#: ../gnucash/report/standard-reports/portfolio.scm:85
+#: ../gnucash/report/standard-reports/advanced-portfolio.scm:170
+#: ../gnucash/report/standard-reports/portfolio.scm:83
 msgid "Include accounts that have a zero share balances."
 msgstr "Incluye cuentas que tengan un balance de mercancías a cero."
 
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1060
-#: ../gnucash/report/standard-reports/portfolio.scm:257
+#: ../gnucash/report/standard-reports/portfolio.scm:255
 msgid "Listing"
 msgstr "Índices"
 
@@ -21840,16 +21728,16 @@ msgid "Basis"
 msgstr "Base"
 
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1074
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:332
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:357
-#: ../gnucash/report/standard-reports/cash-flow.scm:309
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:331
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:356
+#: ../gnucash/report/standard-reports/cash-flow.scm:308
 msgid "Money In"
 msgstr "Efectivo entrante"
 
 #: ../gnucash/report/standard-reports/advanced-portfolio.scm:1075
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:333
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:358
-#: ../gnucash/report/standard-reports/cash-flow.scm:354
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:332
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:357
+#: ../gnucash/report/standard-reports/cash-flow.scm:353
 msgid "Money Out"
 msgstr "Efectivo saliente"
 
@@ -21898,16 +21786,16 @@ msgid "Average Balance"
 msgstr "Balance Promedio"
 
 #: ../gnucash/report/standard-reports/average-balance.scm:40
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:61
-#: ../gnucash/report/standard-reports/category-barchart.scm:77
-#: ../gnucash/report/standard-reports/net-barchart.scm:49
-#: ../gnucash/report/standard-reports/net-linechart.scm:45
-#: ../gnucash/report/standard-reports/price-scatter.scm:39
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:60
+#: ../gnucash/report/standard-reports/category-barchart.scm:75
+#: ../gnucash/report/standard-reports/net-barchart.scm:48
+#: ../gnucash/report/standard-reports/net-linechart.scm:44
+#: ../gnucash/report/standard-reports/price-scatter.scm:37
 msgid "Step Size"
 msgstr "Tamaño del Paso"
 
 #: ../gnucash/report/standard-reports/average-balance.scm:43
-#: ../gnucash/report/standard-reports/daily-reports.scm:64
+#: ../gnucash/report/standard-reports/daily-reports.scm:62
 msgid "Include Sub-Accounts"
 msgstr "Incluir las subcuentas"
 
@@ -21916,7 +21804,7 @@ msgid "Exclude transactions between selected accounts"
 msgstr "Excluir transacciones entre cuentas seleccionadas"
 
 #: ../gnucash/report/standard-reports/average-balance.scm:78
-#: ../gnucash/report/standard-reports/daily-reports.scm:96
+#: ../gnucash/report/standard-reports/daily-reports.scm:94
 msgid "Include sub-accounts of all selected accounts."
 msgstr "Incluir las subcuentas de todas las cuentas seleccionadas."
 
@@ -21930,20 +21818,20 @@ msgstr "Crear boletín transaccional sobre esta cuenta."
 
 #: ../gnucash/report/standard-reports/average-balance.scm:114
 #: ../gnucash/report/standard-reports/average-balance.scm:341
-#: ../gnucash/report/standard-reports/category-barchart.scm:203
-#: ../gnucash/report/standard-reports/category-barchart.scm:273
-#: ../gnucash/report/standard-reports/net-barchart.scm:133
-#: ../gnucash/report/standard-reports/net-barchart.scm:199
-#: ../gnucash/report/standard-reports/net-linechart.scm:139
-#: ../gnucash/report/standard-reports/net-linechart.scm:235
+#: ../gnucash/report/standard-reports/category-barchart.scm:201
+#: ../gnucash/report/standard-reports/category-barchart.scm:271
+#: ../gnucash/report/standard-reports/net-barchart.scm:132
+#: ../gnucash/report/standard-reports/net-barchart.scm:198
+#: ../gnucash/report/standard-reports/net-linechart.scm:138
+#: ../gnucash/report/standard-reports/net-linechart.scm:234
 msgid "Show table"
 msgstr "Mostrar tabla"
 
 #: ../gnucash/report/standard-reports/average-balance.scm:115
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:129
-#: ../gnucash/report/standard-reports/category-barchart.scm:204
-#: ../gnucash/report/standard-reports/net-barchart.scm:134
-#: ../gnucash/report/standard-reports/net-linechart.scm:140
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:128
+#: ../gnucash/report/standard-reports/category-barchart.scm:202
+#: ../gnucash/report/standard-reports/net-barchart.scm:133
+#: ../gnucash/report/standard-reports/net-linechart.scm:139
 msgid "Display a table of the selected data."
 msgstr "Enseñar una lengüeta de los datos seleccionados."
 
@@ -22004,7 +21892,7 @@ msgid "Loss"
 msgstr "Pérdida"
 
 #: ../gnucash/report/standard-reports/balance-sheet.scm:72
-#: ../gnucash/report/standard-reports/trial-balance.scm:619
+#: ../gnucash/report/standard-reports/trial-balance.scm:618
 msgid "Balance Sheet"
 msgstr "Hoja de Balance"
 
@@ -22106,15 +21994,15 @@ msgstr "Pérdida Mercantil"
 
 #: ../gnucash/report/standard-reports/balance-sheet.scm:685
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:848
-#: ../gnucash/report/standard-reports/equity-statement.scm:615
-#: ../gnucash/report/standard-reports/trial-balance.scm:852
+#: ../gnucash/report/standard-reports/equity-statement.scm:613
+#: ../gnucash/report/standard-reports/trial-balance.scm:851
 msgid "Unrealized Gains"
 msgstr "Ganancias No Ocurridas"
 
 #: ../gnucash/report/standard-reports/balance-sheet.scm:686
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:849
-#: ../gnucash/report/standard-reports/equity-statement.scm:616
-#: ../gnucash/report/standard-reports/trial-balance.scm:853
+#: ../gnucash/report/standard-reports/equity-statement.scm:614
+#: ../gnucash/report/standard-reports/trial-balance.scm:852
 msgid "Unrealized Losses"
 msgstr "Pérdidas no ocurridas"
 
@@ -22141,10 +22029,10 @@ msgid "Whether or not to include lines indicating change in totals introduced by
 msgstr "Si se debe o no incluir líneas indicando cambio en totales introducido por presupuesto."
 
 #: ../gnucash/report/standard-reports/budget-balance-sheet.scm:112
-#: ../gnucash/report/standard-reports/budget-barchart.scm:72
-#: ../gnucash/report/standard-reports/budget-flow.scm:59
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:60
-#: ../gnucash/report/standard-reports/budget.scm:150
+#: ../gnucash/report/standard-reports/budget-barchart.scm:70
+#: ../gnucash/report/standard-reports/budget-flow.scm:57
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:59
+#: ../gnucash/report/standard-reports/budget.scm:149
 msgid "Budget to use."
 msgstr "Presupuesto para usar."
 
@@ -22200,66 +22088,66 @@ msgstr "Patrimonio Existente"
 msgid "New Equity"
 msgstr "Crear Patrimonio"
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:43
+#: ../gnucash/report/standard-reports/budget-barchart.scm:41
 msgid "Budget Chart"
 msgstr "Diagrama Presupuestario"
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:48
+#: ../gnucash/report/standard-reports/budget-barchart.scm:46
 msgid "Running Sum"
 msgstr "Calculando Sumatorio"
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:49
-#: ../gnucash/report/standard-reports/category-barchart.scm:86
+#: ../gnucash/report/standard-reports/budget-barchart.scm:47
+#: ../gnucash/report/standard-reports/category-barchart.scm:84
 msgid "Chart Type"
 msgstr "Tipo de Diagrama"
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:82
-#: ../gnucash/report/standard-reports/budget-flow.scm:90
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:92
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:708
-#: ../gnucash/report/standard-reports/transaction.scm:530
-#: ../gnucash/report/standard-reports/trial-balance.scm:79
+#: ../gnucash/report/standard-reports/budget-barchart.scm:80
+#: ../gnucash/report/standard-reports/budget-flow.scm:88
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:91
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:82
+#: ../gnucash/report/standard-reports/transaction.scm:534
+#: ../gnucash/report/standard-reports/trial-balance.scm:78
 msgid "Report on these accounts."
 msgstr "Boletín sobre estas cuentas."
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:99
+#: ../gnucash/report/standard-reports/budget-barchart.scm:97
 msgid "Calculate as running sum?"
 msgstr "¿Calcular como total?"
 
 #. tab name
 #. displayed option name
 #. localization in the tab
-#: ../gnucash/report/standard-reports/budget-barchart.scm:108
+#: ../gnucash/report/standard-reports/budget-barchart.scm:106
 #: ../gnucash/report/utility-reports/hello-world.scm:67
 msgid "This is a multi choice option."
 msgstr "Esta es una opción de selección múltiple."
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:113
+#: ../gnucash/report/standard-reports/budget-barchart.scm:111
 msgid "Barchart"
 msgstr "Barra Gráfica"
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:114
+#: ../gnucash/report/standard-reports/budget-barchart.scm:112
 msgid "Show the report as a bar chart."
 msgstr "Muestra el boletín como un diagrama de barra."
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:119
+#: ../gnucash/report/standard-reports/budget-barchart.scm:117
 msgid "Linechart"
 msgstr "Diagrama lineal"
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:120
+#: ../gnucash/report/standard-reports/budget-barchart.scm:118
 msgid "Show the report as a line chart."
 msgstr "Muestra el boletín como un diagrama de línea."
 
-#: ../gnucash/report/standard-reports/budget-barchart.scm:159
-#: ../gnucash/report/standard-reports/budget-barchart.scm:172
+#: ../gnucash/report/standard-reports/budget-barchart.scm:157
+#: ../gnucash/report/standard-reports/budget-barchart.scm:170
 msgid "Actual"
 msgstr "Efectiva"
 
-#: ../gnucash/report/standard-reports/budget-flow.scm:39
+#: ../gnucash/report/standard-reports/budget-flow.scm:37
 msgid "Budget Flow"
 msgstr "Presupuesto"
 
-#: ../gnucash/report/standard-reports/budget-flow.scm:47
+#: ../gnucash/report/standard-reports/budget-flow.scm:45
 msgid "Period"
 msgstr "Periodo"
 
@@ -22270,404 +22158,411 @@ msgstr "Periodo"
 #. FIXME: It would be even nicer if the max number of budget
 #. periods was determined by the number of periods in the
 #. currently selected budget
-#: ../gnucash/report/standard-reports/budget-flow.scm:73
+#: ../gnucash/report/standard-reports/budget-flow.scm:71
 msgid "Period number."
 msgstr "Número del periodo."
 
-#: ../gnucash/report/standard-reports/budget-flow.scm:321
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+#: ../gnucash/report/standard-reports/budget-flow.scm:319
+#, scheme-format
+msgid "~a: ~a - ~a"
+msgstr "~a: ~a - ~a"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:63
-#: ../gnucash/report/standard-reports/budget.scm:73
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:62
+#: ../gnucash/report/standard-reports/budget.scm:72
 msgid "Report for range of budget periods"
 msgstr "Boletín para rango de períodos presupuestarios"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:65
-#: ../gnucash/report/standard-reports/budget.scm:75
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:64
+#: ../gnucash/report/standard-reports/budget.scm:74
 msgid "Create report for a budget period range instead of the entire budget."
 msgstr "Crea un boletín para un rango de periodo presupuestario en vez del presupuesto completo."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:67
-#: ../gnucash/report/standard-reports/budget.scm:77
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:66
+#: ../gnucash/report/standard-reports/budget.scm:76
 msgid "Range start"
 msgstr "Inicio de Rango"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:69
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:68
 msgid "Select a budget period that begins the reporting range."
 msgstr "Seleccione un período presupuestario que empiece en el rango boletinado."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:71
-#: ../gnucash/report/standard-reports/budget.scm:84
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:70
+#: ../gnucash/report/standard-reports/budget.scm:83
 msgid "Range end"
 msgstr "Final de Rango"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:73
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:72
 msgid "Select a budget period that ends the reporting range."
 msgstr "Seleccione un período presupuestario que finalice en el rango boletinado."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:104
-#: ../gnucash/report/standard-reports/income-statement.scm:91
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:103
+#: ../gnucash/report/standard-reports/income-statement.scm:90
 msgid "Label the revenue section"
 msgstr "Etiqueta la sección de recibos"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:106
-#: ../gnucash/report/standard-reports/income-statement.scm:93
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:105
+#: ../gnucash/report/standard-reports/income-statement.scm:92
 msgid "Whether or not to include a label for the revenue section."
 msgstr "Si se debe o no incluir una etiqueta para la sección de recibos."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:107
-#: ../gnucash/report/standard-reports/income-statement.scm:94
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:106
+#: ../gnucash/report/standard-reports/income-statement.scm:93
 msgid "Include revenue total"
 msgstr "Incluir total de beneficios"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:109
-#: ../gnucash/report/standard-reports/income-statement.scm:96
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:108
+#: ../gnucash/report/standard-reports/income-statement.scm:95
 msgid "Whether or not to include a line indicating total revenue."
 msgstr "Si se debe o no incluir una línea indicando el total de rédito."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:110
-#: ../gnucash/report/standard-reports/income-statement.scm:103
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:109
+#: ../gnucash/report/standard-reports/income-statement.scm:102
 msgid "Label the expense section"
 msgstr "Etiqueta la sección de gastos"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:112
-#: ../gnucash/report/standard-reports/income-statement.scm:105
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:111
+#: ../gnucash/report/standard-reports/income-statement.scm:104
 msgid "Whether or not to include a label for the expense section."
 msgstr "Si se debe o no incluir una etiqueta para la sección de gastos."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:113
-#: ../gnucash/report/standard-reports/income-statement.scm:106
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:112
+#: ../gnucash/report/standard-reports/income-statement.scm:105
 msgid "Include expense total"
 msgstr "Incluir el total de gastos"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:115
-#: ../gnucash/report/standard-reports/income-statement.scm:108
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:114
+#: ../gnucash/report/standard-reports/income-statement.scm:107
 msgid "Whether or not to include a line indicating total expense."
 msgstr "Si se debe o no incluir una línea indicando el total de gastos."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:128
-#: ../gnucash/report/standard-reports/income-statement.scm:132
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:127
+#: ../gnucash/report/standard-reports/income-statement.scm:131
 msgid "Display as a two column report"
 msgstr "Enseñar como un boletín de dos columnas"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:130
-#: ../gnucash/report/standard-reports/income-statement.scm:134
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:129
+#: ../gnucash/report/standard-reports/income-statement.scm:133
 msgid "Divides the report into an income column and an expense column."
 msgstr "Divide el boletín en una columna de ingresos y una columna de gastos."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:132
-#: ../gnucash/report/standard-reports/income-statement.scm:136
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:131
+#: ../gnucash/report/standard-reports/income-statement.scm:135
 msgid "Display in standard, income first, order"
 msgstr "Enseñar en común, primero ingresos, operación"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:134
-#: ../gnucash/report/standard-reports/income-statement.scm:138
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:133
+#: ../gnucash/report/standard-reports/income-statement.scm:137
 msgid "Causes the report to display in the standard order, placing income before expenses."
 msgstr "Ocasiona que el boletín para enseñar en la operación común, situando ingresos antes que gastos."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:478
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:477
 msgid "Reporting range end period cannot be less than start period."
 msgstr "Boletín del periodo del final del rango no puede ser inferior al período de inicio."
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:508
-msgid "for Budget %s Period %u"
-msgstr "para Presupuesto %s de Periodo %u"
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:507
+#, scheme-format
+msgid "for Budget ~a Period ~d"
+msgstr "para Presupuesto ~a de Periodo ~d"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:513
-msgid "for Budget %s Periods %u - %u"
-msgstr "para Presupuesto %s de Periodos %u - %u"
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:512
+#, scheme-format
+msgid "for Budget ~a Periods ~d - ~d"
+msgstr "para Presupuesto ~a de Periodos ~d - ~d"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:519
-msgid "for Budget %s"
-msgstr "para Presupuesto %s"
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:518
+#, scheme-format
+msgid "for Budget ~a"
+msgstr "para Presupuesto ~a"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:661
-#: ../gnucash/report/standard-reports/income-statement.scm:598
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:660
+#: ../gnucash/report/standard-reports/income-statement.scm:597
 msgid "Revenues"
 msgstr "Rentas"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:670
-#: ../gnucash/report/standard-reports/income-statement.scm:606
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:669
+#: ../gnucash/report/standard-reports/income-statement.scm:605
 msgid "Total Revenue"
 msgstr "Total Devuelto"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:684
-#: ../gnucash/report/standard-reports/income-statement.scm:619
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:683
+#: ../gnucash/report/standard-reports/income-statement.scm:618
 msgid "Total Expenses"
 msgstr "Total Gastos"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:690
-#: ../gnucash/report/standard-reports/equity-statement.scm:593
-#: ../gnucash/report/standard-reports/income-statement.scm:636
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:689
+#: ../gnucash/report/standard-reports/equity-statement.scm:591
+#: ../gnucash/report/standard-reports/income-statement.scm:635
 msgid "Net income"
 msgstr "Ingreso neto"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:691
-#: ../gnucash/report/standard-reports/equity-statement.scm:594
-#: ../gnucash/report/standard-reports/income-statement.scm:637
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:690
+#: ../gnucash/report/standard-reports/equity-statement.scm:592
+#: ../gnucash/report/standard-reports/income-statement.scm:636
 msgid "Net loss"
 msgstr "Pérdidas netas"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:759
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:758
 msgid "Budget Income Statement"
 msgstr "Presupuesto de Declaración de Ingresos"
 
-#: ../gnucash/report/standard-reports/budget-income-statement.scm:760
+#: ../gnucash/report/standard-reports/budget-income-statement.scm:759
 msgid "Budget Profit & Loss"
 msgstr "Presupuesto de Ganancias y Pérdidas"
 
 #. for gnc-build-url
-#: ../gnucash/report/standard-reports/budget.scm:42
+#: ../gnucash/report/standard-reports/budget.scm:41
 msgid "Budget Report"
 msgstr "Boletín Presupuestario"
 
-#: ../gnucash/report/standard-reports/budget.scm:50
-#: ../gnucash/report/standard-reports/cash-flow.scm:49
+#: ../gnucash/report/standard-reports/budget.scm:49
+#: ../gnucash/report/standard-reports/cash-flow.scm:48
 msgid "Account Display Depth"
 msgstr "Profundidad de muestra de cuentas"
 
-#: ../gnucash/report/standard-reports/budget.scm:51
-#: ../gnucash/report/standard-reports/cash-flow.scm:50
+#: ../gnucash/report/standard-reports/budget.scm:50
+#: ../gnucash/report/standard-reports/cash-flow.scm:49
 msgid "Always show sub-accounts"
 msgstr "Siempre mostrar subcuentas"
 
-#: ../gnucash/report/standard-reports/budget.scm:56
-#: ../gnucash/report/standard-reports/cash-flow.scm:56
+#: ../gnucash/report/standard-reports/budget.scm:55
+#: ../gnucash/report/standard-reports/cash-flow.scm:55
 msgid "Show Full Account Names"
 msgstr "Mostrar nombres completos de cuentas"
 
-#: ../gnucash/report/standard-reports/budget.scm:57
+#: ../gnucash/report/standard-reports/budget.scm:56
 msgid "Select Columns"
 msgstr "Seleccionar Columnas"
 
-#: ../gnucash/report/standard-reports/budget.scm:58
+#: ../gnucash/report/standard-reports/budget.scm:57
 msgid "Show Budget"
 msgstr "Mostrar Presupuesto"
 
-#: ../gnucash/report/standard-reports/budget.scm:59
+#: ../gnucash/report/standard-reports/budget.scm:58
 msgid "Display a column for the budget values."
 msgstr "Enseña una columna para los valores del presupuesto."
 
-#: ../gnucash/report/standard-reports/budget.scm:60
+#: ../gnucash/report/standard-reports/budget.scm:59
 msgid "Show Actual"
 msgstr "Mostrar Efectivas"
 
-#: ../gnucash/report/standard-reports/budget.scm:61
+#: ../gnucash/report/standard-reports/budget.scm:60
 msgid "Display a column for the actual values."
 msgstr "Enseña una columna para los valores efectivos."
 
-#: ../gnucash/report/standard-reports/budget.scm:62
+#: ../gnucash/report/standard-reports/budget.scm:61
 msgid "Show Difference"
 msgstr "Mostrar Diferencia"
 
-#: ../gnucash/report/standard-reports/budget.scm:63
+#: ../gnucash/report/standard-reports/budget.scm:62
 msgid "Display the difference as budget - actual."
 msgstr "Enseñar la diferencia como presupuesto - efectiva."
 
-#: ../gnucash/report/standard-reports/budget.scm:64
+#: ../gnucash/report/standard-reports/budget.scm:63
 msgid "Show Column with Totals"
 msgstr "Mostrar Columna con Totales"
 
-#: ../gnucash/report/standard-reports/budget.scm:65
+#: ../gnucash/report/standard-reports/budget.scm:64
 msgid "Display a column with the row totals."
 msgstr "Enseña una columna con la fila de totales."
 
-#: ../gnucash/report/standard-reports/budget.scm:66
+#: ../gnucash/report/standard-reports/budget.scm:65
 msgid "Roll up budget amounts to parent"
 msgstr "Enrolle presupuesto asciende a los precedentes"
 
-#: ../gnucash/report/standard-reports/budget.scm:67
+#: ../gnucash/report/standard-reports/budget.scm:66
 msgid "If parent account does not have its own budget value, use the sum of the child account budget values."
 msgstr "Si la cuenta matriz no tiene su propio valor presupuestado, emplee el total presupuestado para los valores de la subcuenta."
 
-#: ../gnucash/report/standard-reports/budget.scm:68
+#: ../gnucash/report/standard-reports/budget.scm:67
 msgid "Include accounts with zero total balances and budget values"
 msgstr "Incluir cuentas con balances y valores del presupuesto totales a cero"
 
-#: ../gnucash/report/standard-reports/budget.scm:69
+#: ../gnucash/report/standard-reports/budget.scm:68
 msgid "Include accounts with zero total (recursive) balances and budget values in this report."
 msgstr "Incluir cuentas con balances totales a cero (recursivos) y los valores del presupuesto dentro de este boletín."
 
-#: ../gnucash/report/standard-reports/budget.scm:79
+#: ../gnucash/report/standard-reports/budget.scm:78
 msgid "Select a budget period type that starts the reporting range."
 msgstr "Seleccione un tipo de período presupuestario que comience en el rango boletinado."
 
-#: ../gnucash/report/standard-reports/budget.scm:80
+#: ../gnucash/report/standard-reports/budget.scm:79
 msgid "Exact start period"
 msgstr "Inicio de período exacto"
 
-#: ../gnucash/report/standard-reports/budget.scm:82
+#: ../gnucash/report/standard-reports/budget.scm:81
 msgid "Select exact period that starts the reporting range."
 msgstr "Seleccione un período exacto que finalice en el rango boletinado."
 
-#: ../gnucash/report/standard-reports/budget.scm:86
+#: ../gnucash/report/standard-reports/budget.scm:85
 msgid "Select a budget period type that ends the reporting range."
 msgstr "Seleccione un tipo de período presupuestario que finalice en el rango boletinado."
 
-#: ../gnucash/report/standard-reports/budget.scm:87
+#: ../gnucash/report/standard-reports/budget.scm:86
 msgid "Exact end period"
 msgstr "Final del periodo exacto"
 
-#: ../gnucash/report/standard-reports/budget.scm:89
+#: ../gnucash/report/standard-reports/budget.scm:88
 msgid "Select exact period that ends the reporting range."
 msgstr "Seleccione un período exacto que finalice en el rango boletinado."
 
-#: ../gnucash/report/standard-reports/budget.scm:91
+#: ../gnucash/report/standard-reports/budget.scm:90
 msgid "Include collapsed periods before selected."
 msgstr "Incluir periodos plegados antes de seleccionarlos."
 
-#: ../gnucash/report/standard-reports/budget.scm:92
+#: ../gnucash/report/standard-reports/budget.scm:91
 msgid "Include in report previous periods as single collapsed column (one for all periods before starting)"
 msgstr "Incluir en periodos anteriores del boletín como columna única colapsada (uno por todos los periodos de inicio anterior)"
 
-#: ../gnucash/report/standard-reports/budget.scm:93
+#: ../gnucash/report/standard-reports/budget.scm:92
 msgid "Include collapsed periods after selected."
 msgstr "Incluir periodos plegados tras de seleccionarlos."
 
-#: ../gnucash/report/standard-reports/budget.scm:94
+#: ../gnucash/report/standard-reports/budget.scm:93
 msgid "Include in report further periods as single collapsed column (one for all periods after ending and to the end of budget range)"
 msgstr "Incluir al boletín periodos más lejos como columna única colapsada (uno para todos los periodos tras finalizar y al final del rango del presupuesto)"
 
-#: ../gnucash/report/standard-reports/budget.scm:119
+#: ../gnucash/report/standard-reports/budget.scm:118
 msgid "First"
 msgstr "Primera"
 
-#: ../gnucash/report/standard-reports/budget.scm:120
+#: ../gnucash/report/standard-reports/budget.scm:119
 msgid "The first period of the budget"
 msgstr "El primer periodo del presupuesto"
 
-#: ../gnucash/report/standard-reports/budget.scm:123
+#: ../gnucash/report/standard-reports/budget.scm:122
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../gnucash/report/standard-reports/budget.scm:124
+#: ../gnucash/report/standard-reports/budget.scm:123
 msgid "Budget period was before current period, according to report evaluation date"
 msgstr "Periodo presupuestario era anterior al periodo actual, de acuerdo con la fecha de evaluación del boletín"
 
-#: ../gnucash/report/standard-reports/budget.scm:128
+#: ../gnucash/report/standard-reports/budget.scm:127
 msgid "Current period, according to report evaluation date"
 msgstr "Periodo actual, de acuerdo con la fecha de evaluación del boletín"
 
-#: ../gnucash/report/standard-reports/budget.scm:131
+#: ../gnucash/report/standard-reports/budget.scm:130
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../gnucash/report/standard-reports/budget.scm:132
+#: ../gnucash/report/standard-reports/budget.scm:131
 msgid "Next period, according to report evaluation date"
 msgstr "Periodo siguiente, de acuerdo con la fecha de evaluación del boletín"
 
-#: ../gnucash/report/standard-reports/budget.scm:136
+#: ../gnucash/report/standard-reports/budget.scm:135
 msgid "Last budget period"
 msgstr "Periodo del presupuesto último"
 
-#: ../gnucash/report/standard-reports/budget.scm:139
+#: ../gnucash/report/standard-reports/budget.scm:138
 msgid "Manual period selection"
 msgstr "Selección periódica manual"
 
-#: ../gnucash/report/standard-reports/budget.scm:140
+#: ../gnucash/report/standard-reports/budget.scm:139
 msgid "Explicitly select period valud with spinner below"
 msgstr "Explícitamente selecciona periodo valorado con ruleta debajo"
 
-#: ../gnucash/report/standard-reports/budget.scm:170
-#: ../gnucash/report/standard-reports/cash-flow.scm:87
+#: ../gnucash/report/standard-reports/budget.scm:169
+#: ../gnucash/report/standard-reports/cash-flow.scm:86
 msgid "Show full account names (including parent accounts)."
 msgstr "Muestra nombres completos de cuenta (incluyendo cuentas matrices)"
 
-#: ../gnucash/report/standard-reports/budget.scm:595
+#: ../gnucash/report/standard-reports/budget.scm:594
 msgid "Bgt"
 msgstr "Pto"
 
-#: ../gnucash/report/standard-reports/budget.scm:603
+#: ../gnucash/report/standard-reports/budget.scm:602
 msgid "Act"
 msgstr "Ope"
 
-#: ../gnucash/report/standard-reports/budget.scm:611
+#: ../gnucash/report/standard-reports/budget.scm:610
 msgid "Diff"
 msgstr "Difer"
 
-#: ../gnucash/report/standard-reports/budget.scm:879
-msgid "%s: %s"
-msgstr "%s: %s"
+#: ../gnucash/report/standard-reports/budget.scm:878
+#, scheme-format
+msgid "~a: ~a"
+msgstr "~a: ~a"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:44
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:43
 msgid "Cash Flow Barchart"
 msgstr "Barra Gráfica del Efectivo Corriente"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:50
-#: ../gnucash/report/standard-reports/cash-flow.scm:57
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:49
+#: ../gnucash/report/standard-reports/cash-flow.scm:56
 msgid "Include Trading Accounts in report"
 msgstr "Incluir Cuentas de Bursátiles en el boletín"
 
 #. Display
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:52
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:51
 msgid "Show Money In"
 msgstr "Mostrar Moneda Entrante"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:53
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:52
 msgid "Show Money Out"
 msgstr "Mostrar Moneda Saliente"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:54
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:53
 msgid "Show Net Flow"
 msgstr "Mostrar Flujo Neto"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:55
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:54
 msgid "Show Table"
 msgstr "Mostrar Tabla"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:104
-#: ../gnucash/report/standard-reports/cash-flow.scm:106
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:103
+#: ../gnucash/report/standard-reports/cash-flow.scm:105
 msgid "Include transfers to and from Trading Accounts in the report."
 msgstr "Incluir emisión y recepción de transferencias de Cuentas Bursátiles en el boletín."
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:111
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:110
 msgid "Show money in?"
 msgstr "¿Muestro moneda entrante?"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:117
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:116
 msgid "Show money out?"
 msgstr "¿Muestro moneda saliente?"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:123
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:122
 msgid "Show net money flow?"
 msgstr "¿Muestro flujo monetario neto?"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:334
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:359
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:333
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:358
 msgid "Net Flow"
 msgstr "Flujo Neto"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:363
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:362
 msgid "Overview:"
 msgstr "Sinopsis:"
 
-#: ../gnucash/report/standard-reports/cashflow-barchart.scm:526
+#: ../gnucash/report/standard-reports/cashflow-barchart.scm:525
 msgid "Shows a barchart with cash flow over time"
 msgstr "Muestra una barra gráfica con efectivo corriente sobre el tiempo"
 
 # Corriente
-#: ../gnucash/report/standard-reports/cash-flow.scm:42
+#: ../gnucash/report/standard-reports/cash-flow.scm:41
 msgid "Cash Flow"
 msgstr "Efectivo Corriente"
 
-#: ../gnucash/report/standard-reports/cash-flow.scm:241
-msgid "%s and subaccounts"
-msgstr "%s y subcuentas"
+#: ../gnucash/report/standard-reports/cash-flow.scm:240
+#, scheme-format
+msgid "~a and subaccounts"
+msgstr "~a y subcuentas"
 
-#: ../gnucash/report/standard-reports/cash-flow.scm:242
-msgid "%s and selected subaccounts"
-msgstr "%s y subcuentas seleccionadas"
+#: ../gnucash/report/standard-reports/cash-flow.scm:241
+#, scheme-format
+msgid "~a and selected subaccounts"
+msgstr "~a y subcuentas seleccionadas"
 
-#: ../gnucash/report/standard-reports/cash-flow.scm:274
+#: ../gnucash/report/standard-reports/cash-flow.scm:273
 msgid "Money into selected accounts comes from"
 msgstr "El dinero entrante a las cuentas seleccionadas viene de"
 
-#: ../gnucash/report/standard-reports/cash-flow.scm:319
+#: ../gnucash/report/standard-reports/cash-flow.scm:318
 msgid "Money out of selected accounts goes to"
 msgstr "El dinero saliente de las cuentas seleccionadas van a"
 
-#: ../gnucash/report/standard-reports/cash-flow.scm:364
+#: ../gnucash/report/standard-reports/cash-flow.scm:363
 msgid "Difference"
 msgstr "Diferencia"
 
@@ -22678,221 +22573,218 @@ msgstr "Diferencia"
 #. spelling errors. The *reportnames* are defined here (and not only
 #. once at the very end) because I need them to define the "other"
 #. report, thus needing them twice.
-#: ../gnucash/report/standard-reports/category-barchart.scm:47
+#: ../gnucash/report/standard-reports/category-barchart.scm:45
 msgid "Income Chart"
 msgstr "Diagrama de Ingresos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:48
+#: ../gnucash/report/standard-reports/category-barchart.scm:46
 msgid "Expense Chart"
 msgstr "Diagrama de Gastos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:49
+#: ../gnucash/report/standard-reports/category-barchart.scm:47
 msgid "Asset Chart"
 msgstr "Diagrama de Activo"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:50
+#: ../gnucash/report/standard-reports/category-barchart.scm:48
 msgid "Liability Chart"
 msgstr "Diagrama de Pasivo"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:55
+#: ../gnucash/report/standard-reports/category-barchart.scm:53
 msgid "Shows a chart with the Income per interval developing over time"
 msgstr "Muestra un diagrama con el Ingreso por intervalo desarrollado sobre el tiempo"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:58
+#: ../gnucash/report/standard-reports/category-barchart.scm:56
 msgid "Shows a chart with the Expenses per interval developing over time"
 msgstr "Muestra un diagrama con los Gastos por intervalo desarrollado sobre el tiempo"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:61
+#: ../gnucash/report/standard-reports/category-barchart.scm:59
 msgid "Shows a chart with the Assets developing over time"
 msgstr "Muestra un diagrama con los Activos desarrollados sobre el tiempo"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:63
+#: ../gnucash/report/standard-reports/category-barchart.scm:61
 msgid "Shows a chart with the Liabilities developing over time"
 msgstr "Muestra un diagrama con los Pasivos desarrollados sobre el tiempo"
 
 #. The names here are used 1. for internal identification, 2. as
 #. tab labels, 3. as default for the 'Report name' option which
 #. in turn is used for the printed report title.
-#: ../gnucash/report/standard-reports/category-barchart.scm:69
+#: ../gnucash/report/standard-reports/category-barchart.scm:67
 msgid "Income Over Time"
 msgstr "Histórico de Ingresos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:70
+#: ../gnucash/report/standard-reports/category-barchart.scm:68
 msgid "Expense Over Time"
 msgstr "Histórico de Gastos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:71
+#: ../gnucash/report/standard-reports/category-barchart.scm:69
 msgid "Assets Over Time"
 msgstr "Histórico de Activos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:72
+#: ../gnucash/report/standard-reports/category-barchart.scm:70
 msgid "Liabilities Over Time"
 msgstr "Histórico de Pasivos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:84
-#: ../gnucash/report/standard-reports/daily-reports.scm:66
+#: ../gnucash/report/standard-reports/category-barchart.scm:82
+#: ../gnucash/report/standard-reports/daily-reports.scm:64
 msgid "Show long account names"
 msgstr "Mostrar nombres largos de cuentas"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:88
+#: ../gnucash/report/standard-reports/category-barchart.scm:86
 msgid "Use Stacked Charts"
 msgstr "Emplear Diagramas Apilados"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:89
+#: ../gnucash/report/standard-reports/category-barchart.scm:87
 msgid "Maximum Bars"
 msgstr "Barras de Máximos"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:140
+#: ../gnucash/report/standard-reports/category-barchart.scm:138
 msgid "Show the average daily amount during the reporting period."
 msgstr "Muestra la media diaria de la cantidad durante el periodo del boletín."
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:178
+#: ../gnucash/report/standard-reports/category-barchart.scm:176
 msgid "Bar Chart"
 msgstr "Diagrama de Barra"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:179
+#: ../gnucash/report/standard-reports/category-barchart.scm:177
 msgid "Use bar charts."
 msgstr "Emplear gráficas de barras."
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:181
+#: ../gnucash/report/standard-reports/category-barchart.scm:179
 msgid "Line Chart"
 msgstr "Diagrama Lineal"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:182
+#: ../gnucash/report/standard-reports/category-barchart.scm:180
 msgid "Use line charts."
 msgstr "Emplear gráficas lineales."
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:191
+#: ../gnucash/report/standard-reports/category-barchart.scm:189
 msgid "Show charts as stacked charts?"
 msgstr "¿Muestro diagramas como diagramas apilados?"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:197
+#: ../gnucash/report/standard-reports/category-barchart.scm:195
 msgid "Maximum number of stacks in the chart."
 msgstr "Número máximo de pilas en el diagrama."
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:338
+#: ../gnucash/report/standard-reports/category-barchart.scm:336
 msgid "Daily Average"
 msgstr "Promedia diaria"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:538
-#: ../gnucash/report/standard-reports/category-barchart.scm:564
-msgid "Balances %s to %s"
-msgstr "Saldos de %s al %s"
+#: ../gnucash/report/standard-reports/category-barchart.scm:536
+#: ../gnucash/report/standard-reports/category-barchart.scm:562
+#, scheme-format
+msgid "Balances ~a to ~a"
+msgstr "Balances de ~a al ~a"
 
-#: ../gnucash/report/standard-reports/category-barchart.scm:748
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:331
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1170
-#: ../gnucash/report/standard-reports/transaction.scm:1392
+#: ../gnucash/report/standard-reports/category-barchart.scm:746
+#: ../gnucash/report/standard-reports/transaction.scm:1406
 msgid "Grand Total"
 msgstr "Saldo"
 
 #. The names here are used 1. for internal identification, 2. as
 #. tab labels, 3. as default for the 'Report name' option which
 #. in turn is used for the printed report title.
-#: ../gnucash/report/standard-reports/daily-reports.scm:42
-#: ../gnucash/report/standard-reports/daily-reports.scm:54
+#: ../gnucash/report/standard-reports/daily-reports.scm:40
+#: ../gnucash/report/standard-reports/daily-reports.scm:52
 msgid "Income vs. Day of Week"
 msgstr "Ingresos por Día de la semana"
 
-#: ../gnucash/report/standard-reports/daily-reports.scm:43
-#: ../gnucash/report/standard-reports/daily-reports.scm:55
+#: ../gnucash/report/standard-reports/daily-reports.scm:41
+#: ../gnucash/report/standard-reports/daily-reports.scm:53
 msgid "Expenses vs. Day of Week"
 msgstr "Gastos por Día de la semana"
 
-#: ../gnucash/report/standard-reports/daily-reports.scm:47
+#: ../gnucash/report/standard-reports/daily-reports.scm:45
 msgid "Shows a piechart with the total income for each day of the week"
 msgstr "Muestra una porción con los ingresos totales para cada día de la semana"
 
-#: ../gnucash/report/standard-reports/daily-reports.scm:49
+#: ../gnucash/report/standard-reports/daily-reports.scm:47
 msgid "Shows a piechart with the total expenses for each day of the week"
 msgstr "Muestra una porción con los gastos totales por cada día de la semana"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:57
+#: ../gnucash/report/standard-reports/equity-statement.scm:55
 msgid "Equity Statement"
 msgstr "Declaración Patrimonial"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:72
+#: ../gnucash/report/standard-reports/equity-statement.scm:70
 msgid "Report only on these accounts."
 msgstr "Boletín únicamente en estas cuentas."
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:88
-#: ../gnucash/report/standard-reports/income-statement.scm:120
-#: ../gnucash/report/standard-reports/trial-balance.scm:105
+#: ../gnucash/report/standard-reports/equity-statement.scm:86
+#: ../gnucash/report/standard-reports/income-statement.scm:119
+#: ../gnucash/report/standard-reports/trial-balance.scm:104
 msgid "Closing Entries pattern"
 msgstr "Patrón de Asientos de Cierre"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:90
-#: ../gnucash/report/standard-reports/income-statement.scm:122
-#: ../gnucash/report/standard-reports/trial-balance.scm:107
+#: ../gnucash/report/standard-reports/equity-statement.scm:88
+#: ../gnucash/report/standard-reports/income-statement.scm:121
+#: ../gnucash/report/standard-reports/trial-balance.scm:106
 msgid "Any text in the Description column which identifies closing entries."
 msgstr "Cualquier texto en el campo Descripción que identifique asientos de cierre."
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:92
-#: ../gnucash/report/standard-reports/income-statement.scm:124
-#: ../gnucash/report/standard-reports/trial-balance.scm:109
+#: ../gnucash/report/standard-reports/equity-statement.scm:90
+#: ../gnucash/report/standard-reports/income-statement.scm:123
+#: ../gnucash/report/standard-reports/trial-balance.scm:108
 msgid "Closing Entries pattern is case-sensitive"
 msgstr "El patrón de Asientos de Cierre distingue mayúsculas"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:94
-#: ../gnucash/report/standard-reports/income-statement.scm:126
-#: ../gnucash/report/standard-reports/trial-balance.scm:111
+#: ../gnucash/report/standard-reports/equity-statement.scm:92
+#: ../gnucash/report/standard-reports/income-statement.scm:125
+#: ../gnucash/report/standard-reports/trial-balance.scm:110
 msgid "Causes the Closing Entries Pattern match to be case-sensitive."
 msgstr "Ocasiona que el cotejo del Patrón de Asientos de Cierre distingue mayúsculas."
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:96
-#: ../gnucash/report/standard-reports/income-statement.scm:128
-#: ../gnucash/report/standard-reports/trial-balance.scm:113
+#: ../gnucash/report/standard-reports/equity-statement.scm:94
+#: ../gnucash/report/standard-reports/income-statement.scm:127
+#: ../gnucash/report/standard-reports/trial-balance.scm:112
 msgid "Closing Entries Pattern is regular expression"
 msgstr "El Patrón de Asientos de Cierre es una expresión regular"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:98
-#: ../gnucash/report/standard-reports/income-statement.scm:130
-#: ../gnucash/report/standard-reports/trial-balance.scm:115
+#: ../gnucash/report/standard-reports/equity-statement.scm:96
+#: ../gnucash/report/standard-reports/income-statement.scm:129
+#: ../gnucash/report/standard-reports/trial-balance.scm:114
 msgid "Causes the Closing Entries Pattern to be treated as a regular expression."
 msgstr "Ocasiona que el Patrón de Asientos de Cierre sea tratado como una expresión regular."
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:282
-#: ../gnucash/report/standard-reports/income-statement.scm:435
-#: ../gnucash/report/standard-reports/sx-summary.scm:315
-#: ../gnucash/report/standard-reports/trial-balance.scm:403
-msgid "For Period Covering %s to %s"
-msgstr "Para un Periodo cubriendo %s hasta %s"
+#: ../gnucash/report/standard-reports/equity-statement.scm:280
+#: ../gnucash/report/standard-reports/sx-summary.scm:314
+#: ../gnucash/report/standard-reports/trial-balance.scm:402
+#, scheme-format
+msgid "For Period Covering ~a to ~a"
+msgstr "Para un Periodo cubriendo ~a hasta ~a"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:346
-#: ../gnucash/report/standard-reports/income-statement.scm:474
-#: ../gnucash/report/standard-reports/trial-balance.scm:390
+#: ../gnucash/report/standard-reports/equity-statement.scm:344
+#: ../gnucash/report/standard-reports/income-statement.scm:473
+#: ../gnucash/report/standard-reports/trial-balance.scm:389
 msgid "for Period"
 msgstr "al Periodo"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:586
-#: ../gnucash/report/standard-reports/equity-statement.scm:630
+#: ../gnucash/report/standard-reports/equity-statement.scm:584
+#: ../gnucash/report/standard-reports/equity-statement.scm:628
 msgid "Capital"
 msgstr "Capital"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:600
+#: ../gnucash/report/standard-reports/equity-statement.scm:598
 msgid "Investments"
 msgstr "Inversiones"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:607
+#: ../gnucash/report/standard-reports/equity-statement.scm:605
 msgid "Withdrawals"
 msgstr "Retiradas"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:623
+#: ../gnucash/report/standard-reports/equity-statement.scm:621
 msgid "Increase in capital"
 msgstr "Incremento del capital"
 
-#: ../gnucash/report/standard-reports/equity-statement.scm:624
+#: ../gnucash/report/standard-reports/equity-statement.scm:622
 msgid "Decrease in capital"
 msgstr "Decremento del capital"
 
 #: ../gnucash/report/standard-reports/general-journal.scm:109
 #: ../gnucash/report/standard-reports/general-ledger.scm:78
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:414
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1067
 #: ../gnucash/report/standard-reports/register.scm:145
 #: ../gnucash/report/standard-reports/register.scm:416
-#: ../gnucash/report/standard-reports/transaction.scm:791
-#: ../gnucash/report/standard-reports/transaction.scm:898
+#: ../gnucash/report/standard-reports/transaction.scm:793
+#: ../gnucash/report/standard-reports/transaction.scm:911
 msgid "Num/Action"
 msgstr "Núm/Operación"
 
@@ -22901,10 +22793,10 @@ msgstr "Núm/Operación"
 #: ../gnucash/report/standard-reports/general-ledger.scm:92
 #: ../gnucash/report/standard-reports/general-ledger.scm:112
 #: ../gnucash/report/standard-reports/register.scm:469
-#: ../gnucash/report/standard-reports/transaction.scm:409
-#: ../gnucash/report/standard-reports/transaction.scm:804
-#: ../gnucash/report/standard-reports/transaction.scm:916
-#: ../gnucash/report/standard-reports/transaction.scm:1160
+#: ../gnucash/report/standard-reports/transaction.scm:404
+#: ../gnucash/report/standard-reports/transaction.scm:806
+#: ../gnucash/report/standard-reports/transaction.scm:929
+#: ../gnucash/report/standard-reports/transaction.scm:1166
 msgid "Running Balance"
 msgstr "Balance Actual"
 
@@ -22914,967 +22806,470 @@ msgstr "Libro General"
 
 #. Sorting
 #: ../gnucash/report/standard-reports/general-ledger.scm:58
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:52
-#: ../gnucash/report/standard-reports/transaction.scm:68
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:39
+#: ../gnucash/report/standard-reports/transaction.scm:65
 msgid "Sorting"
 msgstr "Ordenación"
 
 #: ../gnucash/report/standard-reports/general-ledger.scm:65
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:766
-#: ../gnucash/report/standard-reports/transaction.scm:62
+#: ../gnucash/report/standard-reports/transaction.scm:59
 msgid "Filter Type"
 msgstr "Clase de Filtro"
 
 #: ../gnucash/report/standard-reports/general-ledger.scm:67
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:63
-#: ../gnucash/report/standard-reports/transaction.scm:100
+#: ../gnucash/report/standard-reports/transaction.scm:97
 msgid "Void Transactions"
 msgstr "Transacciones Vacías"
 
 #: ../gnucash/report/standard-reports/general-ledger.scm:77
 #: ../gnucash/report/standard-reports/general-ledger.scm:98
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:410
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:456
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:823
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:874
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1065
-#: ../gnucash/report/standard-reports/transaction.scm:166
-#: ../gnucash/report/standard-reports/transaction.scm:408
-#: ../gnucash/report/standard-reports/transaction.scm:789
-#: ../gnucash/report/standard-reports/transaction.scm:896
-#: ../gnucash/report/standard-reports/transaction.scm:973
+#: ../gnucash/report/standard-reports/transaction.scm:159
+#: ../gnucash/report/standard-reports/transaction.scm:403
+#: ../gnucash/report/standard-reports/transaction.scm:791
+#: ../gnucash/report/standard-reports/transaction.scm:909
+#: ../gnucash/report/standard-reports/transaction.scm:986
 msgid "Reconciled Date"
 msgstr "Fecha Conciliada"
 
 #: ../gnucash/report/standard-reports/general-ledger.scm:79
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:462
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:466
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:560
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:562
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1093
-#: ../gnucash/report/standard-reports/transaction.scm:810
-#: ../gnucash/report/standard-reports/transaction.scm:984
-#: ../gnucash/report/standard-reports/transaction.scm:991
+#: ../gnucash/report/standard-reports/transaction.scm:812
+#: ../gnucash/report/standard-reports/transaction.scm:996
+#: ../gnucash/report/standard-reports/transaction.scm:1003
 msgid "Trans Number"
 msgstr "Núm. de Trans"
 
-#. (if (opt-val gnc:pagename-display (N_ "Shares"))
-#. (vector-set! column-list 6 #t))
-#. (if (opt-val gnc:pagename-display (N_ "Price"))
-#. (vector-set! column-list 7 #t))
-#. (let ((amount-setting (opt-val gnc:pagename-display (N_ "Amount"))))
-#. (if (eq? amount-setting 'single)
-#. (vector-set! column-list 8 #t))
-#. (if (eq? amount-setting 'double)
-#. (begin (vector-set! column-list 9 #t)
-#. (vector-set! column-list 10 #t))))
 #. account name option appears here
 #: ../gnucash/report/standard-reports/general-ledger.scm:83
 #: ../gnucash/report/standard-reports/general-ledger.scm:103
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:433
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1072
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1118
-#: ../gnucash/report/standard-reports/transaction.scm:757
-#: ../gnucash/report/standard-reports/transaction.scm:796
-#: ../gnucash/report/standard-reports/transaction.scm:917
+#: ../gnucash/report/standard-reports/transaction.scm:759
+#: ../gnucash/report/standard-reports/transaction.scm:798
+#: ../gnucash/report/standard-reports/transaction.scm:930
 msgid "Use Full Account Name"
 msgstr "Emplee Nombre Completo de Cuenta"
 
 #: ../gnucash/report/standard-reports/general-ledger.scm:85
 #: ../gnucash/report/standard-reports/general-ledger.scm:105
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:420
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:831
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:882
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1124
-#: ../gnucash/report/standard-reports/transaction.scm:191
-#: ../gnucash/report/standard-reports/transaction.scm:761
-#: ../gnucash/report/standard-reports/transaction.scm:837
-#: ../gnucash/report/standard-reports/transaction.scm:903
-msgid "Other Account Name"
-msgstr "Nombre de otra cuenta"
-
-#. other account name option appears here
-#: ../gnucash/report/standard-reports/general-ledger.scm:86
-#: ../gnucash/report/standard-reports/general-ledger.scm:106
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:441
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1075
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1130
-#: ../gnucash/report/standard-reports/transaction.scm:769
-#: ../gnucash/report/standard-reports/transaction.scm:799
-#: ../gnucash/report/standard-reports/transaction.scm:923
-msgid "Use Full Other Account Name"
-msgstr "Emplee Nombre Completo de Otra Cuenta"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:87
-#: ../gnucash/report/standard-reports/general-ledger.scm:107
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:439
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:835
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:886
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1076
-#: ../gnucash/report/standard-reports/transaction.scm:197
-#: ../gnucash/report/standard-reports/transaction.scm:773
-#: ../gnucash/report/standard-reports/transaction.scm:800
-#: ../gnucash/report/standard-reports/transaction.scm:921
-msgid "Other Account Code"
-msgstr "Código de otra cuenta"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:94
-#: ../gnucash/report/standard-reports/general-ledger.scm:114
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:520
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1087
-#: ../gnucash/report/standard-reports/transaction.scm:765
-#: ../gnucash/report/standard-reports/transaction.scm:876
-#: ../gnucash/report/standard-reports/transaction.scm:951
-msgid "Sign Reverses"
-msgstr "Firma Inversa"
-
-#. Display
-#: ../gnucash/report/standard-reports/general-ledger.scm:121
-#: ../gnucash/report/standard-reports/transaction.scm:65
-msgid "Detail Level"
-msgstr "Nivel de Detalles"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:134
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:53
-#: ../gnucash/report/standard-reports/transaction.scm:69
-msgid "Primary Key"
-msgstr "Clave Primaria"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:135
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:57
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:445
-#: ../gnucash/report/standard-reports/transaction.scm:73
-#: ../gnucash/report/standard-reports/transaction.scm:925
-msgid "Show Full Account Name"
-msgstr "Mostrar nombres de cuentas completas"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:136
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:58
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:443
-#: ../gnucash/report/standard-reports/transaction.scm:74
-#: ../gnucash/report/standard-reports/transaction.scm:924
-msgid "Show Account Code"
-msgstr "Mostrar Código de Cuenta"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:137
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:54
-#: ../gnucash/report/standard-reports/transaction.scm:70
-msgid "Primary Subtotal"
-msgstr "Subtotal principal"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:138
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:56
-#: ../gnucash/report/standard-reports/transaction.scm:72
-msgid "Primary Subtotal for Date Key"
-msgstr "Subtotal principal para la clave Fecha"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:139
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:55
-#: ../gnucash/report/standard-reports/transaction.scm:71
-msgid "Primary Sort Order"
-msgstr "Tipo de Ordenación Principal"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:140
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:59
-#: ../gnucash/report/standard-reports/transaction.scm:79
-msgid "Secondary Key"
-msgstr "Clave Secundaria"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:141
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:60
-#: ../gnucash/report/standard-reports/transaction.scm:80
-msgid "Secondary Subtotal"
-msgstr "Subtotal Secundario"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:142
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:62
-#: ../gnucash/report/standard-reports/transaction.scm:82
-msgid "Secondary Subtotal for Date Key"
-msgstr "Subtotal secundario para clave de fecha"
-
-#: ../gnucash/report/standard-reports/general-ledger.scm:143
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:61
-#: ../gnucash/report/standard-reports/transaction.scm:81
-msgid "Secondary Sort Order"
-msgstr "Tipo de Orden Secundario"
-
-#. Define the strings here to avoid typos and make changes easier.
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:51
-msgid "Income & GST Statement"
-msgstr "Declaración de Ingresos & GST"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:64
-#: ../gnucash/report/standard-reports/transaction.scm:87
-msgid "Table for Exporting"
-msgstr "Tabla Exportante"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:65
-#: ../gnucash/report/standard-reports/transaction.scm:88
-msgid "Common Currency"
-msgstr "Moneda común"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:66
-msgid "From the Report Options, you will need to select the accounts which will hold the GST/VAT taxes collected or paid. These accounts must contain splits which document the monies which are wholly sent or claimed from tax authorities during periodic GST/VAT returns. These accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales."
-msgstr "Desde las Opciones del Boletín, necesitará seleccionar las cuentas las cuales conservarán las imposiciones TIV/IVA recogidas o pagadas. Estas cuentas deberían contener desgloses las cuales documentan las monedas que quieran envían o reclamar desde autoridades impositivas durante las devoluciones TIV/IVA periódicas. Estas cuentas deben ser de tipo ACTIVOS para imposiciones abonadas en gastos, y de tipo PASIVOS para imposiciones recogidas en ventas."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:71
-msgid "Account Matcher"
-msgstr "Cuenta Cotejante"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:72
-msgid "Account Matcher uses regular expressions for extended matching"
-msgstr "Cotejador de Cuenta utiliza expresiones regulares para cotejos extendidos"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:73
-msgid "Transaction Matcher"
-msgstr "Cotejo Transaccional"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:74
-msgid "Transaction Matcher uses regular expressions for extended matching"
-msgstr "Cotejo Transaccional emplea expresiones regulares desde cotejo extendido"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:157
-#: ../gnucash/report/standard-reports/transaction.scm:1335
-msgid "Split Transaction"
-msgstr "Desglose de Transacción"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:273
-#: ../gnucash/report/standard-reports/transaction.scm:1323
-msgid "Total For "
-msgstr "Total para  "
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:468
-#: ../gnucash/report/standard-reports/transaction.scm:985
-msgid "Num/T-Num"
-msgstr "Núm/T-Núm"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:479
-#: ../gnucash/report/standard-reports/transaction.scm:1032
-msgid "Transfer from/to"
-msgstr "Contrapartida/Destino"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:668
-#: ../gnucash/report/standard-reports/transaction.scm:431
-msgid "Convert all transactions into a common currency."
-msgstr "Convertir todas las transacciones a una moneda común."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:682
-#: ../gnucash/report/standard-reports/transaction.scm:453
-msgid "Formats the table suitable for cut & paste exporting with extra cells."
-msgstr "Formatea la lengüeta de adecuadamente para exportarla cortando y pegando casillas adicionales."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:687
-msgid "Match only transactions whose substring is matched e.g. '#gift' will find all transactions with #gift in memo, description or notes. It can be left blank, which will disable the matcher."
-msgstr "Coincide solo transacciones cuya subcadena coincide p. e. '#gift' encontrará todas las transaciones con #gift en memorandum, descripción o anotación. Puede ser dejado en blanco, lo cual desactiva la coincidencia."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:696
-msgid "By default the transaction matcher will search substring only. Set this to true to enable full POSIX regular expressions capabilities. '#work|#family' will match both tags within description, notes or memo. "
-msgstr "Por defecto la coincidencia transacional solo buscará subcadenas. Establezca esto a verdadero para activar habilidad completa de expresión regular POSIX. '#trabajo|#familia' coincidirá con ambas marcas dentro de descripción, anotaciones o memorándum. "
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:722
-msgid "Match only above accounts whose fullname is matched e.g. ':Travel' will match Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, which will disable the matcher."
-msgstr "Coincide solo cuentas superiora s cuyo nombre completo ha coincidido p.e. 'Viaje' coincidirá Gasros:Viajes:Vacaciones y Gastos:Negocios:Viajes. Puede ser dejado en blanco, lo cual desactivará la coincidencia."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:731
-msgid "By default the account matcher will search substring only. Set this to true to enable full POSIX regular expressions capabilities. 'Car|Flights' will match both Expenses:Car and Expenses:Flights. Use a period (.) to match a single character e.g. '20../.' will match 'Travel 2017/1 London'. "
-msgstr "Por defecto el cotejo de cuenta buscará subcadenas únicamente. Establezca esto a verdadero para activas capacidades de expresiones regulares POSIX. «Coche|Vuelos» coincidirá ambas Gastos:Vehículo y Gastos:Vuelos. Emplee un punto (.) para cotejar un solo carácter p.e. «20../.» coincidirá con «Viaje 2017/1 Londres».  "
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:738
-msgid "Tax Accounts"
-msgstr "Cuentas Impositivas"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:739
-msgid "Please find and select the accounts which will hold the tax collected or paid. These accounts must contain splits which document the monies which are wholly sent or claimed from tax authorities during periodic GST/VAT returns. These accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales."
-msgstr "Por favor encuentre y seleccione las cuentas las cuales mantendrán las imposiciones recorgidas o abonadas. Estas cuentas deben contener desgloses cuyo documenta las monedas las cuales están enviadas o reclamadas desde autoridades impositivas durante devoluciones periódicas de TIV/IVA. Estas cuentas deben ser de tipo ACTIVO para imposiciones abonadas en gastos, y tipo PASIVO para imposiciones recogidas en ventas."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:751
-#: ../gnucash/report/standard-reports/transaction.scm:543
-msgid "Filter on these accounts."
-msgstr "Filtrar en estas cuentas."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:767
-#: ../gnucash/report/standard-reports/transaction.scm:551
-msgid "Filter account."
-msgstr "Filtrar cuenta."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:771
-#: ../gnucash/report/standard-reports/transaction.scm:303
-msgid "Do not do any filtering."
-msgstr "No hace ningún filtrado."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:773
-#: ../gnucash/report/standard-reports/transaction.scm:306
-msgid "Include Transactions to/from Filter Accounts"
-msgstr "Incluye Transacciones origen/destino de Cuentas Filtradas"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:774
-#: ../gnucash/report/standard-reports/transaction.scm:307
-msgid "Include transactions to/from filter accounts only."
-msgstr "Incluir transacciones origen/destino únicamente en cuentas de filtro."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:776
-#: ../gnucash/report/standard-reports/transaction.scm:310
-msgid "Exclude Transactions to/from Filter Accounts"
-msgstr "Excluir Cuentas Filtradas de Transacciones Origen/Destino"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:777
-#: ../gnucash/report/standard-reports/transaction.scm:311
-msgid "Exclude transactions to/from all filter accounts."
-msgstr "Excluye a todas las cuentas filtradas por transacciones de origen/destino."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:785
-#: ../gnucash/report/standard-reports/transaction.scm:520
-msgid "How to handle void transactions."
-msgstr "Como manipular transacciones vacías."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:789
-#: ../gnucash/report/standard-reports/transaction.scm:316
-msgid "Non-void only"
-msgstr "Sólo no vacío"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:790
-#: ../gnucash/report/standard-reports/transaction.scm:317
-msgid "Show only non-voided transactions."
-msgstr "Mostrar únicamente transacciones no vacías."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:793
-#: ../gnucash/report/standard-reports/transaction.scm:320
-msgid "Void only"
-msgstr "Solo vacío"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:794
-#: ../gnucash/report/standard-reports/transaction.scm:321
-msgid "Show only voided transactions."
-msgstr "Mostrar únicamente transacciones vacías."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:797
-#: ../gnucash/report/standard-reports/transaction.scm:324
-msgid "Both"
-msgstr "Ambos"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:798
-#: ../gnucash/report/standard-reports/transaction.scm:325
-msgid "Show both (and include void transactions in totals)."
-msgstr "Mostrar ambos (e incluir transacciones vacías en los totales)."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:808
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:859
-#: ../gnucash/report/standard-reports/transaction.scm:242
-msgid "Do not sort."
-msgstr "No ordenar."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:812
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:863
-#: ../gnucash/report/standard-reports/transaction.scm:149
-msgid "Sort & subtotal by account name."
-msgstr "Ordenar y subtotal por nombre de cuenta."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:816
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:867
-#: ../gnucash/report/standard-reports/transaction.scm:155
-msgid "Sort & subtotal by account code."
-msgstr "Ordenar y subtotal por código de cuenta."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:824
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:875
-#: ../gnucash/report/standard-reports/transaction.scm:167
-msgid "Sort by the Reconciled Date."
-msgstr "Ordenar por fecha de conciliación."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:827
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:878
-#: ../gnucash/report/standard-reports/transaction.scm:185
-msgid "Register Order"
-msgstr "Registrar Operación"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:828
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:879
-#: ../gnucash/report/standard-reports/transaction.scm:186
-msgid "Sort as in the register."
-msgstr "Ordenar como en el registro."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:832
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:883
-#: ../gnucash/report/standard-reports/transaction.scm:192
-msgid "Sort by account transferred from/to's name."
-msgstr "Ordena por nombre inicio/fin de cuenta transferida."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:836
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:887
-#: ../gnucash/report/standard-reports/transaction.scm:198
-msgid "Sort by account transferred from/to's code."
-msgstr "Ordena por código inicio/fin de cuenta transferida."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:848
-#: ../gnucash/report/standard-reports/transaction.scm:218
-msgid "Sort by check number/action."
-msgstr "Ordena por número comprobante/operación."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:852
-#: ../gnucash/report/standard-reports/transaction.scm:230
-msgid "Sort by transaction number."
-msgstr "Ordena por número de transacción."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:899
-#: ../gnucash/report/standard-reports/transaction.scm:224
-msgid "Sort by check/transaction number."
-msgstr "Ordena por número de comprobante/transacción."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:909
-#: ../gnucash/report/standard-reports/transaction.scm:353
-msgid "Smallest to largest, earliest to latest."
-msgstr "Menor a mayor, reciente a último."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:912
-#: ../gnucash/report/standard-reports/transaction.scm:356
-msgid "Largest to smallest, latest to earliest."
-msgstr "Más largo al más corto, último a primero."
+#: ../gnucash/report/standard-reports/transaction.scm:184
+#: ../gnucash/report/standard-reports/transaction.scm:763
+#: ../gnucash/report/standard-reports/transaction.scm:839
+#: ../gnucash/report/standard-reports/transaction.scm:916
+msgid "Other Account Name"
+msgstr "Nombre de otra cuenta"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:916
-#: ../gnucash/report/standard-reports/transaction.scm:266
-msgid "None."
-msgstr "Ninguna."
+#. other account name option appears here
+#: ../gnucash/report/standard-reports/general-ledger.scm:86
+#: ../gnucash/report/standard-reports/general-ledger.scm:106
+#: ../gnucash/report/standard-reports/transaction.scm:771
+#: ../gnucash/report/standard-reports/transaction.scm:801
+#: ../gnucash/report/standard-reports/transaction.scm:936
+msgid "Use Full Other Account Name"
+msgstr "Emplee Nombre Completo de Otra Cuenta"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:917
-#: ../gnucash/report/standard-reports/transaction.scm:278
-msgid "Weekly."
-msgstr "Semanalm."
+#: ../gnucash/report/standard-reports/general-ledger.scm:87
+#: ../gnucash/report/standard-reports/general-ledger.scm:107
+#: ../gnucash/report/standard-reports/transaction.scm:190
+#: ../gnucash/report/standard-reports/transaction.scm:775
+#: ../gnucash/report/standard-reports/transaction.scm:802
+#: ../gnucash/report/standard-reports/transaction.scm:934
+msgid "Other Account Code"
+msgstr "Código de otra cuenta"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:918
-#: ../gnucash/report/standard-reports/transaction.scm:284
-msgid "Monthly."
-msgstr "Mensualm."
+#: ../gnucash/report/standard-reports/general-ledger.scm:94
+#: ../gnucash/report/standard-reports/general-ledger.scm:114
+#: ../gnucash/report/standard-reports/transaction.scm:767
+#: ../gnucash/report/standard-reports/transaction.scm:878
+#: ../gnucash/report/standard-reports/transaction.scm:964
+msgid "Sign Reverses"
+msgstr "Firma Inversa"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:919
-#: ../gnucash/report/standard-reports/transaction.scm:290
-msgid "Quarterly."
-msgstr "Trimestral."
+#. Display
+#: ../gnucash/report/standard-reports/general-ledger.scm:121
+#: ../gnucash/report/standard-reports/transaction.scm:62
+msgid "Detail Level"
+msgstr "Nivel de Detalles"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:920
-#: ../gnucash/report/standard-reports/transaction.scm:296
-msgid "Yearly."
-msgstr "Anualm."
+#: ../gnucash/report/standard-reports/general-ledger.scm:134
+#: ../gnucash/report/standard-reports/transaction.scm:66
+msgid "Primary Key"
+msgstr "Clave Primaria"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:973
-#: ../gnucash/report/standard-reports/transaction.scm:638
-msgid "Sort by this criterion first."
-msgstr "Ordenar por este criterio primero."
+#: ../gnucash/report/standard-reports/general-ledger.scm:135
+#: ../gnucash/report/standard-reports/transaction.scm:70
+#: ../gnucash/report/standard-reports/transaction.scm:938
+msgid "Show Full Account Name"
+msgstr "Mostrar nombres de cuentas completas"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:984
-msgid "Show the full account name for subtotals and subtitles?"
-msgstr "¿Mostrar el nombre de cuenta completo en subtotales y subtítulos?"
+#: ../gnucash/report/standard-reports/general-ledger.scm:136
+#: ../gnucash/report/standard-reports/transaction.scm:71
+#: ../gnucash/report/standard-reports/transaction.scm:937
+msgid "Show Account Code"
+msgstr "Mostrar Código de Cuenta"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:991
-msgid "Show the account code for subtotals and subtitles?"
-msgstr "¿Mostrar el código de cuenta para subtotales y subtítulos?"
+#: ../gnucash/report/standard-reports/general-ledger.scm:137
+#: ../gnucash/report/standard-reports/transaction.scm:67
+msgid "Primary Subtotal"
+msgstr "Subtotal principal"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:998
-#: ../gnucash/report/standard-reports/transaction.scm:691
-msgid "Subtotal according to the primary key?"
-msgstr "¿Subtotal de acuerdo a la clave primaria?"
+#: ../gnucash/report/standard-reports/general-ledger.scm:138
+#: ../gnucash/report/standard-reports/transaction.scm:69
+msgid "Primary Subtotal for Date Key"
+msgstr "Subtotal principal para la clave Fecha"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1007
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1043
-#: ../gnucash/report/standard-reports/transaction.scm:700
-#: ../gnucash/report/standard-reports/transaction.scm:736
-msgid "Do a date subtotal."
-msgstr "Hacer un subtotal por fecha."
+#: ../gnucash/report/standard-reports/general-ledger.scm:139
+#: ../gnucash/report/standard-reports/transaction.scm:68
+msgid "Primary Sort Order"
+msgstr "Tipo de Ordenación Principal"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1014
-#: ../gnucash/report/standard-reports/transaction.scm:707
-msgid "Order of primary sorting."
-msgstr "Operación de ordenación primaria."
+#: ../gnucash/report/standard-reports/general-ledger.scm:140
+#: ../gnucash/report/standard-reports/transaction.scm:76
+msgid "Secondary Key"
+msgstr "Clave Secundaria"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1023
-#: ../gnucash/report/standard-reports/transaction.scm:716
-msgid "Sort by this criterion second."
-msgstr "Ordenar por este criterio segundo."
+#: ../gnucash/report/standard-reports/general-ledger.scm:141
+#: ../gnucash/report/standard-reports/transaction.scm:77
+msgid "Secondary Subtotal"
+msgstr "Subtotal Secundario"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1034
-#: ../gnucash/report/standard-reports/transaction.scm:727
-msgid "Subtotal according to the secondary key?"
-msgstr "¿Subtotal de acuerdo a la clave secundaria?"
+#: ../gnucash/report/standard-reports/general-ledger.scm:142
+#: ../gnucash/report/standard-reports/transaction.scm:79
+msgid "Secondary Subtotal for Date Key"
+msgstr "Subtotal secundario para clave de fecha"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1050
-#: ../gnucash/report/standard-reports/transaction.scm:743
-msgid "Order of Secondary sorting."
-msgstr "Operación de ordenación secundaria."
+#: ../gnucash/report/standard-reports/general-ledger.scm:143
+#: ../gnucash/report/standard-reports/transaction.scm:78
+msgid "Secondary Sort Order"
+msgstr "Tipo de Orden Secundario"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1065
-#: ../gnucash/report/standard-reports/transaction.scm:789
-msgid "Display the reconciled date?"
-msgstr "¿Enseñar la fecha de conciliación?"
+#. Define the strings here to avoid typos and make changes easier.
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:38
+msgid "Income & GST Statement"
+msgstr "Declaración de Ingresos & GST"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1067
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1068
-#: ../gnucash/report/standard-reports/register.scm:421
-#: ../gnucash/report/standard-reports/transaction.scm:791
-#: ../gnucash/report/standard-reports/transaction.scm:792
-msgid "Display the check number?"
-msgstr "¿Enseñar el número comprobante?"
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:42
+msgid ""
+"This report is useful to calculate periodic business tax payable/receivable from\n"
+" authorities. From <i>Edit report options</i> above, choose your Business Income and Business Expense accounts.\n"
+" Each transaction may contain, in addition to the accounts payable/receivable or bank accounts,\n"
+" a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100."
+msgstr ""
+"Este boletín es útil para calcular imposiciones periódicas de negocios desde\n"
+" autoridades. Desde <i>Opciones de edición del boletín</i> encima, elija sus cuentas de Ingresos de Negocios y Liquidaciones\n"
+" de Negocios. Cada transacción quizá contenga, en adición a las cuentas liquidables/recibidas o cuentas bancarias,\n"
+" un desglose a una cuenta imponible, p. e. Ingreso:Ventas -1000€, Pasivo:GST en Ventas -100€, Activo:Banca 1100€."
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1070
-#: ../gnucash/report/standard-reports/transaction.scm:794
-msgid "Display the notes if the memo is unavailable?"
-msgstr "¿Enseñar las anotaciones si el memorándum no está disponible?"
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:47
+msgid ""
+"These tax accounts can either be populated using the standard register, or from Business Invoices and Bills\n"
+" which will require Business > Sales Tax Tables to be set up correctly. Please see the documentation."
+msgstr ""
+"Estas cuentas impositivas pueden o ser completadas empleando el registro común, o desde Facturas\n"
+" Negociadas y Recibos los cuales requerirán Negocios → Impositiva sobre Ventas para ser configurada\n"
+" correctamente. Por favor vea la documentación."
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1072
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1075
-#: ../gnucash/report/standard-reports/transaction.scm:796
-#: ../gnucash/report/standard-reports/transaction.scm:799
-msgid "Display the full account name?"
-msgstr "¿Enseñar el nombre completo de la cuenta?"
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:50
+msgid "From the Report Options, you will need to select the accounts which will hold the GST/VAT taxes collected or paid. These accounts must contain splits which document the monies which are wholly sent or claimed from tax authorities during periodic GST/VAT returns. These accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales."
+msgstr "Desde las Opciones del Boletín, necesitará seleccionar las cuentas las cuales conservarán las imposiciones TIV/IVA recogidas o pagadas. Estas cuentas deberían contener desgloses las cuales documentan las monedas que quieran envían o reclamar desde autoridades impositivas durante las devoluciones TIV/IVA periódicas. Estas cuentas deben ser de tipo ACTIVOS para imposiciones abonadas en gastos, y de tipo PASIVOS para imposiciones recogidas en ventas."
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1073
-#: ../gnucash/report/standard-reports/transaction.scm:797
-msgid "Display the account code?"
-msgstr "¿Enseñar el código de cuenta?"
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:89
+msgid "Tax Accounts"
+msgstr "Cuentas Impositivas"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1076
-#: ../gnucash/report/standard-reports/transaction.scm:800
-msgid "Display the other account code?"
-msgstr "¿Enseñar el código de la otra cuenta?"
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:90
+msgid "Please find and select the accounts which will hold the tax collected or paid. These accounts must contain splits which document the monies which are wholly sent or claimed from tax authorities during periodic GST/VAT returns. These accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales."
+msgstr "Por favor encuentre y seleccione las cuentas las cuales mantendrán las imposiciones recorgidas o abonadas. Estas cuentas deben contener desgloses cuyo documenta las monedas las cuales están enviadas o reclamadas desde autoridades impositivas durante devoluciones periódicas de TIV/IVA. Estas cuentas deben ser de tipo ACTIVO para imposiciones abonadas en gastos, y tipo PASIVO para imposiciones recogidas en ventas."
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1081
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1233
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:104
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:207
 msgid "Individual income columns"
 msgstr "Columnas de ingresos individuales"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1081
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:104
 msgid "Display individual income columns rather than their sum"
 msgstr "Enseña columnas ingresantes individuales en vez de su sumatorio"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1082
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1242
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:105
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:231
 msgid "Individual expense columns"
 msgstr "Columnas de cargos individuales"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1082
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:105
 msgid "Display individual expense columns rather than their sum"
 msgstr "Enseña columnas de desembolsos individuales en vez de su sumatorio"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1083
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1237
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1246
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:106
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:217
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:241
 msgid "Individual tax columns"
 msgstr "Columnas de imposiciones individuales"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1083
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:106
 msgid "Display individual tax columns rather than their sum"
 msgstr "Enseña columnas impositivas individuales en vez de su sumatorio"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1084
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1250
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:107
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:251
 msgid "Remittance amount"
 msgstr "Cantidad remitida"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1084
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:107
 msgid "Display the remittance amount (total sales - total purchases)"
 msgstr "Enseñar la cantidad aportada (ventas totales - adquisiciones totales)"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1085
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1253
-#: ../gnucash/report/standard-reports/trial-balance.scm:1071
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:108
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:257
+#: ../gnucash/report/standard-reports/trial-balance.scm:1070
 msgid "Net Income"
 msgstr "Ingreso Neto"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1085
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:108
 msgid "Display the net income (sales without tax - purchases without tax)"
 msgstr "Enseñar el ingreso neto (ventas sin imposiciones - adquisiciones sin imposiciones)"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1086
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1256
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:109
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:263
 msgid "Tax payable"
 msgstr "Liquidación impositiva"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1086
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:109
 msgid "Display the tax payable (tax on sales - tax on purchases)"
 msgstr "Enseñar la imposición liquidable (imposiciones sobre ventas - adquisiciones)"
 
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1087
-msgid "Reverse amount display for income-related columns."
-msgstr "Revertir cantidad enseñada para columnas de Ingresos empleadas."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1094
-#: ../gnucash/report/standard-reports/transaction.scm:811
-msgid "Display the trans number?"
-msgstr "¿Enseñar el núm. de la transacción?"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1101
-#: ../gnucash/report/standard-reports/register.scm:431
-#: ../gnucash/report/standard-reports/transaction.scm:818
-msgid "Display the memo?"
-msgstr "¿Enseñar el memorándum?"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1113
-#: ../gnucash/report/standard-reports/transaction.scm:828
-msgid "Display the account name?"
-msgstr "¿Enseñar el nombre de la cuenta?"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1125
-#: ../gnucash/report/standard-reports/transaction.scm:838
-msgid "Display the other account name? (if this is a split transaction, this parameter is guessed)."
-msgstr "¿Enseñar el nombre de la otra cuenta? (si este es una transacción con múltiples desgloses, este parámetro se adivina)."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1153
-msgid "From %s To %s"
-msgstr "Origen %s Destino %s"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1157
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1163
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1169
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1175
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1181
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:102
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:109
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:116
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:123
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:130
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:138
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:146
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:154
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:195
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:196
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:197
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:198
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:199
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:202
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:205
-#: ../gnucash/report/stylesheets/stylesheet-easy.scm:207
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:96
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:103
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:110
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:117
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:124
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:132
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:140
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:148
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:189
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:190
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:191
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:192
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:193
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:196
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:199
-#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:201
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:115
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:122
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:129
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:136
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:143
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:151
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:159
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:167
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:209
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:210
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:211
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:212
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:213
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:216
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:219
-#: ../gnucash/report/stylesheets/stylesheet-footer.scm:221
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:171
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:178
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:185
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:192
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:199
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:207
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:215
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:223
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:274
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:275
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:276
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:277
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:278
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:281
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:284
-#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:286
-#: ../gnucash/report/stylesheets/stylesheet-plain.scm:63
-msgid "Colors"
-msgstr "Colores"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1158
-msgid "Primary Subtotals/headings"
-msgstr "Subtotales/encabezados principales"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1164
-msgid "Secondary Subtotals/headings"
-msgstr "Subtotales/encabezados secundarios"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1176
-msgid "Split Odd"
-msgstr "Desglose impar"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1182
-msgid "Split Even"
-msgstr "Desglose par"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1772
-#: ../gnucash/report/standard-reports/transaction.scm:109
-msgid "No matching transactions found"
-msgstr "No se han encontrado transacciones cotejadas"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1774
-#: ../gnucash/report/standard-reports/transaction.scm:110
-msgid "No transactions were found that match the time interval and account selection specified in the Options panel."
-msgstr "No se han encontrado transacciones cotejadas con el intervalo de tiempo y la cuenta seleccionada especificadas en el panel de Opciones."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1791
-msgid ""
-"This report is useful to calculate periodic business tax payable/receivable from\n"
-" authorities. From <i>Edit report options</i> above, choose your Business Income and Business Expense accounts.\n"
-" Each transaction may contain, in addition to the accounts payable/receivable or bank accounts,\n"
-" a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100."
-msgstr ""
-"Este boletín es útil para calcular imposiciones periódicas de negocios desde\n"
-" autoridades. Desde <i>Opciones de edición del boletín</i> encima, elija sus cuentas de Ingresos de Negocios y Liquidaciones\n"
-" de Negocios. Cada transacción quizá contenga, en adición a las cuentas liquidables/recibidas o cuentas bancarias,\n"
-" un desglose a una cuenta imponible, p. e. Ingreso:Ventas -1000€, Pasivo:GST en Ventas -100€, Activo:Banca 1100€."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1797
-msgid ""
-"These tax accounts can either be populated using the standard register, or from Business Invoices and Bills\n"
-" which will require Business > Sales Tax Tables to be set up correctly. Please see the documentation."
-msgstr ""
-"Estas cuentas impositivas pueden o ser completadas empleando el registro común, o desde Facturas\n"
-" Negociadas y Recibos los cuales requerirán Negocios → Impositiva sobre Ventas para ser configurada\n"
-" correctamente. Por favor vea la documentación."
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1810
-msgid "No accounts were matched"
-msgstr "Ninguna cuenta fue cotejada"
-
-#: ../gnucash/report/standard-reports/income-gst-statement.scm:1812
-msgid "The account matcher specified in the report options did not match any accounts."
-msgstr "La cuenta cotejadora especificada dentro de las opciones del boletín no coincidió con ninguna de las cuentas."
+#: ../gnucash/report/standard-reports/income-gst-statement.scm:151
+#: ../gnucash/report/standard-reports/transaction.scm:85
+msgid "Common Currency"
+msgstr "Moneda común"
 
-#: ../gnucash/report/standard-reports/income-statement.scm:97
+#: ../gnucash/report/standard-reports/income-statement.scm:96
 msgid "Label the trading accounts section"
 msgstr "Etiqueta la sección de cuentas mercantiles"
 
-#: ../gnucash/report/standard-reports/income-statement.scm:99
+#: ../gnucash/report/standard-reports/income-statement.scm:98
 msgid "Whether or not to include a label for the trading accounts section."
 msgstr "Si se debe o no incluir una etiqueta para la sección de cuentas bursátiles."
 
-#: ../gnucash/report/standard-reports/income-statement.scm:100
+#: ../gnucash/report/standard-reports/income-statement.scm:99
 msgid "Include trading accounts total"
 msgstr "Incluir las cuentas con saldos totales a cero"
 
-#: ../gnucash/report/standard-reports/income-statement.scm:102
+#: ../gnucash/report/standard-reports/income-statement.scm:101
 msgid "Whether or not to include a line indicating total trading accounts balance."
 msgstr "Si se debe o no incluir una línea indicando el saldo de cuentas bursátiles totales."
 
-#: ../gnucash/report/standard-reports/income-statement.scm:622
+#: ../gnucash/report/standard-reports/income-statement.scm:434
+msgid "For Period Covering %s to %s"
+msgstr "Para un Periodo cubriendo %s hasta %s"
+
+#: ../gnucash/report/standard-reports/income-statement.scm:621
 #: ../libgnucash/engine/Account.cpp:4114 ../libgnucash/engine/Scrub.c:429
 #: ../libgnucash/engine/Scrub.c:494
 msgid "Trading"
 msgstr "Comercial"
 
-#: ../gnucash/report/standard-reports/income-statement.scm:630
+#: ../gnucash/report/standard-reports/income-statement.scm:629
 msgid "Total Trading"
 msgstr "Total Comercial"
 
-#: ../gnucash/report/standard-reports/income-statement.scm:719
-#: ../gnucash/report/standard-reports/trial-balance.scm:618
+#: ../gnucash/report/standard-reports/income-statement.scm:718
+#: ../gnucash/report/standard-reports/trial-balance.scm:617
 msgid "Income Statement"
 msgstr "Declaración Ingresante"
 
-#: ../gnucash/report/standard-reports/income-statement.scm:720
+#: ../gnucash/report/standard-reports/income-statement.scm:719
 msgid "Profit & Loss"
 msgstr "Beneficio y Pérdidas"
 
 #. included since Bug726449
 #. for regexp-substitute/global, used by jpqplot
 #. for jqplot-escape-string
-#: ../gnucash/report/standard-reports/net-barchart.scm:45
-#: ../gnucash/report/standard-reports/net-linechart.scm:41
+#: ../gnucash/report/standard-reports/net-barchart.scm:44
+#: ../gnucash/report/standard-reports/net-linechart.scm:40
 msgid "Income/Expense Chart"
 msgstr "Diagrama de Ingresos/Gastos"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:56
-#: ../gnucash/report/standard-reports/net-linechart.scm:52
-#: ../gnucash/report/standard-reports/price-scatter.scm:52
+#: ../gnucash/report/standard-reports/net-barchart.scm:55
+#: ../gnucash/report/standard-reports/net-linechart.scm:51
+#: ../gnucash/report/standard-reports/price-scatter.scm:50
 msgid "Show Net Profit"
 msgstr "Mostrar Beneficio Neto"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:58
-#: ../gnucash/report/standard-reports/price-scatter.scm:54
+#: ../gnucash/report/standard-reports/net-barchart.scm:57
+#: ../gnucash/report/standard-reports/price-scatter.scm:52
 msgid "Show Asset & Liability bars"
 msgstr "Mostrar barras de Activo y Pasivo"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:59
-#: ../gnucash/report/standard-reports/price-scatter.scm:55
+#: ../gnucash/report/standard-reports/net-barchart.scm:58
+#: ../gnucash/report/standard-reports/price-scatter.scm:53
 msgid "Show Net Worth bars"
 msgstr "Mostrar barras de Valor Neto"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:116
-#: ../gnucash/report/standard-reports/net-linechart.scm:122
+#: ../gnucash/report/standard-reports/net-barchart.scm:115
+#: ../gnucash/report/standard-reports/net-linechart.scm:121
 msgid "Show Income and Expenses?"
 msgstr "¿Muestro ingresos y gastos?"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:117
-#: ../gnucash/report/standard-reports/net-linechart.scm:123
+#: ../gnucash/report/standard-reports/net-barchart.scm:116
+#: ../gnucash/report/standard-reports/net-linechart.scm:122
 msgid "Show the Asset and the Liability bars?"
 msgstr "¿Muestro las barras de Activo y Pasivo?"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:126
-#: ../gnucash/report/standard-reports/net-linechart.scm:132
+#: ../gnucash/report/standard-reports/net-barchart.scm:125
+#: ../gnucash/report/standard-reports/net-linechart.scm:131
 msgid "Show the net profit?"
 msgstr "¿Muestro el ganancia neta?"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:127
-#: ../gnucash/report/standard-reports/net-linechart.scm:133
+#: ../gnucash/report/standard-reports/net-barchart.scm:126
+#: ../gnucash/report/standard-reports/net-linechart.scm:132
 msgid "Show a Net Worth bar?"
 msgstr "¿Muestro una barra de Valor Neto?"
 
+#: ../gnucash/report/standard-reports/net-barchart.scm:372
+#: ../gnucash/report/standard-reports/net-barchart.scm:434
+#: ../gnucash/report/standard-reports/net-linechart.scm:415
+#: ../gnucash/report/standard-reports/net-linechart.scm:488
+msgid "Net Profit"
+msgstr "Beneficio Neto"
+
 #: ../gnucash/report/standard-reports/net-barchart.scm:373
 #: ../gnucash/report/standard-reports/net-barchart.scm:435
 #: ../gnucash/report/standard-reports/net-linechart.scm:416
 #: ../gnucash/report/standard-reports/net-linechart.scm:489
-msgid "Net Profit"
-msgstr "Beneficio Neto"
-
-#: ../gnucash/report/standard-reports/net-barchart.scm:374
-#: ../gnucash/report/standard-reports/net-barchart.scm:436
-#: ../gnucash/report/standard-reports/net-linechart.scm:417
-#: ../gnucash/report/standard-reports/net-linechart.scm:490
 msgid "Net Worth"
 msgstr "Valor Neto"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:484
+#: ../gnucash/report/standard-reports/net-barchart.scm:483
 msgid "Net Worth Barchart"
 msgstr "Barra Gráfica de Valor Neto"
 
-#: ../gnucash/report/standard-reports/net-barchart.scm:494
+#: ../gnucash/report/standard-reports/net-barchart.scm:493
 msgid "Income & Expense Barchart"
 msgstr "Barra Gráfica de Ingreso y Gasto"
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:54
+#: ../gnucash/report/standard-reports/net-linechart.scm:53
 msgid "Show Asset & Liability"
 msgstr "Mostrar Activo y Pasivo"
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:55
+#: ../gnucash/report/standard-reports/net-linechart.scm:54
 msgid "Show Net Worth"
 msgstr "Mostrar Valor Neto"
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:60
+#: ../gnucash/report/standard-reports/net-linechart.scm:59
 msgid "Line Width"
 msgstr "Ancho de Línea"
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:61
+#: ../gnucash/report/standard-reports/net-linechart.scm:60
 msgid "Set line width in pixels."
 msgstr "Establece el ancho de la línea en píxeles."
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:63
+#: ../gnucash/report/standard-reports/net-linechart.scm:62
 msgid "Data markers?"
 msgstr "¿Datos de mercados?"
 
 #. (define optname-x-grid (N_ "X grid"))
-#: ../gnucash/report/standard-reports/net-linechart.scm:66
+#: ../gnucash/report/standard-reports/net-linechart.scm:65
 msgid "Grid"
 msgstr "Cuadrícula"
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:158
+#: ../gnucash/report/standard-reports/net-linechart.scm:157
 msgid "Add grid lines."
 msgstr "Añadir líneas de rejilla."
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:170
+#: ../gnucash/report/standard-reports/net-linechart.scm:169
 msgid "Display a mark for each data point."
 msgstr "Enseña un marcaje por cada punto de datos."
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:536
+#: ../gnucash/report/standard-reports/net-linechart.scm:535
 msgid "Net Worth Linechart"
 msgstr "Línea Gráfica de Valor Neto"
 
-#: ../gnucash/report/standard-reports/net-linechart.scm:548
+#: ../gnucash/report/standard-reports/net-linechart.scm:547
 msgid "Income & Expense Linechart"
 msgstr "Diagrama Lineal de Ingresos y Gastos"
 
-#: ../gnucash/report/standard-reports/portfolio.scm:35
+#: ../gnucash/report/standard-reports/portfolio.scm:33
 msgid "Investment Portfolio"
 msgstr "Cartera de Inversiones"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:43
+#: ../gnucash/report/standard-reports/price-scatter.scm:41
 msgid "Price of Commodity"
 msgstr "Precio de Bien"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:45
+#: ../gnucash/report/standard-reports/price-scatter.scm:43
 msgid "Invert prices"
 msgstr "Precio de inventario"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:57
+#: ../gnucash/report/standard-reports/price-scatter.scm:55
 msgid "Marker"
 msgstr "Marcador"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:58
+#: ../gnucash/report/standard-reports/price-scatter.scm:56
 msgid "Marker Color"
 msgstr "Color del marcador"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:83
+#: ../gnucash/report/standard-reports/price-scatter.scm:81
 msgid "Calculate the price of this commodity."
 msgstr "Calcula el precio de esta mercancía."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:95
+#: ../gnucash/report/standard-reports/price-scatter.scm:93
 msgid "Actual Transactions"
 msgstr "Transacciones Efectivas"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:96
+#: ../gnucash/report/standard-reports/price-scatter.scm:94
 msgid "The instantaneous price of actual currency transactions in the past."
 msgstr "El precio instantáneo efectivo de las transacciones monetarias en el pasado."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:99
+#: ../gnucash/report/standard-reports/price-scatter.scm:97
 msgid "The recorded prices."
 msgstr "Los precios registrados."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:106
+#: ../gnucash/report/standard-reports/price-scatter.scm:104
 msgid "Plot commodity per currency rather than currency per commodity."
 msgstr "Esquematiza mercancía por moneda en vez de moneda por mercancía."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:122
+#: ../gnucash/report/standard-reports/price-scatter.scm:120
 msgid "Color of the marker."
 msgstr "Color del marcador."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:232
+#: ../gnucash/report/standard-reports/price-scatter.scm:230
 msgid "Double-Weeks"
 msgstr "Quincenal"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:313
+#: ../gnucash/report/standard-reports/price-scatter.scm:311
 msgid "All Prices equal"
 msgstr "Todas los precios iguales"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:314
+#: ../gnucash/report/standard-reports/price-scatter.scm:312
 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."
 msgstr "Todas los precios encontrados son iguales. Esto generaría un gráfico con una línea recta. Desgraciadamente, la herramienta de gráficos no lo puede generar."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:319
+#: ../gnucash/report/standard-reports/price-scatter.scm:317
 msgid "All Prices at the same date"
 msgstr "Todas los precios en la misma fecha"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:320
+#: ../gnucash/report/standard-reports/price-scatter.scm:318
 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."
 msgstr "Todas los precios encontrados son de la misma fecha. Esto generaría un gráfico con una línea recta. Desgraciadamente, la herramienta de gráficos no puede generar eso."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:327
+#: ../gnucash/report/standard-reports/price-scatter.scm:325
 msgid "Only one price"
 msgstr "Sólo un precio"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:328
+#: ../gnucash/report/standard-reports/price-scatter.scm:326
 msgid "There was only one single price found for the selected commodities in the selected time period. This doesn't give a useful plot."
 msgstr "Hubo solo un único precio encontrado para las mercancías seleccionadas dentro del periodo del tiempo seleccionado. Esto no da un trazo útil."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:333
+#: ../gnucash/report/standard-reports/price-scatter.scm:331
 msgid "There is no price information available for the selected commodities in the selected time period."
 msgstr "No hay información de cotización disponible para las mercancías seleccionadas en el periodo de tiempo seleccionado."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:338
+#: ../gnucash/report/standard-reports/price-scatter.scm:336
 msgid "Identical commodities"
 msgstr "Mercancías idénticas"
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:339
+#: ../gnucash/report/standard-reports/price-scatter.scm:337
 msgid "Your selected commodity and the currency of the report are identical. It doesn't make sense to show prices for identical commodities."
 msgstr "Ha elegido una mercancía y una moneda para el boletín que son idénticos. No tiene sentido mostrar precios para mercancías idénticas."
 
-#: ../gnucash/report/standard-reports/price-scatter.scm:351
+#: ../gnucash/report/standard-reports/price-scatter.scm:349
 msgid "Price Scatterplot"
 msgstr "Dispersión de precios"
 
@@ -23900,12 +23295,23 @@ msgstr "El título para este boletín."
 msgid "Display the check number/action?"
 msgstr "¿Enseñar la número comprobante/operación?"
 
+#: ../gnucash/report/standard-reports/register.scm:421
+#: ../gnucash/report/standard-reports/transaction.scm:793
+#: ../gnucash/report/standard-reports/transaction.scm:794
+msgid "Display the check number?"
+msgstr "¿Enseñar el número comprobante?"
+
+#: ../gnucash/report/standard-reports/register.scm:431
+#: ../gnucash/report/standard-reports/transaction.scm:820
+msgid "Display the memo?"
+msgstr "¿Enseñar el memorándum?"
+
 #: ../gnucash/report/standard-reports/register.scm:436
 msgid "Display the account?"
 msgstr "¿Enseñar la cuenta?"
 
 #: ../gnucash/report/standard-reports/register.scm:441
-#: ../gnucash/report/standard-reports/transaction.scm:801
+#: ../gnucash/report/standard-reports/transaction.scm:803
 msgid "Display the number of shares?"
 msgstr "¿Enseñar el número de mercancías?"
 
@@ -23914,33 +23320,33 @@ msgid "Display the name of lot the shares are in?"
 msgstr "¿Enseñar el nombre del lote de mercancías que posea?"
 
 #: ../gnucash/report/standard-reports/register.scm:451
-#: ../gnucash/report/standard-reports/transaction.scm:802
+#: ../gnucash/report/standard-reports/transaction.scm:804
 msgid "Display the shares price?"
 msgstr "¿Enseñar el precio de mercancías?"
 
 #: ../gnucash/report/standard-reports/register.scm:456
-#: ../gnucash/report/standard-reports/transaction.scm:863
+#: ../gnucash/report/standard-reports/transaction.scm:865
 msgid "Display the amount?"
 msgstr "¿Enseñar la cantidad?"
 
 #: ../gnucash/report/standard-reports/register.scm:459
-#: ../gnucash/report/standard-reports/transaction.scm:853
-#: ../gnucash/report/standard-reports/transaction.scm:867
+#: ../gnucash/report/standard-reports/transaction.scm:855
+#: ../gnucash/report/standard-reports/transaction.scm:869
 msgid "Single"
 msgstr "Único"
 
 #: ../gnucash/report/standard-reports/register.scm:459
-#: ../gnucash/report/standard-reports/transaction.scm:867
+#: ../gnucash/report/standard-reports/transaction.scm:869
 msgid "Single Column Display."
 msgstr "Enseñar Una Columna."
 
 #: ../gnucash/report/standard-reports/register.scm:460
-#: ../gnucash/report/standard-reports/transaction.scm:868
+#: ../gnucash/report/standard-reports/transaction.scm:870
 msgid "Double"
 msgstr "Doble"
 
 #: ../gnucash/report/standard-reports/register.scm:460
-#: ../gnucash/report/standard-reports/transaction.scm:868
+#: ../gnucash/report/standard-reports/transaction.scm:870
 msgid "Two Column Display."
 msgstr "Enseñar  Dos Columnas."
 
@@ -23949,7 +23355,7 @@ msgid "Display the value in transaction currency?"
 msgstr "¿Enseñar el valor en la Transacción de la moneda?"
 
 #: ../gnucash/report/standard-reports/register.scm:470
-#: ../gnucash/report/standard-reports/transaction.scm:804
+#: ../gnucash/report/standard-reports/transaction.scm:806
 msgid "Display a running balance?"
 msgstr "¿Enseñar el balance actual?"
 
@@ -23982,166 +23388,294 @@ msgid "Client"
 msgstr "Cliente"
 
 # Menú
-#: ../gnucash/report/standard-reports/sx-summary.scm:45
+#: ../gnucash/report/standard-reports/sx-summary.scm:44
 msgid "Future Scheduled Transactions Summary"
 msgstr "Totales de transacciones programadas futuras"
 
-#: ../gnucash/report/standard-reports/transaction.scm:75
-#: ../gnucash/report/standard-reports/transaction.scm:926
+#: ../gnucash/report/standard-reports/transaction.scm:72
+#: ../gnucash/report/standard-reports/transaction.scm:939
 msgid "Show Account Description"
 msgstr "Mostrar Descripción de Cuenta"
 
-#: ../gnucash/report/standard-reports/transaction.scm:76
+#: ../gnucash/report/standard-reports/transaction.scm:73
 msgid "Show Informal Debit/Credit Headers"
 msgstr "Mostrar Cabeceras Informales de Débitos y Créditos"
 
-#: ../gnucash/report/standard-reports/transaction.scm:77
+#: ../gnucash/report/standard-reports/transaction.scm:74
 msgid "Show subtotals only (hide transactional data)"
 msgstr "Mostrar únicamente subtotales (ocultar fechas transaccional)"
 
-#: ../gnucash/report/standard-reports/transaction.scm:78
+#: ../gnucash/report/standard-reports/transaction.scm:75
 msgid "Add indenting columns"
 msgstr "Añade columnas indentadas"
 
-#: ../gnucash/report/standard-reports/transaction.scm:89
+#: ../gnucash/report/standard-reports/transaction.scm:84
+msgid "Table for Exporting"
+msgstr "Tabla Exportante"
+
+#: ../gnucash/report/standard-reports/transaction.scm:86
 msgid "Show original currency amount"
 msgstr "Mostrar cantidad monetaria original"
 
-#: ../gnucash/report/standard-reports/transaction.scm:91
+#: ../gnucash/report/standard-reports/transaction.scm:88
 msgid "Add options summary"
 msgstr "Añade sumarios de opciones"
 
 #. Filtering
-#: ../gnucash/report/standard-reports/transaction.scm:94
+#: ../gnucash/report/standard-reports/transaction.scm:91
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../gnucash/report/standard-reports/transaction.scm:95
+#: ../gnucash/report/standard-reports/transaction.scm:92
 msgid "Account Name Filter"
 msgstr "Filtro por Nombre de Cuenta"
 
-#: ../gnucash/report/standard-reports/transaction.scm:96
+#: ../gnucash/report/standard-reports/transaction.scm:93
 msgid "Use regular expressions for account name filter"
 msgstr "Emplear expresiones regulares para filtrar nombres de cuentas"
 
-#: ../gnucash/report/standard-reports/transaction.scm:97
+#: ../gnucash/report/standard-reports/transaction.scm:94
 msgid "Transaction Filter"
 msgstr "Filtro de Transacción"
 
-#: ../gnucash/report/standard-reports/transaction.scm:98
+#: ../gnucash/report/standard-reports/transaction.scm:95
 msgid "Use regular expressions for transaction filter"
 msgstr "Emplear expresión regular para filtrar transacción"
 
-#: ../gnucash/report/standard-reports/transaction.scm:99
+#: ../gnucash/report/standard-reports/transaction.scm:96
 msgid "Reconcile Status"
 msgstr "Conciliar Estado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:113
-msgid "No matching accounts found"
-msgstr "Ninguna cuenta coincidente encontrada"
+#: ../gnucash/report/standard-reports/transaction.scm:106
+msgid "No matching transactions found"
+msgstr "No se han encontrado transacciones cotejadas"
+
+#: ../gnucash/report/standard-reports/transaction.scm:107
+msgid "No transactions were found that match the time interval and account selection specified in the Options panel."
+msgstr "No se han encontrado transacciones cotejadas con el intervalo de tiempo y la cuenta seleccionada especificadas en el panel de Opciones."
 
-#: ../gnucash/report/standard-reports/transaction.scm:114
-msgid "No account were found that match the options specified in the Options panels."
-msgstr "No se han encontrado ninguna cuenta cotejadas con las opciones especificadas en el panel de Opciones."
+#: ../gnucash/report/standard-reports/transaction.scm:142
+msgid "Sort & subtotal by account name."
+msgstr "Ordenar y subtotal por nombre de cuenta."
 
-#: ../gnucash/report/standard-reports/transaction.scm:173
+#: ../gnucash/report/standard-reports/transaction.scm:148
+msgid "Sort & subtotal by account code."
+msgstr "Ordenar y subtotal por código de cuenta."
+
+#: ../gnucash/report/standard-reports/transaction.scm:160
+msgid "Sort by the Reconciled Date."
+msgstr "Ordenar por fecha de conciliación."
+
+#: ../gnucash/report/standard-reports/transaction.scm:166
 msgid "Reconciled Status"
 msgstr "Estado Conciliado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:174
+#: ../gnucash/report/standard-reports/transaction.scm:167
 msgid "Sort by the Reconciled Status"
 msgstr "Ordenar por Estado de Conciliado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:178
-#: ../gnucash/report/standard-reports/transaction.scm:337
+#: ../gnucash/report/standard-reports/transaction.scm:171
+#: ../gnucash/report/standard-reports/transaction.scm:330
 msgid "Unreconciled"
 msgstr "Desconciliado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:272
+#: ../gnucash/report/standard-reports/transaction.scm:178
+msgid "Register Order"
+msgstr "Registrar Operación"
+
+#: ../gnucash/report/standard-reports/transaction.scm:179
+msgid "Sort as in the register."
+msgstr "Ordenar como en el registro."
+
+#: ../gnucash/report/standard-reports/transaction.scm:185
+msgid "Sort by account transferred from/to's name."
+msgstr "Ordena por nombre inicio/fin de cuenta transferida."
+
+#: ../gnucash/report/standard-reports/transaction.scm:191
+msgid "Sort by account transferred from/to's code."
+msgstr "Ordena por código inicio/fin de cuenta transferida."
+
+#: ../gnucash/report/standard-reports/transaction.scm:211
+msgid "Sort by check number/action."
+msgstr "Ordena por número comprobante/operación."
+
+#: ../gnucash/report/standard-reports/transaction.scm:217
+msgid "Sort by check/transaction number."
+msgstr "Ordena por número de comprobante/transacción."
+
+#: ../gnucash/report/standard-reports/transaction.scm:223
+msgid "Sort by transaction number."
+msgstr "Ordena por número de transacción."
+
+#: ../gnucash/report/standard-reports/transaction.scm:235
+msgid "Do not sort."
+msgstr "No ordenar."
+
+#: ../gnucash/report/standard-reports/transaction.scm:259
+msgid "None."
+msgstr "Ninguna."
+
+#: ../gnucash/report/standard-reports/transaction.scm:265
 msgid "Daily."
 msgstr "Diariamente."
 
-#: ../gnucash/report/standard-reports/transaction.scm:334
+#: ../gnucash/report/standard-reports/transaction.scm:271
+msgid "Weekly."
+msgstr "Semanalm."
+
+#: ../gnucash/report/standard-reports/transaction.scm:277
+msgid "Monthly."
+msgstr "Mensualm."
+
+#: ../gnucash/report/standard-reports/transaction.scm:283
+msgid "Quarterly."
+msgstr "Trimestral."
+
+#: ../gnucash/report/standard-reports/transaction.scm:289
+msgid "Yearly."
+msgstr "Anualm."
+
+#: ../gnucash/report/standard-reports/transaction.scm:296
+msgid "Do not do any filtering."
+msgstr "No hace ningún filtrado."
+
+#: ../gnucash/report/standard-reports/transaction.scm:299
+msgid "Include Transactions to/from Filter Accounts"
+msgstr "Incluye Transacciones origen/destino de Cuentas Filtradas"
+
+#: ../gnucash/report/standard-reports/transaction.scm:300
+msgid "Include transactions to/from filter accounts only."
+msgstr "Incluir transacciones origen/destino únicamente en cuentas de filtro."
+
+#: ../gnucash/report/standard-reports/transaction.scm:303
+msgid "Exclude Transactions to/from Filter Accounts"
+msgstr "Excluir Cuentas Filtradas de Transacciones Origen/Destino"
+
+#: ../gnucash/report/standard-reports/transaction.scm:304
+msgid "Exclude transactions to/from all filter accounts."
+msgstr "Excluye a todas las cuentas filtradas por transacciones de origen/destino."
+
+#: ../gnucash/report/standard-reports/transaction.scm:309
+msgid "Non-void only"
+msgstr "Sólo no vacío"
+
+#: ../gnucash/report/standard-reports/transaction.scm:310
+msgid "Show only non-voided transactions."
+msgstr "Mostrar únicamente transacciones no vacías."
+
+#: ../gnucash/report/standard-reports/transaction.scm:313
+msgid "Void only"
+msgstr "Solo vacío"
+
+#: ../gnucash/report/standard-reports/transaction.scm:314
+msgid "Show only voided transactions."
+msgstr "Mostrar únicamente transacciones vacías."
+
+#: ../gnucash/report/standard-reports/transaction.scm:317
+msgid "Both"
+msgstr "Ambos"
+
+#: ../gnucash/report/standard-reports/transaction.scm:318
+msgid "Show both (and include void transactions in totals)."
+msgstr "Mostrar ambos (e incluir transacciones vacías en los totales)."
+
+#: ../gnucash/report/standard-reports/transaction.scm:327
 msgid "Show All Transactions"
 msgstr "Mostrar Todas Transacciones"
 
-#: ../gnucash/report/standard-reports/transaction.scm:338
+#: ../gnucash/report/standard-reports/transaction.scm:331
 msgid "Unreconciled only"
 msgstr "Solo desconciliado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:342
+#: ../gnucash/report/standard-reports/transaction.scm:335
 msgid "Cleared only"
 msgstr "Solo punteado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:346
+#: ../gnucash/report/standard-reports/transaction.scm:339
 msgid "Reconciled only"
 msgstr "Solo conciliado"
 
-#: ../gnucash/report/standard-reports/transaction.scm:362
+#: ../gnucash/report/standard-reports/transaction.scm:346
+msgid "Smallest to largest, earliest to latest."
+msgstr "Menor a mayor, reciente a último."
+
+#: ../gnucash/report/standard-reports/transaction.scm:349
+msgid "Largest to smallest, latest to earliest."
+msgstr "Más largo al más corto, último a primero."
+
+#: ../gnucash/report/standard-reports/transaction.scm:355
 msgid "Use Global Preference"
 msgstr "Emplear Preferencia Global"
 
-#: ../gnucash/report/standard-reports/transaction.scm:363
+#: ../gnucash/report/standard-reports/transaction.scm:356
 msgid "Use reversing option specified in global preference."
 msgstr "Emplee opción de reversión especificada en preferencia global."
 
-#: ../gnucash/report/standard-reports/transaction.scm:368
+#: ../gnucash/report/standard-reports/transaction.scm:361
 msgid "Don't change any displayed amounts."
 msgstr "No cambiar ninguna cantidad enseñada."
 
-#: ../gnucash/report/standard-reports/transaction.scm:372
+#: ../gnucash/report/standard-reports/transaction.scm:365
 msgid "Income and Expense"
 msgstr "Ingresos y gastos"
 
-#: ../gnucash/report/standard-reports/transaction.scm:373
+#: ../gnucash/report/standard-reports/transaction.scm:366
 msgid "Reverse amount display for Income and Expense Accounts."
 msgstr "Revertir cantidad enseñada para Cuentas de Ingresos y Gastos."
 
-#: ../gnucash/report/standard-reports/transaction.scm:377
+#: ../gnucash/report/standard-reports/transaction.scm:370
 msgid "Credit Accounts"
 msgstr "Cuentas de Crédito"
 
-#: ../gnucash/report/standard-reports/transaction.scm:378
+#: ../gnucash/report/standard-reports/transaction.scm:371
 msgid "Reverse amount display for Liability, Payable, Equity, Credit Card, and Income accounts."
 msgstr "Revertir cantidad enseñada para cuentas Pasivas, Liquidables, Patrimonios, Tarjetas de Crédito e Ingresos."
 
-#: ../gnucash/report/standard-reports/transaction.scm:448
+#: ../gnucash/report/standard-reports/transaction.scm:435
+msgid "Convert all transactions into a common currency."
+msgstr "Convertir todas las transacciones a una moneda común."
+
+#: ../gnucash/report/standard-reports/transaction.scm:452
 msgid "Also show original currency amounts"
 msgstr "Además mostrar cantidades en moneda original"
 
-#: ../gnucash/report/standard-reports/transaction.scm:458
+#: ../gnucash/report/standard-reports/transaction.scm:457
+msgid "Formats the table suitable for cut & paste exporting with extra cells."
+msgstr "Formatea la lengüeta de adecuadamente para exportarla cortando y pegando casillas adicionales."
+
+#: ../gnucash/report/standard-reports/transaction.scm:462
 msgid "Add summary of options."
 msgstr "Añadir resumen de opciones."
 
-#: ../gnucash/report/standard-reports/transaction.scm:464
+#: ../gnucash/report/standard-reports/transaction.scm:468
 msgid "If no transactions matched"
 msgstr "Si ninguna transacción cotejada"
 
-#: ../gnucash/report/standard-reports/transaction.scm:465
+#: ../gnucash/report/standard-reports/transaction.scm:469
 msgid "Display summary if no transactions were matched."
 msgstr "Enseñar resumen si ninguna transación ha sido cotejada."
 
-#: ../gnucash/report/standard-reports/transaction.scm:467
+#: ../gnucash/report/standard-reports/transaction.scm:471
 msgid "Always"
 msgstr "Siempre"
 
-#: ../gnucash/report/standard-reports/transaction.scm:468
+#: ../gnucash/report/standard-reports/transaction.scm:472
 msgid "Always display summary."
 msgstr "Siempre enseñar resumen."
 
-#: ../gnucash/report/standard-reports/transaction.scm:471
+#: ../gnucash/report/standard-reports/transaction.scm:475
 msgid "Disable report summary."
 msgstr "Desactivar boletín resumen."
 
-#: ../gnucash/report/standard-reports/transaction.scm:478
+#: ../gnucash/report/standard-reports/transaction.scm:482
 msgid "Show only accounts whose full name matches this filter e.g. ':Travel' will match Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, which will disable the filter."
 msgstr "Mostrar solo cuentas cuyo nombre completo coincide con este filtro p. e. ':Viaje' cotejará Gastos:Viaje:Vacaciones y Gastos:Negocios:Viaje. Puede dejarse en blanco, lo cual desactiva el filtro."
 
-#: ../gnucash/report/standard-reports/transaction.scm:487
+#: ../gnucash/report/standard-reports/transaction.scm:491
 msgid "By default the account filter will search substring only. Set this to true to enable full POSIX regular expressions capabilities. 'Car|Flights' will match both Expenses:Car and Expenses:Flights. Use a period (.) to match a single character e.g. '20../.' will match 'Travel 2017/1 London'. "
 msgstr "Por defecto el filtro de la cuenta buscará subcadenas únicamente. Estalezca esto a verdadero para actuvar capacidad completa de expresión regular POSIX. 'Vehículo|Vuelo' coincidirá ambas Gastos:Vehículo y Gastos:Vuelos. Emplee un punto (.) para coincidir con un solo carácter, p. e. '20../.' coincidirá 'Viaje 2017/1 Londres'. "
 
-#: ../gnucash/report/standard-reports/transaction.scm:496
+#: ../gnucash/report/standard-reports/transaction.scm:500
 msgid ""
 "Show only transactions where description, notes, or memo matches this filter.\n"
 "e.g. '#gift' will find all transactions with #gift in description, notes or memo. It can be left blank, which will disable the filter."
@@ -24149,181 +23683,259 @@ msgstr ""
 "Mostrar solo transacciones donde descripción, anotaciones, o memorandum coincide con este filtro.\n"
 "p. e. '#gift' encontrará todoas las transacciones con #gift en descripción, anotaciones o memorándum. Puede dejarse en blanco, lo cual desactiva el filtro."
 
-#: ../gnucash/report/standard-reports/transaction.scm:505
-msgid "By default the transaction filter will search substring only. Set this to true to enable full POSIX regular expressions capabilities. '#work|#family' will match both tags within description, notes or memo. "
-msgstr "Por defecto el filtro transacional solo buscará subcadenas. Establezca esto a verdadero para activar habilidad de expresión regular POSIX. '#trabajo|#familia' coincidirá con ambas marcas dentro de descripción, anotaciones o memorandum. "
+#: ../gnucash/report/standard-reports/transaction.scm:509
+msgid "By default the transaction filter will search substring only. Set this to true to enable full POSIX regular expressions capabilities. '#work|#family' will match both tags within description, notes or memo. "
+msgstr "Por defecto el filtro transacional solo buscará subcadenas. Establezca esto a verdadero para activar habilidad de expresión regular POSIX. '#trabajo|#familia' coincidirá con ambas marcas dentro de descripción, anotaciones o memorandum. "
+
+#: ../gnucash/report/standard-reports/transaction.scm:517
+msgid "Filter by reconcile status."
+msgstr "Filtrar por boletín conciliado."
+
+#: ../gnucash/report/standard-reports/transaction.scm:524
+msgid "How to handle void transactions."
+msgstr "Como manipular transacciones vacías."
+
+#: ../gnucash/report/standard-reports/transaction.scm:547
+msgid "Filter on these accounts."
+msgstr "Filtrar en estas cuentas."
+
+#: ../gnucash/report/standard-reports/transaction.scm:555
+msgid "Filter account."
+msgstr "Filtrar cuenta."
+
+#: ../gnucash/report/standard-reports/transaction.scm:640
+msgid "Sort by this criterion first."
+msgstr "Ordenar por este criterio primero."
+
+#: ../gnucash/report/standard-reports/transaction.scm:651
+msgid "Show the full account name for subtotals and subheadings?"
+msgstr "¿Mostrar el nombre de cuenta completo en subtotales y subtítulos?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:658
+msgid "Show the account code for subtotals and subheadings?"
+msgstr "¿Mostrar el código de cuenta para subtotales y subtítulos?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:665
+msgid "Show the account description for subheadings?"
+msgstr "¿Mostrar la descripción de cuenta para subtítulos?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:672
+msgid "Show the informal headers for debit/credit accounts?"
+msgstr "¿Muestro las cabeceras informales para cuentas de débitos/créditos?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:679
+msgid "Add indenting columns with grouping and subtotals?"
+msgstr "¿Añadir columnas indentadas con agrupación y subtotales?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:686
+msgid "Show subtotals only, hiding transactional detail?"
+msgstr "¿Mostrar únicamente subtotales, ocultando detalle transaccional?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:693
+msgid "Subtotal according to the primary key?"
+msgstr "¿Subtotal de acuerdo a la clave primaria?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:702
+#: ../gnucash/report/standard-reports/transaction.scm:738
+msgid "Do a date subtotal."
+msgstr "Hacer un subtotal por fecha."
+
+#: ../gnucash/report/standard-reports/transaction.scm:709
+msgid "Order of primary sorting."
+msgstr "Operación de ordenación primaria."
+
+#: ../gnucash/report/standard-reports/transaction.scm:718
+msgid "Sort by this criterion second."
+msgstr "Ordenar por este criterio segundo."
+
+#: ../gnucash/report/standard-reports/transaction.scm:729
+msgid "Subtotal according to the secondary key?"
+msgstr "¿Subtotal de acuerdo a la clave secundaria?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:745
+msgid "Order of Secondary sorting."
+msgstr "Operación de ordenación secundaria."
 
-#: ../gnucash/report/standard-reports/transaction.scm:513
-msgid "Filter by reconcile status."
-msgstr "Filtrar por boletín conciliado."
+#: ../gnucash/report/standard-reports/transaction.scm:791
+msgid "Display the reconciled date?"
+msgstr "¿Enseñar la fecha de conciliación?"
 
-#: ../gnucash/report/standard-reports/transaction.scm:649
-msgid "Show the full account name for subtotals and subheadings?"
-msgstr "¿Mostrar el nombre de cuenta completo en subtotales y subtítulos?"
+#: ../gnucash/report/standard-reports/transaction.scm:796
+msgid "Display the notes if the memo is unavailable?"
+msgstr "¿Enseñar las anotaciones si el memorándum no está disponible?"
 
-#: ../gnucash/report/standard-reports/transaction.scm:656
-msgid "Show the account code for subtotals and subheadings?"
-msgstr "¿Mostrar el código de cuenta para subtotales y subtítulos?"
+#: ../gnucash/report/standard-reports/transaction.scm:798
+#: ../gnucash/report/standard-reports/transaction.scm:801
+msgid "Display the full account name?"
+msgstr "¿Enseñar el nombre completo de la cuenta?"
 
-#: ../gnucash/report/standard-reports/transaction.scm:663
-msgid "Show the account description for subheadings?"
-msgstr "¿Mostrar la descripción de cuenta para subtítulos?"
+#: ../gnucash/report/standard-reports/transaction.scm:799
+msgid "Display the account code?"
+msgstr "¿Enseñar el código de cuenta?"
 
-#: ../gnucash/report/standard-reports/transaction.scm:670
-msgid "Show the informal headers for debit/credit accounts?"
-msgstr "¿Muestro las cabeceras informales para cuentas de débitos/créditos?"
+#: ../gnucash/report/standard-reports/transaction.scm:802
+msgid "Display the other account code?"
+msgstr "¿Enseñar el código de la otra cuenta?"
 
-#: ../gnucash/report/standard-reports/transaction.scm:677
-msgid "Add indenting columns with grouping and subtotals?"
-msgstr "¿Añadir columnas indentadas con agrupación y subtotales?"
+#: ../gnucash/report/standard-reports/transaction.scm:813
+msgid "Display the trans number?"
+msgstr "¿Enseñar el núm. de la transacción?"
 
-#: ../gnucash/report/standard-reports/transaction.scm:684
-msgid "Show subtotals only, hiding transactional detail?"
-msgstr "¿Mostrar únicamente subtotales, ocultando detalle transaccional?"
+#: ../gnucash/report/standard-reports/transaction.scm:830
+msgid "Display the account name?"
+msgstr "¿Enseñar el nombre de la cuenta?"
+
+#: ../gnucash/report/standard-reports/transaction.scm:840
+msgid "Display the other account name? (if this is a split transaction, this parameter is guessed)."
+msgstr "¿Enseñar el nombre de la otra cuenta? (si este es una transacción con múltiples desgloses, este parámetro se adivina)."
 
-#: ../gnucash/report/standard-reports/transaction.scm:847
+#: ../gnucash/report/standard-reports/transaction.scm:849
 msgid "Amount of detail to display per transaction."
 msgstr "Cantidad de detalle a enseñar por transacción."
 
-#: ../gnucash/report/standard-reports/transaction.scm:850
+#: ../gnucash/report/standard-reports/transaction.scm:852
 msgid "Multi-Line"
 msgstr "Multi-Línea"
 
-#: ../gnucash/report/standard-reports/transaction.scm:851
+#: ../gnucash/report/standard-reports/transaction.scm:853
 msgid "Display all splits in a transaction on a separate line."
 msgstr "Enseñar todos los desgloses dentro de una transacción en una línea separada."
 
-#: ../gnucash/report/standard-reports/transaction.scm:854
+#: ../gnucash/report/standard-reports/transaction.scm:856
 msgid "Display one line per transaction, merging multiple splits where required."
 msgstr "Enseña una línea por transacción, uniendo múltiples desgloses donde se requieran."
 
-#: ../gnucash/report/standard-reports/transaction.scm:866
+#: ../gnucash/report/standard-reports/transaction.scm:868
 msgid "No amount display."
 msgstr "No enseñar cantidad."
 
-#: ../gnucash/report/standard-reports/transaction.scm:877
+#: ../gnucash/report/standard-reports/transaction.scm:879
 msgid "Reverse amount display for certain account types."
 msgstr "Revertir cantidad enseñada para cierto tipo de cuentas."
 
-#: ../gnucash/report/standard-reports/transaction.scm:1728
-msgid "Disabled"
-msgstr "Deshabilitado"
+#: ../gnucash/report/standard-reports/transaction.scm:997
+msgid "Num/T-Num"
+msgstr "Núm/T-Núm"
 
-#: ../gnucash/report/standard-reports/transaction.scm:1736
-#: ../gnucash/report/standard-reports/transaction.scm:1753
-msgid " regex"
-msgstr " expreg"
+#: ../gnucash/report/standard-reports/transaction.scm:1044
+msgid "Transfer from/to"
+msgstr "Contrapartida/Destino"
+
+#: ../gnucash/report/standard-reports/transaction.scm:1337
+msgid "Total For "
+msgstr "Total para  "
 
-#: ../gnucash/report/standard-reports/transaction.scm:1740
-msgid "Accounts produced"
-msgstr "Cuentas producidad"
+#: ../gnucash/report/standard-reports/transaction.scm:1349
+msgid "Split Transaction"
+msgstr "Desglose de Transacción"
 
-#: ../gnucash/report/standard-reports/transaction.scm:1896
-msgid "From %s to %s"
-msgstr "Origen %s Destino %s"
+#: ../gnucash/report/standard-reports/transaction.scm:1848
+#, scheme-format
+msgid "From ~a to ~a"
+msgstr "Origen ~a destino ~a"
 
-#: ../gnucash/report/standard-reports/transaction.scm:1914
+#: ../gnucash/report/standard-reports/transaction.scm:1871
 msgid "Reconciliation Report"
 msgstr "Boletín Conciliación"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:61
-#: ../gnucash/report/standard-reports/trial-balance.scm:615
+#: ../gnucash/report/standard-reports/trial-balance.scm:60
+#: ../gnucash/report/standard-reports/trial-balance.scm:614
 msgid "Trial Balance"
 msgstr "Balance de Comprobación"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:71
+#: ../gnucash/report/standard-reports/trial-balance.scm:70
 msgid "Start of Adjusting/Closing"
 msgstr "Comienzo de Ajuste/Cierre"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:72
+#: ../gnucash/report/standard-reports/trial-balance.scm:71
 msgid "Date of Report"
 msgstr "Fecha de Boletín"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:73
+#: ../gnucash/report/standard-reports/trial-balance.scm:72
 msgid "Report variation"
 msgstr "Variante boletinada"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:74
+#: ../gnucash/report/standard-reports/trial-balance.scm:73
 msgid "Kind of trial balance to generate."
 msgstr "Familia de balance de ajuste a generar."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:84
+#: ../gnucash/report/standard-reports/trial-balance.scm:83
 msgid "Merchandising"
 msgstr "Mercantilidad"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:85
+#: ../gnucash/report/standard-reports/trial-balance.scm:84
 msgid "Gross adjustment accounts."
 msgstr "Ajuste de tonalidades de cuentas."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:87
+#: ../gnucash/report/standard-reports/trial-balance.scm:86
 msgid "Do not net, but show gross debit/credit adjustments to these accounts. Merchandising businesses will normally select their inventory accounts here."
 msgstr "No mostrar neto, pero mostrar ajustes de débito/crédito de esas cuentas. Las negocios de mercado generalmente seleccionarán aquí sus cuentas de inventario."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:88
+#: ../gnucash/report/standard-reports/trial-balance.scm:87
 msgid "Income summary accounts"
 msgstr "Resumen de cuentas de ingresos"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:90
+#: ../gnucash/report/standard-reports/trial-balance.scm:89
 msgid "Adjustments made to these accounts are gross adjusted (see above) in the Adjustments, Adjusted Trial Balance, and Income Statement columns. Mostly useful for merchandising businesses."
 msgstr "Los ajustes realizados sobre estas cuentas se ajustan (ver arriba) en las columnas Ajustes, Saldo de Prueba Ajustado y Declaración de Ingresos. Útil para empresas mercantiles."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:93
+#: ../gnucash/report/standard-reports/trial-balance.scm:92
 msgid "Adjusting Entries pattern"
 msgstr "Patrón de Ajuste de Asientos"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:95
+#: ../gnucash/report/standard-reports/trial-balance.scm:94
 msgid "Any text in the Description column which identifies adjusting entries."
 msgstr "Cualquier texto en la columna Descripción el cual identifica asientos de ajuste."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:97
+#: ../gnucash/report/standard-reports/trial-balance.scm:96
 msgid "Adjusting Entries pattern is case-sensitive"
 msgstr "Patrón de Ajuste de Asiento distingue mayúsculas"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:99
+#: ../gnucash/report/standard-reports/trial-balance.scm:98
 msgid "Causes the Adjusting Entries Pattern match to be case-sensitive."
 msgstr "Ocasiona que el cotejo del Ajuste del Patrón de Asientos distingue mayúsculas."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:101
+#: ../gnucash/report/standard-reports/trial-balance.scm:100
 msgid "Adjusting Entries Pattern is regular expression"
 msgstr "Patrón de Ajuste de Asientos es expresión regular"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:103
+#: ../gnucash/report/standard-reports/trial-balance.scm:102
 msgid "Causes the Adjusting Entries Pattern to be treated as a regular expression."
 msgstr "Ocasiona que el Ajuste del Patrón de Asientos sea tratado como una expresión regular."
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:167
+#: ../gnucash/report/standard-reports/trial-balance.scm:166
 msgid "Current Trial Balance"
 msgstr "Balance de Prueba Actual"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:168
+#: ../gnucash/report/standard-reports/trial-balance.scm:167
 msgid "Uses the exact balances in the general journal"
 msgstr "Emplee los balances exactos en el libro diario"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:170
+#: ../gnucash/report/standard-reports/trial-balance.scm:169
 msgid "Pre-adjustment Trial Balance"
 msgstr "Saldo de Prueba Anterior al Ajuste"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:171
+#: ../gnucash/report/standard-reports/trial-balance.scm:170
 msgid "Ignores Adjusting/Closing entries"
 msgstr "Ignora asientos de Ajuste/Cierre"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:173
+#: ../gnucash/report/standard-reports/trial-balance.scm:172
 msgid "Work Sheet"
 msgstr "Hoja de Operación"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:174
+#: ../gnucash/report/standard-reports/trial-balance.scm:173
 msgid "Creates a complete end-of-period work sheet"
 msgstr "Crea una hoja de operación del final-del-periodo completo"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:616
+#: ../gnucash/report/standard-reports/trial-balance.scm:615
 msgid "Adjustments"
 msgstr "Ajustes"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:617
+#: ../gnucash/report/standard-reports/trial-balance.scm:616
 msgid "Adjusted Trial Balance"
 msgstr "Balance de Prueba Ajustado"
 
-#: ../gnucash/report/standard-reports/trial-balance.scm:1071
+#: ../gnucash/report/standard-reports/trial-balance.scm:1070
 msgid "Net Loss"
 msgstr "Pérdida Neta"
 
@@ -24557,6 +24169,74 @@ msgstr "Logotipo"
 msgid "Company logo image."
 msgstr "Imagen del logotipo de la sociedad."
 
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:102
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:109
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:116
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:123
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:130
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:138
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:146
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:154
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:195
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:196
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:197
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:198
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:199
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:202
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:205
+#: ../gnucash/report/stylesheets/stylesheet-easy.scm:207
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:96
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:103
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:110
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:117
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:124
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:132
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:140
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:148
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:189
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:190
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:191
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:192
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:193
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:196
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:199
+#: ../gnucash/report/stylesheets/stylesheet-fancy.scm:201
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:115
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:122
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:129
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:136
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:143
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:151
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:159
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:167
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:209
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:210
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:211
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:212
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:213
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:216
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:219
+#: ../gnucash/report/stylesheets/stylesheet-footer.scm:221
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:171
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:178
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:185
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:192
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:199
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:207
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:215
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:223
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:274
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:275
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:276
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:277
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:278
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:281
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:284
+#: ../gnucash/report/stylesheets/stylesheet-head-or-tail.scm:286
+#: ../gnucash/report/stylesheets/stylesheet-plain.scm:63
+msgid "Colors"
+msgstr "Colores"
+
 #: ../gnucash/report/stylesheets/stylesheet-easy.scm:103
 #: ../gnucash/report/stylesheets/stylesheet-easy.scm:195
 #: ../gnucash/report/stylesheets/stylesheet-fancy.scm:97
@@ -25146,8 +24826,9 @@ msgid "This is a sample GnuCash report. See the guile (scheme) source code in th
 msgstr "Este es un ejemplo de informe de GnuCash. Vea el código fuente en guile (scheme) en el directorio scm/report para detalles sobre cómo escribir sus propios informes, o extender los boletines existentes."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:348
-msgid "For help on writing reports, or to contribute your brand new, totally cool report, consult the mailing list %s."
-msgstr "Para obtener ayuda sobre la escritura de boletines o para contribuir con sus nuevos y totalmente fabulosos boletines, consulte la lista de correo %s."
+#, scheme-format
+msgid "For help on writing reports, or to contribute your brand new, totally cool report, consult the mailing list ~a."
+msgstr "Para ayuda acerca de la escritura de boletines, o para contribuir con sus nuevos y totalmente fabulosos boletines, consulte la lista de correo ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:353
 msgid "For details on subscribing to that list, see <http://www.gnucash.org/>."
@@ -25158,12 +24839,14 @@ msgid "You can learn more about writing scheme at <http://www.scheme.com/tspl
 msgstr "Puede aprender más sobre escribir scheme en <http://www.scheme.com/tspl2d/>."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:358
-msgid "The current time is %s."
-msgstr "La hora actual es %s."
+#, scheme-format
+msgid "The current time is ~a."
+msgstr "La hora actual es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:363
-msgid "The boolean option is %s."
-msgstr "La opción booleana es %s."
+#, scheme-format
+msgid "The boolean option is ~a."
+msgstr "La opción booleana es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:364
 msgid "true"
@@ -25174,36 +24857,44 @@ msgid "false"
 msgstr "falso"
 
 #: ../gnucash/report/utility-reports/hello-world.scm:368
-msgid "The multi-choice option is %s."
-msgstr "La opción multiselección es %s."
+#, scheme-format
+msgid "The multi-choice option is ~a."
+msgstr "La opción multiselección es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:373
-msgid "The string option is %s."
-msgstr "La opción de cadena de texto es %s."
+#, scheme-format
+msgid "The string option is ~a."
+msgstr "La opción de cadena de texto es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:378
-msgid "The date option is %s."
-msgstr "La opción de fecha es %s."
+#, scheme-format
+msgid "The date option is ~a."
+msgstr "La opción de fecha es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:383
-msgid "The date and time option is %s."
-msgstr "La opción de fecha y hora es %s."
+#, scheme-format
+msgid "The date and time option is ~a."
+msgstr "La opción de fecha y hora es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:388
-msgid "The relative date option is %s."
-msgstr "La opción de fecha relativa es %s."
+#, scheme-format
+msgid "The relative date option is ~a."
+msgstr "La opción de fecha relativa es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:393
-msgid "The combination date option is %s."
-msgstr "La opción de fecha combinada es %s."
+#, scheme-format
+msgid "The combination date option is ~a."
+msgstr "La opción de fecha combinada es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:398
-msgid "The number option is %s."
-msgstr "La opción de número es %s."
+#, scheme-format
+msgid "The number option is ~a."
+msgstr "La opción numérica es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:409
-msgid "The number option formatted as currency is %s."
-msgstr "La opción de número formateado como moneda es %s."
+#, scheme-format
+msgid "The number option formatted as currency is ~a."
+msgstr "La opción numérica formateado como moneda es ~a."
 
 #: ../gnucash/report/utility-reports/hello-world.scm:421
 msgid "Items you selected:"
@@ -25241,28 +24932,28 @@ msgstr "Boletín Muestra con ejemplos"
 msgid "A sample report with examples."
 msgstr "Un boletín de muestra con varios ejemplos."
 
-#: ../gnucash/report/utility-reports/view-column.scm:56
-#: ../gnucash/report/utility-reports/view-column.scm:82
+#: ../gnucash/report/utility-reports/view-column.scm:54
+#: ../gnucash/report/utility-reports/view-column.scm:80
 msgid "Number of columns"
 msgstr "Número de columnas"
 
-#: ../gnucash/report/utility-reports/view-column.scm:57
+#: ../gnucash/report/utility-reports/view-column.scm:55
 msgid "Number of columns before wrapping to a new row."
 msgstr "Número de columnas anteriores a una fila nueva."
 
-#: ../gnucash/report/utility-reports/view-column.scm:177
+#: ../gnucash/report/utility-reports/view-column.scm:175
 msgid "Edit Options"
 msgstr "Editar Opciones"
 
-#: ../gnucash/report/utility-reports/view-column.scm:185
+#: ../gnucash/report/utility-reports/view-column.scm:183
 msgid "Single Report"
 msgstr "Boletín Sencillo"
 
-#: ../gnucash/report/utility-reports/view-column.scm:245
+#: ../gnucash/report/utility-reports/view-column.scm:243
 msgid "Multicolumn View"
 msgstr "Vista Multicolumna"
 
-#: ../gnucash/report/utility-reports/view-column.scm:247
+#: ../gnucash/report/utility-reports/view-column.scm:245
 msgid "Custom Multicolumn Report"
 msgstr "Boletín Multicolumna Personalizado"
 
@@ -25281,39 +24972,39 @@ msgstr "¡Bienvenido a GnuCash ~a!"
 msgid "GnuCash ~a has lots of nice features. Here are a few."
 msgstr "GnuCash ~a tiene muchas características interesantes. Aquí tiene algunas."
 
-#: ../libgnucash/app-utils/app-utils.scm:307
+#: ../libgnucash/app-utils/app-utils.scm:309
 msgid "Company Address"
 msgstr "Dirección de Sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:308
+#: ../libgnucash/app-utils/app-utils.scm:310
 msgid "Company ID"
 msgstr "ID de sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:309
+#: ../libgnucash/app-utils/app-utils.scm:311
 msgid "Company Phone Number"
 msgstr "Teléfono de Sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:310
+#: ../libgnucash/app-utils/app-utils.scm:312
 msgid "Company Fax Number"
 msgstr "Número de fax de Sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:311
+#: ../libgnucash/app-utils/app-utils.scm:313
 msgid "Company Website URL"
 msgstr "URL del Web de Sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:312
+#: ../libgnucash/app-utils/app-utils.scm:314
 msgid "Company Email Address"
 msgstr "Correo-e de Sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:313
+#: ../libgnucash/app-utils/app-utils.scm:315
 msgid "Company Contact Person"
 msgstr "Persona de Contacto de Sociedad"
 
-#: ../libgnucash/app-utils/app-utils.scm:314
+#: ../libgnucash/app-utils/app-utils.scm:316
 msgid "Fancy Date Format"
 msgstr "Formato de fecha adornado"
 
-#: ../libgnucash/app-utils/app-utils.scm:315
+#: ../libgnucash/app-utils/app-utils.scm:317
 msgid "custom"
 msgstr "personalizado"
 
@@ -25509,246 +25200,274 @@ msgstr "Marca para tener cuentas de mercado bursátil usadas para transacciones
 msgid "Budget to be used when none has been otherwise specified."
 msgstr "Presupuesto para utilizar cuando no se haya especificado de otra cosa."
 
-#: ../libgnucash/app-utils/date-utilities.scm:764
+#: ../libgnucash/app-utils/date-utilities.scm:94
+#, scheme-format
+msgid "~s to ~s"
+msgstr "~s a ~s"
+
+#: ../libgnucash/app-utils/date-utilities.scm:763
 msgid "First day of the current calendar year."
 msgstr "Primer día del año del calendario actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:771
+#: ../libgnucash/app-utils/date-utilities.scm:770
 msgid "Last day of the current calendar year."
 msgstr "Último día del año del calendario actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:778
+#: ../libgnucash/app-utils/date-utilities.scm:777
 msgid "First day of the previous calendar year."
 msgstr "Primer día del año anterior del calendario."
 
-#: ../libgnucash/app-utils/date-utilities.scm:785
+#: ../libgnucash/app-utils/date-utilities.scm:784
 msgid "Last day of the previous calendar year."
 msgstr "Último día del año anterior del calendario."
 
-#: ../libgnucash/app-utils/date-utilities.scm:789
+#: ../libgnucash/app-utils/date-utilities.scm:788
 msgid "Start of next year"
 msgstr "Inicio del año siguiente"
 
-#: ../libgnucash/app-utils/date-utilities.scm:792
+#: ../libgnucash/app-utils/date-utilities.scm:791
 msgid "First day of the next calendar year."
 msgstr "Primer día del año del siguiente calendario."
 
-#: ../libgnucash/app-utils/date-utilities.scm:796
+#: ../libgnucash/app-utils/date-utilities.scm:795
 msgid "End of next year"
 msgstr "Final del siguiente año"
 
-#: ../libgnucash/app-utils/date-utilities.scm:799
+#: ../libgnucash/app-utils/date-utilities.scm:798
 msgid "Last day of the next calendar year."
 msgstr "Último día del año siguiente del calendario."
 
-#: ../libgnucash/app-utils/date-utilities.scm:803
+#: ../libgnucash/app-utils/date-utilities.scm:802
 msgid "Start of accounting period"
 msgstr "Inicio del período contable"
 
-#: ../libgnucash/app-utils/date-utilities.scm:806
+#: ../libgnucash/app-utils/date-utilities.scm:805
 msgid "First day of the accounting period, as set in the global preferences."
 msgstr "Primer día del periodo contable, establecido en las preferencias globales."
 
-#: ../libgnucash/app-utils/date-utilities.scm:810
+#: ../libgnucash/app-utils/date-utilities.scm:809
 msgid "End of accounting period"
 msgstr "Final del periodo contable"
 
-#: ../libgnucash/app-utils/date-utilities.scm:813
+#: ../libgnucash/app-utils/date-utilities.scm:812
 msgid "Last day of the accounting period, as set in the global preferences."
 msgstr "Último día del periodo contable, establecido en las preferencias globales."
 
-#: ../libgnucash/app-utils/date-utilities.scm:820
+#: ../libgnucash/app-utils/date-utilities.scm:819
 msgid "First day of the current month."
 msgstr "Primer día del mes actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:827
+#: ../libgnucash/app-utils/date-utilities.scm:826
 msgid "Last day of the current month."
 msgstr "Último día del mes actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:834
+#: ../libgnucash/app-utils/date-utilities.scm:833
 msgid "First day of the previous month."
 msgstr "Primer día del mes anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:841
+#: ../libgnucash/app-utils/date-utilities.scm:840
 msgid "Last day of previous month."
 msgstr "Ultimo día del mes anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:845
+#: ../libgnucash/app-utils/date-utilities.scm:844
 msgid "Start of next month"
 msgstr "Inicio del mes siguiente"
 
-#: ../libgnucash/app-utils/date-utilities.scm:848
+#: ../libgnucash/app-utils/date-utilities.scm:847
 msgid "First day of the next month."
 msgstr "Primer día del mes siguiente."
 
-#: ../libgnucash/app-utils/date-utilities.scm:852
+#: ../libgnucash/app-utils/date-utilities.scm:851
 msgid "End of next month"
 msgstr "Final del mes siguiente"
 
-#: ../libgnucash/app-utils/date-utilities.scm:855
+#: ../libgnucash/app-utils/date-utilities.scm:854
 msgid "Last day of next month."
 msgstr "Último día del mes siguiente."
 
-#: ../libgnucash/app-utils/date-utilities.scm:859
+#: ../libgnucash/app-utils/date-utilities.scm:858
 msgid "Start of current quarter"
 msgstr "Inicio del trimestre actual"
 
-#: ../libgnucash/app-utils/date-utilities.scm:862
+#: ../libgnucash/app-utils/date-utilities.scm:861
 msgid "First day of the current quarterly accounting period."
 msgstr "Primer día del periodo trimestral contable actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:866
+#: ../libgnucash/app-utils/date-utilities.scm:865
 msgid "End of current quarter"
 msgstr "Final del trimestre actual"
 
-#: ../libgnucash/app-utils/date-utilities.scm:869
+#: ../libgnucash/app-utils/date-utilities.scm:868
 msgid "Last day of the current quarterly accounting period."
 msgstr "Último día del periodo trimestral contable actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:876
+#: ../libgnucash/app-utils/date-utilities.scm:875
 msgid "First day of the previous quarterly accounting period."
 msgstr "Primer día del periodo trimestral contable anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:883
+#: ../libgnucash/app-utils/date-utilities.scm:882
 msgid "Last day of previous quarterly accounting period."
 msgstr "Último día del periodo trimestral contable anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:887
+#: ../libgnucash/app-utils/date-utilities.scm:886
 msgid "Start of next quarter"
 msgstr "Inicio del trimestre siguiente"
 
-#: ../libgnucash/app-utils/date-utilities.scm:890
+#: ../libgnucash/app-utils/date-utilities.scm:889
 msgid "First day of the next quarterly accounting period."
 msgstr "Primer día del período trimestral contable siguiente."
 
-#: ../libgnucash/app-utils/date-utilities.scm:894
+#: ../libgnucash/app-utils/date-utilities.scm:893
 msgid "End of next quarter"
 msgstr "Final del trimestre siguiente"
 
-#: ../libgnucash/app-utils/date-utilities.scm:897
+#: ../libgnucash/app-utils/date-utilities.scm:896
 msgid "Last day of next quarterly accounting period."
 msgstr "Último día del período trimestral contable siguiente."
 
-#: ../libgnucash/app-utils/date-utilities.scm:903
+#: ../libgnucash/app-utils/date-utilities.scm:902
 msgid "The current date."
 msgstr "La fecha actual."
 
-#: ../libgnucash/app-utils/date-utilities.scm:907
+#: ../libgnucash/app-utils/date-utilities.scm:906
 msgid "One Month Ago"
 msgstr "Hace un mes"
 
-#: ../libgnucash/app-utils/date-utilities.scm:909
+#: ../libgnucash/app-utils/date-utilities.scm:908
 msgid "One Month Ago."
 msgstr "Un mes anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:913
+#: ../libgnucash/app-utils/date-utilities.scm:912
 msgid "One Week Ago"
 msgstr "Hace una semana"
 
-#: ../libgnucash/app-utils/date-utilities.scm:915
+#: ../libgnucash/app-utils/date-utilities.scm:914
 msgid "One Week Ago."
 msgstr "Una semana anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:919
+#: ../libgnucash/app-utils/date-utilities.scm:918
 msgid "Three Months Ago"
 msgstr "Hace tres meses"
 
-#: ../libgnucash/app-utils/date-utilities.scm:921
+#: ../libgnucash/app-utils/date-utilities.scm:920
 msgid "Three Months Ago."
 msgstr "Tres meses anteriores."
 
-#: ../libgnucash/app-utils/date-utilities.scm:925
+#: ../libgnucash/app-utils/date-utilities.scm:924
 msgid "Six Months Ago"
 msgstr "Hace seis meses"
 
-#: ../libgnucash/app-utils/date-utilities.scm:927
+#: ../libgnucash/app-utils/date-utilities.scm:926
 msgid "Six Months Ago."
 msgstr "Seis meses anteriores."
 
-#: ../libgnucash/app-utils/date-utilities.scm:930
+#: ../libgnucash/app-utils/date-utilities.scm:929
 msgid "One Year Ago"
 msgstr "Hace un año"
 
-#: ../libgnucash/app-utils/date-utilities.scm:932
+#: ../libgnucash/app-utils/date-utilities.scm:931
 msgid "One Year Ago."
 msgstr "Un año anterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:936
+#: ../libgnucash/app-utils/date-utilities.scm:935
 msgid "One Month Ahead"
 msgstr "Un mes por delante"
 
-#: ../libgnucash/app-utils/date-utilities.scm:938
+#: ../libgnucash/app-utils/date-utilities.scm:937
 msgid "One Month Ahead."
 msgstr "Un mes posterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:942
+#: ../libgnucash/app-utils/date-utilities.scm:941
 msgid "One Week Ahead"
 msgstr "Una semana por delante"
 
-#: ../libgnucash/app-utils/date-utilities.scm:944
+#: ../libgnucash/app-utils/date-utilities.scm:943
 msgid "One Week Ahead."
 msgstr "Una semana posterior."
 
-#: ../libgnucash/app-utils/date-utilities.scm:948
+#: ../libgnucash/app-utils/date-utilities.scm:947
 msgid "Three Months Ahead"
 msgstr "Tres meses por delante"
 
-#: ../libgnucash/app-utils/date-utilities.scm:950
+#: ../libgnucash/app-utils/date-utilities.scm:949
 msgid "Three Months Ahead."
 msgstr "Tres meses posteriores."
 
-#: ../libgnucash/app-utils/date-utilities.scm:954
+#: ../libgnucash/app-utils/date-utilities.scm:953
 msgid "Six Months Ahead"
 msgstr "Tras seis meses"
 
-#: ../libgnucash/app-utils/date-utilities.scm:956
+#: ../libgnucash/app-utils/date-utilities.scm:955
 msgid "Six Months Ahead."
 msgstr "Seis meses posteriores."
 
-#: ../libgnucash/app-utils/date-utilities.scm:959
+#: ../libgnucash/app-utils/date-utilities.scm:958
 msgid "One Year Ahead"
 msgstr "Un año por delante"
 
-#: ../libgnucash/app-utils/date-utilities.scm:961
+#: ../libgnucash/app-utils/date-utilities.scm:960
 msgid "One Year Ahead."
 msgstr "Un año posterior."
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:609
+#: ../libgnucash/app-utils/gnc-exp-parser.c:611
 msgid "Illegal variable in expression."
 msgstr "Variable ilegal en la expresión."
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:620
+#: ../libgnucash/app-utils/gnc-exp-parser.c:622
 msgid "Unbalanced parenthesis"
 msgstr "Paréntesis desequilibrados"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:622
+#: ../libgnucash/app-utils/gnc-exp-parser.c:624
 msgid "Stack overflow"
 msgstr "Desbordamiento de pila"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:624
+#: ../libgnucash/app-utils/gnc-exp-parser.c:626
 msgid "Stack underflow"
 msgstr "Subordamiento de pila"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:626
+#: ../libgnucash/app-utils/gnc-exp-parser.c:628
 msgid "Undefined character"
 msgstr "Carácter sin definir"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:628
+#: ../libgnucash/app-utils/gnc-exp-parser.c:630
 msgid "Not a variable"
 msgstr "No es una variable"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:630
+#: ../libgnucash/app-utils/gnc-exp-parser.c:632
 msgid "Not a defined function"
 msgstr "No es una función definida"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:632
+#: ../libgnucash/app-utils/gnc-exp-parser.c:634
 msgid "Out of memory"
 msgstr "Falta memoria"
 
-#: ../libgnucash/app-utils/gnc-exp-parser.c:634
+#: ../libgnucash/app-utils/gnc-exp-parser.c:636
 msgid "Numeric error"
 msgstr "Error numérico"
 
+#. Translators: A list of error messages from the Scheduled Transactions (SX).
+#. * They might appear in their editor or in "Since last run".
+#: ../libgnucash/app-utils/gnc-sx-instance-model.c:983
+#, c-format
+msgid "Unknown account for guid [%s], cancelling SX [%s] creation."
+msgstr "Cuenta desconocida para guid [%s], cancelando creación SX[%s]."
+
+#: ../libgnucash/app-utils/gnc-sx-instance-model.c:1035
+#, c-format
+msgid "Error parsing SX [%s] key [%s]=formula [%s] at [%s]: %s."
+msgstr "Error de interpretación SX [%s] clave [%s]=fórmula [%s] en [%s]: %s."
+
+#: ../libgnucash/app-utils/gnc-sx-instance-model.c:1089
+#: ../libgnucash/app-utils/gnc-sx-instance-model.c:1707
+#, c-format
+msgid "Error %d in SX [%s] final gnc_numeric value, using 0 instead."
+msgstr "Error %d en SX [%s] valor final gnc_numeric, empleando 0 en su lugar."
+
+#: ../libgnucash/app-utils/gnc-sx-instance-model.c:1716
+#, c-format
+msgid "No exchange rate available in SX [%s] for %s -> %s, value is zero."
+msgstr "Ningún tipo de cambio monetario disponible en SX [%s] para %s → %s, valor es cero."
+
 #. Translators: This and the following strings appear on
 #. * the account tab if the Tax Info column is displayed,
 #. * i.e. if the user wants to record the tax form number
@@ -25758,62 +25477,62 @@ msgstr "Error numérico"
 #. * account generally corresponds to a specific line number
 #. * on a paper form and each form has a unique
 #. * identification (e.g., Form 1040, Schedule A).
-#: ../libgnucash/app-utils/gnc-ui-util.c:472
+#: ../libgnucash/app-utils/gnc-ui-util.c:478
 msgid "Tax-related but has no tax code"
 msgstr "Imposición relativa pero sin código impositivo"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:486
+#: ../libgnucash/app-utils/gnc-ui-util.c:492
 msgid "Tax entity type not specified"
 msgstr "Tipo de entidad impositiva no especificado"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:559
+#: ../libgnucash/app-utils/gnc-ui-util.c:565
 #, c-format
 msgid "Tax type %s: invalid code %s for account type"
 msgstr "Tipo impositivo %s: código %s inválido para el tipo de cuenta"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:563
+#: ../libgnucash/app-utils/gnc-ui-util.c:569
 #, c-format
 msgid "Not tax-related; tax type %s: invalid code %s for account type"
 msgstr "No relacionado con fiscalidad; tipo impositivo %s: código %s inválido para el tipo de cuenta"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:576
+#: ../libgnucash/app-utils/gnc-ui-util.c:582
 #, c-format
 msgid "Invalid code %s for tax type %s"
 msgstr "Código %s inválido para el tipo impositivo %s"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:580
+#: ../libgnucash/app-utils/gnc-ui-util.c:586
 #, c-format
 msgid "Not tax-related; invalid code %s for tax type %s"
 msgstr "Sin relación fiscal; código %s inválido para el tipo impositivo %s"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:598
+#: ../libgnucash/app-utils/gnc-ui-util.c:604
 #, c-format
 msgid "No form: code %s, tax type %s"
 msgstr "Sin clase: código %s, tipo impositivo %s"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:602
+#: ../libgnucash/app-utils/gnc-ui-util.c:608
 #, c-format
 msgid "Not tax-related; no form: code %s, tax type %s"
 msgstr "No relacionada con fiscalidad; ninguna forma: código %s, tipo impositivo %s"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:619
-#: ../libgnucash/app-utils/gnc-ui-util.c:634
+#: ../libgnucash/app-utils/gnc-ui-util.c:625
+#: ../libgnucash/app-utils/gnc-ui-util.c:640
 #, c-format
 msgid "No description: form %s, code %s, tax type %s"
 msgstr "Sin descripción: formulario %s, código %s, tipo impositivo %s"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:623
-#: ../libgnucash/app-utils/gnc-ui-util.c:638
+#: ../libgnucash/app-utils/gnc-ui-util.c:629
+#: ../libgnucash/app-utils/gnc-ui-util.c:644
 #, c-format
 msgid "Not tax-related; no description: form %s, code %s, tax type %s"
 msgstr "No relacionada con fiscalidad; no hay ninguna descripción: clase: %s, código: %s, tipo impositivo: %s"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:661
+#: ../libgnucash/app-utils/gnc-ui-util.c:667
 #, c-format
 msgid "Not tax-related; %s%s: %s (code %s, tax type %s)"
 msgstr "No relacionada con fiscalidad; %s%s %s (código %s, tipo impositivo %s)"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:708
+#: ../libgnucash/app-utils/gnc-ui-util.c:714
 #, c-format
 msgid "(Tax-related subaccounts: %d)"
 msgstr "(Subcuenta de Relación Impositiva: %d)"
@@ -25821,35 +25540,39 @@ msgstr "(Subcuenta de Relación Impositiva: %d)"
 #. 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.
-#: ../libgnucash/app-utils/gnc-ui-util.c:745
+#: ../libgnucash/app-utils/gnc-ui-util.c:751
 msgid "not cleared:n"
 msgstr "n"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../libgnucash/app-utils/gnc-ui-util.c:748
+#: ../libgnucash/app-utils/gnc-ui-util.c:754
 msgid "cleared:c"
 msgstr "p"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../libgnucash/app-utils/gnc-ui-util.c:751
+#: ../libgnucash/app-utils/gnc-ui-util.c:757
 msgid "reconciled:y"
 msgstr "s"
 
 # bloqueado
 #. Translators: Please only translate the letter *after* the colon.
-#: ../libgnucash/app-utils/gnc-ui-util.c:754
+#: ../libgnucash/app-utils/gnc-ui-util.c:760
 msgid "frozen:f"
 msgstr "b"
 
 #. Translators: Please only translate the letter *after* the colon.
-#: ../libgnucash/app-utils/gnc-ui-util.c:757
+#: ../libgnucash/app-utils/gnc-ui-util.c:763
 msgid "void:v"
 msgstr "v"
 
-#: ../libgnucash/app-utils/gnc-ui-util.c:798
+#: ../libgnucash/app-utils/gnc-ui-util.c:804
 msgid "Opening Balances"
 msgstr "Saldos de Apertura"
 
+#: ../libgnucash/app-utils/options.scm:2028
+msgid "Disabled"
+msgstr "Deshabilitado"
+
 #: ../libgnucash/app-utils/option-util.c:1698
 #, c-format
 msgid ""
@@ -25863,6 +25586,54 @@ msgstr ""
 msgid "Invalid option value"
 msgstr "Valor de opción inválida"
 
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:611
+msgid "Notice"
+msgstr "Notificación"
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:612
+msgid "Your gnucash metadata has been migrated."
+msgstr "Sus metadatos de gnucash han sido migrados."
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:613
+msgid "Old location:"
+msgstr "Ubicación anterior:"
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:614
+msgid "New location:"
+msgstr "Ubicación actual:"
+
+#. Translators {1} will be replaced with the package name (typically Gnucash) at runtime
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:616
+msgid "If you no longer intend to run {1} 2.6.x or older on this system you can safely remove the old directory."
+msgstr "Si no intenta más ejecutar {1} 2.6.x o más anterior en este sistema puede quitar con seguridad el directorio antiguo."
+
+#. Translators: this string refers to a file name that gets renamed
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:665
+msgid "Renamed to:"
+msgstr "Renombrado a:"
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:685
+msgid "In addition:"
+msgstr "En adición:"
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:690
+msgid "The following file has been moved to {1} instead:"
+msgid_plural "The following files have been moved to {1} instead:"
+msgstr[0] "El siguiente fichero ha sido trasladado a {1}:"
+msgstr[1] "Los siguientes ficheros han sido trasladados a {1}:"
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:700
+msgid "The following file has been removed instead:"
+msgid_plural "The following files have been removed instead:"
+msgstr[0] "El siguiente fichero ha sido eliminado en su lugar:"
+msgstr[1] "Los siguientes ficheros han sido eliminados en su lugar:"
+
+#: ../libgnucash/core-utils/gnc-filepath-utils.cpp:710
+msgid "The following file could not be moved to {1}:"
+msgid_plural "The following files could not be moved to {1}:"
+msgstr[0] "El fichero siguiente no se pudo ser trasladado a {1}:"
+msgstr[1] "Los ficheros siguientes no se pudieron ser trasladados a {1}:"
+
 #: ../libgnucash/engine/Account.cpp:197
 #, c-format
 msgid ""
@@ -25961,16 +25732,16 @@ msgstr "d-m"
 msgid "m-d"
 msgstr "m-d"
 
-#: ../libgnucash/engine/gnc-datetime.cpp:383
+#: ../libgnucash/engine/gnc-datetime.cpp:378
 msgid "Unknown date format specifier passed as argument."
 msgstr "Especificador de formato de fecha desconocido pasado como argumento."
 
 #. regex didn't find a match
-#: ../libgnucash/engine/gnc-datetime.cpp:388
+#: ../libgnucash/engine/gnc-datetime.cpp:383
 msgid "Value can't be parsed into a date using the selected date format."
 msgstr "Valor no puede ser analizado dentro de una fecha utilizando el formato de fecha seleccionado."
 
-#: ../libgnucash/engine/gnc-datetime.cpp:393
+#: ../libgnucash/engine/gnc-datetime.cpp:388
 msgid "Value appears to contain a year while the selected format forbids this."
 msgstr "Valor parece contener un año mientras que el formato selecionado prohíbe esto."
 
@@ -26385,6 +26156,138 @@ msgstr ""
 "\n"
 "Douglas Adams, «El Restaurador al Final del Universo»"
 
+#~ msgctxt "Daily"
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgctxt "Daily"
+#~ msgid "days."
+#~ msgstr "días."
+
+#~ msgctxt "Weekly"
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgctxt "Weekly"
+#~ msgid "weeks."
+#~ msgstr "semanas."
+
+#~ msgctxt "Semimonthly"
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgctxt "Semimonthly"
+#~ msgid "months."
+#~ msgstr "meses."
+
+#~ msgctxt "Monthly"
+#~ msgid "Every"
+#~ msgstr "Cada"
+
+#~ msgctxt "Monthly"
+#~ msgid "months."
+#~ msgstr "meses."
+
+#~ msgid ""
+#~ "Notice\n"
+#~ "\n"
+#~ "Your gnucash metadata has been migrated.\n"
+#~ "\n"
+#~ "Old location: %s%s\n"
+#~ "New location: %s\n"
+#~ "\n"
+#~ "If you no longer intend to run "
+#~ msgstr ""
+#~ "Notificación\n"
+#~ "\n"
+#~ "Sus metadatos de Gnucash han sido migrados.\n"
+#~ "\n"
+#~ "Ubicación anterior: %s%s\n"
+#~ "Ubicación nueva: %s\n"
+#~ "\n"
+#~ "Si no intente después ejecutar "
+
+#~ msgid "%s %s - %s"
+#~ msgstr "%s %s - %s"
+
+#~ msgid "%s #%d"
+#~ msgstr "%s nº%d"
+
+#~ msgid "%s: %s - %s"
+#~ msgstr "%s: %s - %s"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "%s and subaccounts"
+#~ msgstr "%s y subcuentas"
+
+#~ msgid "Account Matcher"
+#~ msgstr "Cuenta Cotejante"
+
+#~ msgid "Account Matcher uses regular expressions for extended matching"
+#~ msgstr "Cotejador de Cuenta utiliza expresiones regulares para cotejos extendidos"
+
+#~ msgid "Transaction Matcher"
+#~ msgstr "Cotejo Transaccional"
+
+#~ msgid "Transaction Matcher uses regular expressions for extended matching"
+#~ msgstr "Cotejo Transaccional emplea expresiones regulares desde cotejo extendido"
+
+#~ msgid "Match only transactions whose substring is matched e.g. '#gift' will find all transactions with #gift in memo, description or notes. It can be left blank, which will disable the matcher."
+#~ msgstr "Coincide solo transacciones cuya subcadena coincide p. e. '#gift' encontrará todas las transaciones con #gift en memorandum, descripción o anotación. Puede ser dejado en blanco, lo cual desactiva la coincidencia."
+
+#~ msgid "By default the transaction matcher will search substring only. Set this to true to enable full POSIX regular expressions capabilities. '#work|#family' will match both tags within description, notes or memo. "
+#~ msgstr "Por defecto la coincidencia transacional solo buscará subcadenas. Establezca esto a verdadero para activar habilidad completa de expresión regular POSIX. '#trabajo|#familia' coincidirá con ambas marcas dentro de descripción, anotaciones o memorándum. "
+
+#~ msgid "Match only above accounts whose fullname is matched e.g. ':Travel' will match Expenses:Travel:Holiday and Expenses:Business:Travel. It can be left blank, which will disable the matcher."
+#~ msgstr "Coincide solo cuentas superiora s cuyo nombre completo ha coincidido p.e. 'Viaje' coincidirá Gasros:Viajes:Vacaciones y Gastos:Negocios:Viajes. Puede ser dejado en blanco, lo cual desactivará la coincidencia."
+
+#~ msgid "By default the account matcher will search substring only. Set this to true to enable full POSIX regular expressions capabilities. 'Car|Flights' will match both Expenses:Car and Expenses:Flights. Use a period (.) to match a single character e.g. '20../.' will match 'Travel 2017/1 London'. "
+#~ msgstr "Por defecto el cotejo de cuenta buscará subcadenas únicamente. Establezca esto a verdadero para activas capacidades de expresiones regulares POSIX. «Coche|Vuelos» coincidirá ambas Gastos:Vehículo y Gastos:Vuelos. Emplee un punto (.) para cotejar un solo carácter p.e. «20../.» coincidirá con «Viaje 2017/1 Londres».  "
+
+#~ msgid "Show the full account name for subtotals and subtitles?"
+#~ msgstr "¿Mostrar el nombre de cuenta completo en subtotales y subtítulos?"
+
+#~ msgid "Show the account code for subtotals and subtitles?"
+#~ msgstr "¿Mostrar el código de cuenta para subtotales y subtítulos?"
+
+#~ msgid "Reverse amount display for income-related columns."
+#~ msgstr "Revertir cantidad enseñada para columnas de Ingresos empleadas."
+
+#~ msgid "From %s To %s"
+#~ msgstr "Origen %s Destino %s"
+
+#~ msgid "Primary Subtotals/headings"
+#~ msgstr "Subtotales/encabezados principales"
+
+#~ msgid "Secondary Subtotals/headings"
+#~ msgstr "Subtotales/encabezados secundarios"
+
+#~ msgid "Split Odd"
+#~ msgstr "Desglose impar"
+
+#~ msgid "Split Even"
+#~ msgstr "Desglose par"
+
+#~ msgid "No accounts were matched"
+#~ msgstr "Ninguna cuenta fue cotejada"
+
+#~ msgid "The account matcher specified in the report options did not match any accounts."
+#~ msgstr "La cuenta cotejadora especificada dentro de las opciones del boletín no coincidió con ninguna de las cuentas."
+
+#~ msgid "No matching accounts found"
+#~ msgstr "Ninguna cuenta coincidente encontrada"
+
+#~ msgid "No account were found that match the options specified in the Options panels."
+#~ msgstr "No se han encontrado ninguna cuenta cotejadas con las opciones especificadas en el panel de Opciones."
+
+#~ msgid " regex"
+#~ msgstr " expreg"
+
+#~ msgid "Accounts produced"
+#~ msgstr "Cuentas producidad"
+
 #~ msgid "(dummy)"
 #~ msgstr "(ficticio)"
 

commit fc5dd9d2c868042e8c58620259e08a6f8816b60e
Merge: 21c5219 25585de
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 10 13:12:54 2018 -0800

    Merge Bob Fewell's two bug fixes, PR302, into unstable.


commit 21c52199377a971fdf20b51183acb215fb294e31
Merge: daca131 3fce50a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 10 12:31:04 2018 -0800

    Merge Bob Fewell's focus-fix PR304.


commit daca1312e7462c9526f2515560f367d1919ecfe8
Merge: fd0ba2c 612cb5c
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 10 12:12:48 2018 -0800

    Merge Bob Fewell's transient parent PR308 into unstable.


commit fd0ba2c760328e6534b050f6bb6272cb18d1d3f3
Author: mpuels <mpuels at gmail.com>
Date:   Sat Mar 10 19:39:20 2018 +0100

    Fix typo

diff --git a/HACKING b/HACKING
index 934ed8b..6c00093 100644
--- a/HACKING
+++ b/HACKING
@@ -126,7 +126,7 @@ Using Electric Fence with GnuCash
 There are currently no rules in our build system to build and run gnucash
 or unit tests with Electric Fence.
 
-I should probably be relatively straightforward to add this as all it
+It should probably be relatively straightforward to add this as all it
 needs is to link with libefence.so (-lefence).
 
 Fedora 27 ships an ElectricFence package containing that libary and also

commit dc3911058478aa5e51f50a1d19284b4c59a4984b
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 10 11:24:44 2018 -0800

    Put the crlf line-endings back on windows text files.

diff --git a/doc/README-ca.win32-bin.txt b/doc/README-ca.win32-bin.txt
index 93e5f86..e5e1fe3 100644
--- a/doc/README-ca.win32-bin.txt
+++ b/doc/README-ca.win32-bin.txt
@@ -1,52 +1,52 @@
-GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
-Llicència Pública General GNU (GPL) i disponible per a GNU / Linux, *BSD,
-Solaris, Mac OSX i Microsoft Windows.
-
-Dissenyat per ser fàcil d'usar, però potent i flexible, GnuCash permet
-realitzar un seguiment dels comptes bancaris, les existències, els ingressos i les despeses. Tan ràpid i
-intuïtiu d'utilitzar com una llista de verificació, es basa en 
-principis comptables professionals per assegurar balanços de comptes i informes precisos.
-
--------------------
-
-Opcions d'assistència disponibles:
-
-Preguntes freqüents en línia: http://wiki.gnucash.org/wiki/FAQ
-Llistes de correu: http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també http://wiki.gnucash.org/wiki/IRC
-
-Si trobeu errors o problemes, no dubteu a informar-los
-a la nostra eina de seguiment d'errors "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Característiques principals: 
-
-    * Comptabilitat de doble entrada
-    * Comptes d'accions / bons / fons d'inversió
-    * Importació de fitxers QIF / OFX
-    * OFX / HBCI Banca en línia
-    * Informes, gràfics
-    * Comptabilitat de petites empreses
-    * Clients, venedors, treballs, factures, comptes de deutes i cobraments
-    * Transaccions programades
-    * Càlculs financers
-
-Podeu trobar més informació i un tutorial sobre com començar
-al menú "Ajuda" quan feu clic a "Guia de conceptes i tutorials".
-
--------------------
-
-Sobre el programa:
-
-GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
-Llicència pública general GNU (GPL). Està desenvolupat de manera col·laborativa per
-12 persones de més de 6 països.
-
-La programació de GnuCash va començar el 1997, i la seva primera versió
-va ser l'any 1998. 
-
--------------------
-
+GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
+Llicència Pública General GNU (GPL) i disponible per a GNU / Linux, *BSD,
+Solaris, Mac OSX i Microsoft Windows.
+
+Dissenyat per ser fàcil d'usar, però potent i flexible, GnuCash permet
+realitzar un seguiment dels comptes bancaris, les existències, els ingressos i les despeses. Tan ràpid i
+intuïtiu d'utilitzar com una llista de verificació, es basa en 
+principis comptables professionals per assegurar balanços de comptes i informes precisos.
+
+-------------------
+
+Opcions d'assistència disponibles:
+
+Preguntes freqüents en línia: http://wiki.gnucash.org/wiki/FAQ
+Llistes de correu: http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també http://wiki.gnucash.org/wiki/IRC
+
+Si trobeu errors o problemes, no dubteu a informar-los
+a la nostra eina de seguiment d'errors "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Característiques principals: 
+
+    * Comptabilitat de doble entrada
+    * Comptes d'accions / bons / fons d'inversió
+    * Importació de fitxers QIF / OFX
+    * OFX / HBCI Banca en línia
+    * Informes, gràfics
+    * Comptabilitat de petites empreses
+    * Clients, venedors, treballs, factures, comptes de deutes i cobraments
+    * Transaccions programades
+    * Càlculs financers
+
+Podeu trobar més informació i un tutorial sobre com començar
+al menú "Ajuda" quan feu clic a "Guia de conceptes i tutorials".
+
+-------------------
+
+Sobre el programa:
+
+GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
+Llicència pública general GNU (GPL). Està desenvolupat de manera col·laborativa per
+12 persones de més de 6 països.
+
+La programació de GnuCash va començar el 1997, i la seva primera versió
+va ser l'any 1998. 
+
+-------------------
+
 Aquesta és la traducció al català del fitxer README GnuCash 2.2.x per als paquets binaris de Windows.
\ No newline at end of file
diff --git a/doc/README-de.win32-bin.txt b/doc/README-de.win32-bin.txt
index 87a125e..6bde138 100644
--- a/doc/README-de.win32-bin.txt
+++ b/doc/README-de.win32-bin.txt
@@ -1,56 +1,56 @@
-GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
-erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
-Solaris, Mac OSX und Microsoft Windows.
-
-Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
-Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
-bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
-umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
-erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
-
--------------------
-
-Verfügbarer Support
-
-Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
-Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
-IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
-beschrieben auf http://wiki.gnucash.org/wiki/IRC
-
-Sollten Probleme auftreten, bitten die Entwickler darum, diese als
-englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Feature-Ãœbersicht:
-
-    * Doppelte Buchführung
-    * Aktienkonten, Währungskonten
-    * HBCI Online-Banking
-    * QIF/OFX/MT940 Importieren
-    * Berichte, Diagramme
-    * Buchführung für Kleinbetriebe
-    * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
-    * Terminierte Buchungen
-    * Finanzrechner
-
-Weitere Informationen und eine (bisher nur englischsprachige)
-Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
-Kurs und Konzepte«.
-
--------------------
-
-Ãœber GnuCash:
-
-GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
-erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
-Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
-
-Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
-Veröffentlichung war im Jahr 1998.
-
--------------------
-
-This is the German GnuCash 2.2.x README file for Windows binary
-packages.
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
+Solaris, Mac OSX und Microsoft Windows.
+
+Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
+Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
+bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
+umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
+erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
+
+-------------------
+
+Verfügbarer Support
+
+Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
+Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
+IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
+beschrieben auf http://wiki.gnucash.org/wiki/IRC
+
+Sollten Probleme auftreten, bitten die Entwickler darum, diese als
+englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Feature-Ãœbersicht:
+
+    * Doppelte Buchführung
+    * Aktienkonten, Währungskonten
+    * HBCI Online-Banking
+    * QIF/OFX/MT940 Importieren
+    * Berichte, Diagramme
+    * Buchführung für Kleinbetriebe
+    * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
+    * Terminierte Buchungen
+    * Finanzrechner
+
+Weitere Informationen und eine (bisher nur englischsprachige)
+Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
+Kurs und Konzepte«.
+
+-------------------
+
+Ãœber GnuCash:
+
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
+Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
+
+Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
+Veröffentlichung war im Jahr 1998.
+
+-------------------
+
+This is the German GnuCash 2.2.x README file for Windows binary
+packages.
diff --git a/doc/README-fr.win32-bin.txt b/doc/README-fr.win32-bin.txt
index d34dae7..29e3b6f 100644
--- a/doc/README-fr.win32-bin.txt
+++ b/doc/README-fr.win32-bin.txt
@@ -1,58 +1,58 @@
-GnuCash est un logiciel de comptabilité gratuit et de source
-libre, émis sous licence GNU Public Licence (GPL) et disponible
-sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
-
-Conçu pour une utilisation aisée, tout en étant puissant et flexible,
-GnuCash permet le suivi des comptes bancaires, des titres, des
-revenus et des dépenses. D'utilisation aussi rapide et intuitive
-qu'un registre de chèques, il est basé sur des principes comptables
-professionnels afin d'assurer des comptes en balance et des rapports
-précis.
-
-------------------- 
-
-Sources disponibles d'assistance :
-
-FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
-Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
-Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
-
-N'hésitez pas à rapporter toute erreur ou tout problème rencontré
-sur notre outil de suivi des bogues "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Survol des fonctionnalités::
-
-    * Comptabilité à partie double
-    * Comptes de titres en Actions/Obligations/Fonds d'investissement
-    * Importation de fichiers QIF/OFX
-    * Transactions bancaires en ligne OFX/HBCI
-    * Rapports et graphiques
-    * Comptabilité des petites entreprises
-    * Listes des clients, fournisseurs et prestations
-    * Facturation, Comptes clients et comptes fournisseurs
-    * Transactions récurrentes
-    * Calculs financiers
-
-Vous trouverez des informations additionnelles et un tutoriel sur la
-mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
-et guide des concepts" dans le menu d'aide.
-
--------------------
-
-À propos du logiciel:
-
-GnuCash est un logiciel de comptabilité gratuit et de source
-libre, émis sous licence GNU Public Licence (GPL). Il est développé
-en collaboration par 12 personnes provenant d'au moins 6 pays.
-
-La programmation de GnuCash a commencé en 1997, sa première version
-a été lancée en 1998.
-
--------------------
-
-Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
-binaire pour Windows.
+GnuCash est un logiciel de comptabilité gratuit et de source
+libre, émis sous licence GNU Public Licence (GPL) et disponible
+sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
+
+Conçu pour une utilisation aisée, tout en étant puissant et flexible,
+GnuCash permet le suivi des comptes bancaires, des titres, des
+revenus et des dépenses. D'utilisation aussi rapide et intuitive
+qu'un registre de chèques, il est basé sur des principes comptables
+professionnels afin d'assurer des comptes en balance et des rapports
+précis.
+
+------------------- 
+
+Sources disponibles d'assistance :
+
+FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
+Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
+Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
+
+N'hésitez pas à rapporter toute erreur ou tout problème rencontré
+sur notre outil de suivi des bogues "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Survol des fonctionnalités::
+
+    * Comptabilité à partie double
+    * Comptes de titres en Actions/Obligations/Fonds d'investissement
+    * Importation de fichiers QIF/OFX
+    * Transactions bancaires en ligne OFX/HBCI
+    * Rapports et graphiques
+    * Comptabilité des petites entreprises
+    * Listes des clients, fournisseurs et prestations
+    * Facturation, Comptes clients et comptes fournisseurs
+    * Transactions récurrentes
+    * Calculs financiers
+
+Vous trouverez des informations additionnelles et un tutoriel sur la
+mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
+et guide des concepts" dans le menu d'aide.
+
+-------------------
+
+À propos du logiciel:
+
+GnuCash est un logiciel de comptabilité gratuit et de source
+libre, émis sous licence GNU Public Licence (GPL). Il est développé
+en collaboration par 12 personnes provenant d'au moins 6 pays.
+
+La programmation de GnuCash a commencé en 1997, sa première version
+a été lancée en 1998.
+
+-------------------
+
+Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
+binaire pour Windows.
diff --git a/doc/README-it.win32-bin.txt b/doc/README-it.win32-bin.txt
index ae5fe55..96a420c 100644
--- a/doc/README-it.win32-bin.txt
+++ b/doc/README-it.win32-bin.txt
@@ -1,51 +1,51 @@
-GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
-licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
-Solaris, Mac OSX e Microsoft Windows.
-
-Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile, 
-GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi. 
-Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
-contabilità assicurando il bilancio dei conti e l'accurattezza dei resoconti.
-
--------------------
-
-Disponibilità di supporto
-
-FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
-Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
-
-Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
-di tracciamento dei bug di GnuCash denominato "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Caratteristiche principali: 
-
-    * Contabilità a partita doppia
-    * Conti per azioni, obbligazioni(bond) e fondi comuni
-    * Importazione di file QIF/OFX
-    * OFX/HBCI Online Banking
-    * Resoconti e grafici
-    * Contabilità  di piccole imprese
-    * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
-    * Transazioni pianificate
-    * Calcolatrice finanziaria
-
-Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
-raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
-
--------------------
-
-Informazioni sul programma:
-
-GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
-licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
-12 programmatori provenienti da oltre 6 paesi.
-
-La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
-
--------------------
-
-Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.
+GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
+licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
+Solaris, Mac OSX e Microsoft Windows.
+
+Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile, 
+GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi. 
+Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
+contabilità assicurando il bilancio dei conti e l'accurattezza dei resoconti.
+
+-------------------
+
+Disponibilità di supporto
+
+FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
+Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
+
+Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
+di tracciamento dei bug di GnuCash denominato "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Caratteristiche principali: 
+
+    * Contabilità a partita doppia
+    * Conti per azioni, obbligazioni(bond) e fondi comuni
+    * Importazione di file QIF/OFX
+    * OFX/HBCI Online Banking
+    * Resoconti e grafici
+    * Contabilità  di piccole imprese
+    * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
+    * Transazioni pianificate
+    * Calcolatrice finanziaria
+
+Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
+raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
+
+-------------------
+
+Informazioni sul programma:
+
+GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
+licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
+12 programmatori provenienti da oltre 6 paesi.
+
+La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
+
+-------------------
+
+Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.
diff --git a/doc/README-lv.win32-bin.txt b/doc/README-lv.win32-bin.txt
index 0d8cbc1..85a4578 100644
--- a/doc/README-lv.win32-bin.txt
+++ b/doc/README-lv.win32-bin.txt
@@ -1,52 +1,52 @@
-GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
-GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
-*BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
-
-GnuCash ir veidots tā, lai to būtu vienkārši lietot, tajā pat laikā tas
-ir pietiekami jaudīgs un ļauj uzskaitīt skaidru naudu, banku kontus,
-akcijas, ieņēmumus un izdevumus.
-Tajā var ātri un ērti reģistrēt darījumu, un tā ir balstīta uz 
-profesionālās grāmatvedības principiem, nodrošinot bilanci un
-precīzus pārskatus.
-
--------------------
-
-Tehniskā palīdzība
-
-Tiešsaistes palīdzība:    http://wiki.gnucash.org/wiki/FAQ
-VÄ“stkopas:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī http://wiki.gnucash.org/wiki/IRC
-
-Ja atklājat kļūdas vai problēmas, nekautrējieties tās reģistrēt "Bugzilla" kļūdu apstrādes 
-sistēmā http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Galvenās iespējas: 
-
-    * Divkāršā ieraksta grāmatvedība
-    * Akciju/Vērtspapīru/Kapitāla daļu konti
-    * QIF/OFX datu imports
-    * OFX/HBCI tiešsaistes banka
-    * Pārskati, grafiki
-    * Mazo uzņēmumu biznesa atbalsts
-    * Klienti, Piegādātāji, Darbi, Saņemtie un izsniegtie rēķini
-    * Ieplānoti grāmatojumi
-    * Finanšu aprēķini
-
-Vairāk informācijas un sākotnējā apmācība pieejama aktivizējot izvēlni
-"Palīdzība" un "Pamācība un jēdzienu ceļvedis".
-
--------------------
-
-Par Å¡o programmu:
-
-GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar 
-GNU General Public License (GPL) licenci. Tās galvenie izstrādātāji ir
-12 cilvēki, kas sadarbojas ar atbalstītājiem vairāk kā 6 valstīs.
-
-GnuCash izstrāde sākās 1997. gadā un tās pirmais laidiens bija 1998. gadā.
-
--------------------
-
-Šis ir GnuCash 2.2.x README fails Windows binārajai pakotnei.
+GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
+GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
+*BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
+
+GnuCash ir veidots tā, lai to būtu vienkārši lietot, tajā pat laikā tas
+ir pietiekami jaudīgs un ļauj uzskaitīt skaidru naudu, banku kontus,
+akcijas, ieņēmumus un izdevumus.
+Tajā var ātri un ērti reģistrēt darījumu, un tā ir balstīta uz 
+profesionālās grāmatvedības principiem, nodrošinot bilanci un
+precīzus pārskatus.
+
+-------------------
+
+Tehniskā palīdzība
+
+Tiešsaistes palīdzība:    http://wiki.gnucash.org/wiki/FAQ
+VÄ“stkopas:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī http://wiki.gnucash.org/wiki/IRC
+
+Ja atklājat kļūdas vai problēmas, nekautrējieties tās reģistrēt "Bugzilla" kļūdu apstrādes 
+sistēmā http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Galvenās iespējas: 
+
+    * Divkāršā ieraksta grāmatvedība
+    * Akciju/Vērtspapīru/Kapitāla daļu konti
+    * QIF/OFX datu imports
+    * OFX/HBCI tiešsaistes banka
+    * Pārskati, grafiki
+    * Mazo uzņēmumu biznesa atbalsts
+    * Klienti, Piegādātāji, Darbi, Saņemtie un izsniegtie rēķini
+    * Ieplānoti grāmatojumi
+    * Finanšu aprēķini
+
+Vairāk informācijas un sākotnējā apmācība pieejama aktivizējot izvēlni
+"Palīdzība" un "Pamācība un jēdzienu ceļvedis".
+
+-------------------
+
+Par Å¡o programmu:
+
+GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar 
+GNU General Public License (GPL) licenci. Tās galvenie izstrādātāji ir
+12 cilvēki, kas sadarbojas ar atbalstītājiem vairāk kā 6 valstīs.
+
+GnuCash izstrāde sākās 1997. gadā un tās pirmais laidiens bija 1998. gadā.
+
+-------------------
+
+Šis ir GnuCash 2.2.x README fails Windows binārajai pakotnei.
diff --git a/doc/README-nl.win32-bin.txt b/doc/README-nl.win32-bin.txt
index d54bc23..6825257 100644
--- a/doc/README-nl.win32-bin.txt
+++ b/doc/README-nl.win32-bin.txt
@@ -1,51 +1,51 @@
-GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
-onder de GNU General Public License (GPL) en is beschikbaar voor
-GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
-
-Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
-programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
-te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
-anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
-balans en nauwkeurige rapporten te verzekeren.
-
--------------------
-
-Beschikbare bronnen voor ondersteuning
-
-Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
-Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
-
-Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
-bug opvolgsysteem "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Interessante functies: 
-
-    * Dubbel boekhouden
-    * Aandelen-/belegginsrekeningen
-    * QIF/OFX/HBCI import met dubbele transactie herkenning
-    * Rapporten, grafieken
-    * Klein-ondernemingsboekhouding
-    * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
-    * Periodieke Transacties
-    * Financiële berekeningen
-
-Meer informatie en een handleiding om je op weg te helpen vind je
-in het "Hulp" menu onder het "Tutorial en concepten gids".
-
--------------------
-
-Over het programma:
-
-GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
-GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
-6 landen gezamelijk ontwikkeld.
-
-De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
-
--------------------
-
-Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.
+GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
+onder de GNU General Public License (GPL) en is beschikbaar voor
+GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
+
+Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
+programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
+te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
+anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
+balans en nauwkeurige rapporten te verzekeren.
+
+-------------------
+
+Beschikbare bronnen voor ondersteuning
+
+Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
+Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
+
+Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
+bug opvolgsysteem "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Interessante functies: 
+
+    * Dubbel boekhouden
+    * Aandelen-/belegginsrekeningen
+    * QIF/OFX/HBCI import met dubbele transactie herkenning
+    * Rapporten, grafieken
+    * Klein-ondernemingsboekhouding
+    * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
+    * Periodieke Transacties
+    * Financiële berekeningen
+
+Meer informatie en een handleiding om je op weg te helpen vind je
+in het "Hulp" menu onder het "Tutorial en concepten gids".
+
+-------------------
+
+Over het programma:
+
+GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
+GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
+6 landen gezamelijk ontwikkeld.
+
+De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
+
+-------------------
+
+Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.
diff --git a/doc/README-zh_CN.win32-bin.txt b/doc/README-zh_CN.win32-bin.txt
index c9f8915..01f9ea7 100644
--- a/doc/README-zh_CN.win32-bin.txt
+++ b/doc/README-zh_CN.win32-bin.txt
@@ -1,41 +1,41 @@
-GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
-
-致力于易于使用,但功能强大而且灵活。GnuCash 允许您跟踪银行账户、股票、收入和支出。就像账簿一样快捷而且直观,它是基于专业的会计理念来确保平衡的账簿和准确的报告。
-
--------------------
-
-您可以获得支持的途径
-
-在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
-邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道,另见 http://wiki.gnucash.org/wiki/IRC
-
-如果您遇到了任何 bug 或者问题,请不要犹豫,将它们报告到我们的 bug 跟踪工具“Bugzilla”:http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-功能亮点:
-
-    * 复式记账会计
-    * 股票/债券/基金科目
-    * QIF/OFX 导入
-    * OFX/HBCI 网上银行
-    * 报告、图表
-    * 小型企业财会
-    * 客户、厂商、任务、发票、应付账款及应收账款
-    * 计划的交易
-    * 金融计算工具
-
-当点击“教程和理念指南”时,可以在“帮助”菜单中找到更多的信息以及如何开始的教程。
-
--------------------
-
-关于程序:
-
-GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
-
-程序撰写开始于1997年,并且于1998年第一次发布。
-
--------------------
-
-这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。
+GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
+
+致力于易于使用,但功能强大而且灵活。GnuCash 允许您跟踪银行账户、股票、收入和支出。就像账簿一样快捷而且直观,它是基于专业的会计理念来确保平衡的账簿和准确的报告。
+
+-------------------
+
+您可以获得支持的途径
+
+在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
+邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道,另见 http://wiki.gnucash.org/wiki/IRC
+
+如果您遇到了任何 bug 或者问题,请不要犹豫,将它们报告到我们的 bug 跟踪工具“Bugzilla”:http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+功能亮点:
+
+    * 复式记账会计
+    * 股票/债券/基金科目
+    * QIF/OFX 导入
+    * OFX/HBCI 网上银行
+    * 报告、图表
+    * 小型企业财会
+    * 客户、厂商、任务、发票、应付账款及应收账款
+    * 计划的交易
+    * 金融计算工具
+
+当点击“教程和理念指南”时,可以在“帮助”菜单中找到更多的信息以及如何开始的教程。
+
+-------------------
+
+关于程序:
+
+GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
+
+程序撰写开始于1997年,并且于1998年第一次发布。
+
+-------------------
+
+这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。
diff --git a/doc/README-zh_TW.win32-bin.txt b/doc/README-zh_TW.win32-bin.txt
index 19f62d4..d0f0397 100644
--- a/doc/README-zh_TW.win32-bin.txt
+++ b/doc/README-zh_TW.win32-bin.txt
@@ -1,42 +1,42 @@
-GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
-
-GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以追蹤銀行帳戶、股票、收入與支出,就像用帳簿一樣快捷、直覺。基於專業的會計原則確保帳目平衡並提供準確的報表。
-
--------------------
-
-可獲得支援的管道
-
-常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
-通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (聊天):     irc.gnome.org 伺服器的 #gnucash 頻道,見 http://wiki.gnucash.org/wiki/IRC
-
-如果您遇到了任何 bug 或問題,請不要遲疑,將問題報告到我們的 bug 追蹤系統 "Bugzilla": (請用英文)
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-功能特點:
-
-    * 複式簿記
-    * 股票/債券/基金帳號
-    * 匯入 QIF/OFX
-    * OFX/HBCI 網路銀行
-    * 各式報告、圖表
-    * 小企業財務管理
-    * 客戶、廠商、工作、收據、應付帳款、應收帳款
-    * 交易排程
-    * 金融計算工具
-
-更多資訊及入門教學可以在功能表 "說明" 裡的 "教學與觀念指南" 找到。
-
--------------------
-
-關於程式:
-
-GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
-
-GnuCash 的程式撰寫始於 1997 年,第一版發布於 1998 年。
-
--------------------
-
-這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。
+GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
+
+GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以追蹤銀行帳戶、股票、收入與支出,就像用帳簿一樣快捷、直覺。基於專業的會計原則確保帳目平衡並提供準確的報表。
+
+-------------------
+
+可獲得支援的管道
+
+常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
+通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (聊天):     irc.gnome.org 伺服器的 #gnucash 頻道,見 http://wiki.gnucash.org/wiki/IRC
+
+如果您遇到了任何 bug 或問題,請不要遲疑,將問題報告到我們的 bug 追蹤系統 "Bugzilla": (請用英文)
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+功能特點:
+
+    * 複式簿記
+    * 股票/債券/基金帳號
+    * 匯入 QIF/OFX
+    * OFX/HBCI 網路銀行
+    * 各式報告、圖表
+    * 小企業財務管理
+    * 客戶、廠商、工作、收據、應付帳款、應收帳款
+    * 交易排程
+    * 金融計算工具
+
+更多資訊及入門教學可以在功能表 "說明" 裡的 "教學與觀念指南" 找到。
+
+-------------------
+
+關於程式:
+
+GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
+
+GnuCash 的程式撰寫始於 1997 年,第一版發布於 1998 年。
+
+-------------------
+
+這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。
diff --git a/doc/README.win32-bin.txt b/doc/README.win32-bin.txt
index 69a4b93..5bf8c2b 100644
--- a/doc/README.win32-bin.txt
+++ b/doc/README.win32-bin.txt
@@ -1,52 +1,52 @@
-GnuCash is a free, open source accounting program released under the
-GNU General Public License (GPL) and available for GNU/Linux, *BSD,
-Solaris, Mac OSX, and Microsoft Windows.
-
-Designed to be easy to use, yet powerful and flexible, GnuCash allows
-you to track bank accounts, stocks, income and expenses. As quick and
-intuitive to use as a checkbook register, it is based on professional
-accounting principles to ensure balanced books and accurate reports.
-
--------------------
-
-Available Support Options
-
-Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
-Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
-
-If you encounter any bugs or problems, do not hesitate to report them
-into our bug tracking tool "Bugzilla":
-http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
-
--------------------
-
-Feature Highlights: 
-
-    * Double-Entry Accounting
-    * Stock/Bond/Mutual Fund Accounts
-    * QIF/OFX Import
-    * OFX/HBCI Online Banking
-    * Reports, Graphs
-    * Small-Business Accounting
-    * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
-    * Scheduled Transactions
-    * Financial Calculations
-
-More information and a Tutorial on how to get started can be found in
-the "Help" menu when clicking on "Tutorial and Concepts Guide".
-
--------------------
-
-About the Program:
-
-GnuCash is a free, open source accounting program released under the
-GNU General Public License (GPL). It is collaboratively developed by
-12 people from over 6 countries.
-
-Programming on GnuCash began in 1997, and its first release was in
-1998. 
-
--------------------
-
-This is the GnuCash 2.2.x README file for Windows binary packages.
+GnuCash is a free, open source accounting program released under the
+GNU General Public License (GPL) and available for GNU/Linux, *BSD,
+Solaris, Mac OSX, and Microsoft Windows.
+
+Designed to be easy to use, yet powerful and flexible, GnuCash allows
+you to track bank accounts, stocks, income and expenses. As quick and
+intuitive to use as a checkbook register, it is based on professional
+accounting principles to ensure balanced books and accurate reports.
+
+-------------------
+
+Available Support Options
+
+Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
+Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
+
+If you encounter any bugs or problems, do not hesitate to report them
+into our bug tracking tool "Bugzilla":
+http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
+
+-------------------
+
+Feature Highlights: 
+
+    * Double-Entry Accounting
+    * Stock/Bond/Mutual Fund Accounts
+    * QIF/OFX Import
+    * OFX/HBCI Online Banking
+    * Reports, Graphs
+    * Small-Business Accounting
+    * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
+    * Scheduled Transactions
+    * Financial Calculations
+
+More information and a Tutorial on how to get started can be found in
+the "Help" menu when clicking on "Tutorial and Concepts Guide".
+
+-------------------
+
+About the Program:
+
+GnuCash is a free, open source accounting program released under the
+GNU General Public License (GPL). It is collaboratively developed by
+12 people from over 6 countries.
+
+Programming on GnuCash began in 1997, and its first release was in
+1998. 
+
+-------------------
+
+This is the GnuCash 2.2.x README file for Windows binary packages.
diff --git a/doc/examples/downloaded.mt940 b/doc/examples/downloaded.mt940
index 3ddb2e1..64afa9a 100644
--- a/doc/examples/downloaded.mt940
+++ b/doc/examples/downloaded.mt940
@@ -1,9 +1,9 @@
-:20:STARTUMS  
-:25:80007777/2602272001
-:28C:0
-:60F:C060228EUR0,00
-:61:0604280228D12,56N020NONREF//
-:86:020?00ÜBERWEISUNG?100?20TESTING GNUCASH FOR HBCI?21AND MT940
-?3080007777?312602272003?32GNUCASH?34000
-:62F:D060228EUR12,56
--
+:20:STARTUMS  
+:25:80007777/2602272001
+:28C:0
+:60F:C060228EUR0,00
+:61:0604280228D12,56N020NONREF//
+:86:020?00ÜBERWEISUNG?100?20TESTING GNUCASH FOR HBCI?21AND MT940
+?3080007777?312602272003?32GNUCASH?34000
+:62F:D060228EUR12,56
+-
diff --git a/gnucash/gnucash.rc.in b/gnucash/gnucash.rc.in
index bff61e1..b2e2776 100644
--- a/gnucash/gnucash.rc.in
+++ b/gnucash/gnucash.rc.in
@@ -1,33 +1,33 @@
-#include <windows.h>
-
-APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
-
-VS_VERSION VERSIONINFO
- FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
- PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
- FILEFLAGSMASK   0x3fL
- FILEFLAGS       0x0L
- FILEOS          VOS__WINDOWS32
- FILETYPE        VFT_APP
- FILESUBTYPE     0x0L
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    BEGIN
-      VALUE "CompanyName", "GnuCash Development Team"
-      VALUE "FileDescription", "GnuCash Program File"
-      VALUE "FileVersion", "@VERSION@"
-      VALUE "InternalName", "gnucash"
-      VALUE "LegalCopyright", "©2017 GnuCash Development Team, Licence: GPL v2.0 or later"
-      VALUE "OriginalFilename", "gnucash.exe"
-      VALUE "ProductName", "GnuCash Free Finance Manager"
-      VALUE "ProductVersion", "@VERSION@"
-    END
-  END
-
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1252
-  END
-END
+#include <windows.h>
+
+APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
+
+VS_VERSION VERSIONINFO
+ FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
+ PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
+ FILEFLAGSMASK   0x3fL
+ FILEFLAGS       0x0L
+ FILEOS          VOS__WINDOWS32
+ FILETYPE        VFT_APP
+ FILESUBTYPE     0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "GnuCash Development Team"
+      VALUE "FileDescription", "GnuCash Program File"
+      VALUE "FileVersion", "@VERSION@"
+      VALUE "InternalName", "gnucash"
+      VALUE "LegalCopyright", "©2017 GnuCash Development Team, Licence: GPL v2.0 or later"
+      VALUE "OriginalFilename", "gnucash.exe"
+      VALUE "ProductName", "GnuCash Free Finance Manager"
+      VALUE "ProductVersion", "@VERSION@"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END

commit fdfa6f528c70d317a20b7ba34f79111c67cd8ea0
Merge: 867fdce d61cd79
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Sat Mar 10 11:06:59 2018 +0100

    Merge branch 'maint' into unstable

diff --cc doc/README-ca.win32-bin.txt
index e5e1fe3,e5e1fe3..93e5f86
--- a/doc/README-ca.win32-bin.txt
+++ b/doc/README-ca.win32-bin.txt
@@@ -1,52 -1,52 +1,52 @@@
--GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
--Llicència Pública General GNU (GPL) i disponible per a GNU / Linux, *BSD,
--Solaris, Mac OSX i Microsoft Windows.
--
--Dissenyat per ser fàcil d'usar, però potent i flexible, GnuCash permet
--realitzar un seguiment dels comptes bancaris, les existències, els ingressos i les despeses. Tan ràpid i
--intuïtiu d'utilitzar com una llista de verificació, es basa en 
--principis comptables professionals per assegurar balanços de comptes i informes precisos.
--
---------------------
--
--Opcions d'assistència disponibles:
--
--Preguntes freqüents en línia: http://wiki.gnucash.org/wiki/FAQ
--Llistes de correu: http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també http://wiki.gnucash.org/wiki/IRC
--
--Si trobeu errors o problemes, no dubteu a informar-los
--a la nostra eina de seguiment d'errors "Bugzilla":
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Característiques principals: 
--
--    * Comptabilitat de doble entrada
--    * Comptes d'accions / bons / fons d'inversió
--    * Importació de fitxers QIF / OFX
--    * OFX / HBCI Banca en línia
--    * Informes, gràfics
--    * Comptabilitat de petites empreses
--    * Clients, venedors, treballs, factures, comptes de deutes i cobraments
--    * Transaccions programades
--    * Càlculs financers
--
--Podeu trobar més informació i un tutorial sobre com començar
--al menú "Ajuda" quan feu clic a "Guia de conceptes i tutorials".
--
---------------------
--
--Sobre el programa:
--
--GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
--Llicència pública general GNU (GPL). Està desenvolupat de manera col·laborativa per
--12 persones de més de 6 països.
--
--La programació de GnuCash va començar el 1997, i la seva primera versió
--va ser l'any 1998. 
--
---------------------
--
++GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
++Llicència Pública General GNU (GPL) i disponible per a GNU / Linux, *BSD,
++Solaris, Mac OSX i Microsoft Windows.
++
++Dissenyat per ser fàcil d'usar, però potent i flexible, GnuCash permet
++realitzar un seguiment dels comptes bancaris, les existències, els ingressos i les despeses. Tan ràpid i
++intuïtiu d'utilitzar com una llista de verificació, es basa en 
++principis comptables professionals per assegurar balanços de comptes i informes precisos.
++
++-------------------
++
++Opcions d'assistència disponibles:
++
++Preguntes freqüents en línia: http://wiki.gnucash.org/wiki/FAQ
++Llistes de correu: http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també http://wiki.gnucash.org/wiki/IRC
++
++Si trobeu errors o problemes, no dubteu a informar-los
++a la nostra eina de seguiment d'errors "Bugzilla":
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Característiques principals: 
++
++    * Comptabilitat de doble entrada
++    * Comptes d'accions / bons / fons d'inversió
++    * Importació de fitxers QIF / OFX
++    * OFX / HBCI Banca en línia
++    * Informes, gràfics
++    * Comptabilitat de petites empreses
++    * Clients, venedors, treballs, factures, comptes de deutes i cobraments
++    * Transaccions programades
++    * Càlculs financers
++
++Podeu trobar més informació i un tutorial sobre com començar
++al menú "Ajuda" quan feu clic a "Guia de conceptes i tutorials".
++
++-------------------
++
++Sobre el programa:
++
++GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
++Llicència pública general GNU (GPL). Està desenvolupat de manera col·laborativa per
++12 persones de més de 6 països.
++
++La programació de GnuCash va començar el 1997, i la seva primera versió
++va ser l'any 1998. 
++
++-------------------
++
  Aquesta és la traducció al català del fitxer README GnuCash 2.2.x per als paquets binaris de Windows.
diff --cc doc/README-de.win32-bin.txt
index 6bde138,6bde138..87a125e
--- a/doc/README-de.win32-bin.txt
+++ b/doc/README-de.win32-bin.txt
@@@ -1,56 -1,56 +1,56 @@@
--GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
--erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
--Solaris, Mac OSX und Microsoft Windows.
--
--Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
--Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
--bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
--umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
--erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
--
---------------------
--
--Verfügbarer Support
--
--Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
--Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
--IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
--beschrieben auf http://wiki.gnucash.org/wiki/IRC
--
--Sollten Probleme auftreten, bitten die Entwickler darum, diese als
--englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Feature-Ãœbersicht:
--
--    * Doppelte Buchführung
--    * Aktienkonten, Währungskonten
--    * HBCI Online-Banking
--    * QIF/OFX/MT940 Importieren
--    * Berichte, Diagramme
--    * Buchführung für Kleinbetriebe
--    * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
--    * Terminierte Buchungen
--    * Finanzrechner
--
--Weitere Informationen und eine (bisher nur englischsprachige)
--Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
--Kurs und Konzepte«.
--
---------------------
--
--Ãœber GnuCash:
--
--GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
--erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
--Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
--
--Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
--Veröffentlichung war im Jahr 1998.
--
---------------------
--
--This is the German GnuCash 2.2.x README file for Windows binary
--packages.
++GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
++erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
++Solaris, Mac OSX und Microsoft Windows.
++
++Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen von
++Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
++bekannte Prinzip der doppelten Buchführung wird in GnuCash konsequent
++umgesetzt, so dass GnuCash höchste Ansprüche an die Kontenführung
++erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
++
++-------------------
++
++Verfügbarer Support
++
++Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
++Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
++IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
++beschrieben auf http://wiki.gnucash.org/wiki/IRC
++
++Sollten Probleme auftreten, bitten die Entwickler darum, diese als
++englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Feature-Ãœbersicht:
++
++    * Doppelte Buchführung
++    * Aktienkonten, Währungskonten
++    * HBCI Online-Banking
++    * QIF/OFX/MT940 Importieren
++    * Berichte, Diagramme
++    * Buchführung für Kleinbetriebe
++    * Verwaltung von Kunden, Lieferanten, Aufträgen, Rechnungen
++    * Terminierte Buchungen
++    * Finanzrechner
++
++Weitere Informationen und eine (bisher nur englischsprachige)
++Einführung sind im Menü »Hilfe« zu finden unter dem Menüpunkt »GnuCash
++Kurs und Konzepte«.
++
++-------------------
++
++Ãœber GnuCash:
++
++GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
++erhältlich unter der GNU GPL Lizenz. Das Programm wird von 12
++Programmierern aus mehr als 6 Ländern gemeinsam weiterentwickelt.
++
++Die Anfänge von GnuCash reichen ins Jahr 1997 zurück. Die erste
++Veröffentlichung war im Jahr 1998.
++
++-------------------
++
++This is the German GnuCash 2.2.x README file for Windows binary
++packages.
diff --cc doc/README-fr.win32-bin.txt
index 29e3b6f,29e3b6f..d34dae7
--- a/doc/README-fr.win32-bin.txt
+++ b/doc/README-fr.win32-bin.txt
@@@ -1,58 -1,58 +1,58 @@@
--GnuCash est un logiciel de comptabilité gratuit et de source
--libre, émis sous licence GNU Public Licence (GPL) et disponible
--sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
--
--Conçu pour une utilisation aisée, tout en étant puissant et flexible,
--GnuCash permet le suivi des comptes bancaires, des titres, des
--revenus et des dépenses. D'utilisation aussi rapide et intuitive
--qu'un registre de chèques, il est basé sur des principes comptables
--professionnels afin d'assurer des comptes en balance et des rapports
--précis.
--
--------------------- 
--
--Sources disponibles d'assistance :
--
--FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
--Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
--Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
--
--N'hésitez pas à rapporter toute erreur ou tout problème rencontré
--sur notre outil de suivi des bogues "Bugzilla":
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Survol des fonctionnalités::
--
--    * Comptabilité à partie double
--    * Comptes de titres en Actions/Obligations/Fonds d'investissement
--    * Importation de fichiers QIF/OFX
--    * Transactions bancaires en ligne OFX/HBCI
--    * Rapports et graphiques
--    * Comptabilité des petites entreprises
--    * Listes des clients, fournisseurs et prestations
--    * Facturation, Comptes clients et comptes fournisseurs
--    * Transactions récurrentes
--    * Calculs financiers
--
--Vous trouverez des informations additionnelles et un tutoriel sur la
--mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
--et guide des concepts" dans le menu d'aide.
--
---------------------
--
--À propos du logiciel:
--
--GnuCash est un logiciel de comptabilité gratuit et de source
--libre, émis sous licence GNU Public Licence (GPL). Il est développé
--en collaboration par 12 personnes provenant d'au moins 6 pays.
--
--La programmation de GnuCash a commencé en 1997, sa première version
--a été lancée en 1998.
--
---------------------
--
--Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
--binaire pour Windows.
++GnuCash est un logiciel de comptabilité gratuit et de source
++libre, émis sous licence GNU Public Licence (GPL) et disponible
++sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
++
++Conçu pour une utilisation aisée, tout en étant puissant et flexible,
++GnuCash permet le suivi des comptes bancaires, des titres, des
++revenus et des dépenses. D'utilisation aussi rapide et intuitive
++qu'un registre de chèques, il est basé sur des principes comptables
++professionnels afin d'assurer des comptes en balance et des rapports
++précis.
++
++------------------- 
++
++Sources disponibles d'assistance :
++
++FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
++Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
++Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
++
++N'hésitez pas à rapporter toute erreur ou tout problème rencontré
++sur notre outil de suivi des bogues "Bugzilla":
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Survol des fonctionnalités::
++
++    * Comptabilité à partie double
++    * Comptes de titres en Actions/Obligations/Fonds d'investissement
++    * Importation de fichiers QIF/OFX
++    * Transactions bancaires en ligne OFX/HBCI
++    * Rapports et graphiques
++    * Comptabilité des petites entreprises
++    * Listes des clients, fournisseurs et prestations
++    * Facturation, Comptes clients et comptes fournisseurs
++    * Transactions récurrentes
++    * Calculs financiers
++
++Vous trouverez des informations additionnelles et un tutoriel sur la
++mise en route (en anglais, pour l'instant) en cliquant sur "Tutoriel
++et guide des concepts" dans le menu d'aide.
++
++-------------------
++
++À propos du logiciel:
++
++GnuCash est un logiciel de comptabilité gratuit et de source
++libre, émis sous licence GNU Public Licence (GPL). Il est développé
++en collaboration par 12 personnes provenant d'au moins 6 pays.
++
++La programmation de GnuCash a commencé en 1997, sa première version
++a été lancée en 1998.
++
++-------------------
++
++Ceci est le fichier README de GnuCash 2.2.x pour les paquetages en
++binaire pour Windows.
diff --cc doc/README-it.win32-bin.txt
index 96a420c,96a420c..ae5fe55
--- a/doc/README-it.win32-bin.txt
+++ b/doc/README-it.win32-bin.txt
@@@ -1,51 -1,51 +1,51 @@@
--GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
--licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
--Solaris, Mac OSX e Microsoft Windows.
--
--Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile, 
--GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi. 
--Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
--contabilità assicurando il bilancio dei conti e l'accurattezza dei resoconti.
--
---------------------
--
--Disponibilità di supporto
--
--FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
--Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
--
--Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
--di tracciamento dei bug di GnuCash denominato "Bugzilla":
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Caratteristiche principali: 
--
--    * Contabilità a partita doppia
--    * Conti per azioni, obbligazioni(bond) e fondi comuni
--    * Importazione di file QIF/OFX
--    * OFX/HBCI Online Banking
--    * Resoconti e grafici
--    * Contabilità  di piccole imprese
--    * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
--    * Transazioni pianificate
--    * Calcolatrice finanziaria
--
--Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
--raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
--
---------------------
--
--Informazioni sul programma:
--
--GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
--licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
--12 programmatori provenienti da oltre 6 paesi.
--
--La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
--
---------------------
--
--Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.
++GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
++licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
++Solaris, Mac OSX e Microsoft Windows.
++
++Progettato per essere di facile utilizzo, ma allo stesso tempo potente e flessibile, 
++GnuCash permette di tenere traccia dei propri conti bancari, delle azioni, dei costi e dei ricavi. 
++Veloce e intuitivo come il registro degli assegni, GnuCash si basa su concetti fondamentali della
++contabilità assicurando il bilancio dei conti e l'accurattezza dei resoconti.
++
++-------------------
++
++Disponibilità di supporto
++
++FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
++Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
++
++Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
++di tracciamento dei bug di GnuCash denominato "Bugzilla":
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Caratteristiche principali: 
++
++    * Contabilità a partita doppia
++    * Conti per azioni, obbligazioni(bond) e fondi comuni
++    * Importazione di file QIF/OFX
++    * OFX/HBCI Online Banking
++    * Resoconti e grafici
++    * Contabilità  di piccole imprese
++    * Clienti, venditori, lavori, fatture, conti per debiti e crediti correnti
++    * Transazioni pianificate
++    * Calcolatrice finanziaria
++
++Maggiori informazioni e una guida su come iniziare a utilizzare il programma, sono
++raggiungibili tramite il menu "Aiuto" selezionando la voce "Guida ai concetti e manuale".
++
++-------------------
++
++Informazioni sul programma:
++
++GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
++licenza GNU Public Licence (GPL). E' sviluppato con la collaborazione di
++12 programmatori provenienti da oltre 6 paesi.
++
++La programmazione di GnuCash è iniziata nel 1997 e il primo rilascio risale al 1998. 
++
++-------------------
++
++Questo è il file LEGGIMI di GnuCash 2.2.x dei pacchetti binari per Windows.
diff --cc doc/README-lv.win32-bin.txt
index 85a4578,85a4578..0d8cbc1
--- a/doc/README-lv.win32-bin.txt
+++ b/doc/README-lv.win32-bin.txt
@@@ -1,52 -1,52 +1,52 @@@
--GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
--GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
--*BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
--
--GnuCash ir veidots tā, lai to būtu vienkārši lietot, tajā pat laikā tas
--ir pietiekami jaudīgs un ļauj uzskaitīt skaidru naudu, banku kontus,
--akcijas, ieņēmumus un izdevumus.
--Tajā var ātri un ērti reģistrēt darījumu, un tā ir balstīta uz 
--profesionālās grāmatvedības principiem, nodrošinot bilanci un
--precīzus pārskatus.
--
---------------------
--
--Tehniskā palīdzība
--
--Tiešsaistes palīdzība:    http://wiki.gnucash.org/wiki/FAQ
--VÄ“stkopas:  http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī http://wiki.gnucash.org/wiki/IRC
--
--Ja atklājat kļūdas vai problēmas, nekautrējieties tās reģistrēt "Bugzilla" kļūdu apstrādes 
--sistēmā http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Galvenās iespējas: 
--
--    * Divkāršā ieraksta grāmatvedība
--    * Akciju/Vērtspapīru/Kapitāla daļu konti
--    * QIF/OFX datu imports
--    * OFX/HBCI tiešsaistes banka
--    * Pārskati, grafiki
--    * Mazo uzņēmumu biznesa atbalsts
--    * Klienti, Piegādātāji, Darbi, Saņemtie un izsniegtie rēķini
--    * Ieplānoti grāmatojumi
--    * Finanšu aprēķini
--
--Vairāk informācijas un sākotnējā apmācība pieejama aktivizējot izvēlni
--"Palīdzība" un "Pamācība un jēdzienu ceļvedis".
--
---------------------
--
--Par Å¡o programmu:
--
--GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar 
--GNU General Public License (GPL) licenci. Tās galvenie izstrādātāji ir
--12 cilvēki, kas sadarbojas ar atbalstītājiem vairāk kā 6 valstīs.
--
--GnuCash izstrāde sākās 1997. gadā un tās pirmais laidiens bija 1998. gadā.
--
---------------------
--
--Šis ir GnuCash 2.2.x README fails Windows binārajai pakotnei.
++GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
++GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
++*BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
++
++GnuCash ir veidots tā, lai to būtu vienkārši lietot, tajā pat laikā tas
++ir pietiekami jaudīgs un ļauj uzskaitīt skaidru naudu, banku kontus,
++akcijas, ieņēmumus un izdevumus.
++Tajā var ātri un ērti reģistrēt darījumu, un tā ir balstīta uz 
++profesionālās grāmatvedības principiem, nodrošinot bilanci un
++precīzus pārskatus.
++
++-------------------
++
++Tehniskā palīdzība
++
++Tiešsaistes palīdzība:    http://wiki.gnucash.org/wiki/FAQ
++VÄ“stkopas:  http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī http://wiki.gnucash.org/wiki/IRC
++
++Ja atklājat kļūdas vai problēmas, nekautrējieties tās reģistrēt "Bugzilla" kļūdu apstrādes 
++sistēmā http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Galvenās iespējas: 
++
++    * Divkāršā ieraksta grāmatvedība
++    * Akciju/Vērtspapīru/Kapitāla daļu konti
++    * QIF/OFX datu imports
++    * OFX/HBCI tiešsaistes banka
++    * Pārskati, grafiki
++    * Mazo uzņēmumu biznesa atbalsts
++    * Klienti, Piegādātāji, Darbi, Saņemtie un izsniegtie rēķini
++    * Ieplānoti grāmatojumi
++    * Finanšu aprēķini
++
++Vairāk informācijas un sākotnējā apmācība pieejama aktivizējot izvēlni
++"Palīdzība" un "Pamācība un jēdzienu ceļvedis".
++
++-------------------
++
++Par Å¡o programmu:
++
++GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar 
++GNU General Public License (GPL) licenci. Tās galvenie izstrādātāji ir
++12 cilvēki, kas sadarbojas ar atbalstītājiem vairāk kā 6 valstīs.
++
++GnuCash izstrāde sākās 1997. gadā un tās pirmais laidiens bija 1998. gadā.
++
++-------------------
++
++Šis ir GnuCash 2.2.x README fails Windows binārajai pakotnei.
diff --cc doc/README-nl.win32-bin.txt
index 6825257,6825257..d54bc23
--- a/doc/README-nl.win32-bin.txt
+++ b/doc/README-nl.win32-bin.txt
@@@ -1,51 -1,51 +1,51 @@@
--GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
--onder de GNU General Public License (GPL) en is beschikbaar voor
--GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
--
--Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
--programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
--te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
--anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
--balans en nauwkeurige rapporten te verzekeren.
--
---------------------
--
--Beschikbare bronnen voor ondersteuning
--
--Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
--Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
--
--Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
--bug opvolgsysteem "Bugzilla":
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Interessante functies: 
--
--    * Dubbel boekhouden
--    * Aandelen-/belegginsrekeningen
--    * QIF/OFX/HBCI import met dubbele transactie herkenning
--    * Rapporten, grafieken
--    * Klein-ondernemingsboekhouding
--    * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
--    * Periodieke Transacties
--    * Financiële berekeningen
--
--Meer informatie en een handleiding om je op weg te helpen vind je
--in het "Hulp" menu onder het "Tutorial en concepten gids".
--
---------------------
--
--Over het programma:
--
--GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
--GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
--6 landen gezamelijk ontwikkeld.
--
--De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
--
---------------------
--
--Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.
++GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
++onder de GNU General Public License (GPL) en is beschikbaar voor
++GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
++
++Het is een eenvoudig te gebruiken, en tegelijkertijd krachtig en flexibel
++programma dat je helpt om je bankrekeningen, aandelen, inkomsten en uitgaven
++te beheren. Zo vlot en intuïtief te gebruiken als een dagboek enerzijds, en
++anderzijds gebaseerd op professionele boekhoudkundige principes om boeken in
++balans en nauwkeurige rapporten te verzekeren.
++
++-------------------
++
++Beschikbare bronnen voor ondersteuning
++
++Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
++Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
++
++Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
++bug opvolgsysteem "Bugzilla":
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Interessante functies: 
++
++    * Dubbel boekhouden
++    * Aandelen-/belegginsrekeningen
++    * QIF/OFX/HBCI import met dubbele transactie herkenning
++    * Rapporten, grafieken
++    * Klein-ondernemingsboekhouding
++    * Klanten, verkopers, opdrachten, Facturen, Lopende rekening
++    * Periodieke Transacties
++    * Financiële berekeningen
++
++Meer informatie en een handleiding om je op weg te helpen vind je
++in het "Hulp" menu onder het "Tutorial en concepten gids".
++
++-------------------
++
++Over het programma:
++
++GnuCash is a  vrij, open source boekhoudprogramma uitgegeven onder de
++GNU General Public License (GPL). Het wordt door 12 personen uit meer dan
++6 landen gezamelijk ontwikkeld.
++
++De ontwikkeling van GnuCash begon in 1997, de de eerste uitgave was in 1998. 
++
++-------------------
++
++Dit is het Nederlandstalige GnuCash 2.2.x LEESMIJ bestand voor het Windows installatie programma.
diff --cc doc/README-zh_CN.win32-bin.txt
index 01f9ea7,01f9ea7..c9f8915
--- a/doc/README-zh_CN.win32-bin.txt
+++ b/doc/README-zh_CN.win32-bin.txt
@@@ -1,41 -1,41 +1,41 @@@
--GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
--
--致力于易于使用,但功能强大而且灵活。GnuCash 允许您跟踪银行账户、股票、收入和支出。就像账簿一样快捷而且直观,它是基于专业的会计理念来确保平衡的账簿和准确的报告。
--
---------------------
--
--您可以获得支持的途径
--
--在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
--邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道,另见 http://wiki.gnucash.org/wiki/IRC
--
--如果您遇到了任何 bug 或者问题,请不要犹豫,将它们报告到我们的 bug 跟踪工具“Bugzilla”:http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--功能亮点:
--
--    * 复式记账会计
--    * 股票/债券/基金科目
--    * QIF/OFX 导入
--    * OFX/HBCI 网上银行
--    * 报告、图表
--    * 小型企业财会
--    * 客户、厂商、任务、发票、应付账款及应收账款
--    * 计划的交易
--    * 金融计算工具
--
--当点击“教程和理念指南”时,可以在“帮助”菜单中找到更多的信息以及如何开始的教程。
--
---------------------
--
--关于程序:
--
--GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
--
--程序撰写开始于1997年,并且于1998年第一次发布。
--
---------------------
--
--这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。
++GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
++
++致力于易于使用,但功能强大而且灵活。GnuCash 允许您跟踪银行账户、股票、收入和支出。就像账簿一样快捷而且直观,它是基于专业的会计理念来确保平衡的账簿和准确的报告。
++
++-------------------
++
++您可以获得支持的途径
++
++在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
++邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道,另见 http://wiki.gnucash.org/wiki/IRC
++
++如果您遇到了任何 bug 或者问题,请不要犹豫,将它们报告到我们的 bug 跟踪工具“Bugzilla”:http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++功能亮点:
++
++    * 复式记账会计
++    * 股票/债券/基金科目
++    * QIF/OFX 导入
++    * OFX/HBCI 网上银行
++    * 报告、图表
++    * 小型企业财会
++    * 客户、厂商、任务、发票、应付账款及应收账款
++    * 计划的交易
++    * 金融计算工具
++
++当点击“教程和理念指南”时,可以在“帮助”菜单中找到更多的信息以及如何开始的教程。
++
++-------------------
++
++关于程序:
++
++GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL)。它是由横跨6个国家共12个开发人员共同合作开发而成。
++
++程序撰写开始于1997年,并且于1998年第一次发布。
++
++-------------------
++
++这是 GnuCash 2.2.x 用于 Windows 二进制发布包的自述文件。
diff --cc doc/README-zh_TW.win32-bin.txt
index d0f0397,d0f0397..19f62d4
--- a/doc/README-zh_TW.win32-bin.txt
+++ b/doc/README-zh_TW.win32-bin.txt
@@@ -1,42 -1,42 +1,42 @@@
--GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
--
--GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以追蹤銀行帳戶、股票、收入與支出,就像用帳簿一樣快捷、直覺。基於專業的會計原則確保帳目平衡並提供準確的報表。
--
---------------------
--
--可獲得支援的管道
--
--常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
--通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (聊天):     irc.gnome.org 伺服器的 #gnucash 頻道,見 http://wiki.gnucash.org/wiki/IRC
--
--如果您遇到了任何 bug 或問題,請不要遲疑,將問題報告到我們的 bug 追蹤系統 "Bugzilla": (請用英文)
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--功能特點:
--
--    * 複式簿記
--    * 股票/債券/基金帳號
--    * 匯入 QIF/OFX
--    * OFX/HBCI 網路銀行
--    * 各式報告、圖表
--    * 小企業財務管理
--    * 客戶、廠商、工作、收據、應付帳款、應收帳款
--    * 交易排程
--    * 金融計算工具
--
--更多資訊及入門教學可以在功能表 "說明" 裡的 "教學與觀念指南" 找到。
--
---------------------
--
--關於程式:
--
--GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
--
--GnuCash 的程式撰寫始於 1997 年,第一版發布於 1998 年。
--
---------------------
--
--這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。
++GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
++
++GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以追蹤銀行帳戶、股票、收入與支出,就像用帳簿一樣快捷、直覺。基於專業的會計原則確保帳目平衡並提供準確的報表。
++
++-------------------
++
++可獲得支援的管道
++
++常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
++通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (聊天):     irc.gnome.org 伺服器的 #gnucash 頻道,見 http://wiki.gnucash.org/wiki/IRC
++
++如果您遇到了任何 bug 或問題,請不要遲疑,將問題報告到我們的 bug 追蹤系統 "Bugzilla": (請用英文)
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++功能特點:
++
++    * 複式簿記
++    * 股票/債券/基金帳號
++    * 匯入 QIF/OFX
++    * OFX/HBCI 網路銀行
++    * 各式報告、圖表
++    * 小企業財務管理
++    * 客戶、廠商、工作、收據、應付帳款、應收帳款
++    * 交易排程
++    * 金融計算工具
++
++更多資訊及入門教學可以在功能表 "說明" 裡的 "教學與觀念指南" 找到。
++
++-------------------
++
++關於程式:
++
++GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL)發布。它是由橫跨 6 國共 12 個開發人員共同合作開發而成。
++
++GnuCash 的程式撰寫始於 1997 年,第一版發布於 1998 年。
++
++-------------------
++
++這是 GnuCash 2.2.x 在 Windows 二進位套件的 README 檔案。
diff --cc doc/README.win32-bin.txt
index 5bf8c2b,5bf8c2b..69a4b93
--- a/doc/README.win32-bin.txt
+++ b/doc/README.win32-bin.txt
@@@ -1,52 -1,52 +1,52 @@@
--GnuCash is a free, open source accounting program released under the
--GNU General Public License (GPL) and available for GNU/Linux, *BSD,
--Solaris, Mac OSX, and Microsoft Windows.
--
--Designed to be easy to use, yet powerful and flexible, GnuCash allows
--you to track bank accounts, stocks, income and expenses. As quick and
--intuitive to use as a checkbook register, it is based on professional
--accounting principles to ensure balanced books and accurate reports.
--
---------------------
--
--Available Support Options
--
--Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
--Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
--IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
--
--If you encounter any bugs or problems, do not hesitate to report them
--into our bug tracking tool "Bugzilla":
--http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
--
---------------------
--
--Feature Highlights: 
--
--    * Double-Entry Accounting
--    * Stock/Bond/Mutual Fund Accounts
--    * QIF/OFX Import
--    * OFX/HBCI Online Banking
--    * Reports, Graphs
--    * Small-Business Accounting
--    * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
--    * Scheduled Transactions
--    * Financial Calculations
--
--More information and a Tutorial on how to get started can be found in
--the "Help" menu when clicking on "Tutorial and Concepts Guide".
--
---------------------
--
--About the Program:
--
--GnuCash is a free, open source accounting program released under the
--GNU General Public License (GPL). It is collaboratively developed by
--12 people from over 6 countries.
--
--Programming on GnuCash began in 1997, and its first release was in
--1998. 
--
---------------------
--
--This is the GnuCash 2.2.x README file for Windows binary packages.
++GnuCash is a free, open source accounting program released under the
++GNU General Public License (GPL) and available for GNU/Linux, *BSD,
++Solaris, Mac OSX, and Microsoft Windows.
++
++Designed to be easy to use, yet powerful and flexible, GnuCash allows
++you to track bank accounts, stocks, income and expenses. As quick and
++intuitive to use as a checkbook register, it is based on professional
++accounting principles to ensure balanced books and accurate reports.
++
++-------------------
++
++Available Support Options
++
++Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
++Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
++IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
++
++If you encounter any bugs or problems, do not hesitate to report them
++into our bug tracking tool "Bugzilla":
++http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash
++
++-------------------
++
++Feature Highlights: 
++
++    * Double-Entry Accounting
++    * Stock/Bond/Mutual Fund Accounts
++    * QIF/OFX Import
++    * OFX/HBCI Online Banking
++    * Reports, Graphs
++    * Small-Business Accounting
++    * Customers, Vendors, Jobs, Invoices, Accounts/Payables and /Receivables
++    * Scheduled Transactions
++    * Financial Calculations
++
++More information and a Tutorial on how to get started can be found in
++the "Help" menu when clicking on "Tutorial and Concepts Guide".
++
++-------------------
++
++About the Program:
++
++GnuCash is a free, open source accounting program released under the
++GNU General Public License (GPL). It is collaboratively developed by
++12 people from over 6 countries.
++
++Programming on GnuCash began in 1997, and its first release was in
++1998. 
++
++-------------------
++
++This is the GnuCash 2.2.x README file for Windows binary packages.
diff --cc doc/examples/downloaded.mt940
index 64afa9a,64afa9a..3ddb2e1
--- a/doc/examples/downloaded.mt940
+++ b/doc/examples/downloaded.mt940
@@@ -1,9 -1,9 +1,9 @@@
--:20:STARTUMS  
--:25:80007777/2602272001
--:28C:0
--:60F:C060228EUR0,00
--:61:0604280228D12,56N020NONREF//
--:86:020?00ÜBERWEISUNG?100?20TESTING GNUCASH FOR HBCI?21AND MT940
--?3080007777?312602272003?32GNUCASH?34000
--:62F:D060228EUR12,56
---
++:20:STARTUMS  
++:25:80007777/2602272001
++:28C:0
++:60F:C060228EUR0,00
++:61:0604280228D12,56N020NONREF//
++:86:020?00ÜBERWEISUNG?100?20TESTING GNUCASH FOR HBCI?21AND MT940
++?3080007777?312602272003?32GNUCASH?34000
++:62F:D060228EUR12,56
++-
diff --cc gnucash/gnome-utils/gnc-tree-view-commodity.c
index 62d21d9,0000000..ebd2ea6
mode 100644,000000..100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@@ -1,708 -1,0 +1,708 @@@
 +/********************************************************************\
 + * gnc-tree-view-commodity.c -- GtkTreeView implementation to       *
 + *                            display commodities in a GtkTreeView. *
 + * Copyright (C) 2003,2005 David Hampton <hampton at employees.org>    *
 + *                                                                  *
 + * This program is free software; you can redistribute it and/or    *
 + * modify it under the terms of the GNU General Public License as   *
 + * published by the Free Software Foundation; either version 2 of   *
 + * the License, or (at your option) any later version.              *
 + *                                                                  *
 + * This program is distributed in the hope that it will be useful,  *
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
 + * GNU General Public License for more details.                     *
 + *                                                                  *
 + * You should have received a copy of the GNU General Public License*
 + * along with this program; if not, contact:                        *
 + *                                                                  *
 + * Free Software Foundation           Voice:  +1-617-542-5942       *
 + * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 + * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 + *                                                                  *
 +\********************************************************************/
 +
 +#include <config.h>
 +
 +#include <gtk/gtk.h>
 +#include <glib/gi18n.h>
 +#include <string.h>
 +
 +#include "gnc-tree-view.h"
 +#include "gnc-tree-model-commodity.h"
 +#include "gnc-tree-view-commodity.h"
 +
 +#include "gnc-commodity.h"
 +#include "gnc-component-manager.h"
 +#include "gnc-engine.h"
 +#include "gnc-glib-utils.h"
 +#include "gnc-gnome-utils.h"
 +#include "gnc-icons.h"
 +#include "gnc-ui-util.h"
 +
 +
 +/** Static Globals *******************************************************/
 +
 +/* This static indicates the debugging module that this .o belongs to.  */
 +static QofLogModule log_module = GNC_MOD_GUI;
 +
 +/** Declarations *********************************************************/
 +static void gnc_tree_view_commodity_class_init (GncTreeViewCommodityClass *klass);
 +static void gnc_tree_view_commodity_init (GncTreeViewCommodity *view);
 +static void gnc_tree_view_commodity_finalize (GObject *object);
 +static void gnc_tree_view_commodity_destroy (GtkWidget *widget);
 +
 +typedef struct GncTreeViewCommodityPrivate
 +{
 +    gpointer dummy;
 +} GncTreeViewCommodityPrivate;
 +
 +#define GNC_TREE_VIEW_COMMODITY_GET_PRIVATE(o)  \
 +   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW_COMMODITY, GncTreeViewCommodityPrivate))
 +
 +
 +/************************************************************/
 +/*               g_object required functions                */
 +/************************************************************/
 +
 +static GObjectClass *parent_class = NULL;
 +
 +GType
 +gnc_tree_view_commodity_get_type (void)
 +{
 +    static GType gnc_tree_view_commodity_type = 0;
 +
 +    if (gnc_tree_view_commodity_type == 0)
 +    {
 +        static const GTypeInfo our_info =
 +        {
 +            sizeof (GncTreeViewCommodityClass),
 +            NULL,
 +            NULL,
 +            (GClassInitFunc) gnc_tree_view_commodity_class_init,
 +            NULL,
 +            NULL,
 +            sizeof (GncTreeViewCommodity),
 +            0,
 +            (GInstanceInitFunc) gnc_tree_view_commodity_init
 +        };
 +
 +        gnc_tree_view_commodity_type = g_type_register_static (GNC_TYPE_TREE_VIEW,
 +                                       "GncTreeViewCommodity",
 +                                       &our_info, 0);
 +    }
 +
 +    return gnc_tree_view_commodity_type;
 +}
 +
 +static void
 +gnc_tree_view_commodity_class_init (GncTreeViewCommodityClass *klass)
 +{
 +    GObjectClass *o_class;
 +    GtkWidgetClass *widget_class;
 +
 +    parent_class = g_type_class_peek_parent (klass);
 +
 +    o_class = G_OBJECT_CLASS (klass);
 +    widget_class = GTK_WIDGET_CLASS (klass);
 +
 +    /* GObject signals */
 +    o_class->finalize = gnc_tree_view_commodity_finalize;
 +
 +    /* GtkWidget signals */
 +    widget_class->destroy = gnc_tree_view_commodity_destroy;
 +
 +    g_type_class_add_private(klass, sizeof(GncTreeViewCommodityPrivate));
 +}
 +
 +static void
 +gnc_tree_view_commodity_init (GncTreeViewCommodity *view)
 +{
 +}
 +
 +static void
 +gnc_tree_view_commodity_finalize (GObject *object)
 +{
 +    g_return_if_fail (object != NULL);
 +    g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY (object));
 +
 +    ENTER("view %p", object);
 +    if (G_OBJECT_CLASS (parent_class)->finalize)
 +        (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 +    LEAVE(" ");
 +}
 +
 +static void
 +gnc_tree_view_commodity_destroy (GtkWidget *widget)
 +{
 +    g_return_if_fail (widget != NULL);
 +    g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY (widget));
 +
 +    ENTER("view %p", widget);
 +
 +    if (GTK_WIDGET_CLASS (parent_class)->destroy)
 +        (* GTK_WIDGET_CLASS (parent_class)->destroy) (widget);
 +    LEAVE(" ");
 +}
 +
 +
 +/************************************************************/
 +/*                      sort functions                      */
 +/************************************************************/
 +
 +static gboolean
 +get_commodities_w_iters (GtkTreeModel *f_model,
 +                         GtkTreeIter *f_iter_a,
 +                         GtkTreeIter *f_iter_b,
 +                         GtkTreeModel **model_p,
 +                         GtkTreeIter *iter_a,
 +                         GtkTreeIter *iter_b,
 +                         gnc_commodity **comm_a,
 +                         gnc_commodity **comm_b)
 +{
 +    GncTreeModelCommodity *model;
 +    GtkTreeModel *tree_model;
 +
 +    tree_model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
 +    model = GNC_TREE_MODEL_COMMODITY(tree_model);
 +
 +    gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
 +            iter_a,
 +            f_iter_a);
 +
 +    gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
 +            iter_b,
 +            f_iter_b);
 +
 +    /* Both iters must point to commodities for this to be meaningful */
 +    if (!gnc_tree_model_commodity_iter_is_commodity (model, iter_a))
 +        return FALSE;
 +    if (!gnc_tree_model_commodity_iter_is_commodity (model, iter_b))
 +        return FALSE;
 +
 +    *comm_a = gnc_tree_model_commodity_get_commodity (model, iter_a);
 +    *comm_b = gnc_tree_model_commodity_get_commodity (model, iter_b);
 +    if (model_p)
 +        *model_p = tree_model;
 +    return TRUE;
 +}
 +
 +static gboolean
 +get_commodities (GtkTreeModel *f_model,
 +                 GtkTreeIter *f_iter_a,
 +                 GtkTreeIter *f_iter_b,
 +                 GtkTreeModel **model_p,
 +                 gnc_commodity **comm_a,
 +                 gnc_commodity **comm_b)
 +{
 +    GtkTreeIter iter_a, iter_b;
 +
 +    return get_commodities_w_iters(f_model, f_iter_a, f_iter_b, model_p,
 +                                   &iter_a, &iter_b, comm_a, comm_b);
 +}
 +
 +static gint
 +sort_namespace (GtkTreeModel *f_model,
 +                GtkTreeIter *f_iter_a,
 +                GtkTreeIter *f_iter_b)
 +{
 +    GncTreeModelCommodity *model;
 +    GtkTreeModel *tree_model;
 +    GtkTreeIter iter_a, iter_b;
 +    gnc_commodity_namespace *ns_a, *ns_b;
 +
 +    tree_model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
 +    model = GNC_TREE_MODEL_COMMODITY(tree_model);
 +
 +    gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
 +            &iter_a,
 +            f_iter_a);
 +    gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
 +            &iter_b,
 +            f_iter_b);
 +
 +    ns_a = gnc_tree_model_commodity_get_namespace (model, &iter_a);
 +    ns_b = gnc_tree_model_commodity_get_namespace (model, &iter_b);
 +    return safe_utf8_collate (gnc_commodity_namespace_get_gui_name (ns_a),
 +                              gnc_commodity_namespace_get_gui_name (ns_b));
 +}
 +
 +static gint
 +default_sort (gnc_commodity *comm_a, gnc_commodity *comm_b)
 +{
 +    gint fraction_a, fraction_b, result;
 +
 +    result = safe_utf8_collate (gnc_commodity_get_namespace (comm_a),
 +                                gnc_commodity_get_namespace (comm_b));
 +    if (result != 0) return result;
 +
 +    result = safe_utf8_collate (gnc_commodity_get_mnemonic (comm_a),
 +                                gnc_commodity_get_mnemonic (comm_b));
 +    if (result != 0) return result;
 +
 +    result = safe_utf8_collate (gnc_commodity_get_fullname (comm_a),
 +                                gnc_commodity_get_fullname (comm_b));
 +    if (result != 0) return result;
 +
 +    result = safe_utf8_collate (gnc_commodity_get_cusip (comm_a),
 +                                gnc_commodity_get_cusip (comm_b));
 +    if (result != 0) return result;
 +
 +    fraction_a = gnc_commodity_get_fraction (comm_a);
 +    fraction_b = gnc_commodity_get_fraction (comm_b);
 +
 +    if (fraction_a < fraction_b)
 +        return -1;
 +
 +    if (fraction_b < fraction_a)
 +        return 1;
 +
 +    return 0;
 +}
 +
 +static gint
 +sort_by_commodity_string (GtkTreeModel *f_model,
 +                          GtkTreeIter *f_iter_a,
 +                          GtkTreeIter *f_iter_b,
 +                          gpointer user_data)
 +{
 +    GtkTreeModel *model;
 +    GtkTreeIter iter_a, iter_b;
 +    gnc_commodity *comm_a, *comm_b;
 +    gchar *str1, *str2;
 +    gint column = GPOINTER_TO_INT(user_data);
 +    gint result;
 +
 +    if (!get_commodities_w_iters(f_model, f_iter_a, f_iter_b,
 +                                 &model, &iter_a, &iter_b, &comm_a, &comm_b))
 +        return sort_namespace (f_model, f_iter_a, f_iter_b);
 +
 +    /* Get the strings. */
 +    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter_a,  column, &str1, -1);
 +    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter_b,  column, &str2, -1);
 +
 +    result = safe_utf8_collate(str1, str2);
 +    g_free(str1);
 +    g_free(str2);
 +    if (result != 0)
 +        return result;
 +    return default_sort(comm_a, comm_b);
 +}
 +
 +
 +static gint
 +sort_by_fraction (GtkTreeModel *f_model,
 +                  GtkTreeIter *f_iter_a,
 +                  GtkTreeIter *f_iter_b,
 +                  gpointer user_data)
 +{
 +    gnc_commodity *comm_a, *comm_b;
 +    gint fraction_a, fraction_b;
 +
 +    if (!get_commodities (f_model, f_iter_a, f_iter_b, NULL, &comm_a, &comm_b))
 +        return sort_namespace (f_model, f_iter_a, f_iter_b);
 +
 +    fraction_a = gnc_commodity_get_fraction (comm_a);
 +    fraction_b = gnc_commodity_get_fraction (comm_b);
 +
 +    if (fraction_a < fraction_b)
 +        return -1;
 +
 +    if (fraction_b < fraction_a)
 +        return 1;
 +
 +    return default_sort(comm_a, comm_b);
 +}
 +
 +static gint
 +sort_by_quote_flag (GtkTreeModel *f_model,
 +                    GtkTreeIter *f_iter_a,
 +                    GtkTreeIter *f_iter_b,
 +                    gpointer user_data)
 +{
 +    gnc_commodity *comm_a, *comm_b;
 +    gboolean flag_a, flag_b;
 +
 +    if (!get_commodities (f_model, f_iter_a, f_iter_b, NULL, &comm_a, &comm_b))
 +        return sort_namespace (f_model, f_iter_a, f_iter_b);
 +
 +    flag_a = gnc_commodity_get_quote_flag(comm_a);
 +    flag_b = gnc_commodity_get_quote_flag(comm_b);
 +
 +    if (flag_a < flag_b)
 +        return -1;
 +    else if (flag_a > flag_b)
 +        return 1;
 +    return default_sort(comm_a, comm_b);
 +}
 +
 +/************************************************************/
 +/*                    New View Creation                     */
 +/************************************************************/
 +
 +/*
 + * Create a new commodity tree view with (optional) top level root node.
 + * This view will be based on a model that is common to all view of
 + * the same set of books, but will have its own private filter on that
 + * model.
 + */
 +GtkTreeView *
 +gnc_tree_view_commodity_new (QofBook *book,
 +                             const gchar *first_property_name,
 +                             ...)
 +{
 +    GncTreeView *view;
 +    GtkTreeModel *model, *f_model, *s_model;
 +    GtkTreeViewColumn *col;
 +    gnc_commodity_table *ct;
 +    va_list var_args;
 +
 +    ENTER(" ");
 +    /* Create/get a pointer to the existing model for this set of books. */
 +    ct = gnc_commodity_table_get_table (book);
 +    model = gnc_tree_model_commodity_new (book, ct);
 +
 +    /* Set up the view private filter on the common model. */
 +    f_model = gtk_tree_model_filter_new (model, NULL);
 +    g_object_unref(G_OBJECT(model));
 +    s_model = gtk_tree_model_sort_new_with_model (f_model);
 +    g_object_unref(G_OBJECT(f_model));
 +
 +    /* Create our view */
 +    view = g_object_new (GNC_TYPE_TREE_VIEW_COMMODITY,
 +                         "name", "commodity_tree", NULL);
 +    gtk_tree_view_set_model (GTK_TREE_VIEW (view), s_model);
 +    g_object_unref(G_OBJECT(s_model));
 +
 +    DEBUG("model ref count is %d",   G_OBJECT(model)->ref_count);
 +    DEBUG("f_model ref count is %d", G_OBJECT(f_model)->ref_count);
 +    DEBUG("s_model ref count is %d", G_OBJECT(s_model)->ref_count);
 +
 +    /* Set default visibilities */
 +    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(view), FALSE);
 +
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Namespace"), "namespace", NULL, "NASDAQ",
 +              GNC_TREE_MODEL_COMMODITY_COL_NAMESPACE,
 +              GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
 +              sort_by_commodity_string);
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Symbol"), "symbol", NULL, "ACMEACME",
 +              GNC_TREE_MODEL_COMMODITY_COL_MNEMONIC,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Name"), "name", NULL, "Acme Corporation, Inc.",
 +              GNC_TREE_MODEL_COMMODITY_COL_FULLNAME,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Print Name"), "printname", NULL,
 +              "ACMEACME (Acme Corporation, Inc.)",
 +              GNC_TREE_MODEL_COMMODITY_COL_PRINTNAME,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Display symbol"), "user_symbol", NULL, "ACME",
 +              GNC_TREE_MODEL_COMMODITY_COL_USER_SYMBOL,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Unique Name"), "uniquename", NULL,
 +              "NASDAQ::ACMEACME", GNC_TREE_MODEL_COMMODITY_COL_UNIQUE_NAME,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    col = gnc_tree_view_add_text_column (
 +              /* Translators: Again replace CUSIP by the name of your
 +                 National Securities Identifying Number. */
-               view, _("ISIN/CUSIP"), "cusip_code", NULL, "QWERTYUIOP",
++              view, _("ISIN/CUSIP"), "cusip_code", NULL, "US1234567890",
 +              GNC_TREE_MODEL_COMMODITY_COL_CUSIP,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 +    col = gnc_tree_view_add_numeric_column (
 +              view, _("Fraction"), "fraction", "10000",
 +              GNC_TREE_MODEL_COMMODITY_COL_FRACTION,
 +              GNC_TREE_VIEW_COLUMN_COLOR_NONE,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_fraction);
 +    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 +    col = gnc_tree_view_add_toggle_column(
 +              view, _("Get Quotes"),
 +              /* Translators: This string has a context prefix; the translation
 +                 must only contain the part after the | character. */
 +              Q_("Column letter for 'Get Quotes'|Q"), "quote_flag",
 +              GNC_TREE_MODEL_COMMODITY_COL_QUOTE_FLAG,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_quote_flag,
 +              NULL);
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Source"), "quote_source", NULL, "alphavantage",
 +              GNC_TREE_MODEL_COMMODITY_COL_QUOTE_SOURCE,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    col = gnc_tree_view_add_text_column (
 +              view, _("Timezone"), "quote_timezone", NULL, "America/New_York",
 +              GNC_TREE_MODEL_COMMODITY_COL_QUOTE_TZ,
 +              GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
 +              sort_by_commodity_string);
 +    g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
 +
 +    gnc_tree_view_configure_columns(view);
 +
 +    /* Set properties */
 +    va_start (var_args, first_property_name);
 +    g_object_set_valist (G_OBJECT(view), first_property_name, var_args);
 +    va_end (var_args);
 +
 +    /* Sort on the name column by default. This allows for a consistent
 +     * sort if commodities are briefly removed and re-added. */
 +    if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
 +            NULL, NULL))
 +    {
 +        gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),
 +                                             GNC_TREE_MODEL_COMMODITY_COL_FULLNAME,
 +                                             GTK_SORT_ASCENDING);
 +    }
 +
 +    gtk_widget_show(GTK_WIDGET(view));
 +    LEAVE(" %p", view);
 +    return GTK_TREE_VIEW(view);
 +}
 +
 +/************************************************************/
 +/*                   Auxiliary Functions                    */
 +/************************************************************/
 +
 +#define debug_path(fn, path) {				\
 +    gchar *path_string = gtk_tree_path_to_string(path); \
 +    fn("tree path %s", path_string);			\
 +    g_free(path_string);				\
 +  }
 +
 +#if 0 /* Not Used */
 +static gboolean
 +gnc_tree_view_commodity_get_iter_from_commodity (GncTreeViewCommodity *view,
 +        gnc_commodity *commodity,
 +        GtkTreeIter *s_iter)
 +{
 +    GtkTreeModel *model, *f_model, *s_model;
 +    GtkTreeIter iter, f_iter;
 +
 +    g_return_val_if_fail(GNC_IS_TREE_VIEW_COMMODITY(view), FALSE);
 +    g_return_val_if_fail(commodity != NULL, FALSE);
 +    g_return_val_if_fail(s_iter != NULL, FALSE);
 +
 +    ENTER("view %p, commodity %p (%s)", view, commodity, gnc_commodity_get_mnemonic(commodity));
 +
 +    /* Reach down to the real model and get an iter for this commodity */
 +    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
 +    f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
 +    model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
 +    if (!gnc_tree_model_commodity_get_iter_from_commodity (GNC_TREE_MODEL_COMMODITY(model), commodity, &iter))
 +    {
 +        LEAVE("model_get_iter_from_commodity failed");
 +        return FALSE;
 +    }
 +
 +    /* convert back to a sort iter */
 +    gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER(f_model),
 +            &f_iter, &iter);
 +    gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT(s_model),
 +            s_iter, &f_iter);
 +    LEAVE(" ");
 +    return TRUE;
 +}
 +#endif /* Not Used */
 +
 +/************************************************************/
 +/*          Commodity Tree View Visibility Filter           */
 +/************************************************************/
 +
 +typedef struct
 +{
 +    gnc_tree_view_commodity_ns_filter_func user_ns_fn;
 +    gnc_tree_view_commodity_cm_filter_func user_cm_fn;
 +    gpointer                               user_data;
 +    GDestroyNotify                         user_destroy;
 +} filter_user_data;
 +
 +static void
 +gnc_tree_view_commodity_filter_destroy (gpointer data)
 +{
 +    filter_user_data *fd = data;
 +
 +    if (fd->user_destroy)
 +        fd->user_destroy(fd->user_data);
 +    g_free(fd);
 +}
 +
 +static gboolean
 +gnc_tree_view_commodity_filter_helper (GtkTreeModel *model,
 +                                       GtkTreeIter *iter,
 +                                       gpointer data)
 +{
 +    gnc_commodity_namespace *name_space;
 +    gnc_commodity *commodity;
 +    filter_user_data *fd = data;
 +
 +    g_return_val_if_fail (GNC_IS_TREE_MODEL_COMMODITY (model), FALSE);
 +    g_return_val_if_fail (iter != NULL, FALSE);
 +
 +    if (gnc_tree_model_commodity_iter_is_namespace (GNC_TREE_MODEL_COMMODITY(model), iter))
 +    {
 +        if (fd->user_ns_fn)
 +        {
 +            name_space = gnc_tree_model_commodity_get_namespace (GNC_TREE_MODEL_COMMODITY(model), iter);
 +            return fd->user_ns_fn(name_space, fd->user_data);
 +        }
 +        return TRUE;
 +    }
 +
 +    if (gnc_tree_model_commodity_iter_is_commodity (GNC_TREE_MODEL_COMMODITY(model), iter))
 +    {
 +        if (fd->user_cm_fn)
 +        {
 +            commodity = gnc_tree_model_commodity_get_commodity (GNC_TREE_MODEL_COMMODITY(model), iter);
 +            return fd->user_cm_fn(commodity, fd->user_data);
 +        }
 +        return TRUE;
 +    }
 +
 +    return FALSE;
 +}
 +
 +/*
 + * Set an GtkTreeModel visible filter on this commodity.  This filter will be
 + * called for each commodity that the tree is about to show, and the
 + * commodity will be passed to the callback function.
 + */
 +void
 +gnc_tree_view_commodity_set_filter (GncTreeViewCommodity *view,
 +                                    gnc_tree_view_commodity_ns_filter_func ns_func,
 +                                    gnc_tree_view_commodity_cm_filter_func cm_func,
 +                                    gpointer data,
 +                                    GDestroyNotify destroy)
 +{
 +    GtkTreeModel *f_model, *s_model;
 +    filter_user_data *fd = data;
 +
 +    g_return_if_fail(GNC_IS_TREE_VIEW_COMMODITY(view));
 +    g_return_if_fail((ns_func != NULL) || (cm_func != NULL));
 +
 +    ENTER("view %p, ns func %p, cm func %p, data %p, destroy %p",
 +          view, ns_func, cm_func, data, destroy);
 +
 +    fd = g_malloc(sizeof(filter_user_data));
 +    fd->user_ns_fn   = ns_func;
 +    fd->user_cm_fn   = cm_func;
 +    fd->user_data    = data;
 +    fd->user_destroy = destroy;
 +
 +    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
 +    f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
 +    gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (f_model),
 +                                            gnc_tree_view_commodity_filter_helper,
 +                                            fd,
 +                                            gnc_tree_view_commodity_filter_destroy);
 +
 +    /* Whack any existing levels. The top two levels have been created
 +     * before this routine can be called. */
 +    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
 +    LEAVE(" ");
 +}
 +
 +/*
 + * Forces the entire commodity tree to be re-evaluated for visibility.
 + */
 +void
 +gnc_tree_view_commodity_refilter (GncTreeViewCommodity *view)
 +{
 +    GtkTreeModel *f_model, *s_model;
 +
 +    g_return_if_fail(GNC_IS_TREE_VIEW_COMMODITY(view));
 +
 +    ENTER("view %p", view);
 +    s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
 +    f_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (s_model));
 +    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
 +    LEAVE(" ");
 +}
 +
 +
 +/************************************************************/
 +/*           Commodity Tree View Get/Set Functions            */
 +/************************************************************/
 +
 +/*
 + * Retrieve the selected commodity from an commodity tree view.  The
 + * commodity tree must be in single selection mode.
 + */
 +gnc_commodity *
 +gnc_tree_view_commodity_get_selected_commodity (GncTreeViewCommodity *view)
 +{
 +    GtkTreeSelection *selection;
 +    GtkTreeModel *model, *f_model, *s_model;
 +    GtkTreeIter iter, f_iter, s_iter;
 +    gnc_commodity *commodity;
 +
 +    g_return_val_if_fail (GNC_IS_TREE_VIEW_COMMODITY (view), NULL);
 +
 +    ENTER("view %p", view);
 +
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
 +    if (!gtk_tree_selection_get_selected (selection, &s_model, &s_iter))
 +    {
 +        LEAVE("no commodity, get_selected failed");
 +        return FALSE;
 +    }
 +
 +    gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (s_model),
 +            &f_iter, &s_iter);
 +
 +    f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
 +    gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
 +            &iter, &f_iter);
 +
 +    model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
 +    commodity = gnc_tree_model_commodity_get_commodity (GNC_TREE_MODEL_COMMODITY(model),
 +                &iter);
 +    LEAVE("commodity %p (%s)", commodity,
 +          commodity ? gnc_commodity_get_mnemonic(commodity) : "");
 +    return commodity;
 +}
 +
 +
 +#if 0 /* Not Used */
 +/*
 + * This helper function is called once for each row in the tree view
 + * that is currently selected.  Its task is to an the corresponding
 + * commodity to the end of a glist.
 + */
 +static void
 +get_selected_commodities_helper (GtkTreeModel *s_model,
 +                                 GtkTreePath *s_path,
 +                                 GtkTreeIter *s_iter,
 +                                 gpointer data)
 +{
 +    GList **return_list = data;
 +    GtkTreeModel *model, *f_model;
 +    GtkTreeIter iter, f_iter;
 +    gnc_commodity *commodity;
 +
 +    gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (s_model),
 +            &f_iter, s_iter);
 +
 +    f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
 +    gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
 +            &iter, &f_iter);
 +
 +    model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
 +    commodity = gnc_tree_model_commodity_get_commodity (GNC_TREE_MODEL_COMMODITY(model),
 +                &iter);
 +    *return_list = g_list_append(*return_list, commodity);
 +}
 +#endif /* Not Used */
diff --cc gnucash/gnucash.rc.in
index b2e2776,0000000..bff61e1
mode 100644,000000..100644
--- a/gnucash/gnucash.rc.in
+++ b/gnucash/gnucash.rc.in
@@@ -1,33 -1,0 +1,33 @@@
- #include <windows.h>
- 
- APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
- 
- VS_VERSION VERSIONINFO
-  FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
-  PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
-  FILEFLAGSMASK   0x3fL
-  FILEFLAGS       0x0L
-  FILEOS          VOS__WINDOWS32
-  FILETYPE        VFT_APP
-  FILESUBTYPE     0x0L
- BEGIN
-   BLOCK "StringFileInfo"
-   BEGIN
-     BLOCK "040904E4"
-     BEGIN
-       VALUE "CompanyName", "GnuCash Development Team"
-       VALUE "FileDescription", "GnuCash Program File"
-       VALUE "FileVersion", "@VERSION@"
-       VALUE "InternalName", "gnucash"
-       VALUE "LegalCopyright", "©2017 GnuCash Development Team, Licence: GPL v2.0 or later"
-       VALUE "OriginalFilename", "gnucash.exe"
-       VALUE "ProductName", "GnuCash Free Finance Manager"
-       VALUE "ProductVersion", "@VERSION@"
-     END
-   END
- 
-   BLOCK "VarFileInfo"
-   BEGIN
-     VALUE "Translation", 0x409, 1252
-   END
- END
++#include <windows.h>
++
++APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
++
++VS_VERSION VERSIONINFO
++ FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
++ PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
++ FILEFLAGSMASK   0x3fL
++ FILEFLAGS       0x0L
++ FILEOS          VOS__WINDOWS32
++ FILETYPE        VFT_APP
++ FILESUBTYPE     0x0L
++BEGIN
++  BLOCK "StringFileInfo"
++  BEGIN
++    BLOCK "040904E4"
++    BEGIN
++      VALUE "CompanyName", "GnuCash Development Team"
++      VALUE "FileDescription", "GnuCash Program File"
++      VALUE "FileVersion", "@VERSION@"
++      VALUE "InternalName", "gnucash"
++      VALUE "LegalCopyright", "©2017 GnuCash Development Team, Licence: GPL v2.0 or later"
++      VALUE "OriginalFilename", "gnucash.exe"
++      VALUE "ProductName", "GnuCash Free Finance Manager"
++      VALUE "ProductVersion", "@VERSION@"
++    END
++  END
++
++  BLOCK "VarFileInfo"
++  BEGIN
++    VALUE "Translation", 0x409, 1252
++  END
++END
diff --cc libgnucash/engine/gnc-commodity.c
index ae37acb,0000000..0978fb8
mode 100644,000000..100644
--- a/libgnucash/engine/gnc-commodity.c
+++ b/libgnucash/engine/gnc-commodity.c
@@@ -1,2629 -1,0 +1,2651 @@@
 +/********************************************************************
 + * gnc-commodity.c -- api for tradable commodities (incl. currency) *
 + * Copyright (C) 2000 Bill Gribble                                  *
 + * Copyright (C) 2001,2003 Linas Vepstas <linas at linas.org>          *
 + * Copyright (c) 2006 David Hampton <hampton at employees.org>         *
 + *                                                                  *
 + * This program is free software; you can redistribute it and/or    *
 + * modify it under the terms of the GNU General Public License as   *
 + * published by the Free Software Foundation; either version 2 of   *
 + * the License, or (at your option) any later version.              *
 + *                                                                  *
 + * This program is distributed in the hope that it will be useful,  *
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
 + * GNU General Public License for more details.                     *
 + *                                                                  *
 + * You should have received a copy of the GNU General Public License*
 + * along with this program; if not, contact:                        *
 + *                                                                  *
 + * Free Software Foundation           Voice:  +1-617-542-5942       *
 + * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 + * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 + *                                                                  *
 + *******************************************************************/
 +
 +#include <config.h>
 +
 +#include <glib.h>
 +#include <glib/gi18n.h>
 +#include <ctype.h>
 +#include <limits.h>
 +#include <string.h>
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <regex.h>
 +#include <qofinstance-p.h>
 +
 +#include "gnc-commodity.h"
 +#include "gnc-locale-utils.h"
 +#include "gnc-prefs.h"
 +
 +static QofLogModule log_module = GNC_MOD_COMMODITY;
 +
 +/* Parts per unit is nominal, i.e. number of 'partname' units in
 + * a 'unitname' unit.  fraction is transactional, i.e. how many
 + * of the smallest-transactional-units of the currency are there
 + * in a 'unitname' unit. */
 +
 +enum
 +{
 +    PROP_0,
 +    PROP_NAMESPACE,	/* Table */
 +    PROP_FULL_NAME,	/* Table */
 +    PROP_MNEMONIC,	/* Table */
 +    PROP_PRINTNAME,	/* Constructed */
 +    PROP_CUSIP,		/* Table */
 +    PROP_FRACTION,	/* Table */
 +    PROP_UNIQUE_NAME,	/* Constructed */
 +    PROP_QUOTE_FLAG,	/* Table */
 +    PROP_QUOTE_SOURCE,	/* Table */
 +    PROP_QUOTE_TZ,	/* Table */
 +};
 +
 +struct gnc_commodity_s
 +{
 +    QofInstance inst;
 +};
 +
 +typedef struct CommodityPrivate
 +{
 +    gnc_commodity_namespace *name_space;
 +
 +    char    * fullname;
 +    char    * mnemonic;
 +    char    * printname;
 +    char    * cusip;          /* CUSIP or other identifying code */
 +    int       fraction;
 +    char    * unique_name;
 +
 +    gboolean  quote_flag;	    /* user wants price quotes */
 +    gnc_quote_source * quote_source;   /* current/old source of quotes */
 +    char    * quote_tz;
 +
 +    /* the number of accounts using this commodity - this field is not
 +     * persisted */
 +    int       usage_count;
 +
 +    /* the default display_symbol, set in iso-4217-currencies at start-up */
 +    const char * default_symbol;
 +} CommodityPrivate;
 +
 +#define GET_PRIVATE(o) \
 +    (G_TYPE_INSTANCE_GET_PRIVATE((o), GNC_TYPE_COMMODITY, CommodityPrivate))
 +
 +struct _GncCommodityClass
 +{
 +    QofInstanceClass parent_class;
 +};
 +
 +static void commodity_free(gnc_commodity * cm);
 +static void gnc_commodity_set_default_symbol(gnc_commodity *, const char *);
 +
 +struct gnc_commodity_namespace_s
 +{
 +    QofInstance inst;
 +
 +    gchar      * name;
 +    gboolean     iso4217;
 +    GHashTable * cm_table;
 +    GList      * cm_list;
 +};
 +
 +struct _GncCommodityNamespaceClass
 +{
 +    QofInstanceClass parent_class;
 +};
 +
 +struct gnc_commodity_table_s
 +{
 +    GHashTable * ns_table;
 +    GList      * ns_list;
 +};
 +
 +struct gnc_new_iso_code
 +{
 +    const char *old_code;
 +    const char *new_code;
 +} gnc_new_iso_codes[] =
 +{
 +    {"RUR", "RUB"}, /* Russian Ruble: RUR through 1997-12, RUB from 1998-01 onwards; see bug #393185 */
 +    {"PLZ", "PLN"}, /* Polish Zloty */
 +    {"UAG", "UAH"}, /* Ukraine Hryvnia */
 +    {"NIS", "ILS"}, /* New Israeli Shekel: The informal abbreviation may be "NIS", but
 +		     its iso-4217 is clearly ILS and only this! Incorrectly changed
 +		     due to bug#152755 (Nov 2004) and changed back again by bug#492417
 +		     (Oct 2008). */
 +    {"MXP", "MXN"}, /* Mexican (Nuevo) Peso */
 +    {"TRL", "TRY"}, /* New Turkish Lira: changed 2005 */
 +
 +    /* Only add currencies to this table when the old currency no longer
 +     * exists in the file iso-4217-currencies.scm */
 +};
 +#define GNC_NEW_ISO_CODES \
 +        (sizeof(gnc_new_iso_codes) / sizeof(struct gnc_new_iso_code))
 +
 +static char *fq_version = NULL;
 +
 +struct gnc_quote_source_s
 +{
 +    gboolean supported;
 +    QuoteSourceType type;
 +    gint index;
-     char *user_name;		/* User friendly name */
++    char *user_name;		/* User friendly name incl. region code*/
 +    char *old_internal_name;	/* Name used internally (deprecated) */
-     char *internal_name;		/* Name used internally and by finance::quote. */
++    char *internal_name;	/* Name used internally and by finance::quote. */
 +};
 +
++/* To update the following lists search the FQ modules for their 'method's
++ * because most of them have more than one.
++ */
 +static gnc_quote_source currency_quote_source =
 +{ TRUE, 0, 0, "Currency", "CURRENCY", "currency" };
 +
 +static gnc_quote_source single_quote_sources[] =
 +{
-     { FALSE, 0, 0, "Alphavantage USA", "ALPHAVANTAGE", "alphavantage" },
++    { FALSE, 0, 0, "Alphavantage, US", "ALPHAVANTAGE", "alphavantage" },
 +    { FALSE, 0, 0, "Amsterdam Euronext eXchange, NL", "AEX", "aex" },
 +    { FALSE, 0, 0, "American International Assurance, HK", "AIAHK", "aiahk" },
-     { FALSE, 0, 0, "Association  of  Mutual  Funds  in  India", "AMFIINDIA", "amfiindia" },
++    { FALSE, 0, 0, "Association of Mutual Funds in India", "AMFIINDIA", "amfiindia" },
 +    { FALSE, 0, 0, "Athens Stock Exchange, GR", "ASEGR", "asegr" },
 +    { FALSE, 0, 0, "Australian Stock Exchange, AU", "ASX", "asx" },
 +    { FALSE, 0, 0, "BAMOSZ funds, HU", "BAMOSZ", "bamosz" },
 +    { FALSE, 0, 0, "BMO NesbittBurns, CA", "BMONESBITTBURNS", "bmonesbittburns" },
 +    { FALSE, 0, 0, "Bucharest Stock Exchange, RO", "BSERO", "bsero" },
 +    { FALSE, 0, 0, "Budapest Stock Exchange (BET), ex-BUX, HU", "BSE", "bse" },
 +    { FALSE, 0, 0, "Canada Mutual", "CANADAMUTUAL", "canadamutual" },
 +    { FALSE, 0, 0, "Citywire Funds, GB", "citywire", "citywire" },
 +    { FALSE, 0, 0, "Colombo Stock Exchange, LK", "CSE", "cse" },
 +    { FALSE, 0, 0, "Cominvest, ex-Adig, DE", "COMINVEST", "cominvest" },
 +    { FALSE, 0, 0, "Deka Investments, DE", "DEKA", "deka" },
 +    { FALSE, 0, 0, "Dutch", "DUTCH", "dutch" },
 +    { FALSE, 0, 0, "DWS, DE", "DWS", "dwsfunds" },
 +    { FALSE, 0, 0, "Equinox Unit Trusts, ZA", "ZA_unittrusts", "za_unittrusts" },
-     { FALSE, 0, 0, "Fidelity", "FIDELITY", "fidelity" },
 +    { FALSE, 0, 0, "Fidelity Direct", "FIDELITY_DIRECT", "fidelity_direct" },
++    { FALSE, 0, 0, "Fidelity Fixed", "FIDELITY_DIRECT", "fidelityfixed" },
 +    { FALSE, 0, 0, "Finance Canada", "FINANCECANADA", "financecanada" },
 +    { FALSE, 0, 0, "Financial Times Funds service, GB", "FTFUNDS", "ftfunds" },
 +    { FALSE, 0, 0, "Finanzpartner, DE", "FINANZPARTNER", "finanzpartner" },
 +    { FALSE, 0, 0, "First Trust Portfolios, US", "FTPORTFOLIOS", "ftportfolios" },
 +    { FALSE, 0, 0, "Fund Library, CA", "FUNDLIBRARY", "fundlibrary" },
 +    { FALSE, 0, 0, "GoldMoney spot rates, JE", "GOLDMONEY", "goldmoney" },
 +    { FALSE, 0, 0, "Greece", "GREECE", "greece" },
 +    { FALSE, 0, 0, "Helsinki stock eXchange, FI", "HEX", "hex" },
 +    { FALSE, 0, 0, "Hungary", "HU", "hu" },
 +    { FALSE, 0, 0, "India Mutual", "INDIAMUTUAL", "indiamutual" },
 +    { FALSE, 0, 0, "Man Investments, AU", "maninv", "maninv" },
 +    { FALSE, 0, 0, "Morningstar, GB", "MSTARUK", "mstaruk" },
 +    { FALSE, 0, 0, "Morningstar, JP", "MORNINGSTARJP", "morningstarjp" },
 +    { FALSE, 0, 0, "Morningstar, SE", "MORNINGSTAR", "morningstar" },
 +    { FALSE, 0, 0, "Motley Fool, US", "FOOL", "fool" },
 +    { FALSE, 0, 0, "New Zealand stock eXchange, NZ", "NZX", "nzx" },
 +    { FALSE, 0, 0, "Paris Stock Exchange/Boursorama, FR", "BOURSO", "bourso" },
 +    { FALSE, 0, 0, "Paris Stock Exchange/LeRevenu, FR", "LEREVENU", "lerevenu" },
 +    { FALSE, 0, 0, "Platinum Asset Management, AU", "PLATINUM", "platinum" },
 +    { FALSE, 0, 0, "Romania", "romania", "romania" },
 +    { FALSE, 0, 0, "SIX Swiss Exchange funds, CH", "SIXFUNDS", "sixfunds" },
 +    { FALSE, 0, 0, "SIX Swiss Exchange shares, CH", "SIXSHARES", "sixshares" },
 +    { FALSE, 0, 0, "Skandinaviska Enskilda Banken, SE", "SEB_FUNDS", "seb_funds" },
 +    { FALSE, 0, 0, "Sharenet, ZA", "ZA", "za" },
 +    { FALSE, 0, 0, "StockHouse Canada", "STOCKHOUSE_FUND", "stockhousecanada_fund" },
-     { FALSE, 0, 0, "TD Waterhouse Canada", "TDWATERHOUSE", "tdwaterhouse" },
++    { FALSE, 0, 0, "TD Waterhouse Funds, CA", "TDWATERHOUSE", "tdwaterhouse" },
 +    { FALSE, 0, 0, "TD Efunds, CA", "TDEFUNDS", "tdefunds" },
 +    { FALSE, 0, 0, "TIAA-CREF, US", "TIAACREF", "tiaacref" },
 +    { FALSE, 0, 0, "Toronto Stock eXchange, CA", "TSX", "tsx" },
 +    { FALSE, 0, 0, "T. Rowe Price", "TRPRICE", "troweprice" },
 +    { FALSE, 0, 0, "T. Rowe Price, US", "TRPRICE_DIRECT", "troweprice_direct" },
 +    { FALSE, 0, 0, "Trustnet via tnetuk.pm, GB", "TNETUK", "tnetuk" },
 +    { FALSE, 0, 0, "Trustnet via trustnet.pm, GB", "TRUSTNET", "trustnet" },
 +    { FALSE, 0, 0, "U.K. Unit Trusts", "UKUNITTRUSTS", "uk_unit_trusts" },
 +    { FALSE, 0, 0, "Union Investment, DE", "UNIONFUNDS", "unionfunds" },
 +    { FALSE, 0, 0, "US Treasury Bonds", "usfedbonds", "usfedbonds" },
 +    { FALSE, 0, 0, "US Govt. Thrift Savings Plan", "TSP", "tsp" },
-     { FALSE, 0, 0, "Vanguard", "VANGUARD", "vanguard" }, /* No module seen in F::Q 1.17. */
++    { FALSE, 0, 0, "Vanguard", "VANGUARD", "vanguard" }, /* Method of Alphavantage */
 +    { FALSE, 0, 0, "VWD, DE (unmaintained)", "VWD", "vwd" },
 +    { FALSE, 0, 0, "Yahoo as JSON", "YAHOO_JSON", "yahoo_json" },
++    { FALSE, 0, 0, "Yahoo as YQL", "YAHOO_YQL", "yahoo_yql" },
 +};
 +static gnc_quote_source multiple_quote_sources[] =
 +{
-     { FALSE, 0, 0, "Europe (Athens, Boursorama, Bucharest)", "EUROPE", "europe" },
-     { FALSE, 0, 0, "France (Boursorama, LeRevenue)", "FRANCE", "france" },
++    { FALSE, 0, 0, "Australia (ASX, ...)", "AUSTRALIA", "australia" },
++    { FALSE, 0, 0, "Canada (Alphavantage, TSX, ...)", "CANADA", "canada" },
++    { FALSE, 0, 0, "Canada Mutual (Fund Library, StockHouse, ...)", "CANADAMUTUAL", "canadamutual" },
++    { FALSE, 0, 0, "Dutch (AEX, ...)", "DUTCH", "dutch" },
++    { FALSE, 0, 0, "Europe (asegr,.bsero, hex ...)", "EUROPE", "europe" },
++    { FALSE, 0, 0, "Greece (ASE, ...)", "GREECE", "greece" },
++    { FALSE, 0, 0, "Hungary (Bamosz, BET, ...)", "HU", "hu" },
++    { FALSE, 0, 0, "India Mutual (AMFI, ...)", "INDIAMUTUAL", "indiamutual" },
++    { FALSE, 0, 0, "Fidelity (Fidelity, ...)", "FIDELITY", "fidelity" },
++    { FALSE, 0, 0, "Finland (HEX, ...)", "FINLAND", "finland" },
++    { FALSE, 0, 0, "First Trust (First Trust, ...)", "FTPORTFOLIOS", "ftportfolios" },
++    { FALSE, 0, 0, "France (bourso, ĺerevenu, ...)", "FRANCE", "france" },
++    { FALSE, 0, 0, "Nasdaq (alphavantage, fool, ...)", "NASDAQ", "nasdaq" },
++    { FALSE, 0, 0, "New Zealand (NZX, ...)", "NZ", "nz" },
++    { FALSE, 0, 0, "NYSE (alphavantage, fool, ...)", "NYSE", "nyse" },
++    { FALSE, 0, 0, "South Africa (Sharenet, ...)", "ZA", "za" },
++    { FALSE, 0, 0, "Romania (BSE-RO, ...)", "romania", "romania" },
++    { FALSE, 0, 0, "T. Rowe Price", "TRPRICE", "troweprice" },
 +    { FALSE, 0, 0, "U.K. Funds (citywire, FTfunds, MStar, tnetuk, ...)", "ukfunds", "ukfunds" },
++    { FALSE, 0, 0, "U.K. Unit Trusts (trustnet, ...)", "UKUNITTRUSTS", "uk_unit_trusts" },
++    { FALSE, 0, 0, "USA (Alphavantage, Fool, ...)", "USA", "usa" },
 +};
 +
 +static const int num_single_quote_sources =
 +    sizeof(single_quote_sources) / sizeof(gnc_quote_source);
 +static const int num_multiple_quote_sources =
 +    sizeof(multiple_quote_sources) / sizeof(gnc_quote_source);
 +static GList *new_quote_sources = NULL;
 +
 +
 +/********************************************************************
 + * gnc_quote_source_fq_installed
 + *
 + * This function indicates whether or not the Finance::Quote module
 + * is installed on a users computer.
 + ********************************************************************/
 +gboolean
 +gnc_quote_source_fq_installed (void)
 +{
 +    return (fq_version != NULL);
 +}
 +
 +
 +/********************************************************************
 + * gnc_quote_source_fq_version
 + *
 + * This function the version of the Finance::Quote module installed
 + * on a user's computer or NULL if no installation is found.
 + ********************************************************************/
 +const char*
 +gnc_quote_source_fq_version (void)
 +{
 +    return fq_version;
 +}
 +
 +/********************************************************************
 + * gnc_quote_source_num_entries
 + *
 + * Return the number of entries for a given type of price source.
 + ********************************************************************/
 +gint gnc_quote_source_num_entries(QuoteSourceType type)
 +{
 +    if  (type == SOURCE_CURRENCY)
 +        return 1;
 +
 +    if  (type == SOURCE_SINGLE)
 +        return num_single_quote_sources;
 +
 +    if (type == SOURCE_MULTI)
 +        return num_multiple_quote_sources;
 +
 +    return g_list_length(new_quote_sources);
 +}
 +
 +/********************************************************************
 + * gnc_quote_source_init_tables
 + *
 + * Update the type/index values for prices sources.
 + ********************************************************************/
 +static void
 +gnc_quote_source_init_tables (void)
 +{
 +    gint i;
 +
 +    for (i = 0; i < num_single_quote_sources; i++)
 +    {
 +        single_quote_sources[i].type = SOURCE_SINGLE;
 +        single_quote_sources[i].index = i;
 +    }
 +
 +    for (i = 0; i < num_multiple_quote_sources; i++)
 +    {
 +        multiple_quote_sources[i].type = SOURCE_MULTI;
 +        multiple_quote_sources[i].index = i;
 +    }
 +
 +    currency_quote_source.type = SOURCE_CURRENCY;
 +    currency_quote_source.index = 0;
 +}
 +
 +
 +/********************************************************************
 + * gnc_quote_source_add_new
 + *
 + * Add a new price source. Called when unknown source names are found
 + * either in the F::Q installation (a newly available source) or in
 + * the user's data file (a source that has vanished but needs to be
 + * tracked.)
 + ********************************************************************/
 +gnc_quote_source *
 +gnc_quote_source_add_new (const char *source_name, gboolean supported)
 +{
 +    gnc_quote_source *new_source;
 +
 +    DEBUG("Creating new source %s", (source_name == NULL ? "(null)" : source_name));
 +    new_source = malloc(sizeof(gnc_quote_source));
 +    new_source->supported = supported;
 +    new_source->type = SOURCE_UNKNOWN;
 +    new_source->index = g_list_length(new_quote_sources);
 +
 +    /* This name can be changed if/when support for this price source is
 +     * integrated into gnucash. */
 +    new_source->user_name = g_strdup(source_name);
 +
 +    /* This name is permanent and must be kept the same if/when support
 +     * for this price source is integrated into gnucash (i.e. for a
 +     * nice user name). */
 +    new_source->old_internal_name = g_strdup(source_name);
 +    new_source->internal_name = g_strdup(source_name);
 +    new_quote_sources = g_list_append(new_quote_sources, new_source);
 +    return new_source;
 +}
 +
 +/********************************************************************
 + * gnc_quote_source_lookup_by_xxx
 + *
 + * Lookup a price source data structure based upon various criteria.
 + ********************************************************************/
 +gnc_quote_source *
 +gnc_quote_source_lookup_by_ti (QuoteSourceType type, gint index)
 +{
 +    gnc_quote_source *source;
 +    GList *node;
 +
 +    ENTER("type/index is %d/%d", type, index);
 +    switch (type)
 +    {
 +    case SOURCE_CURRENCY:
 +        LEAVE("found %s", currency_quote_source.user_name);
 +        return &currency_quote_source;
 +        break;
 +
 +    case SOURCE_SINGLE:
 +        if (index < num_single_quote_sources)
 +        {
 +            LEAVE("found %s", single_quote_sources[index].user_name);
 +            return &single_quote_sources[index];
 +        }
 +        break;
 +
 +    case SOURCE_MULTI:
 +        if (index < num_multiple_quote_sources)
 +        {
 +            LEAVE("found %s", multiple_quote_sources[index].user_name);
 +            return &multiple_quote_sources[index];
 +        }
 +        break;
 +
 +    case SOURCE_UNKNOWN:
 +    default:
 +        node = g_list_nth(new_quote_sources, index);
 +        if (node)
 +        {
 +            source = node->data;
 +            LEAVE("found %s", source->user_name);
 +            return source;
 +        }
 +        break;
 +    }
 +
 +    LEAVE("not found");
 +    return NULL;
 +}
 +
 +gnc_quote_source *
 +gnc_quote_source_lookup_by_internal(const char * name)
 +{
 +    gnc_quote_source *source;
 +    GList *node;
 +    gint i;
 +
 +    if ((name == NULL) || (g_strcmp0(name, "") == 0))
 +    {
 +        return NULL;
 +    }
 +
 +    if (g_strcmp0(name, currency_quote_source.internal_name) == 0)
 +        return &currency_quote_source;
 +    if (g_strcmp0(name, currency_quote_source.old_internal_name) == 0)
 +        return &currency_quote_source;
 +
 +    for (i = 0; i < num_single_quote_sources; i++)
 +    {
 +        if (g_strcmp0(name, single_quote_sources[i].internal_name) == 0)
 +            return &single_quote_sources[i];
 +        if (g_strcmp0(name, single_quote_sources[i].old_internal_name) == 0)
 +            return &single_quote_sources[i];
 +    }
 +
 +    for (i = 0; i < num_multiple_quote_sources; i++)
 +    {
 +        if (g_strcmp0(name, multiple_quote_sources[i].internal_name) == 0)
 +            return &multiple_quote_sources[i];
 +        if (g_strcmp0(name, multiple_quote_sources[i].old_internal_name) == 0)
 +            return &multiple_quote_sources[i];
 +    }
 +
 +    for (i = 0, node = new_quote_sources; node; node = node->next, i++)
 +    {
 +        source = node->data;
 +        if (g_strcmp0(name, source->internal_name) == 0)
 +            return source;
 +        if (g_strcmp0(name, source->old_internal_name) == 0)
 +            return source;
 +    }
 +
 +    DEBUG("gnc_quote_source_lookup_by_internal: Unknown source %s", name);
 +    return NULL;
 +}
 +
 +/********************************************************************
 + * gnc_quote_source_get_xxx
 + *
 + * Accessor functions - get functions only. There are no set functions.
 + ********************************************************************/
 +QuoteSourceType
 +gnc_quote_source_get_type (const gnc_quote_source *source)
 +{
 +    ENTER("%p", source);
 +    if (!source)
 +    {
 +        LEAVE("bad source");
 +        return SOURCE_SINGLE;
 +    }
 +
 +    LEAVE("type is %d", source->type);
 +    return source->type;
 +}
 +
 +gint
 +gnc_quote_source_get_index (const gnc_quote_source *source)
 +{
 +    ENTER("%p", source);
 +    if (!source)
 +    {
 +        LEAVE("bad source");
 +        return 0;
 +    }
 +
 +    LEAVE("index is %d", source->index);
 +    return source->index;
 +}
 +
 +gboolean
 +gnc_quote_source_get_supported (const gnc_quote_source *source)
 +{
 +    ENTER("%p", source);
 +    if (!source)
 +    {
 +        LEAVE("bad source");
 +        return FALSE;
 +    }
 +
 +    LEAVE("%ssupported", source && source->supported ? "" : "not ");
 +    return source->supported;
 +}
 +
 +const char *
 +gnc_quote_source_get_user_name (const gnc_quote_source *source)
 +{
 +    ENTER("%p", source);
 +    if (!source)
 +    {
 +        LEAVE("bad source");
 +        return NULL;
 +    }
 +    LEAVE("user name %s", source->user_name);
 +    return source->user_name;
 +}
 +
 +const char *
 +gnc_quote_source_get_internal_name (const gnc_quote_source *source)
 +{
 +    ENTER("%p", source);
 +    if (!source)
 +    {
 +        LEAVE("bad source");
 +        return NULL;
 +    }
 +    LEAVE("internal name %s", source->internal_name);
 +    return source->internal_name;
 +}
 +
 +
 +/********************************************************************
 + * gnc_quote_source_set_fq_installed
 + *
 + * Update gnucash internal tables on what Finance::Quote sources are
 + * installed.
 + ********************************************************************/
 +void
 +gnc_quote_source_set_fq_installed (const char* version_string,
 +                                   const GList *sources_list)
 +{
 +    gnc_quote_source *source;
 +    char *source_name;
 +    const GList *node;
 +
 +    ENTER(" ");
 +
 +    if (!sources_list)
 +        return;
 +
 +    if (fq_version)
 +    {
 +        g_free (fq_version);
 +        fq_version = NULL;
 +    }
 +
 +    if (version_string)
 +        fq_version = g_strdup (version_string);
 +
 +    for (node = sources_list; node; node = node->next)
 +    {
 +        source_name = node->data;
 +
 +        source = gnc_quote_source_lookup_by_internal(source_name);
 +        if (source != NULL)
 +        {
 +            DEBUG("Found source %s: %s", source_name, source->user_name);
 +            source->supported = TRUE;
 +            continue;
 +        }
 +
 +        gnc_quote_source_add_new(source_name, TRUE);
 +    }
 +    LEAVE(" ");
 +}
 +
 +/********************************************************************
 + * QoF Helpers
 + ********************************************************************/
 +
 +void
 +gnc_commodity_begin_edit (gnc_commodity *cm)
 +{
 +    qof_begin_edit(&cm->inst);
 +}
 +
 +static void commit_err (QofInstance *inst, QofBackendError errcode)
 +{
 +    PERR ("Failed to commit: %d", errcode);
 +    gnc_engine_signal_commit_error( errcode );
 +}
 +
 +static void noop (QofInstance *inst) {}
 +
 +static void
 +comm_free(QofInstance* inst)
 +{
 +    commodity_free( GNC_COMMODITY(inst) );
 +}
 +
 +void
 +gnc_commodity_commit_edit (gnc_commodity *cm)
 +{
 +    if (!qof_commit_edit (QOF_INSTANCE(cm))) return;
 +    qof_commit_edit_part2 (&cm->inst, commit_err, noop, comm_free);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_new
 + ********************************************************************/
 +
 +static void
 +mark_commodity_dirty (gnc_commodity *cm)
 +{
 +    qof_instance_set_dirty(&cm->inst);
 +    qof_event_gen (&cm->inst, QOF_EVENT_MODIFY, NULL);
 +}
 +
 +static void
 +reset_printname(CommodityPrivate *priv)
 +{
 +    g_free(priv->printname);
 +    priv->printname = g_strdup_printf("%s (%s)",
 +                                      priv->mnemonic ? priv->mnemonic : "",
 +                                      priv->fullname ? priv->fullname : "");
 +}
 +
 +static void
 +reset_unique_name(CommodityPrivate *priv)
 +{
 +    gnc_commodity_namespace *ns;
 +
 +    g_free(priv->unique_name);
 +    ns = priv->name_space;
 +    priv->unique_name = g_strdup_printf("%s::%s",
 +                                        ns ? ns->name : "",
 +                                        priv->mnemonic ? priv->mnemonic : "");
 +}
 +
 +/* GObject Initialization */
 +G_DEFINE_TYPE(gnc_commodity, gnc_commodity, QOF_TYPE_INSTANCE);
 +
 +static void
 +gnc_commodity_init(gnc_commodity* com)
 +{
 +    CommodityPrivate* priv;
 +
 +    priv = GET_PRIVATE(com);
 +
 +    priv->name_space = NULL;
 +    priv->fullname = CACHE_INSERT("");
 +    priv->mnemonic = CACHE_INSERT("");
 +    priv->cusip = CACHE_INSERT("");
 +    priv->fraction = 10000;
 +    priv->quote_flag = 0;
 +    priv->quote_source = NULL;
 +    priv->quote_tz = CACHE_INSERT("");
 +
 +    reset_printname(priv);
 +    reset_unique_name(priv);
 +}
 +
 +static void
 +gnc_commodity_dispose(GObject *comp)
 +{
 +    G_OBJECT_CLASS(gnc_commodity_parent_class)->dispose(comp);
 +}
 +
 +static void
 +gnc_commodity_finalize(GObject* comp)
 +{
 +    G_OBJECT_CLASS(gnc_commodity_parent_class)->finalize(comp);
 +}
 +/* Note that g_value_set_object() refs the object, as does
 + * g_object_get(). But g_object_get() only unrefs once when it disgorges
 + * the object, leaving an unbalanced ref, which leaks. So instead of
 + * using g_value_set_object(), use g_value_take_object() which doesn't
 + * ref the object when used in get_property().
 + */
 +static void
 +gnc_commodity_get_property (GObject         *object,
 +                            guint            prop_id,
 +                            GValue          *value,
 +                            GParamSpec      *pspec)
 +{
 +    gnc_commodity *commodity;
 +    CommodityPrivate* priv;
 +
 +    g_return_if_fail(GNC_IS_COMMODITY(object));
 +
 +    commodity = GNC_COMMODITY(object);
 +    priv = GET_PRIVATE(commodity);
 +    switch (prop_id)
 +    {
 +    case PROP_NAMESPACE:
 +        g_value_take_object(value, priv->name_space);
 +        break;
 +    case PROP_FULL_NAME:
 +        g_value_set_string(value, priv->fullname);
 +        break;
 +    case PROP_MNEMONIC:
 +        g_value_set_string(value, priv->mnemonic);
 +        break;
 +    case PROP_PRINTNAME:
 +        g_value_set_string(value, priv->printname);
 +        break;
 +    case PROP_CUSIP:
 +        g_value_set_string(value, priv->cusip);
 +        break;
 +    case PROP_FRACTION:
 +        g_value_set_int(value, priv->fraction);
 +        break;
 +    case PROP_UNIQUE_NAME:
 +        g_value_set_string(value, priv->unique_name);
 +        break;
 +    case PROP_QUOTE_FLAG:
 +        g_value_set_boolean(value, priv->quote_flag);
 +        break;
 +    case PROP_QUOTE_SOURCE:
 +        g_value_set_pointer(value, priv->quote_source);
 +        break;
 +    case PROP_QUOTE_TZ:
 +        g_value_set_string(value, priv->quote_tz);
 +        break;
 +    default:
 +        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 +        break;
 +    }
 +}
 +
 +static void
 +gnc_commodity_set_property (GObject         *object,
 +                            guint            prop_id,
 +                            const GValue    *value,
 +                            GParamSpec      *pspec)
 +{
 +    gnc_commodity *commodity;
 +
 +    g_return_if_fail(GNC_IS_COMMODITY(object));
 +
 +    commodity = GNC_COMMODITY(object);
 +    g_assert (qof_instance_get_editlevel(commodity));
 +
 +    switch (prop_id)
 +    {
 +    case PROP_NAMESPACE:
 +        gnc_commodity_set_namespace(commodity, g_value_get_object(value));
 +        break;
 +    case PROP_FULL_NAME:
 +        gnc_commodity_set_fullname(commodity, g_value_get_string(value));
 +        break;
 +    case PROP_MNEMONIC:
 +        gnc_commodity_set_mnemonic(commodity, g_value_get_string(value));
 +        break;
 +    case PROP_CUSIP:
 +        gnc_commodity_set_cusip(commodity, g_value_get_string(value));
 +        break;
 +    case PROP_FRACTION:
 +        gnc_commodity_set_fraction(commodity, g_value_get_int(value));
 +        break;
 +    case PROP_QUOTE_FLAG:
 +        gnc_commodity_set_quote_flag(commodity, g_value_get_boolean(value));
 +        break;
 +    case PROP_QUOTE_SOURCE:
 +        gnc_commodity_set_quote_source(commodity, g_value_get_pointer(value));
 +        break;
 +    case PROP_QUOTE_TZ:
 +        gnc_commodity_set_quote_tz(commodity, g_value_get_string(value));
 +        break;
 +    default:
 +        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 +        break;
 +    }
 +}
 +static void
 +gnc_commodity_class_init(struct _GncCommodityClass* klass)
 +{
 +    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
 +
 +    gobject_class->dispose = gnc_commodity_dispose;
 +    gobject_class->finalize = gnc_commodity_finalize;
 +    gobject_class->set_property = gnc_commodity_set_property;
 +    gobject_class->get_property = gnc_commodity_get_property;
 +
 +    g_type_class_add_private(klass, sizeof(CommodityPrivate));
 +
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_NAMESPACE,
 +                                    g_param_spec_object ("namespace",
 +                                            "Namespace",
 +                                            "The namespace field denotes the "
 +                                            "namespace for this commodity, either "
 +                                            "a currency or symbol from a quote source.",
 +                                            GNC_TYPE_COMMODITY_NAMESPACE,
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_FULL_NAME,
 +                                    g_param_spec_string ("fullname",
 +                                            "Full Commodity Name",
 +                                            "The fullname is the official full name of"
 +                                            "the currency.",
 +                                            NULL,
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_MNEMONIC,
 +                                    g_param_spec_string ("mnemonic",
 +                                            "Commodity Mnemonic",
 +                                            "The mnemonic is the official abbreviated"
 +                                            "designation for the currency.",
 +                                            NULL,
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_PRINTNAME,
 +                                    g_param_spec_string ("printname",
 +                                            "Commodity Print Name",
 +                                            "Printable form of the commodity name.",
 +                                            NULL,
 +                                            G_PARAM_READABLE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_CUSIP,
 +                                    g_param_spec_string ("cusip",
 +                                            "Commodity CUSIP Code",
 +                                            "?????",
 +                                            NULL,
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_FRACTION,
 +                                    g_param_spec_int ("fraction",
 +                                            "Fraction",
 +                                            "The fraction is the number of sub-units that "
 +                                            "the basic commodity can be divided into.",
 +                                            1,
 +                                            1000000,
 +                                            1,
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_UNIQUE_NAME,
 +                                    g_param_spec_string ("unique-name",
 +                                            "Commodity Unique Name",
 +                                            "Unique form of the commodity name which combines "
 +                                            "the namespace name and the commodity name.",
 +                                            NULL,
 +                                            G_PARAM_READABLE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_QUOTE_FLAG,
 +                                    g_param_spec_boolean ("quote_flag",
 +                                            "Quote Flag",
 +                                            "TRUE if prices are to be downloaded for this "
 +                                            "commodity from a quote source.",
 +                                            FALSE,
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_QUOTE_SOURCE,
 +                                    g_param_spec_pointer("quote-source",
 +                                            "Quote Source",
 +                                            "The quote source from which prices are downloaded.",
 +                                            G_PARAM_READWRITE));
 +    g_object_class_install_property(gobject_class,
 +                                    PROP_QUOTE_TZ,
 +                                    g_param_spec_string ("quote-tz",
 +                                            "Commodity Quote Timezone",
 +                                            "?????",
 +                                            NULL,
 +                                            G_PARAM_READWRITE));
 +}
 +
 +gnc_commodity *
 +gnc_commodity_new(QofBook *book, const char * fullname,
 +                  const char * name_space, const char * mnemonic,
 +                  const char * cusip, int fraction)
 +{
 +    gnc_commodity * retval = g_object_new(GNC_TYPE_COMMODITY, NULL);
 +
 +    qof_instance_init_data (&retval->inst, GNC_ID_COMMODITY, book);
 +    gnc_commodity_begin_edit(retval);
 +
 +    if ( name_space != NULL )
 +    {
 +	/* Prevent setting anything except template in namespace template. */
 +        if (g_strcmp0 (name_space, GNC_COMMODITY_NS_TEMPLATE) == 0 &&
 +	    g_strcmp0 (mnemonic, "template") != 0)
 +	{
 +	    PWARN("Converting commodity %s from namespace template to "
 +		  "namespace User", mnemonic);
 +	    name_space = "User";
 +	}
 +        gnc_commodity_set_namespace(retval, name_space);
 +        if (gnc_commodity_namespace_is_iso(name_space))
 +        {
 +            gnc_commodity_set_quote_source(retval,
 +                                           gnc_quote_source_lookup_by_internal("currency") );
 +        }
 +    }
 +    gnc_commodity_set_fullname(retval, fullname);
 +    gnc_commodity_set_mnemonic(retval, mnemonic);
 +    gnc_commodity_set_cusip(retval, cusip);
 +    gnc_commodity_set_fraction(retval, fraction);
 +    mark_commodity_dirty (retval);
 +    gnc_commodity_commit_edit(retval);
 +
 +    qof_event_gen (&retval->inst, QOF_EVENT_CREATE, NULL);
 +
 +    return retval;
 +}
 +
 +
 +/********************************************************************
 + * gnc_commodity_destroy
 + ********************************************************************/
 +
 +static void
 +commodity_free(gnc_commodity * cm)
 +{
 +    QofBook *book;
 +    gnc_commodity_table *table;
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return;
 +
 +    book = qof_instance_get_book(&cm->inst);
 +    table = gnc_commodity_table_get_table(book);
 +    gnc_commodity_table_remove(table, cm);
 +    priv = GET_PRIVATE(cm);
 +
 +    qof_event_gen (&cm->inst, QOF_EVENT_DESTROY, NULL);
 +
 +    /* Set at creation */
 +    CACHE_REMOVE (priv->fullname);
 +    CACHE_REMOVE (priv->cusip);
 +    CACHE_REMOVE (priv->mnemonic);
 +    CACHE_REMOVE (priv->quote_tz);
 +    priv->name_space = NULL;
 +
 +    /* Set through accessor functions */
 +    priv->quote_source = NULL;
 +
 +    /* Automatically generated */
 +    g_free(priv->printname);
 +    priv->printname = NULL;
 +
 +    g_free(priv->unique_name);
 +    priv->unique_name = NULL;
 +
 +#ifdef ACCOUNTS_CLEANED_UP
 +    /* Account objects are not actually cleaned up when a book is closed (in fact
 +     * a memory leak), but commodities are, so in currently this warning gets hit
 +     * quite frequently.  Disable the check until cleaning up of accounts objects
 +     * on close is implemented.  */
 +    if (priv->usage_count != 0)
 +    {
 +        PWARN("Destroying commodity (%p) with non-zero usage_count (%d).", cm,
 +              priv->usage_count);
 +    }
 +#endif
 +
 +    /* qof_instance_release (&cm->inst); */
 +    g_object_unref(cm);
 +}
 +
 +void
 +gnc_commodity_destroy(gnc_commodity * cm)
 +{
 +    gnc_commodity_begin_edit(cm);
 +    qof_instance_set_destroying(cm, TRUE);
 +    gnc_commodity_commit_edit(cm);
 +}
 +
 +void
 +gnc_commodity_copy(gnc_commodity * dest, const gnc_commodity *src)
 +{
 +    CommodityPrivate* src_priv = GET_PRIVATE(src);
 +    CommodityPrivate* dest_priv = GET_PRIVATE(dest);
 +
 +    gnc_commodity_set_fullname (dest, src_priv->fullname);
 +    gnc_commodity_set_mnemonic (dest, src_priv->mnemonic);
 +    dest_priv->name_space = src_priv->name_space;
 +    gnc_commodity_set_fraction (dest, src_priv->fraction);
 +    gnc_commodity_set_cusip (dest, src_priv->cusip);
 +    gnc_commodity_set_quote_flag (dest, src_priv->quote_flag);
 +    gnc_commodity_set_quote_source (dest, gnc_commodity_get_quote_source (src));
 +    gnc_commodity_set_quote_tz (dest, src_priv->quote_tz);
 +    qof_instance_copy_kvp (QOF_INSTANCE (dest), QOF_INSTANCE (src));
 +}
 +
 +gnc_commodity *
 +gnc_commodity_clone(const gnc_commodity *src, QofBook *dest_book)
 +{
 +    CommodityPrivate* src_priv;
 +    CommodityPrivate* dest_priv;
 +
 +    gnc_commodity * dest = g_object_new(GNC_TYPE_COMMODITY, NULL);
 +    qof_instance_init_data (&dest->inst, GNC_ID_COMMODITY, dest_book);
 +    src_priv = GET_PRIVATE(src);
 +    dest_priv = GET_PRIVATE(dest);
 +
 +    dest_priv->fullname = CACHE_INSERT(src_priv->fullname);
 +    dest_priv->mnemonic = CACHE_INSERT(src_priv->mnemonic);
 +    dest_priv->cusip = CACHE_INSERT(src_priv->cusip);
 +    dest_priv->quote_tz = CACHE_INSERT(src_priv->quote_tz);
 +
 +    dest_priv->name_space = src_priv->name_space;
 +
 +    dest_priv->fraction = src_priv->fraction;
 +    dest_priv->quote_flag = src_priv->quote_flag;
 +
 +    gnc_commodity_set_quote_source (dest, gnc_commodity_get_quote_source (src));
 +
 +    qof_instance_copy_kvp (QOF_INSTANCE (dest), QOF_INSTANCE (src));
 +
 +    reset_printname(dest_priv);
 +    reset_unique_name(dest_priv);
 +
 +    return dest;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_mnemonic
 + ********************************************************************/
 +
 +const char *
 +gnc_commodity_get_mnemonic(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->mnemonic;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_printname
 + ********************************************************************/
 +
 +const char *
 +gnc_commodity_get_printname(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->printname;
 +}
 +
 +
 +/********************************************************************
 + * gnc_commodity_get_namespace
 + ********************************************************************/
 +
 +const char *
 +gnc_commodity_get_namespace(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return gnc_commodity_namespace_get_name(GET_PRIVATE(cm)->name_space);
 +}
 +
 +gnc_commodity_namespace *
 +gnc_commodity_get_namespace_ds(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->name_space;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_fullname
 + ********************************************************************/
 +
 +const char *
 +gnc_commodity_get_fullname(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->fullname;
 +}
 +
 +
 +/********************************************************************
 + * gnc_commodity_get_unique_name
 + ********************************************************************/
 +
 +const char *
 +gnc_commodity_get_unique_name(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->unique_name;
 +}
 +
 +
 +/********************************************************************
 + * gnc_commodity_get_cusip
 + ********************************************************************/
 +
 +const char *
 +gnc_commodity_get_cusip(const gnc_commodity * cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->cusip;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_fraction
 + ********************************************************************/
 +
 +int
 +gnc_commodity_get_fraction(const gnc_commodity * cm)
 +{
 +    if (!cm) return 0;
 +    return GET_PRIVATE(cm)->fraction;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_auto_quote_control_flag
 + ********************************************************************/
 +
 +static gboolean
 +gnc_commodity_get_auto_quote_control_flag(const gnc_commodity *cm)
 +{
 +    GValue v = G_VALUE_INIT;
 +
 +    if (!cm) return FALSE;
 +    qof_instance_get_kvp (QOF_INSTANCE (cm), &v, 1, "auto_quote_control");
 +    if (G_VALUE_HOLDS_STRING (&v) &&
 +        strcmp(g_value_get_string (&v), "false") == 0)
 +        return FALSE;
 +    return TRUE;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_quote_flag
 + ********************************************************************/
 +
 +gboolean
 +gnc_commodity_get_quote_flag(const gnc_commodity *cm)
 +{
 +    if (!cm) return FALSE;
 +    return (GET_PRIVATE(cm)->quote_flag);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_quote_source
 + ********************************************************************/
 +
 +gnc_quote_source*
 +gnc_commodity_get_quote_source(const gnc_commodity *cm)
 +{
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return NULL;
 +    priv = GET_PRIVATE(cm);
 +    if (!priv->quote_source && gnc_commodity_is_iso(cm))
 +        return &currency_quote_source;
 +    return priv->quote_source;
 +}
 +
 +gnc_quote_source*
 +gnc_commodity_get_default_quote_source(const gnc_commodity *cm)
 +{
 +    if (cm && gnc_commodity_is_iso(cm))
 +        return &currency_quote_source;
 +    /* Should make this a user option at some point. */
 +    return gnc_quote_source_lookup_by_internal("alphavantage");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_quote_tz
 + ********************************************************************/
 +
 +const char*
 +gnc_commodity_get_quote_tz(const gnc_commodity *cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->quote_tz;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_user_symbol
 + ********************************************************************/
 +const char*
 +gnc_commodity_get_user_symbol(const gnc_commodity *cm)
 +{
 +    GValue v = G_VALUE_INIT;
 +    if (!cm) return NULL;
 +    qof_instance_get_kvp (QOF_INSTANCE(cm), &v, 1, "user_symbol");
 +    if (G_VALUE_HOLDS_STRING (&v))
 +        return g_value_get_string (&v);
 +    return NULL;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_default_symbol
 + *******************************************************************/
 +const char*
 +gnc_commodity_get_default_symbol(const gnc_commodity *cm)
 +{
 +    if (!cm) return NULL;
 +    return GET_PRIVATE(cm)->default_symbol;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_get_nice_symbol
 + *******************************************************************/
 +const char*
 +gnc_commodity_get_nice_symbol (const gnc_commodity *cm)
 +{
 +    const char *nice_symbol;
 +    struct lconv *lc;
 +    if (!cm) return NULL;
 +
 +    nice_symbol = gnc_commodity_get_user_symbol(cm);
 +    if (nice_symbol && *nice_symbol)
 +        return nice_symbol;
 +
 +    lc = gnc_localeconv();
 +    nice_symbol = lc->currency_symbol;
 +    if (!g_strcmp0(gnc_commodity_get_mnemonic(cm), lc->int_curr_symbol))
 +        return nice_symbol;
 +
 +    nice_symbol = gnc_commodity_get_default_symbol(cm);
 +    if (nice_symbol && *nice_symbol)
 +        return nice_symbol;
 +
 +    return gnc_commodity_get_mnemonic(cm);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_mnemonic
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_mnemonic(gnc_commodity * cm, const char * mnemonic)
 +{
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return;
 +    priv = GET_PRIVATE(cm);
 +    if (priv->mnemonic == mnemonic) return;
 +
 +    gnc_commodity_begin_edit(cm);
 +    CACHE_REMOVE (priv->mnemonic);
 +    priv->mnemonic = CACHE_INSERT(mnemonic);
 +
 +    mark_commodity_dirty (cm);
 +    reset_printname(priv);
 +    reset_unique_name(priv);
 +    gnc_commodity_commit_edit(cm);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_namespace
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_namespace(gnc_commodity * cm, const char * name_space)
 +{
 +    QofBook *book;
 +    gnc_commodity_table *table;
 +    gnc_commodity_namespace *nsp;
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return;
 +    priv = GET_PRIVATE(cm);
 +    book = qof_instance_get_book (&cm->inst);
 +    table = gnc_commodity_table_get_table(book);
 +    nsp = gnc_commodity_table_add_namespace(table, name_space, book);
 +    if (priv->name_space == nsp)
 +        return;
 +
 +    gnc_commodity_begin_edit(cm);
 +    priv->name_space = nsp;
 +    if (nsp->iso4217)
 +        priv->quote_source = gnc_quote_source_lookup_by_internal("currency");
 +    mark_commodity_dirty(cm);
 +    reset_printname(priv);
 +    reset_unique_name(priv);
 +    gnc_commodity_commit_edit(cm);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_fullname
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_fullname(gnc_commodity * cm, const char * fullname)
 +{
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return;
 +    priv = GET_PRIVATE(cm);
 +    if (priv->fullname == fullname) return;
 +
 +    CACHE_REMOVE (priv->fullname);
 +    priv->fullname = CACHE_INSERT (fullname);
 +
 +    gnc_commodity_begin_edit(cm);
 +    mark_commodity_dirty(cm);
 +    reset_printname(priv);
 +    gnc_commodity_commit_edit(cm);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_cusip
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_cusip(gnc_commodity * cm,
 +                        const char * cusip)
 +{
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return;
 +
 +    priv = GET_PRIVATE(cm);
 +    if (priv->cusip == cusip) return;
 +
 +    gnc_commodity_begin_edit(cm);
 +    CACHE_REMOVE (priv->cusip);
 +    priv->cusip = CACHE_INSERT (cusip);
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_fraction
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_fraction(gnc_commodity * cm, int fraction)
 +{
 +    if (!cm) return;
 +    gnc_commodity_begin_edit(cm);
 +    GET_PRIVATE(cm)->fraction = fraction;
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_auto_quote_control_flag
 + ********************************************************************/
 +
 +static void
 +gnc_commodity_set_auto_quote_control_flag(gnc_commodity *cm,
 +        const gboolean flag)
 +{
 +    GValue v = G_VALUE_INIT;
 +    ENTER ("(cm=%p, flag=%d)", cm, flag);
 +
 +    if (!cm)
 +    {
 +        LEAVE("");
 +        return;
 +    }
 +    gnc_commodity_begin_edit(cm);
 +    if (flag)
 +        qof_instance_set_kvp (QOF_INSTANCE (cm), NULL, 1, "auto_quote_control");
 +    else
 +    {
 +        g_value_init (&v, G_TYPE_STRING);
 +        g_value_set_string (&v, "false");
 +        qof_instance_set_kvp (QOF_INSTANCE (cm), &v, 1, "auto_quote_control");
 +    }
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +    LEAVE("");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_user_set_quote_flag
 + ********************************************************************/
 +
 +void
 +gnc_commodity_user_set_quote_flag(gnc_commodity *cm, const gboolean flag)
 +{
 +    CommodityPrivate* priv;
 +
 +    ENTER ("(cm=%p, flag=%d)", cm, flag);
 +
 +    if (!cm)
 +    {
 +        LEAVE("");
 +        return;
 +    }
 +
 +    priv = GET_PRIVATE(cm);
 +    gnc_commodity_begin_edit(cm);
 +    gnc_commodity_set_quote_flag(cm, flag);
 +    if (gnc_commodity_is_iso(cm))
 +    {
 +        /* For currencies, disable auto quote control if the quote flag is being
 +         * changed from its default value and enable it if the quote flag is being
 +         * reset to its default value.  The defaults for the quote flag are
 +         * disabled if no accounts are using the currency, and true otherwise.
 +         * Thus enable auto quote control if flag is FALSE and there are not any
 +         * accounts using this currency OR flag is TRUE and there are accounts
 +         * using this currency; otherwise disable auto quote control */
 +        gnc_commodity_set_auto_quote_control_flag(cm,
 +                (!flag && (priv->usage_count == 0)) || (flag && (priv->usage_count != 0)));
 +    }
 +    gnc_commodity_commit_edit(cm);
 +    LEAVE("");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_quote_flag
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_quote_flag(gnc_commodity *cm, const gboolean flag)
 +{
 +    ENTER ("(cm=%p, flag=%d)", cm, flag);
 +
 +    if (!cm) return;
 +    gnc_commodity_begin_edit(cm);
 +    GET_PRIVATE(cm)->quote_flag = flag;
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +    LEAVE(" ");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_quote_source
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_quote_source(gnc_commodity *cm, gnc_quote_source *src)
 +{
 +    ENTER ("(cm=%p, src=%p(%s))", cm, src, src ? src->internal_name : "unknown");
 +
 +    if (!cm) return;
 +    gnc_commodity_begin_edit(cm);
 +    GET_PRIVATE(cm)->quote_source = src;
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +    LEAVE(" ");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_quote_tz
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_quote_tz(gnc_commodity *cm, const char *tz)
 +{
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return;
 +
 +    ENTER ("(cm=%p, tz=%s)", cm, tz ? tz : "(null)");
 +
 +    priv = GET_PRIVATE(cm);
 +
 +    if (tz == priv->quote_tz)
 +    {
 +        LEAVE("Already correct TZ");
 +        return;
 +    }
 +
 +    gnc_commodity_begin_edit(cm);
 +    CACHE_REMOVE (priv->quote_tz);
 +    priv->quote_tz = CACHE_INSERT (tz);
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +    LEAVE(" ");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_user_symbol
 + ********************************************************************/
 +
 +void
 +gnc_commodity_set_user_symbol(gnc_commodity * cm, const char * user_symbol)
 +{
 +    struct lconv *lc;
 +    GValue v = G_VALUE_INIT;
 +    if (!cm) return;
 +
 +    ENTER ("(cm=%p, symbol=%s)", cm, user_symbol ? user_symbol : "(null)");
 +
 +    gnc_commodity_begin_edit(cm);
 +
 +    lc = gnc_localeconv();
 +    if (!user_symbol || !*user_symbol)
 +	user_symbol = NULL;
 +    else if (!g_strcmp0(lc->int_curr_symbol, gnc_commodity_get_mnemonic(cm)) &&
 +	     !g_strcmp0(lc->currency_symbol, user_symbol))
 +	/* if the user gives the ISO symbol for the locale currency or the
 +	 * default symbol, actually remove the user symbol */
 +	user_symbol = NULL;
 +    else if (!g_strcmp0(user_symbol, gnc_commodity_get_default_symbol(cm)))
 +	user_symbol = NULL;
 +    if (user_symbol)
 +    {
 +        g_value_init (&v, G_TYPE_STRING);
 +        g_value_set_string (&v, user_symbol);
 +        qof_instance_set_kvp (QOF_INSTANCE(cm), &v, 1, "user_symbol");
 +    }
 +    else
 +        qof_instance_set_kvp (QOF_INSTANCE(cm), NULL, 1, "user_symbol");
 +
 +    mark_commodity_dirty(cm);
 +    gnc_commodity_commit_edit(cm);
 +
 +    LEAVE(" ");
 +}
 +
 +/********************************************************************
 + * gnc_commodity_set_default_symbol
 + * Not made visible in gnc-commodity.h, it is only called from
 + * iso-4217-currencies.c at startup.
 + ********************************************************************/
 +void
 +gnc_commodity_set_default_symbol(gnc_commodity * cm,
 +				 const char * default_symbol)
 +{
 +    GET_PRIVATE(cm)->default_symbol = default_symbol;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_increment_usage_count
 + ********************************************************************/
 +
 +void
 +gnc_commodity_increment_usage_count(gnc_commodity *cm)
 +{
 +    CommodityPrivate* priv;
 +
 +    ENTER("(cm=%p)", cm);
 +
 +    if (!cm)
 +    {
 +        LEAVE("");
 +        return;
 +    }
 +
 +    priv = GET_PRIVATE(cm);
 +
 +    if ((priv->usage_count == 0) && !priv->quote_flag
 +            && gnc_commodity_get_auto_quote_control_flag(cm)
 +            && gnc_commodity_is_iso(cm))
 +    {
 +        /* compatibility hack - Gnucash 1.8 gets currency quotes when a
 +           non-default currency is assigned to an account.  */
 +        gnc_commodity_begin_edit(cm);
 +        gnc_commodity_set_quote_flag(cm, TRUE);
 +        gnc_commodity_set_quote_source(cm,
 +                                       gnc_commodity_get_default_quote_source(cm));
 +        gnc_commodity_commit_edit(cm);
 +    }
 +    priv->usage_count++;
 +    LEAVE("(usage_count=%d)", priv->usage_count);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_decrement_usage_count
 + ********************************************************************/
 +
 +void
 +gnc_commodity_decrement_usage_count(gnc_commodity *cm)
 +{
 +    CommodityPrivate* priv;
 +
 +    ENTER("(cm=%p)", cm);
 +
 +    if (!cm)
 +    {
 +        LEAVE("");
 +        return;
 +    }
 +
 +    priv = GET_PRIVATE(cm);
 +
 +    if (priv->usage_count == 0)
 +    {
 +        PWARN("usage_count already zero");
 +        LEAVE("");
 +        return;
 +    }
 +
 +    priv->usage_count--;
 +    if ((priv->usage_count == 0) && priv->quote_flag
 +            && gnc_commodity_get_auto_quote_control_flag(cm)
 +            && gnc_commodity_is_iso(cm))
 +    {
 +        /* if this is a currency with auto quote control enabled and no more
 +         * accounts reference this currency, disable quote retrieval */
 +        gnc_commodity_set_quote_flag(cm, FALSE);
 +    }
 +    LEAVE("(usage_count=%d)", priv->usage_count);
 +}
 +
 +/********************************************************************\
 +\********************************************************************/
 +
 +
 +/********************************************************************
 + * gnc_commodity_equiv
 + * are two commodities the same?
 + ********************************************************************/
 +
 +gboolean
 +gnc_commodity_equiv(const gnc_commodity * a, const gnc_commodity * b)
 +{
 +    CommodityPrivate* priv_a;
 +    CommodityPrivate* priv_b;
 +
 +    if (a == b) return TRUE;
 +    if (!a || !b) return FALSE;
 +
 +    priv_a = GET_PRIVATE(a);
 +    priv_b = GET_PRIVATE(b);
 +    if (priv_a->name_space != priv_b->name_space) return FALSE;
 +    if (g_strcmp0(priv_a->mnemonic, priv_b->mnemonic) != 0) return FALSE;
 +    return TRUE;
 +}
 +
 +gboolean
 +gnc_commodity_equal(const gnc_commodity * a, const gnc_commodity * b)
 +{
 +    CommodityPrivate* priv_a;
 +    CommodityPrivate* priv_b;
 +    gboolean same_book;
 +
 +    if (a == b) return TRUE;
 +
 +    if (!a || !b)
 +    {
 +        DEBUG ("one is NULL");
 +        return FALSE;
 +    }
 +
 +    priv_a = GET_PRIVATE(a);
 +    priv_b = GET_PRIVATE(b);
 +    same_book = qof_instance_get_book(QOF_INSTANCE(a)) == qof_instance_get_book(QOF_INSTANCE(b));
 +
 +    if ((same_book && priv_a->name_space != priv_b->name_space)
 +            || (!same_book && g_strcmp0( gnc_commodity_namespace_get_name(priv_a->name_space),
 +                                           gnc_commodity_namespace_get_name(priv_b->name_space)) != 0))
 +    {
 +        DEBUG ("namespaces differ: %p(%s) vs %p(%s)",
 +               priv_a->name_space, gnc_commodity_namespace_get_name(priv_a->name_space),
 +               priv_b->name_space, gnc_commodity_namespace_get_name(priv_b->name_space));
 +        return FALSE;
 +    }
 +
 +    if (g_strcmp0(priv_a->mnemonic, priv_b->mnemonic) != 0)
 +    {
 +        DEBUG ("mnemonics differ: %s vs %s", priv_a->mnemonic, priv_b->mnemonic);
 +        return FALSE;
 +    }
 +
 +    if (g_strcmp0(priv_a->fullname, priv_b->fullname) != 0)
 +    {
 +        DEBUG ("fullnames differ: %s vs %s", priv_a->fullname, priv_b->fullname);
 +        return FALSE;
 +    }
 +
 +    if (g_strcmp0(priv_a->cusip, priv_b->cusip) != 0)
 +    {
 +        DEBUG ("cusips differ: %s vs %s", priv_a->cusip, priv_b->cusip);
 +        return FALSE;
 +    }
 +
 +    if (priv_a->fraction != priv_b->fraction)
 +    {
 +        DEBUG ("fractions differ: %d vs %d", priv_a->fraction, priv_b->fraction);
 +        return FALSE;
 +    }
 +
 +    return TRUE;
 +}
 +
 +int gnc_commodity_compare(const gnc_commodity * a, const gnc_commodity * b)
 +{
 +    if (gnc_commodity_equal(a, b))
 +    {
 +        return 0;
 +    }
 +    else
 +    {
 +        return 1;
 +    }
 +}
 +
 +int gnc_commodity_compare_void(const void * a, const void * b)
 +{
 +    return gnc_commodity_compare(a, b);
 +}
 +
 +/************************************************************
 + *                   Namespace functions                    *
 + ************************************************************/
 +const char *
 +gnc_commodity_namespace_get_name (const gnc_commodity_namespace *ns)
 +{
 +    if (ns == NULL)
 +        return NULL;
 +    return ns->name;
 +}
 +
 +const char *
 +gnc_commodity_namespace_get_gui_name (const gnc_commodity_namespace *ns)
 +{
 +    if (ns == NULL)
 +        return NULL;
 +    if (g_strcmp0 (ns->name, GNC_COMMODITY_NS_CURRENCY) == 0)
 +        return GNC_COMMODITY_NS_ISO_GUI;
 +    return ns->name;
 +}
 +
 +GList *
 +gnc_commodity_namespace_get_commodity_list(const gnc_commodity_namespace *name_space)
 +{
 +    if (!name_space)
 +        return NULL;
 +
 +    return name_space->cm_list;
 +}
 +
 +gboolean
 +gnc_commodity_namespace_is_iso(const char *name_space)
 +{
 +    return ((g_strcmp0(name_space, GNC_COMMODITY_NS_ISO) == 0) ||
 +            (g_strcmp0(name_space, GNC_COMMODITY_NS_CURRENCY) == 0));
 +}
 +
 +static const gchar *
 +gnc_commodity_table_map_namespace(const char * name_space)
 +{
 +    if (g_strcmp0(name_space, GNC_COMMODITY_NS_ISO) == 0)
 +        return GNC_COMMODITY_NS_CURRENCY;
 +    return name_space;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_new
 + * make a new commodity table
 + ********************************************************************/
 +
 +gnc_commodity_table *
 +gnc_commodity_table_new(void)
 +{
 +    gnc_commodity_table * retval = g_new0(gnc_commodity_table, 1);
 +    retval->ns_table = g_hash_table_new(&g_str_hash, &g_str_equal);
 +    retval->ns_list = NULL;
 +    return retval;
 +}
 +
 +/********************************************************************
 + * book anchor functons
 + ********************************************************************/
 +
 +gnc_commodity_table *
 +gnc_commodity_table_get_table(QofBook *book)
 +{
 +    if (!book) return NULL;
 +    return qof_book_get_data (book, GNC_COMMODITY_TABLE);
 +}
 +
 +gnc_commodity *
 +gnc_commodity_obtain_twin (const gnc_commodity *from, QofBook *book)
 +{
 +    gnc_commodity *twin;
 +    const char * ucom;
 +    gnc_commodity_table * comtbl;
 +
 +    if (!from) return NULL;
 +    comtbl = gnc_commodity_table_get_table (book);
 +    if (!comtbl) return NULL;
 +
 +    ucom = gnc_commodity_get_unique_name (from);
 +    twin = gnc_commodity_table_lookup_unique (comtbl, ucom);
 +    if (!twin)
 +    {
 +        twin = gnc_commodity_clone (from, book);
 +        twin = gnc_commodity_table_insert (comtbl, twin);
 +    }
 +    return twin;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_get_size
 + * get the size of the commodity table
 + ********************************************************************/
 +
 +static void
 +count_coms(gpointer key, gpointer value, gpointer user_data)
 +{
 +    GHashTable *tbl = ((gnc_commodity_namespace*)value)->cm_table;
 +    guint *count = (guint*)user_data;
 +
 +    if (g_strcmp0((char*)key, GNC_COMMODITY_NS_CURRENCY) == 0)
 +    {
 +        /* don't count default commodities */
 +        return;
 +    }
 +
 +    if (!value) return;
 +
 +    *count += g_hash_table_size(tbl);
 +}
 +
 +guint
 +gnc_commodity_table_get_size(const gnc_commodity_table* tbl)
 +{
 +    guint count = 0;
 +    g_return_val_if_fail(tbl, 0);
 +    g_return_val_if_fail(tbl->ns_table, 0);
 +
 +    g_hash_table_foreach(tbl->ns_table, count_coms, (gpointer)&count);
 +
 +    return count;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_lookup
 + * locate a commodity by namespace and mnemonic.
 + ********************************************************************/
 +
 +gnc_commodity *
 +gnc_commodity_table_lookup(const gnc_commodity_table * table,
 +                           const char * name_space, const char * mnemonic)
 +{
 +    gnc_commodity_namespace * nsp = NULL;
 +    unsigned int i;
 +
 +    if (!table || !name_space || !mnemonic) return NULL;
 +
 +    nsp = gnc_commodity_table_find_namespace(table, name_space);
 +
 +    if (nsp)
 +    {
 +        /*
 +         * Backward compatibility support for currencies that have
 +         * recently changed.
 +         */
 +        if (nsp->iso4217)
 +        {
 +            for (i = 0; i < GNC_NEW_ISO_CODES; i++)
 +            {
 +                if (strcmp(mnemonic, gnc_new_iso_codes[i].old_code) == 0)
 +                {
 +                    mnemonic = gnc_new_iso_codes[i].new_code;
 +                    break;
 +                }
 +            }
 +        }
 +        return g_hash_table_lookup(nsp->cm_table, (gpointer)mnemonic);
 +    }
 +    else
 +    {
 +        return NULL;
 +    }
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_lookup
 + * locate a commodity by unique name.
 + ********************************************************************/
 +
 +gnc_commodity *
 +gnc_commodity_table_lookup_unique(const gnc_commodity_table *table,
 +                                  const char * unique_name)
 +{
 +    char *name_space;
 +    char *mnemonic;
 +    gnc_commodity *commodity;
 +
 +    if (!table || !unique_name) return NULL;
 +
 +    name_space = g_strdup (unique_name);
 +    mnemonic = strstr (name_space, "::");
 +    if (!mnemonic)
 +    {
 +        g_free (name_space);
 +        return NULL;
 +    }
 +
 +    *mnemonic = '\0';
 +    mnemonic += 2;
 +
 +    commodity = gnc_commodity_table_lookup (table, name_space, mnemonic);
 +
 +    g_free (name_space);
 +
 +    return commodity;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_find_full
 + * locate a commodity by namespace and printable name
 + ********************************************************************/
 +
 +gnc_commodity *
 +gnc_commodity_table_find_full(const gnc_commodity_table * table,
 +                              const char * name_space,
 +                              const char * fullname)
 +{
 +    gnc_commodity * retval = NULL;
 +    GList         * all;
 +    GList         * iterator;
 +
 +    if (!fullname || (fullname[0] == '\0'))
 +        return NULL;
 +
 +    all = gnc_commodity_table_get_commodities(table, name_space);
 +
 +    for (iterator = all; iterator; iterator = iterator->next)
 +    {
 +        if (!strcmp(fullname,
 +                    gnc_commodity_get_printname(iterator->data)))
 +        {
 +            retval = iterator->data;
 +            break;
 +        }
 +    }
 +
 +    g_list_free (all);
 +
 +    return retval;
 +}
 +
 +
 +/********************************************************************
 + * gnc_commodity_table_insert
 + * add a commodity to the table.
 + ********************************************************************/
 +
 +gnc_commodity *
 +gnc_commodity_table_insert(gnc_commodity_table * table,
 +                           gnc_commodity * comm)
 +{
 +    gnc_commodity_namespace * nsp = NULL;
 +    gnc_commodity *c;
 +    const char *ns_name;
 +    CommodityPrivate* priv;
 +    QofBook *book;
 +
 +    if (!table) return NULL;
 +    if (!comm) return NULL;
 +
 +    priv = GET_PRIVATE(comm);
 +
 +    ENTER ("(table=%p, comm=%p) %s %s", table, comm,
 +           (priv->mnemonic == NULL ? "(null)" : priv->mnemonic),
 +           (priv->fullname == NULL ? "(null)" : priv->fullname));
 +    ns_name = gnc_commodity_namespace_get_name(priv->name_space);
 +    c = gnc_commodity_table_lookup (table, ns_name, priv->mnemonic);
 +
 +    if (c)
 +    {
 +        if (c == comm)
 +        {
 +            LEAVE("already in table");
 +            return c;
 +        }
 +
 +        /* Backward compatibility support for currencies that have
 +         * recently changed. */
 +        if (priv->name_space->iso4217)
 +        {
 +            guint i;
 +            for (i = 0; i < GNC_NEW_ISO_CODES; i++)
 +            {
 +                if (!priv->mnemonic
 +                        || !strcmp(priv->mnemonic, gnc_new_iso_codes[i].old_code))
 +                {
 +                    gnc_commodity_set_mnemonic(comm, gnc_new_iso_codes[i].new_code);
 +                    break;
 +                }
 +            }
 +        }
 +        gnc_commodity_copy (c, comm);
 +        gnc_commodity_destroy (comm);
 +        LEAVE("found at %p", c);
 +        return c;
 +    }
 +
 +    /* Prevent setting anything except template in namespace template. */
 +    if (g_strcmp0 (ns_name, GNC_COMMODITY_NS_TEMPLATE) == 0 &&
 +	g_strcmp0 (priv->mnemonic, "template") != 0)
 +    {
 +	PWARN("Converting commodity %s from namespace template to "
 +	      "namespace User", priv->mnemonic);
 +	gnc_commodity_set_namespace (comm, "User");
 +	ns_name = "User";
 +	mark_commodity_dirty (comm);
 +    }
 +
 +    book = qof_instance_get_book (&comm->inst);
 +    nsp = gnc_commodity_table_add_namespace(table, ns_name, book);
 +
 +    PINFO ("insert %p %s into nsp=%p %s", priv->mnemonic, priv->mnemonic,
 +           nsp->cm_table, nsp->name);
 +    g_hash_table_insert(nsp->cm_table,
 +                        CACHE_INSERT(priv->mnemonic),
 +                        (gpointer)comm);
 +    nsp->cm_list = g_list_append(nsp->cm_list, comm);
 +
 +    qof_event_gen (&comm->inst, QOF_EVENT_ADD, NULL);
 +    LEAVE ("(table=%p, comm=%p)", table, comm);
 +    return comm;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_remove
 + * remove a commodity from the table.
 + ********************************************************************/
 +
 +void
 +gnc_commodity_table_remove(gnc_commodity_table * table,
 +                           gnc_commodity * comm)
 +{
 +    gnc_commodity_namespace * nsp;
 +    gnc_commodity *c;
 +    CommodityPrivate* priv;
 +    const char *ns_name;
 +
 +    if (!table) return;
 +    if (!comm) return;
 +
 +    priv = GET_PRIVATE(comm);
 +    ns_name = gnc_commodity_namespace_get_name(priv->name_space);
 +    c = gnc_commodity_table_lookup (table, ns_name, priv->mnemonic);
 +    if (c != comm) return;
 +
 +    qof_event_gen (&comm->inst, QOF_EVENT_REMOVE, NULL);
 +
 +    nsp = gnc_commodity_table_find_namespace(table, ns_name);
 +    if (!nsp) return;
 +
 +    nsp->cm_list = g_list_remove(nsp->cm_list, comm);
 +    g_hash_table_remove (nsp->cm_table, priv->mnemonic);
 +    /* XXX minor mem leak, should remove the key as well */
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_has_namespace
 + * see if the commodities namespace exists. May have zero commodities.
 + ********************************************************************/
 +
 +int
 +gnc_commodity_table_has_namespace(const gnc_commodity_table * table,
 +                                  const char * name_space)
 +{
 +    gnc_commodity_namespace * nsp = NULL;
 +
 +    if (!table || !name_space)
 +    {
 +        return 0;
 +    }
 +
 +    nsp = gnc_commodity_table_find_namespace(table, name_space);
 +    if (nsp)
 +    {
 +        return 1;
 +    }
 +    else
 +    {
 +        return 0;
 +    }
 +}
 +
 +static void
 +hash_keys_helper(gpointer key, gpointer value, gpointer data)
 +{
 +    GList ** l = data;
 +    *l = g_list_prepend(*l, key);
 +}
 +
 +static GList *
 +g_hash_table_keys(GHashTable * table)
 +{
 +    GList * l = NULL;
 +    g_hash_table_foreach(table, &hash_keys_helper, (gpointer) &l);
 +    return l;
 +}
 +
 +static void
 +hash_values_helper(gpointer key, gpointer value, gpointer data)
 +{
 +    GList ** l = data;
 +    *l = g_list_prepend(*l, value);
 +}
 +
 +static GList *
 +g_hash_table_values(GHashTable * table)
 +{
 +    GList * l = NULL;
 +    g_hash_table_foreach(table, &hash_values_helper, (gpointer) &l);
 +    return l;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_get_namespaces
 + * see if any commodities in the namespace exist
 + ********************************************************************/
 +
 +GList *
 +gnc_commodity_table_get_namespaces(const gnc_commodity_table * table)
 +{
 +    if (!table)
 +        return NULL;
 +
 +    return g_hash_table_keys(table->ns_table);
 +}
 +
 +GList *
 +gnc_commodity_table_get_namespaces_list(const gnc_commodity_table * table)
 +{
 +    if (!table)
 +        return NULL;
 +
 +    return table->ns_list;
 +}
 +
 +/* Because gnc_commodity_table_add_namespace maps GNC_COMMODITY_NS_ISO to
 +   GNC_COMMODITY_NS_CURRENCY and then sets iso4217 if the namespace is
 +   either of these, the net result is that the iso4217 bit is set only
 +   for GNC_COMMODITY_NS_CURRENCY.  This means that gnc_commodity_is_iso is
 +   a subset of gnc_commodity_is_currency.  Most callers seem to use
 +   gnc_commodity_is_iso. */
 +gboolean
 +gnc_commodity_is_iso(const gnc_commodity * cm)
 +{
 +    CommodityPrivate* priv;
 +
 +    if (!cm) return FALSE;
 +
 +    priv = GET_PRIVATE(cm);
 +    if ( !priv->name_space) return FALSE;
 +    return priv->name_space->iso4217;
 +}
 +
 +gboolean
 +gnc_commodity_is_currency(const gnc_commodity *cm)
 +{
 +    const char *ns_name;
 +    if (!cm) return FALSE;
 +
 +    ns_name = gnc_commodity_namespace_get_name(GET_PRIVATE(cm)->name_space);
 +    return (!g_strcmp0(ns_name, GNC_COMMODITY_NS_LEGACY) ||
 +            !g_strcmp0(ns_name, GNC_COMMODITY_NS_CURRENCY));
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_get_commodities
 + * list commodities in a given namespace
 + ********************************************************************/
 +
 +static CommodityList*
 +commodity_table_get_all_noncurrency_commodities(const gnc_commodity_table* table)
 +{
 +    GList *node = NULL, *nslist = gnc_commodity_table_get_namespaces(table);
 +    CommodityList *retval = NULL;
 +    for (node = nslist; node; node=g_list_next(node))
 +    {
 +        gnc_commodity_namespace *ns = NULL;
 +        if (g_strcmp0((char*)(node->data), GNC_COMMODITY_NS_CURRENCY) == 0
 +            || g_strcmp0((char*)(node->data), GNC_COMMODITY_NS_TEMPLATE) == 0)
 +            continue;
 +        ns = gnc_commodity_table_find_namespace(table, (char*)(node->data));
 +        if (!ns)
 +            continue;
 +        retval = g_list_concat(g_hash_table_values(ns->cm_table), retval);
 +    }
 +    g_list_free(nslist);
 +    return retval;
 +}
 +
 +CommodityList *
 +gnc_commodity_table_get_commodities(const gnc_commodity_table * table,
 +                                    const char * name_space)
 +{
 +    gnc_commodity_namespace * ns = NULL;
 +
 +    if (!table)
 +        return NULL;
 +    if (g_strcmp0(name_space, GNC_COMMODITY_NS_NONCURRENCY) == 0)
 +        return commodity_table_get_all_noncurrency_commodities(table);
 +    ns = gnc_commodity_table_find_namespace(table, name_space);
 +    if (!ns)
 +        return NULL;
 +
 +    return g_hash_table_values(ns->cm_table);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_get_quotable_commodities
 + * list commodities in a given namespace that get price quotes
 + ********************************************************************/
 +
 +static void
 +get_quotables_helper1(gpointer key, gpointer value, gpointer data)
 +{
 +    gnc_commodity *comm = value;
 +    CommodityPrivate* priv = GET_PRIVATE(comm);
 +    GList ** l = data;
 +
 +    if (!priv->quote_flag ||
 +            !priv->quote_source || !priv->quote_source->supported)
 +        return;
 +    *l = g_list_prepend(*l, value);
 +}
 +
 +static gboolean
 +get_quotables_helper2 (gnc_commodity *comm, gpointer data)
 +{
 +    GList ** l = data;
 +    CommodityPrivate* priv = GET_PRIVATE(comm);
 +
 +    if (!priv->quote_flag ||
 +            !priv->quote_source || !priv->quote_source->supported)
 +        return TRUE;
 +    *l = g_list_prepend(*l, comm);
 +    return TRUE;
 +}
 +
 +CommodityList *
 +gnc_commodity_table_get_quotable_commodities(const gnc_commodity_table * table)
 +{
 +    gnc_commodity_namespace * ns = NULL;
 +    const char *name_space;
 +    GList * nslist, * tmp;
 +    GList * l = NULL;
 +    regex_t pattern;
 +    const char *expression = gnc_prefs_get_namespace_regexp();
 +
 +    ENTER("table=%p, expression=%s", table, expression);
 +    if (!table)
 +        return NULL;
 +
 +    if (expression && *expression)
 +    {
 +        if (regcomp(&pattern, expression, REG_EXTENDED | REG_ICASE) != 0)
 +        {
 +            LEAVE("Cannot compile regex");
 +            return NULL;
 +        }
 +
 +        nslist = gnc_commodity_table_get_namespaces(table);
 +        for (tmp = nslist; tmp; tmp = tmp->next)
 +        {
 +            name_space = tmp->data;
 +            if (regexec(&pattern, name_space, 0, NULL, 0) == 0)
 +            {
 +                DEBUG("Running list of %s commodities", name_space);
 +                ns = gnc_commodity_table_find_namespace(table, name_space);
 +                if (ns)
 +                {
 +                    g_hash_table_foreach(ns->cm_table, &get_quotables_helper1, (gpointer) &l);
 +                }
 +            }
 +        }
 +        g_list_free(nslist);
 +        regfree(&pattern);
 +    }
 +    else
 +    {
 +        gnc_commodity_table_foreach_commodity(table, get_quotables_helper2,
 +                                              (gpointer) &l);
 +    }
 +    LEAVE("list head %p", l);
 +    return l;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_add_namespace
 + * add an empty namespace if it does not exist
 + ********************************************************************/
 +
 +/* GObject Initialization */
 +QOF_GOBJECT_IMPL(gnc_commodity_namespace, gnc_commodity_namespace, QOF_TYPE_INSTANCE);
 +
 +static void
 +gnc_commodity_namespace_init(gnc_commodity_namespace* ns)
 +{
 +}
 +
 +static void
 +gnc_commodity_namespace_dispose_real (GObject *nsp)
 +{
 +}
 +
 +static void
 +gnc_commodity_namespace_finalize_real(GObject* nsp)
 +{
 +}
 +
 +gnc_commodity_namespace *
 +gnc_commodity_table_add_namespace(gnc_commodity_table * table,
 +                                  const char * name_space,
 +                                  QofBook *book)
 +{
 +    gnc_commodity_namespace * ns = NULL;
 +
 +    if (!table) return NULL;
 +
 +    name_space = gnc_commodity_table_map_namespace(name_space);
 +    ns = gnc_commodity_table_find_namespace(table, name_space);
 +    if (!ns)
 +    {
 +        ns = g_object_new(GNC_TYPE_COMMODITY_NAMESPACE, NULL);
 +        ns->cm_table = g_hash_table_new(g_str_hash, g_str_equal);
 +        ns->name = CACHE_INSERT((gpointer)name_space);
 +        ns->iso4217 = gnc_commodity_namespace_is_iso(name_space);
 +        qof_instance_init_data (&ns->inst, GNC_ID_COMMODITY_NAMESPACE, book);
 +        qof_event_gen (&ns->inst, QOF_EVENT_CREATE, NULL);
 +
 +        g_hash_table_insert(table->ns_table,
 +                            (gpointer) ns->name,
 +                            (gpointer) ns);
 +        table->ns_list = g_list_append(table->ns_list, ns);
 +        qof_event_gen (&ns->inst, QOF_EVENT_ADD, NULL);
 +    }
 +    return ns;
 +}
 +
 +
 +gnc_commodity_namespace *
 +gnc_commodity_table_find_namespace(const gnc_commodity_table * table,
 +                                   const char * name_space)
 +{
 +    if (!table || !name_space)
 +        return NULL;
 +
 +    name_space = gnc_commodity_table_map_namespace(name_space);
 +    return g_hash_table_lookup(table->ns_table, (gpointer)name_space);
 +}
 +
 +
 +gnc_commodity *
 +gnc_commodity_find_commodity_by_guid(const GncGUID *guid, QofBook *book)
 +{
 +    QofCollection *col;
 +    if (!guid || !book) return NULL;
 +    col = qof_book_get_collection (book, GNC_ID_COMMODITY);
 +    return (gnc_commodity *) qof_collection_lookup_entity (col, guid);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_delete_namespace
 + * delete a namespace
 + ********************************************************************/
 +
 +static int
 +ns_helper(gpointer key, gpointer value, gpointer user_data)
 +{
 +    gnc_commodity * c = value;
 +    gnc_commodity_destroy(c);
 +    CACHE_REMOVE(key);  /* key is commodity mnemonic */
 +    return TRUE;
 +}
 +
 +void
 +gnc_commodity_table_delete_namespace(gnc_commodity_table * table,
 +                                     const char * name_space)
 +{
 +    gnc_commodity_namespace * ns;
 +
 +    if (!table) return;
 +
 +    ns = gnc_commodity_table_find_namespace(table, name_space);
 +    if (!ns)
 +        return;
 +
 +    qof_event_gen (&ns->inst, QOF_EVENT_REMOVE, NULL);
 +    g_hash_table_remove(table->ns_table, name_space);
 +    table->ns_list = g_list_remove(table->ns_list, ns);
 +
 +    g_list_free(ns->cm_list);
 +    ns->cm_list = NULL;
 +
 +    g_hash_table_foreach_remove(ns->cm_table, ns_helper, NULL);
 +    g_hash_table_destroy(ns->cm_table);
 +    CACHE_REMOVE(ns->name);
 +
 +    qof_event_gen (&ns->inst, QOF_EVENT_DESTROY, NULL);
 +    /* qof_instance_release(&ns->inst); */
 +    g_object_unref(ns);
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_foreach_commodity
 + * call user-defined function once for every commodity in every
 + * namespace
 + ********************************************************************/
 +
 +typedef struct
 +{
 +    gboolean ok;
 +    gboolean (*func)(gnc_commodity *, gpointer);
 +    gpointer user_data;
 +} IterData;
 +
 +static void
 +iter_commodity (gpointer key, gpointer value, gpointer user_data)
 +{
 +    IterData *iter_data = (IterData *) user_data;
 +    gnc_commodity *cm = (gnc_commodity *) value;
 +
 +    if (iter_data->ok)
 +    {
 +        iter_data->ok = (iter_data->func)(cm, iter_data->user_data);
 +    }
 +}
 +
 +static void
 +iter_namespace (gpointer key, gpointer value, gpointer user_data)
 +{
 +    GHashTable *namespace_hash = ((gnc_commodity_namespace *) value)->cm_table;
 +    g_hash_table_foreach (namespace_hash, iter_commodity, user_data);
 +}
 +
 +gboolean
 +gnc_commodity_table_foreach_commodity (const gnc_commodity_table * tbl,
 +                                       gboolean (*f)(gnc_commodity *, gpointer),
 +                                       gpointer user_data)
 +{
 +    IterData iter_data;
 +
 +    if (!tbl || !f) return FALSE;
 +
 +    iter_data.ok = TRUE;
 +    iter_data.func = f;
 +    iter_data.user_data = user_data;
 +
 +    g_hash_table_foreach(tbl->ns_table, iter_namespace, (gpointer)&iter_data);
 +
 +    return iter_data.ok;
 +}
 +
 +/********************************************************************
 + * gnc_commodity_table_destroy
 + * cleanup and free.
 + ********************************************************************/
 +
 +void
 +gnc_commodity_table_destroy(gnc_commodity_table * t)
 +{
 +    gnc_commodity_namespace * ns;
 +    GList *item, *next;
 +
 +    if (!t) return;
 +    ENTER ("table=%p", t);
 +
 +    for (item = t->ns_list; item; item = next)
 +    {
 +        next = g_list_next(item);
 +        ns = item->data;
 +        gnc_commodity_table_delete_namespace(t, ns->name);
 +    }
 +
 +    g_list_free(t->ns_list);
 +    t->ns_list = NULL;
 +    g_hash_table_destroy(t->ns_table);
 +    t->ns_table = NULL;
 +    g_free(t);
 +    LEAVE ("table=%p", t);
 +}
 +
 +/* =========================================================== */
 +
 +/********************************************************************
 + * gnc_commodity_table_add_default_data
 + ********************************************************************/
 +
 +#define CUR_I18N(String) dgettext ("iso_4217", String)
 +
 +gboolean
 +gnc_commodity_table_add_default_data(gnc_commodity_table *table, QofBook *book)
 +{
 +    QofCollection *col;
 +    gnc_commodity* c;
 +
 +    ENTER ("table=%p", table);
 +    gnc_commodity_table_add_namespace(table, GNC_COMMODITY_NS_AMEX, book);
 +    gnc_commodity_table_add_namespace(table, GNC_COMMODITY_NS_NYSE, book);
 +    gnc_commodity_table_add_namespace(table, GNC_COMMODITY_NS_NASDAQ, book);
 +    gnc_commodity_table_add_namespace(table, GNC_COMMODITY_NS_EUREX, book);
 +    gnc_commodity_table_add_namespace(table, GNC_COMMODITY_NS_MUTUAL, book);
 +    gnc_commodity_table_add_namespace(table, GNC_COMMODITY_NS_TEMPLATE, book);
 +    c = gnc_commodity_new(book, "template", GNC_COMMODITY_NS_TEMPLATE, "template", "template", 1);
 +    gnc_commodity_table_insert(table, c);
 +
 +#include "iso-4217-currencies.c"
 +
 +    /* We've just created the default namespaces and currencies.  Mark
 +     * these collections as clean because there is no USER entered data
 +     * in these collections as of yet. */
 +    col = qof_book_get_collection(book, GNC_ID_COMMODITY);
 +    qof_collection_mark_clean(col);
 +    col = qof_book_get_collection(book, GNC_ID_COMMODITY_NAMESPACE);
 +    qof_collection_mark_clean(col);
 +
 +    LEAVE ("table=%p", table);
 +    return TRUE;
 +}
 +
 +/********************************************************************
 + ********************************************************************/
 +/* QofObject function implementation and registration */
 +
 +#ifdef _MSC_VER
 +/* MSVC compiler doesn't have C99 "designated initializers"
 + * so we wrap them in a macro that is empty on MSVC. */
 +# define DI(x) /* */
 +#else
 +# define DI(x) x
 +#endif
 +static QofObject commodity_object_def =
 +{
 +    DI(.interface_version = ) QOF_OBJECT_VERSION,
 +    DI(.e_type            = ) GNC_ID_COMMODITY,
 +    DI(.type_label        = ) "Commodity",
 +    DI(.create            = ) NULL,
 +    DI(.book_begin        = ) NULL,
 +    DI(.book_end          = ) NULL,
 +    DI(.is_dirty          = ) qof_collection_is_dirty,
 +    DI(.mark_clean        = ) qof_collection_mark_clean,
 +    DI(.foreach           = ) qof_collection_foreach,
 +    DI(.printable         = ) (const char * (*)(gpointer)) gnc_commodity_get_fullname,
 +};
 +
 +static QofObject namespace_object_def =
 +{
 +    DI(.interface_version = ) QOF_OBJECT_VERSION,
 +    DI(.e_type            = ) GNC_ID_COMMODITY_NAMESPACE,
 +    DI(.type_label        = ) "Namespace",
 +    DI(.create            = ) NULL,
 +    DI(.book_begin        = ) NULL,
 +    DI(.book_end          = ) NULL,
 +    DI(.is_dirty          = ) NULL,
 +    DI(.mark_clean        = ) NULL,
 +    DI(.foreach           = ) NULL,
 +    DI(.printable         = ) NULL,
 +};
 +
 +static void
 +commodity_table_book_begin (QofBook *book)
 +{
 +    gnc_commodity_table *ct;
 +    ENTER ("book=%p", book);
 +
 +    if (gnc_commodity_table_get_table(book))
 +        return;
 +
 +    ct = gnc_commodity_table_new ();
 +    qof_book_set_data (book, GNC_COMMODITY_TABLE, ct);
 +
 +    if (!gnc_commodity_table_add_default_data(ct, book))
 +    {
 +        PWARN("unable to initialize book's commodity_table");
 +    }
 +
 +    LEAVE ("book=%p", book);
 +}
 +
 +static void
 +commodity_table_book_end (QofBook *book)
 +{
 +    gnc_commodity_table *ct;
 +
 +    ct = gnc_commodity_table_get_table (book);
 +    qof_book_set_data (book, GNC_COMMODITY_TABLE, NULL);
 +    gnc_commodity_table_destroy (ct);
 +}
 +
 +static QofObject commodity_table_object_def =
 +{
 +    DI(.interface_version = ) QOF_OBJECT_VERSION,
 +    DI(.e_type            = ) GNC_ID_COMMODITY_TABLE,
 +    DI(.type_label        = ) "CommodityTable",
 +    DI(.create            = ) NULL,
 +    DI(.book_begin        = ) commodity_table_book_begin,
 +    DI(.book_end          = ) commodity_table_book_end,
 +    DI(.is_dirty          = ) qof_collection_is_dirty,
 +    DI(.mark_clean        = ) qof_collection_mark_clean,
 +    DI(.foreach           = ) NULL,
 +    DI(.printable         = ) NULL,
 +    DI(.version_cmp       = ) NULL,
 +};
 +
 +gboolean
 +gnc_commodity_table_register (void)
 +{
 +    gnc_quote_source_init_tables();
 +
 +    if (!qof_object_register (&commodity_object_def))
 +        return FALSE;
 +    if (!qof_object_register (&namespace_object_def))
 +        return FALSE;
 +    return qof_object_register (&commodity_table_object_def);
 +}
 +
 +/* *******************************************************************
 +*  gnc_monetary methods
 +********************************************************************/
 +
 +/** Add a gnc_monetary to the list */
 +MonetaryList *
 +gnc_monetary_list_add_monetary(MonetaryList *list, gnc_monetary add_mon)
 +{
 +    MonetaryList *l = list, *tmp;
 +    for (tmp = list; tmp; tmp = tmp->next)
 +    {
 +        gnc_monetary *list_mon = tmp->data;
 +        if (gnc_commodity_equiv(list_mon->commodity, add_mon.commodity))
 +        {
 +            list_mon->value = gnc_numeric_add(list_mon->value, add_mon.value,
 +                                              GNC_DENOM_AUTO, GNC_HOW_DENOM_EXACT);
 +            break;
 +        }
 +    }
 +
 +    /* See if we found an entry, and add one if not */
 +    if (tmp == NULL)
 +    {
 +        gnc_monetary *new_mon = g_new0(gnc_monetary, 1);
 +        *new_mon = add_mon;
 +        l = g_list_prepend(l, new_mon);
 +    }
 +
 +    return l;
 +}
 +
 +/** Delete all entries in the list that have zero value.  Return list
 +    pointer will be a null pointer if there are no non-zero entries **/
 +MonetaryList *
 +gnc_monetary_list_delete_zeros(MonetaryList *list)
 +{
 +    MonetaryList *node, *next;
 +    for (node = list; node; node = next)
 +    {
 +        gnc_monetary *mon = node->data;
 +        next = node->next;
 +        if (gnc_numeric_zero_p(mon->value))
 +        {
 +            g_free(mon);
 +            list = g_list_delete_link(list, node);
 +        }
 +    }
 +    return list;
 +}
 +
 +/** Free a MonetaryList and all the monetaries it points to */
 +void
 +gnc_monetary_list_free(MonetaryList *list)
 +{
 +    MonetaryList *tmp;
 +    for (tmp = list; tmp; tmp = tmp->next)
 +    {
 +        g_free(tmp->data);
 +    }
 +
 +    g_list_free(list);
 +}
 +
 +/* ========================= END OF FILE ============================== */

commit d61cd79ae3c8adfc521c3781fb25eb81ec2a1627
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Sat Mar 10 10:23:56 2018 +0100

    Minor fix in de.po

diff --git a/po/de.po b/po/de.po
index 86b4e16..5e0c77f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5809,11 +5809,14 @@ msgstr "_Buchabschluss"
 msgid "Archive old data using accounting periods"
 msgstr "Alte Daten abschließen und in vorigen Buchführungsperioden speichern."
 
+# Fell: Wie oft muß ich hier noch Editor durch Datenbank ersetzen? S. u.
+# Der Kurs-Editor ist das Fenster, welches danach aufgerufen wird.
+#
 #. Translators: This entry opens the Price Database window
 #. * and will be renamed to "_Price Database" in v.2.8
 #: ../src/gnome/gnc-plugin-basic-commands.c:190
 msgid "_Price Editor"
-msgstr "_Kurs-Editor"
+msgstr "_Kurs-Datenbank"
 
 #: ../src/gnome/gnc-plugin-basic-commands.c:191
 msgid "View and edit the prices for stocks and mutual funds"

commit df26146d2af3bc40bfc5e3b10f30c3faceb6b501
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Sat Mar 10 10:20:26 2018 +0100

    Backport and review of commit c0fd3b3:
    Remove all references to the now-defunct Yahoo! quote retrieval

diff --git a/doc/gnc-fq-dump.1 b/doc/gnc-fq-dump.1
index 1fd1eab..dc593a5 100644
--- a/doc/gnc-fq-dump.1
+++ b/doc/gnc-fq-dump.1
@@ -134,8 +134,8 @@ gnc\-fq\-dump	\- Print out data from the F::Q module
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 .Vb 5
-\&    gnc\-fq\-dump yahoo CSCO JNPR
-\&    gnc\-fq\-dump yahoo BAESY.PK
+\&    gnc\-fq\-dump alphavantage CSCO JNPR
+\&    gnc\-fq\-dump alphavantage BAESY.PK
 \&    gnc\-fq\-dump europe 48406.PA 13000.PA
 \&    gnc\-fq\-dump vwd 632034
 \&    gnc\-fq\-dump ftportfolios FKYGTX
diff --git a/src/backend/dbi/test/test-dbi.xml b/src/backend/dbi/test/test-dbi.xml
index 863ae36..5ea03f5 100644
--- a/src/backend/dbi/test/test-dbi.xml
+++ b/src/backend/dbi/test/test-dbi.xml
@@ -51,7 +51,7 @@
   <cmdty:xcode>12345</cmdty:xcode>
   <cmdty:fraction>10000</cmdty:fraction>
   <cmdty:get_quotes/>
-  <cmdty:quote_source>yahoo</cmdty:quote_source>
+  <cmdty:quote_source>alphavantage</cmdty:quote_source>
 </gnc:commodity>
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
diff --git a/src/doc/design/top-level.texi b/src/doc/design/top-level.texi
index 2900092..31406a0 100644
--- a/src/doc/design/top-level.texi
+++ b/src/doc/design/top-level.texi
@@ -116,9 +116,9 @@ Jon Trowbridge (@url{http://www.gnome.org/guppi}).
 The @dfn{Price Quotes} module (@file{src/quotes}) is a Perl system to
 fetch stock price data off the Internet and insert it into the GnuCash
 Engine. This module requires the functionality of the Finance::Quote
-module available at SourceForge. The Finance::Quote module can fetch
-price quotes from many different sources including Yahoo, Yahoo Europe,
-and some international exchanges.
+module available from CPAN. The Finance::Quote module can fetch
+price quotes from many different sources including Alphavantage
+and several international exchanges and fund companies.
 
 The Finance::Quote module also supports fetching currency exchange
 rates. GnuCash will be extended to allow the fetching and use of
diff --git a/src/engine/gnc-commodity.c b/src/engine/gnc-commodity.c
index 7993d14..fd66afa 100644
--- a/src/engine/gnc-commodity.c
+++ b/src/engine/gnc-commodity.c
@@ -149,19 +149,23 @@ struct gnc_quote_source_s
     gboolean supported;
     QuoteSourceType type;
     gint index;
-    char *user_name;		/* User friendly name */
+    char *user_name;		/* User friendly name incl. region code*/
     char *old_internal_name;	/* Name used internally (deprecated) */
-    char *internal_name;		/* Name used internally and by finance::quote. */
+    char *internal_name;	/* Name used internally and by finance::quote. */
 };
 
+/* To update the following lists search the FQ modules for their 'method's
+ * because most of them have more than one.
+ */
 static gnc_quote_source currency_quote_source =
 { TRUE, 0, 0, "Currency", "CURRENCY", "currency" };
 
 static gnc_quote_source single_quote_sources[] =
 {
+    { FALSE, 0, 0, "Alphavantage, US", "ALPHAVANTAGE", "alphavantage" },
     { FALSE, 0, 0, "Amsterdam Euronext eXchange, NL", "AEX", "aex" },
     { FALSE, 0, 0, "American International Assurance, HK", "AIAHK", "aiahk" },
-    { FALSE, 0, 0, "Association  of  Mutual  Funds  in  India", "AMFIINDIA", "amfiindia" },
+    { FALSE, 0, 0, "Association of Mutual Funds in India", "AMFIINDIA", "amfiindia" },
     { FALSE, 0, 0, "Athens Stock Exchange, GR", "ASEGR", "asegr" },
     { FALSE, 0, 0, "Australian Stock Exchange, AU", "ASX", "asx" },
     { FALSE, 0, 0, "BAMOSZ funds, HU", "BAMOSZ", "bamosz" },
@@ -173,8 +177,9 @@ static gnc_quote_source single_quote_sources[] =
     { FALSE, 0, 0, "Cominvest, ex-Adig, DE", "COMINVEST", "cominvest" },
     { FALSE, 0, 0, "Deka Investments, DE", "DEKA", "deka" },
     { FALSE, 0, 0, "DWS, DE", "DWS", "dwsfunds" },
-	{ FALSE, 0, 0, "Equinox Unit Trusts, ZA", "ZA_unittrusts", "za_unittrusts" },
+    { FALSE, 0, 0, "Equinox Unit Trusts, ZA", "ZA_unittrusts", "za_unittrusts" },
     { FALSE, 0, 0, "Fidelity Direct", "FIDELITY_DIRECT", "fidelity_direct" },
+    { FALSE, 0, 0, "Fidelity Fixed", "FIDELITY_DIRECT", "fidelityfixed" },
     { FALSE, 0, 0, "Finance Canada", "FINANCECANADA", "financecanada" },
     { FALSE, 0, 0, "Financial Times Funds service, GB", "FTFUNDS", "ftfunds" },
     { FALSE, 0, 0, "Finanzpartner, DE", "FINANZPARTNER", "finanzpartner" },
@@ -196,7 +201,7 @@ static gnc_quote_source single_quote_sources[] =
     { FALSE, 0, 0, "Skandinaviska Enskilda Banken, SE", "SEB_FUNDS", "seb_funds" },
     { FALSE, 0, 0, "Sharenet, ZA", "ZA", "za" },
     { FALSE, 0, 0, "StockHouse Canada", "STOCKHOUSE_FUND", "stockhousecanada_fund" },
-    { FALSE, 0, 0, "TD Waterhouse Canada", "TDWATERHOUSE", "tdwaterhouse" },
+    { FALSE, 0, 0, "TD Waterhouse Funds, CA", "TDWATERHOUSE", "tdwaterhouse" },
     { FALSE, 0, 0, "TD Efunds, CA", "TDEFUNDS", "tdefunds" },
     { FALSE, 0, 0, "TIAA-CREF, US", "TIAACREF", "tiaacref" },
     { FALSE, 0, 0, "Toronto Stock eXchange, CA", "TSX", "tsx" },
@@ -206,41 +211,34 @@ static gnc_quote_source single_quote_sources[] =
     { FALSE, 0, 0, "Union Investment, DE", "UNIONFUNDS", "unionfunds" },
     { FALSE, 0, 0, "US Treasury Bonds", "usfedbonds", "usfedbonds" },
     { FALSE, 0, 0, "US Govt. Thrift Savings Plan", "TSP", "tsp" },
-    { FALSE, 0, 0, "Vanguard", "VANGUARD", "vanguard" }, /* No module seen in F::Q 1.17. */
+    { FALSE, 0, 0, "Vanguard", "VANGUARD", "vanguard" }, /* Method of Alphavantage */
     { FALSE, 0, 0, "VWD, DE (unmaintained)", "VWD", "vwd" },
-    { FALSE, 0, 0, "Yahoo USA", "YAHOO", "yahoo" },
-    { FALSE, 0, 0, "Yahoo Asia", "YAHOO_ASIA", "yahoo_asia" },
-    { FALSE, 0, 0, "Yahoo Australia", "YAHOO_AUSTRALIA", "yahoo_australia" },
-    { FALSE, 0, 0, "Yahoo Brasil", "YAHOO_BRASIL", "yahoo_brasil" },
-    { FALSE, 0, 0, "Yahoo Europe", "YAHOO_EUROPE", "yahoo_europe" },
-    { FALSE, 0, 0, "Yahoo New Zealand", "YAHOO_NZ", "yahoo_nz" },
     { FALSE, 0, 0, "Yahoo as JSON", "YAHOO_JSON", "yahoo_json" },
+    { FALSE, 0, 0, "Yahoo as YQL", "YAHOO_YQL", "yahoo_yql" },
 };
 static gnc_quote_source multiple_quote_sources[] =
 {
-    { FALSE, 0, 0, "Asia (Yahoo, ...)", "ASIA", "asia" },
-    { FALSE, 0, 0, "Australia (ASX, Yahoo, ...)", "AUSTRALIA", "australia" },
-    { FALSE, 0, 0, "Brasil (Yahoo, ...)", "BRASIL", "brasil" },
-    { FALSE, 0, 0, "Canada (Yahoo, ...)", "CANADA", "canada" },
-    { FALSE, 0, 0, "Canada Mutual (Fund Library, ...)", "CANADAMUTUAL", "canadamutual" },
+    { FALSE, 0, 0, "Australia (ASX, ...)", "AUSTRALIA", "australia" },
+    { FALSE, 0, 0, "Canada (Alphavantage, TSX, ...)", "CANADA", "canada" },
+    { FALSE, 0, 0, "Canada Mutual (Fund Library, StockHouse, ...)", "CANADAMUTUAL", "canadamutual" },
     { FALSE, 0, 0, "Dutch (AEX, ...)", "DUTCH", "dutch" },
-    { FALSE, 0, 0, "Europe (Yahoo, ...)", "EUROPE", "europe" },
+    { FALSE, 0, 0, "Europe (asegr,.bsero, hex ...)", "EUROPE", "europe" },
     { FALSE, 0, 0, "Greece (ASE, ...)", "GREECE", "greece" },
-    { FALSE, 0, 0, "Hungary (Bamosz, BET)", "HU", "hu" },
+    { FALSE, 0, 0, "Hungary (Bamosz, BET, ...)", "HU", "hu" },
     { FALSE, 0, 0, "India Mutual (AMFI, ...)", "INDIAMUTUAL", "indiamutual" },
     { FALSE, 0, 0, "Fidelity (Fidelity, ...)", "FIDELITY", "fidelity" },
     { FALSE, 0, 0, "Finland (HEX, ...)", "FINLAND", "finland" },
     { FALSE, 0, 0, "First Trust (First Trust, ...)", "FTPORTFOLIOS", "ftportfolios" },
-    { FALSE, 0, 0, "France (Boursorama, ...)", "FRANCE", "france" },
-    { FALSE, 0, 0, "Nasdaq (Yahoo, ...)", "NASDAQ", "nasdaq" },
-    { FALSE, 0, 0, "New Zealand (Yahoo, ...)", "NZ", "nz" },
-    { FALSE, 0, 0, "NYSE (Yahoo, ...)", "NYSE", "nyse" },
-    /*    { FALSE, 0, 0, "South Africa (Sharenet, ...)", "ZA", "za" }, */
+    { FALSE, 0, 0, "France (bourso, ĺerevenu, ...)", "FRANCE", "france" },
+    { FALSE, 0, 0, "Nasdaq (alphavantage, fool, ...)", "NASDAQ", "nasdaq" },
+    { FALSE, 0, 0, "New Zealand (NZX, ...)", "NZ", "nz" },
+    { FALSE, 0, 0, "NYSE (alphavantage, fool, ...)", "NYSE", "nyse" },
+    { FALSE, 0, 0, "South Africa (Sharenet, ...)", "ZA", "za" },
     { FALSE, 0, 0, "Romania (BSE-RO, ...)", "romania", "romania" },
     { FALSE, 0, 0, "T. Rowe Price", "TRPRICE", "troweprice" },
     { FALSE, 0, 0, "U.K. Funds (citywire, FTfunds, MStar, tnetuk, ...)", "ukfunds", "ukfunds" },
     { FALSE, 0, 0, "U.K. Unit Trusts (trustnet, ...)", "UKUNITTRUSTS", "uk_unit_trusts" },
-    { FALSE, 0, 0, "USA (Yahoo, Fool, ...)", "USA", "usa" },
+    { FALSE, 0, 0, "USA (Alphavantage, Fool, ...)", "USA", "usa" },
 };
 
 static const int num_single_quote_sources =
@@ -1160,7 +1158,7 @@ gnc_commodity_get_default_quote_source(const gnc_commodity *cm)
     if (cm && gnc_commodity_is_iso(cm))
         return &currency_quote_source;
     /* Should make this a user option at some point. */
-    return gnc_quote_source_lookup_by_internal("yahoo");
+    return gnc_quote_source_lookup_by_internal("alphavantage");
 }
 
 /********************************************************************
diff --git a/src/gnome-utils/gnc-tree-view-commodity.c b/src/gnome-utils/gnc-tree-view-commodity.c
index a6d6f6c..0db663e 100644
--- a/src/gnome-utils/gnc-tree-view-commodity.c
+++ b/src/gnome-utils/gnc-tree-view-commodity.c
@@ -418,7 +418,7 @@ gnc_tree_view_commodity_new (QofBook *book,
     col = gnc_tree_view_add_text_column (
               /* Translators: Again replace CUSIP by the name of your
                  National Securities Identifying Number. */
-              view, _("ISIN/CUSIP"), "cusip_code", NULL, "QWERTYUIOP",
+              view, _("ISIN/CUSIP"), "cusip_code", NULL, "US1234567890",
               GNC_TREE_MODEL_COMMODITY_COL_CUSIP,
               GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
               sort_by_commodity_string);
@@ -440,7 +440,7 @@ gnc_tree_view_commodity_new (QofBook *book,
               sort_by_quote_flag,
               NULL);
     col = gnc_tree_view_add_text_column (
-              view, _("Source"), "quote_source", NULL, "yahoo",
+              view, _("Source"), "quote_source", NULL, "alphavantage",
               GNC_TREE_MODEL_COMMODITY_COL_QUOTE_SOURCE,
               GNC_TREE_MODEL_COMMODITY_COL_VISIBILITY,
               sort_by_commodity_string);
diff --git a/src/quotes/Quote_example.pl b/src/quotes/Quote_example.pl
index 82192e0..220ee27 100755
--- a/src/quotes/Quote_example.pl
+++ b/src/quotes/Quote_example.pl
@@ -22,12 +22,12 @@ my $quoter = Finance::Quote->new();
 
 # -----------------------------------
 # get quotes for two stocks ...
-%quotes = $quoter->fetch("yahoo","IBM", "SGI"); 
+%quotes = $quoter->fetch("alphavantage","IBM", "SGI"); 
 
 # print some selected values 
-print "NYSE by Yahoo: ", $quotes {"IBM", "name"},  
+print "NYSE by Alphavantage: ", $quotes {"IBM", "name"},  
        " last price: ", $quotes {"IBM", "last"},  "\n";
-print "NYSE by Yahoo: ", $quotes {"SGI", "name"},   
+print "NYSE by Alphavantage: ", $quotes {"SGI", "name"},   
        " last price: ", $quotes {"SGI", "last"},  "\n";
        
 # loop over and print all values.
diff --git a/src/quotes/gnc-fq-dump b/src/quotes/gnc-fq-dump
index 4203436..935647c 100755
--- a/src/quotes/gnc-fq-dump
+++ b/src/quotes/gnc-fq-dump
@@ -191,8 +191,8 @@ gnc-fq-dump	- Print out data from the F::Q module
 
 =head1 SYNOPSIS
 
-    gnc-fq-dump yahoo CSCO JNPR
-    gnc-fq-dump yahoo BAESY.PK
+    gnc-fq-dump alphavantage CSCO JNPR
+    gnc-fq-dump alphavantage BAESY.PK
     gnc-fq-dump europe 48406.PA 13000.PA
     gnc-fq-dump vwd 632034
     gnc-fq-dump ftportfolios FKYGTX
diff --git a/src/quotes/gnc-fq-helper.in b/src/quotes/gnc-fq-helper.in
index 86ba14d..6111ab6 100755
--- a/src/quotes/gnc-fq-helper.in
+++ b/src/quotes/gnc-fq-helper.in
@@ -48,16 +48,14 @@ side :>).
 (<method-name> symbol symbol symbol ...)
 
 where <method-name> indicates the desired Finance::Quote method.
-The currently recognized subset is yahoo, yahoo_europe,
-fidelity_direct, troweprice_direct, vanguard, asx, tiaacref,
-and currency.
+One can list the many methods by running gnc-fq-check.
 
 For currency quotes, the symbols alternate between the 'from'
 and 'to' currencies.
 
 For example:
 
-(yahoo "IBM" "LNUX")
+(alphavantage "IBM" "LNUX")
 (fidelity_direct "FBIOX" "FSELX")
 (currency "USD" "AUD")
 
@@ -78,7 +76,7 @@ need to convert it to that.
 
 For example:
 
- $ echo '(yahoo "CSCO" "JDSU" "^IXIC")' | ./gnc-fq-helper
+ $ echo '(alphavantage "CSCO" "JDSU" "^IXIC")' | ./gnc-fq-helper
 (("CSCO" (symbol . "CSCO")
          (gnc:time-no-zone . "2001-03-13 19:27:00")
          (last . 20.375)
@@ -95,7 +93,7 @@ For example:
 On error, the overall result may be #f, or on individual errors, the
 list sub-item for a given symbol may be #f, like this:
 
- $ echo '(yahoo "CSCO" "JDSU")' | ./gnc-fq-helper
+ $ echo '(alphavantage "CSCO" "JDSU")' | ./gnc-fq-helper
 (#f
  ("JDSU" (symbol . "JDSU")
          (gnc:time-no-zone . "2001-03-13 19:27:00")
diff --git a/src/quotes/gnc-value-portfolio b/src/quotes/gnc-value-portfolio
deleted file mode 100755
index 7c27f08..0000000
--- a/src/quotes/gnc-value-portfolio
+++ /dev/null
@@ -1,672 +0,0 @@
-#!/usr/bin/perl -w
-#######################################################################
-# $Id$
-# Looks up investment prices on the web, and builds a report
-# to summarize the results
-#######################################################################
-$HISTORYFILE="histprices";
-$newprices = "NO";  # Haven't found *any* new prices so far...
-
-#######################################################################
-# Start by initializing the security list
-#######################################################################
-# My TSE stocks...  
-
-#######################################################################
-&add_stock("T", 100, 1670.5, "TSE");
-#&add_stock("NVA", 100, 1345.5, "TSE");
-&add_stock("NVA", 100, -10.16, "TSE");
-&add_stock("TRP", 52, 1345.50, "TSE");
-&add_stock("PCA", 100, 1733, "TSE");
-&add_stock("TOC", 50, 21.035*50, "TSE");
-&add_stock("RY", 50, 32.785*50, "TSE");
-
-#######################################################################
-# My Canada Trust Everest funds...
-#######################################################################
-# Original numbers of units...
-#&add_stock("CTMM", 83.951, 839.51, "CTE");  # Not strictly correct..
-#&add_stock("CTBOND", 121.747, 1315.17, "CTE");
-#&add_stock("CTSTK", 57.177, 832.73, "CTE");
-#&add_stock("CTSPEC", 28.263, 504.07, "CTE");
-#&add_stock("CTAMER", 177.723, 1983.05, "CTE");
-#&add_stock("CTUSEQ", 19.644, 294.91, "CTE");
-#&add_stock("CTASIA", 28.224, 251.99, "CTE");
-#&add_stock("CTEURO", 60.136, 530.50, "CTE");
-#&add_stock("CTEMER", 27.463, 266.67, "CTE");
-#&add_stock("CTIBND", 84.879, 907.37, "CTE");
-
-# Units as at Oct 31/98
-&add_stock("CTMM", 89.572, 839.51, "CTE"); 
-
-&add_stock("CTBOND", 137.398, 1315.17, "CTE");
-&add_stock("CTSTK", 62.896, 832.73, "CTE");
-&add_stock("CTSPEC", 28.263, 504.07, "CTE");
-&add_stock("CTAMER", 251.604, 1983.05, "CTE");
-&add_stock("CTUSEQ", 20.467, 294.91, "CTE");
-&add_stock("CTASIA", 28.238, 251.99, "CTE");
-&add_stock("CTEURO", 91.298, 530.50, "CTE");
-&add_stock("CTEMER", 27.463, 266.67, "CTE");
-&add_stock("CTIBND", 94.264, 907.37, "CTE");
-
-# Stuff on NYSE
-&add_stock("MOT", 15, (62+5/8)*15, "NYSE");
-#&add_stock("IFMXE", 0.1, 0.1, "NYSE");
-&add_stock("TSG", 13.0289, 43.02*5+43.75+44.48, "NYSE");
-&add_stock("TSG", 27.619-13.0289, 44.48*8, "NYSE");
-
-# SuperSaver 401(k)... Approximate...
-&add_stock("AADBX", 0.3*2115.93/14, 0.3*1604.85, "NYSE");
-&add_stock("AADEX", 0.5*2115.93/19, 0.5*1604.85, "NYSE");
-&add_stock("AAIEX", 0.2*2115.93/15, 0.2*1604.85, "NYSE");
-
-# SGRP Balances: Approximate...
-&add_stock("AADBX", 712.33/14.9, 700, "NYSE");  # Balanced
-&add_stock("AADEX", 4556.64/22.5 + (533.94+200.24+183.55)/22.5, 3500+(533.94+200.24+183.55), "NYSE");  # Equity
-&add_stock("AAIEX", 1829.63/18.8 + (213.57+80.1+73.41)/18.8, 1700+(213.57+80.1+73.41), "NYSE");  # Int'l Equity
-&add_stock("AASPX", 2104.81/15 + (320.37+120.12+110.13)/15, 1900 + (320.37+120.12+110.13), "NYSE");  # Stock Index
-
-
-#######################################################################
-# Working Ventures fund...  
-#######################################################################
-&add_stock("WORKVE", 219.701, 3000, "OTHER");
-$PRICE{"WORKVE"} = 3000/219.701;   # Hack in a price for Working Ventures
-$OLD{"WORKVE"} = "yes";  # Indicate that this is *not* a "new" price...
-
-
-#######################################################################
-# Map CT Everest fund names to the "short" IDs 
-#######################################################################
-# I don't want to get long names; this builds an array that
-# shortens the names used in the CT Everest Funds web page to
-# the ones used above
-#######################################################################
-&ct_fund_ids;   # Get mapping of CT "long" fund names to "short" names
-
-&load_prices;   # Load old prices, so that failure to get a price
-                # means we fall back to the previously-found
-                # price
-
-$CURRNAME{"CDN"} = "Canadian";
-$CURRNAME{"USD"} = "United States";
-$CURRATE{"CDN"} = 1;
-$CURRATE{"USD"} = 1.37;
-&get_currency("USD");
-#######################################################################
-# Now, get the current prices by sundry queries of web sites
-#######################################################################
-&search_web_for_prices();   # Find new closing prices
-&calc_variances();          # Calculate variances
-
-#######################################################################
-# Run report that details portfolio value based on the prices, costs
-# and quantities of shares...
-#######################################################################
-if ($newprices eq "YES") {
-    &show_report();     # Display a report summarizing the results...
-#    &show_variances();
-#    &hilo_portfolios();
-    &save_prices();     # Save prices...
-}
-exit 0;   # Done
-
-#######################################################################
-#######################################################################
-#######################################################################
-#######################################################################
-#######################################################################
-######################## End of the main body #########################
-#######################################################################
-#######################################################################
-#######################################################################
-#######################################################################
-#######################################################################
-
-#######################################################################
-#######################################################################
-############################# Subroutines #############################
-#######################################################################
-#######################################################################
-
-
-#######################################################################
-############### &add_stock("NVA", 100, 1345.5, "TSE"); ################
-#######################################################################
-# Add a security to the "active list," including the "ticker symbol,"
-# quantity of shares, original total cost, and the exchange to look it
-# up on. 
-#######################################################################
-sub add_stock {
-    local($ticker, $num, $cost, $exchange) = @_;
-    $NUM{$ticker} += $num;
-    $COST{$ticker} += $cost;
-    $EXCHANGE{$ticker} = $exchange;
-    local ($currency) = "CDN";
-    if ($exchange eq "TSE") {
-        $currency = "CDN";
-    }
-    if ($exchange eq "NYSE") {
-        $currency = "USD";
-    }
-    if ($exchange eq "NY") {
-        $currency = "USD";
-    }
-    $CURRENCY{$ticker} = $currency;
-}
-
-#######################################################################
-######## &get_url_command("http://www.conline.com/~cbbrowne");#########
-#######################################################################
-# Build the appropriate command that accesses (in raw form) the
-# requested URL.  Probably ought to change this to use the w3c
-# "line mode" utility, as it's minscule
-#######################################################################
-sub get_url_command {
-    local ($url) = @_;
-    return "lynx -source '$url'";
-}
-
-#######################################################################
-###################### &search_web_for_prices(); ######################
-#######################################################################
-# This program searches the %EXCHANGE array, determining how
-# the security price should be searched out, and invokes the
-# appropriate method.
-#######################################################################
-sub search_web_for_prices {
-    local ($ticker);
-
-    # Do some per-ticker searching
-    foreach $ticker (keys EXCHANGE) {
-	local($exchange) = $EXCHANGE{$ticker};
-	if ($exchange eq "TSE") {
-	    &get_TSE($ticker);
-	    &get_yahoo($ticker, "TSE");
-	}
-
-	if ($exchange eq "CTE") {
-	    # Do nothing; data is coming
-	    # in en masse via &get_all_everest_rates;
-	}
-	if ($exchange eq "NYSE") {
-	    &get_yahoo($ticker, $EXCHANGE{$ticker});
-	}
-    }
-
-    # search for CT Everest fund data
-    &get_CT_Everest;  # Get Everest mutual fund data
-
-    # Search for Working Ventures fund data
-    &get_WV;
-
-    # get all of the TSE stock prices
-    #    foreach $ticker (ord("a")..ord("z")) {
-    #      &get_TSE( chr($ticker) );
-    #  }
-}
-
-#######################################################################
-########################## &get_TSE ("RY"); ###########################
-#######################################################################
-# Look up a stock's price on the TSE using the Telenium service
-#######################################################################
-sub get_TSE {
-    local ($stock) = @_;
-    local ($page) = "http://www.telenium.ca/TSE/" . 
-
-	lc(
-           substr($stock, 0, 1)
-          ) 
-        . ".html";
-    if ($OLD{$stock} eq "NO!") {  # We've already priced this stock
-	return;
-    }
-    local ($command) = &get_url_command($page) . " | grep ' $stock'";
-    local ($line);
-    open(GETPAGE, "$command |");
-#    open(GETPAGE, "<a:/t~1.htm");
-    while ($line = <GETPAGE>) {
-	chop $line;
-#	print $line, "\n";
-	if ($line =~ /(\d*\.\d*)\D+\d+\S*\s+\d+\s+\S+\s+\d+\/\d+\s+(\S*)\s*$/) {
-	    local($lp, $ls) = (sprintf("%.4f", $1), $2);
-
-#	    print "Found $ls @ $lp\n";
-            #... 21.3  21.35 21.2  21.2 -0.15   142300  193     02/14    T
-            #... 19.4  19.5  19.2  19.35-0.1    687239  181     02/04    T
-            #... 51.5  52    50.6  51.4  0     1527378  583     02/05    RY
-
-	    #... 1.18  1.2   1.1   1.2   0.02   44700   29      02/03     NBX
-	    #                      ^^^
-	    #                      Want this "close" value...
-	    if ($lp < 0.001) {
-		# Do nothing
-	    } elsif ($ls eq $stock) {
-		if ((($lp * 1.0) != $PRICE{$stock}) && ($price > 0)) {
-		    $newprices = "YES";
-		    $PRICE{$stock} = sprintf("%.4f", $price);
-		    print "NEW PRICE: $stock, $lp\n";
-		} else {
-		    $price = $PRICE{$stock};
-		}
-		$PRICE{$stock} = sprintf("%.4f", $lp);
-		$OLD{$stock} = "NO!";  # Indicate that this is an update...
-	    }
-	}
-    }
-    close GETPAGE;
-}
-
-#######################################################################
-############################ &get_yahoo(); ############################
-#######################################################################
-# Look up a stock via "yahoo"
-#######################################################################
-sub get_yahoo {
-    local ($stock, $exchange) = @_;
-    local ($price);
-    if (($exchange eq "NY") || ($exchange eq "NYSE")) {
-	$exchange = "";
-    }
-    if ($exchange eq "TSE") {
-	$exchange = ".TO";
-    }
-    local ($page) = "http://quote.yahoo.com/download/quotes.csv?symbols=" . 
-
-           $stock . $exchange .
-	       "&format=sl1d1t1c1ohgv&ext=.csv";
-    if ($OLD{$stock} eq "NO!") {  # We've already priced this stock
-	return;
-    }
-    local ($command) = &get_url_command($page);
-    local ($line);
-#    print $command, "\n";
-    open(GETPAGE, "$command |");
-    while ($line = <GETPAGE>) {
-#	print "$line";
-	local ($trash, $price)=split(/,/, $line);
-#	print "$trash, $price\n";
-#	print "Old price: ", $PRICE{$stock}, "\n";
-	if ((($price * 1.0) != $PRICE{$stock}) && ($price > 0) ) {
-	    $newprices = "YES";
-	    print "NEW PRICE: $stock, $price\n";
-	} else {
-	    $price = $PRICE{$stock};
-#	    print "Keep old price: $price\n";
-	}
-	$PRICE{$stock} = sprintf("%.4f", $price);
-	$OLD{$stock} = "NO!";  # Indicate that this is an update...
-#	print "Done - ", $stock, $PRICE{$stock}, $OLD{$stock}, "\n";
-    }
-}
-
-#######################################################################
-########################## &get_CT_Everest(); #########################
-#######################################################################
-# Look up all of the CT Everest mutual fund prices
-#######################################################################
-sub get_CT_Everest {
-    local ($line, $fund, $value);
-    local ($url) = "http://www.canadatrust.com/test/ctrates/EV.html";
-    local ($command) = &get_url_command($url);
-    open(FUNDS, "$command |");
-    while ($line = <FUNDS>) {
-	if ($line =~ /.*\s+\d+.\d+\s+\d+.\d+\s+.\d+.\d+/) {
-#	    print "CT: $line";
-	    $fund = substr($line, 0, 15);
-#	    print "fund: [", $fund, "]  ID:[", $ID{$fund}, "]\n";
-	    if ($ID{$fund} ne "") {
-		$value = substr($line, 30, 11);
-		if (($value*1.0) != $PRICE{$ID{$fund}}) {
-		    $newprices = "YES";
-		    print "NEW PRICE: $fund, $value\n";
-
-		}
-
-		$PRICE{$ID{$fund}} = $value;
-		$OLD{$ID{$fund}} = "NO!";  # Indicate that this is an update...
-#		print "CT Price: $value ", $ID{$fund}, "\n";
-	    }
-	}
-    }
-    close FUNDS;
-}
-
-#######################################################################
-############################## &get_WV(); #############################
-#######################################################################
-# Look up Working Ventures fund price
-#######################################################################
-sub get_WV {
-    local ($url) = "http://www.workingventures.ca/main_cell.html";
-    local ($command) = &get_url_command($url) . " | grep 'share price' ";
-    open(FUNDS, "$command |");
-    while (<FUNDS>) {
-       if (/\D+\$(\d+\.\d+)\D+/) {
-              # matches .... $13.66 ...
-		if (($1 * 1.0) != $PRICE{"WORKVE"}) {
-		    $newprices = "YES";
-		    print "NEW PRICE: WV, $1\n";
-		}
-
-		$PRICE{"WORKVE"} = sprintf("%.4f", $1);
-		$OLD{"WORKVE"} = "NO!";  # Indicate that this is an update...
-	}
-    }
-    close FUNDS;
-}
-
-#######################################################################
-########################### &ct_fund_ids (); ##########################
-#######################################################################
-# Build an associative array that lets one take the names used in the
-# CT mutual fund web page, and associate them with the short forms
-# used as "ticker" codes
-#######################################################################
-sub ct_fund_ids {
-    %ID = ("MONEY MARKET   ", "CTMM", 
-	   "PREMIUM MMF    ", "CTPMM", 
-	   "SHORT TERM BND ", "CTSTB", 
-	   "MORTGAGE       ", "CTMTG", 
-	   "BALANCED       ", "CTBAL", 
-	   "BOND           ", "CTBOND", 
-	   "DIV INCOME     ", "CTDIV", 
-	   "STOCK          ", "CTSTK", 
-	   "SPECIAL EQUITY ", "CTSPEC", 
-	   "INT'L BOND     ", "CTIBND",
-	   "NORTH AMERICAN ", "CTNA",
-	   "AMERIGROWTH    ", "CTAMER", 
-	   "U.S. EQUITY    ", "CTUSEQ", 
-	   "ASIAGROWTH     ", "CTASIA", 
-	   "EUROGROWTH     ", "CTEURO", 
-	   "GLOBALGROWTH   ", "CTGLOB", 
-	   "INT'L EQUITY   ", "CTINTL", 
-	   "EMERGING MKTS. ", "CTEMER"
-	   );
-}
-
-
-#######################################################################
-############################ &save_prices()############################
-#######################################################################
-# Dump data out to a file
-#######################################################################
-sub save_prices {
-    local ($date) = `date '+%Y/%m/%d-%H:%M:%S'`;
-    chop $date;
-    local ($ticker, $price);
-    open(HISTPRICES, ">>$HISTORYFILE");
-    while ($ticker = each %PRICE) {
-	if ($OLD{$ticker} eq "yes") {
-	    # Don't dump it; we didn't get a new price...
-	} else {
-	    $key = $date . "" . $ticker;
-	    $price = $PRICE{$ticker};
-            print HISTPRICES $date, "|", $ticker, "|", $price, "\n";;
-	}
-    }
-    close HISTPRICES;
-}
-
-#######################################################################
-########################### &load_prices();############################
-#######################################################################
-# Preload prices, thus always keeping around the latest successfully
-# located price.
-# This means that if the web search process fails, we still do have 
-# pricing, even if it's somewhat out of date...
-#######################################################################
-sub load_prices {
-    local ($date) = `date '+%Y/%m/%d-%H:%M:%S'`;
-    chop $date;
-    local ($ticker, $price, $line);
-    open(HISTPRICES, "<$HISTORYFILE");
-    while ($line = <HISTPRICES>) {
-	($date, $ticker, $price) = split(/\|/, $line);
-	$PRICE{$ticker} = $price;
-	$OLD{$ticker} = "yes"; # Indicate that this is an old price
-                               # and thus not to be redumped
-    }
-    close HISTPRICES;
-}   
-
-
-
-#######################################################################
-############################ &show_report();###########################
-#######################################################################
-# Look up all of the securities, and build a report listing the cost,
-# value, and net profit/loss on each security, along with totals.
-########################################################################
-sub show_report {
-    local($date) = `date`;
-    chop $date;
-    local($ticker, $shares, $price, $value, $cost, $profitloss);
-    local ($tp, $tv, $tc);
-format STDOUT_TOP =
-                          Portfolio Valuation
-                  as at @<<<<<<<<<<<<<<<<<<<<<<<<<<<
-$date                          
-Ticker     Shares  Recent Price   Value        Cost       Profit/Loss
-------------------------------------------------------------------------
-.
-
-
-format STDOUT = 
-@<<<<<<<  @>>>>>>>  @>>>>>>>>  @>>>>>>>>>>> @>>>>>>>>>>>  @>>>>>>>>>>>>
-$ticker, $shares, $price, $value, $cost, $profitloss
-.
-
-
-    foreach $stock (sort keys EXCHANGE) {
-        if ($stock ne "zPortfolio") {
-	    $ticker = $stock;
-	    $shares = sprintf("%.4f", $NUM{$stock});
-	    $price = sprintf("%.4f", $PRICE{$stock});
-	    $value = sprintf("%.2f", $shares * $price * $CURRATE{$CURRENCY{$stock}});
-	    $cost = sprintf("%.2f", $COST{$stock} * $CURRATE{$CURRENCY{$stock} });
-	    $profitloss = sprintf("%.2f", $value - $cost);
-	    $tv += $value;
-	    $tc += $cost;
-	    $tp += $profitloss;
-	    write;
-        }
-    }
-
-($ticker, $shares, $price, $value, $cost, $profitloss) =
-    ("", "", "", "---------------", "---------------", "---------------");
-write;
-
-($ticker, $shares, $price, $value, $cost, $profitloss) =
-    ("Total", "", "",  sprintf("%.2f", $tv), sprintf("%.2f" ,$tc),
-     sprintf("%.2f" ,$tp));
-
-write;
-($ticker, $shares, $price, $value, $cost, $profitloss) =
-    ("", "", "", "===============", "===============", "===============");
-write;
-}
-
-
-
-#########################################################################=
-#####
-##############################  Find Variances  #########################=
-#####
-#########################################################################=
-#####
-sub calc_variances {
-    local ($x);
-    open(PRICEF, "<$HISTORYFILE");
-    while (<PRICEF>) {
-	($date, $id, $price) = split(/\|/, $_);
-	$XCOUNT{$id} ++;
-	$quantity = $NUM{$id};
-        $x = $quantity * $price * $CURRATE{$CURRENCY{$id}};
-	$XSUM{$id} += $x;
-	$XSQUARESUM{$id} += ($x * $x);
-
-	$DATES{$date} ++;
-	$PRICES{"$date|$id"} = $price;
-#    printf "XC: %9.2f  XSUM: %9.2f  XSQ: %9.2f\n", $XCOUNT{$id}, $XSUM{$id}, $XSQUARESUM{$id};
-    }
-
-    &complete_price_list();   # Get prices for *every* day
-    &value_portfolios();      # Value the portfolio for every day
-}
-
-# Need to make sure that we have prices for each stock for each date
-# This is done by (for each stock) going thru all the dates, and
-# inserting prices for dates where prices are missing.  We use the
-# last price present for the stock.
-sub complete_price_list {
-    foreach $stock (keys XCOUNT) {
-	$current_price = $XSUM{$stock} / $XCOUNT{$stock};
-
-	# Move forwards until a price gets found.  That price
-	# is then used for all "empty" price slots up to the first
-	# actual measurement
-      FIRSTPRICE:
-	foreach $date (sort keys DATES) {
-	    if ($PRICES{"$date|$stock"}) {
-		$current_price = $PRICES{"$date|$stock"};
-		last FIRSTPRICE;
-	    }
-	}
-
-	# Now, proceed onwards...
-	foreach $date (sort keys DATES) {
-	    if ($PRICES{"$date|$stock"}) {
-		# There's a price
-		$current_price = $PRICES{"$date|$stock"};
-	    } else {
-		$PRICES{"$date|$stock"} = $current_price;
-	    }
-	}
-    }
-}
-
-sub value_portfolios {
-#    &setup_portfolio_quantities();
-    $NUM{"zPortfolio"}=1;
-    foreach $date (sort keys DATES) {
-	$price = 0;
-	foreach $stock (keys XCOUNT) {
-	    $price += $NUM{$stock} * $PRICES{"$date|$stock"}* $CURRATE{$CURRENCY{$stock}};
-	}
-	$XCOUNT{"zPortfolio"} ++;
-	$XSUM{"zPortfolio"} += $price;
-	$XSQUARESUM{"zPortfolio"} += ($price * $price);
-#    printf "Portfolio on %15s valued at %14.2f\n", $date, $price;
-
-    }
-}
-
-sub hilo_portfolios {
-   local($date, $hi, $lo, $hival, $loval);
-   local ($stock, $price, $latest_date);
-   foreach $stock (keys XCOUNT) {
-        $LO{$stock} =  99999999;
-        $HI{$stock} =  -99999999;
-   }
-   $HI{"zPortfolio"} = -99999999;
-   $LO{"zPortfolio"} = 99999999;
-   foreach $date (keys DATES) {
-       local ($pprice);
-       local($dt) = split(/-/, $date);
-       foreach $stock (keys XCOUNT) {
-	   $price = $PRICES{"$date|$stock"};
-	   if ($date >= $latest_date) {
-	       $latest_date = $date;
-	       $CURRENT{$stock} = $price;
-	   }
-	   if ($price > $HI{$stock}) {
-	       ($HI{$stock}, $HIDATE{$stock}) = ($price, $dt);
-	   }
-	   if ($price < $LO{$stock}) {
-	       ($LO{$stock}, $LODATE{$stock}) = ($price, $dt);
-	   }
-	   $pprice += $NUM{$stock} * $price;
-       }
-       if ($date >= $latest_date) {
-	   $latest_date = $date;
-	   $CURRENT{"zPortfolio"} = $pprice;
-       }
-       if ($pprice > $HI{"zPortfolio"}) {
-	   ($HI{"zPortfolio"}, $HIDATE{"zPortfolio"}) = ($pprice, $dt);
-       }
-       if ($pprice > $LO{"zPortfolio"}) {
-	   ($LO{"zPortfolio"}, $LODATE{"zPortfolio"}) = ($pprice, $dt);
-       }
-   }
-   # Report results...
-   print
-"-----------------------------------------------------------------------
-         Highs/Lows
------------------------------------------------------------------------
-";
-  printf "%10s  %10s %10s  %10s %10s  %10s\n", "Stock", "High Date", "High",
-  "Low Date", "Low Price", "Current";
-   print "-----------------------------------------------------------------------";
-  foreach $stock (sort keys XCOUNT) {
-    printf "%10s  %10s %10.2f  %10s %10.2f %10.2f\n", $stock, $HIDATE{$stock},
-    $HI{$stock}, $LODATE{$stock}, $LO{$stock}, $CURRENT{$stock};
-  }
-   print "-----------------------------------------------------------------------";
-
-}
-
-sub show_variances {
-    print
-	"-----------------------------------------------------------------------
-          Variance/Standard Deviations for Portfolio *VALUE*
-------------------------------------------------------------------------
- Security    Mean           Variance    Std. Dev.  % Std.Dev
-------------------------------------------------------------------------
-";
-
-    foreach $i (sort keys XCOUNT) {
-	if ($XCOUNT{$i} > 2) {
-	    $variance = (($XCOUNT{$i} * $XSQUARESUM{$i}) 
-			 - ($XSUM{$i} * $XSUM{$i})) / 
-			     ($XCOUNT{$i} * ($XCOUNT{$i}-1));  
-
-	}
-	$variance = -$variance if ($variance < 0);
-	$deviation = sqrt($variance);
-
-#    printf "XC: %5d  XSUM: %9.2f  XSQ: %9.2f\n", $XCOUNT{$i}, $XSUM{$i}, $XSQUARESUM{$i};
-	# Divide by mean price to determine volatility of price
-	if ($XCOUNT{$i} != 0 && $XSUM{$i} != 0) {
-	    $volatility = $deviation / ($XSUM{$i} / $XCOUNT{$i});
-	    printf "%10s %10.2f  %14.3f  %9.3f  %9.3f\n", $i, $XSUM{$i}/$XCOUNT{$i},
-	    $variance, $deviation,
-	    $volatility *100; 
-
-	    ($VARIANCE{$i}, $STD{$i}, $VOLATILITY{$i}) = ($variance, $deviation,
-							  $volatility);
-	}
-    }
-	print "------------------------------------------------------------------------";
-
-}
-
-sub get_currency {
-    local ($to) = @_;
-    local($url) =
-	"http://www.dna.lth.se/cgi-bin/kurt/rates/rates?CAD+$to";
-    local($line, $rate);
-    local ($command) = &get_url_command($url);
-
-    local($fromname, $toname) = ($CURRNAME{"CDN"}, $CURRNAME{$to});
-    open(CURRS, "$command |");
-    while ($line = <CURRS>) {
-	if ($line =~ /Rate: $fromname.*$toname.*:\s*(\d*.\d+)/) {
-	    $rate = $1;
-	    $CURRATE{$toname} = sprintf("%f", $rate);
-	    return;
-	}
-    }
-}
-
diff --git a/src/scm/price-quotes.scm b/src/scm/price-quotes.scm
index 2f01ca1..5dcbaa2 100644
--- a/src/scm/price-quotes.scm
+++ b/src/scm/price-quotes.scm
@@ -118,7 +118,7 @@
   ;;
   ;; (<fq-method> sym sym ...)
   ;;
-  ;; i.e. (yahoo "RHAT" "LNUX" "IBM")
+  ;; i.e. (alphavantage "RHAT" "LNUX" "IBM")
   ;;
   ;; for currencies, we have
   ;;
@@ -210,7 +210,7 @@
     ;; gnc-fq-helper.  Each item will of the list will be of the
     ;; form:
     ;;
-    ;; (("yahoo" (commodity-1 currency-1 tz-1)
+    ;; (("alphavantage" (commodity-1 currency-1 tz-1)
     ;;           (commodity-2 currency-2 tz-2) ...)
     ;;  ("fidelity_direct" (commodity-3 currency-3 tz-3)
     ;;                     (commodity-4 currency-4 tz-4) ...)
@@ -259,10 +259,10 @@
     ;; their fq-suitable symbol strings.  i.e. turn the former into
     ;; the latter:
     ;;
-    ;; ("yahoo" (commodity-1 currency-1 tz-1)
+    ;; ("alphavantage" (commodity-1 currency-1 tz-1)
     ;;          (commodity-2 currency-2 tz-2) ...)
     ;;
-    ;; ("yahoo" "IBM" "AMD" ...)
+    ;; ("alphavantage" "IBM" "AMD" ...)
     ;;
 
     (if (equal? (car fq-call-data) "currency")

commit 867fdce4e4fef467c5c2efab41f2a0d5764fffd5
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 9 16:28:00 2018 -0800

    Gcc-4.8 doesn't have std::codecvt.
    
    Use boost::locale::conv::utf_to_utf instead.

diff --git a/libgnucash/engine/gnc-numeric.cpp b/libgnucash/engine/gnc-numeric.cpp
index 3d54005..ee38dbb 100644
--- a/libgnucash/engine/gnc-numeric.cpp
+++ b/libgnucash/engine/gnc-numeric.cpp
@@ -37,6 +37,7 @@ extern "C"
 
 #include <stdint.h>
 #include <boost/regex.hpp>
+#include <boost/locale/encoding_utf.hpp>
 #include <sstream>
 #include <cstdlib>
 
@@ -1307,11 +1308,11 @@ main(int argc, char ** argv)
 std::ostream&
 operator<<(std::ostream& s, GncNumeric n)
 {
+    using boost::locale::conv::utf_to_utf;
     std::basic_ostringstream<wchar_t> ss;
     ss.imbue(s.getloc());
     ss << n;
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> make_utf8;
-    s << make_utf8.to_bytes(ss.str());
+    s << utf_to_utf<char>(ss.str());
     return s;
 }
 
diff --git a/libgnucash/engine/gnc-numeric.hpp b/libgnucash/engine/gnc-numeric.hpp
index a22f89b..8480251 100644
--- a/libgnucash/engine/gnc-numeric.hpp
+++ b/libgnucash/engine/gnc-numeric.hpp
@@ -27,7 +27,6 @@
 #include <iostream>
 #include <locale>
 #include <typeinfo> // For std::bad_cast exception
-#include <codecvt> // UTF-8 <--> UTF16 conversion
 #include "gnc-rational-rounding.hpp"
 
 class GncRational;

commit 10b7cbc2574c048a1bf0b0c84ec66241fafdc18e
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 9 16:24:16 2018 -0800

    Fix boost linking problem on Unbuntu 14.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86607a1..dbf92a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -511,7 +511,7 @@ SET (Boost_FIND_QUIETLY ON)
 IF (NOT DEFINED ${BOOST_ROOT})
   SET(BOOST_ROOT $ENV{BOOST_ROOT})
 ENDIF()
-FIND_PACKAGE (Boost 1.54.0 REQUIRED COMPONENTS date_time regex locale filesystem)
+FIND_PACKAGE (Boost 1.54.0 REQUIRED COMPONENTS date_time regex locale filesystem system)
 
 IF (Boost_FOUND)
   include_directories(${Boost_INCLUDE_DIRS})

commit c9f3c0760cb06225e4c011af2bceafe7029e17e0
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 9 13:48:36 2018 -0800

    Provide fallback value for test_core_dir in case it hasn't been built yet.

diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
index 93476ff..ea5e5f2 100644
--- a/bindings/python/tests/CMakeLists.txt
+++ b/bindings/python/tests/CMakeLists.txt
@@ -1,6 +1,10 @@
 
 IF (WITH_PYTHON)
   find_path(test_core_dir "unittest_support.py" PATHS ${CMAKE_BINARY_DIR}/common/test-core ${CMAKE_SOURCE_DIR}/common/test-core)
+  if (${test_core_dir} STREQUAL "test_core_dir-NOTFOUND")
+    # Because it hasn't been built yet
+    set(test_core_dir ${CMAKE_BINARY_DIR}/common/test-core)
+  endif()
   add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py)
   add_dependencies(check test-python-bindings)
   ADD_TEST(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)

commit fbb172d09672ae059d13210ead18a7738313af4f
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 9 13:04:17 2018 -0800

    Bug 793900 - 2.7.5: test failure: 105 - python-bindings.
    
    unittest_support.py is in ${CMAKE_SOURCE_DIR} for a tarball build
    and ${CMAKE_BINARY_DIR} for a vcs build. Look for it rather than
    assuming it's in ${CMAKE_BINARY_DIR}.

diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
index 55285a3..93476ff 100644
--- a/bindings/python/tests/CMakeLists.txt
+++ b/bindings/python/tests/CMakeLists.txt
@@ -1,11 +1,12 @@
 
 IF (WITH_PYTHON)
+  find_path(test_core_dir "unittest_support.py" PATHS ${CMAKE_BINARY_DIR}/common/test-core ${CMAKE_SOURCE_DIR}/common/test-core)
   add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py)
   add_dependencies(check test-python-bindings)
   ADD_TEST(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
   SET_PROPERTY(TEST python-bindings PROPERTY ENVIRONMENT
     GNC_BUILDDIR=${CMAKE_BINARY_DIR}
-    PYTHONPATH=${PYTHON_SYSCONFIG_BUILD}:${LIBDIR_BUILD}/gnucash:${CMAKE_BINARY_DIR}/common/test-core
+    PYTHONPATH=${PYTHON_SYSCONFIG_BUILD}:${LIBDIR_BUILD}/gnucash:${test_core_dir}
   )
 ENDIF()
 

commit c3180ab374ad9a2c2c0861b85c85299fe9bc16fb
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Mar 8 12:47:26 2018 -0800

    Operator << fix.

diff --git a/libgnucash/engine/gnc-numeric.cpp b/libgnucash/engine/gnc-numeric.cpp
index 0fc47d5..3d54005 100644
--- a/libgnucash/engine/gnc-numeric.cpp
+++ b/libgnucash/engine/gnc-numeric.cpp
@@ -1303,6 +1303,18 @@ main(int argc, char ** argv)
 }
 #endif
 
+
+std::ostream&
+operator<<(std::ostream& s, GncNumeric n)
+{
+    std::basic_ostringstream<wchar_t> ss;
+    ss.imbue(s.getloc());
+    ss << n;
+    std::wstring_convert<std::codecvt_utf8<wchar_t>> make_utf8;
+    s << make_utf8.to_bytes(ss.str());
+    return s;
+}
+
 const char* gnc_numeric_errorCode_to_string(GNCNumericErrorCode error_code)
 {
     switch (error_code)
diff --git a/libgnucash/engine/gnc-numeric.hpp b/libgnucash/engine/gnc-numeric.hpp
index d9ff3d7..a22f89b 100644
--- a/libgnucash/engine/gnc-numeric.hpp
+++ b/libgnucash/engine/gnc-numeric.hpp
@@ -27,6 +27,7 @@
 #include <iostream>
 #include <locale>
 #include <typeinfo> // For std::bad_cast exception
+#include <codecvt> // UTF-8 <--> UTF16 conversion
 #include "gnc-rational-rounding.hpp"
 
 class GncRational;
@@ -339,6 +340,7 @@ inline GncNumeric operator/(int64_t a, GncNumeric b)
  * decimal if the denominator is a multiple of 10, otherwise as
  * "numerator/denominator".
  */
+std::ostream& operator<<(std::ostream&, GncNumeric);
 
 /* Implementation adapted from "The C++ Standard Library, Second Edition" by
  * Nicolai M. Josuttis, Addison-Wesley, 2012, ISBN 978-0-321-62321-8.
@@ -349,10 +351,10 @@ std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, traits>&
     std::basic_ostringstream<charT, traits> ss;
     std::locale loc = s.getloc();
     ss.imbue(loc);
-    char dec_pt = '.';
+    auto dec_pt = static_cast<charT>('.');
     try
     {
-        dec_pt = std::use_facet<std::numpunct<char>>(loc).decimal_point();
+        dec_pt = std::use_facet<std::numpunct<charT>>(loc).decimal_point();
     }
     catch(const std::bad_cast& err) {} //Don't do anything, num_sep is already set.
 
@@ -369,7 +371,6 @@ std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, traits>&
     return s;
 }
 
-
 /**
  * std::stream input operator.
  *
@@ -386,7 +387,7 @@ std::basic_ostream<charT, traits>& operator<<(std::basic_ostream<charT, traits>&
 template <typename charT, typename traits>
 std::basic_istream<charT, traits>& operator>>(std::basic_istream<charT, traits>& s, GncNumeric& n)
 {
-    std::string instr;
+    std::basic_string<charT, traits> instr;
     s >> instr;
     if (s)
         n = GncNumeric(instr, true);
diff --git a/libgnucash/engine/test/gtest-gnc-numeric.cpp b/libgnucash/engine/test/gtest-gnc-numeric.cpp
index 82d6b8f..8326071 100644
--- a/libgnucash/engine/test/gtest-gnc-numeric.cpp
+++ b/libgnucash/engine/test/gtest-gnc-numeric.cpp
@@ -213,10 +213,15 @@ TEST(gncnumeric_stream, output_stream)
     EXPECT_EQ("123/456", output.str());
     try
     {
-        output.imbue(std::locale("fr_FR.utf8"));
+        auto loc = std::locale("fr_FR.utf8");
+        auto thou_sep = std::use_facet<std::numpunct<wchar_t>>(loc).thousands_sep();
+        output.imbue(loc);
         output.str("");
         output << simple_int;
-        EXPECT_EQ("123 456", output.str());
+        if (thou_sep == L' ')
+            EXPECT_EQ("123 456", output.str());
+        else
+            EXPECT_EQ("123\xe2\x80\xaf""456", output.str());
     }
     catch (std::runtime_error)
     {

commit 79dd7d69d0eadf96e2fec132bce1d2a01c8753d3
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Mar 9 00:30:43 2018 +0100

    Csv Importer - Prevent crash if number of saved columns is higher than actually detected ones.
    
    I ran into this while trying to load a utf-16 encoded file
    and loading a saved preset using utf-8. By applying the preset
    the columns in the utf-16 file were no longer detected, but
    the importer was still trying to read from a preset account column.

diff --git a/gnucash/import-export/csv-imp/gnc-import-tx.cpp b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
index ae9383e..8dd940e 100644
--- a/gnucash/import-export/csv-imp/gnc-import-tx.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
@@ -907,9 +907,13 @@ GncTxImport::accounts ()
             continue;
 
         auto col_strs = std::get<PL_INPUT>(parsed_line);
-        if ((acct_col_it != m_settings.m_column_types.end()) && !col_strs[acct_col].empty())
+        if ((acct_col_it != m_settings.m_column_types.end()) &&
+            (acct_col < col_strs.size()) &&
+            !col_strs[acct_col].empty())
             accts.insert(col_strs[acct_col]);
-        if ((tacct_col_it != m_settings.m_column_types.end()) && !col_strs[tacct_col].empty())
+        if ((tacct_col_it != m_settings.m_column_types.end()) &&
+            (tacct_col < col_strs.size()) &&
+            !col_strs[tacct_col].empty())
             accts.insert(col_strs[tacct_col]);
     }
 

commit 6ee1c71d50ca743b71258bed98be09134213abb1
Merge: 25883b1 6a1af63
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Thu Mar 8 23:04:18 2018 +0100

    Merge branch 'maint' into unstable
    PR #305, #:306


commit 6a1af63800f851ca1023278a2a9292e6c677670b
Merge: 6f587f8 edd89aa
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Thu Mar 8 22:49:57 2018 +0100

    PR #306: Merge branch 'maint-transfer-01' of
    https://github.com/DiMan/Gnucash into maint


commit 25883b17ebba418a9100bc9fa3d531f21d80a769
Author: Carsten Rinke <carsten.rinke at gmx.de>
Date:   Sun Sep 17 13:16:21 2017 +0200

    Bug764245 - multi-column reports include incorrect sub-reports

diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm
index 2e7712a..00b5a4c 100644
--- a/gnucash/report/report-system/report.scm
+++ b/gnucash/report/report-system/report.scm
@@ -374,9 +374,16 @@
 
 (define (gnc:restore-report-by-guid id template-id template-name options)
   (if options
-      (let ((r ((record-constructor <report>)
-		 template-id id options #t #t #f #f "")))
-	 (gnc-report-add r))
+      (let* (
+              (r ((record-constructor <report>)
+		    template-id id options #t #t #f #f ""))
+              (report-id (gnc-report-add r))
+            )
+	(if (number? report-id)
+          (gnc:report-set-id! r report-id)
+        )
+        report-id
+      )
       (begin
 	(gnc-error-dialog '() (string-append "Report Failed! One of your previously opened reports has failed to open. The template on which it was based: " template-name ", was not found."))
 	#f))
@@ -384,9 +391,16 @@
 
 (define (gnc:restore-report-by-guid-with-custom-template id template-id template-name custom-template-id options)
   (if options
-      (let ((r ((record-constructor <report>)
-                 template-id id options #t #t #f #f custom-template-id)))
-         (gnc-report-add r))
+      (let* (
+              (r ((record-constructor <report>)
+                 template-id id options #t #t #f #f custom-template-id))
+              (report-id (gnc-report-add r))
+            )
+	(if (number? report-id)
+          (gnc:report-set-id! r report-id)
+        )
+        report-id
+      )
       (begin
         (gnc-error-dialog '() (string-append "Report Failed! One of your previously opened reports has failed to open. The template on which it was based: " template-name ", was not found."))
         #f))
@@ -558,17 +572,67 @@
 (define (gnc:report-serialize-embedded embedded-reports)
   (let* ((result-string ""))
     (if embedded-reports
+      (begin
         (for-each
-         (lambda (subreport-id)
-           (let*
-               ((subreport (gnc-report-find subreport-id))
-                (subreport-options-text (gnc:report-serialize subreport)))
-             (set! result-string (string-append
-                                  result-string
-                                  ";;;; Options for embedded report\n"
-                                  subreport-options-text))))
-         embedded-reports))
-    result-string))
+          (lambda (subreport-id)
+            (let* (
+                    (subreport (gnc-report-find subreport-id))
+                    (subreport-type (gnc:report-type subreport))
+                    (subreport-template (hash-ref *gnc:_report-templates_* subreport-type))
+                    (subreport-template-name (gnc:report-template-name subreport-template))
+                    (thunk (gnc:report-template-options-cleanup-cb subreport-template))
+                  )
+              ;; clean up the options if necessary.  this is only needed
+              ;; in special cases.
+              (if thunk
+                (thunk subreport))
+              ;; save them
+              (set! result-string
+                (string-append
+                  result-string
+                  "\n      ;;;; Options for embedded report\n"
+                  "      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n"
+                  (format #f "      ;; options for report ~S\n" (gnc:report-name subreport))
+                  (format #f "      (let ((options (gnc:report-template-new-options/report-guid ~S ~S)))"
+                    subreport-type
+                    subreport-template-name)
+                  (gnc:generate-restore-forms (gnc:report-options subreport) "options")
+                  (format #f "\n        (set! new-embedded-report-ids\n          (append\n            new-embedded-report-ids\n              (list (gnc:restore-report-by-guid-with-custom-template #f ~S ~S ~S options))\n          )\n        )\n"
+                    subreport-type
+                    subreport-template-name
+                    (gnc:report-custom-template subreport))
+                  "      )\n"
+                )
+              )
+            )
+          )
+          embedded-reports)
+        ;;(set! result-string (string-append result-string (gnc:update-section-general)))
+        (set! result-string
+          (string-append
+            result-string
+            "\n"
+            "      ;;;; Update Section: __general\n"
+            "      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\n"
+            "      (let*\n"
+            "        (\n"
+            "          (option (gnc:lookup-option options \"__general\" \"report-list\"))\n"
+            "          (saved-report-list (gnc:option-value option))\n"
+            "        )\n"
+            "        (\n"
+            "          (lambda (option)\n"
+            "            (if option ((gnc:option-setter option) (map (lambda (x y) (cons x (cdr y))) new-embedded-report-ids saved-report-list)))\n"
+            "          )\n"
+            "          option\n"
+            "        )\n"
+            "      )\n"
+          )
+        )
+      )
+    )
+    result-string
+  )
+)
 
 (define (gnc:report-template-serialize-internal name type templ-name options guid)
   (let* ((embedded-serialized (gnc:report-serialize-embedded (gnc:report-embedded-list options)))
@@ -577,15 +641,15 @@
    (format #f ";; Options for saved report ~S, based on template ~S\n"
            name type)
    (format
-    #f "(let ()\n (define (options-gen)\n  (let ((options (gnc:report-template-new-options/report-guid ~S ~S)))\n"
+    #f "(let ()\n  (define (options-gen)\n    (let\n         (\n           (options (gnc:report-template-new-options/report-guid ~S ~S))\n           (new-embedded-report-ids '()) ;; only used with Multicolumn View Reports\n         )"
     type templ-name)
    (gnc:generate-restore-forms options "options")
    (if embedded-serialized
        embedded-serialized
        "")
-   "  options))\n"
+   "\n      options\n    )\n  )\n"
    (format 
-    #f " (gnc:define-report \n  'version 1\n  'name ~S\n  'report-guid ~S\n  'parent-type ~S\n  'options-generator options-gen\n  'menu-path (list gnc:menuname-custom)\n  'renderer (gnc:report-template-renderer/report-guid ~S ~S)))\n\n"
+    #f "  (gnc:define-report \n    'version 1\n    'name ~S\n    'report-guid ~S\n    'parent-type ~S\n    'options-generator options-gen\n    'menu-path (list gnc:menuname-custom)\n    'renderer (gnc:report-template-renderer/report-guid ~S ~S)\n  )\n)\n\n"
     name
     (if guid
         guid

commit 563d7161610d8d44c9e047a25e1a33ce0d3e85ff
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 17:59:48 2018 +0100

    Csv imp settings - internalize prefix handling
    
    This information is not relevant outside of the settings code
    The way it's implemented now each settings module defines its
    own unique prefix and the generic code can just use it when
    needed.

diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
index d3d5e03..a49c7f0 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
@@ -42,7 +42,7 @@ extern "C"
 #include "gnc-ui-util.h"
 }
 
-const std::string settings_type{"PRICE"};
+constexpr auto group_prefix = "Import csv,price - ";
 
 #define CSV_COL_TYPES    "ColumnTypes"
 
@@ -57,7 +57,6 @@ static std::shared_ptr<CsvPriceImpSettings> create_int_no_preset(void)
 {
     auto preset = std::make_shared<CsvPriceImpSettings>();
     preset->m_name = get_no_settings();
-    preset->m_settings_type = settings_type;
 
     return preset;
 }
@@ -101,7 +100,7 @@ const preset_vec_price& get_import_presets_price (void)
     for (gsize i=0; i < grouplength; i++)
     {
         auto group = std::string(groups[i]);
-        auto gp = get_prefix() + settings_type + " - ";
+        auto gp = std::string {group_prefix};
         auto pos = group.find(gp);
         if (pos == std::string::npos)
             continue;
@@ -125,7 +124,6 @@ const preset_vec_price& get_import_presets_price (void)
     for (auto preset_name : preset_names)
     {
         auto preset = std::make_shared<CsvPriceImpSettings>();
-        preset->m_settings_type = settings_type;
         preset->m_name = preset_name;
         preset->load();
         presets_price.push_back(preset);
@@ -147,7 +145,7 @@ CsvPriceImpSettings::load (void)
     GError *key_error = nullptr;
     m_load_error = false;
     auto keyfile = gnc_state_get_current ();
-    auto group = get_prefix() + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
 
     // Start Loading the settings
     m_load_error = CsvImportSettings::load(); // load the common settings
@@ -210,7 +208,7 @@ CsvPriceImpSettings::save (void)
     }
 
     auto keyfile = gnc_state_get_current ();
-    auto group = get_prefix() + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
 
     // Drop previous saved settings with this name
     g_key_file_remove_group (keyfile, group.c_str(), nullptr);
@@ -256,3 +254,9 @@ CsvPriceImpSettings::remove (void)
 
     CsvImportSettings::remove();
 }
+
+const char*
+CsvPriceImpSettings::get_group_prefix (void)
+{
+    return group_prefix;
+}
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
index f1833e5..ef15cdd 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
@@ -64,6 +64,9 @@ void remove (void);
 gnc_commodity *m_from_commodity;                    //  Price From Commodity
 gnc_commodity *m_to_currency;                       //  Price To Currency
 std::vector<GncPricePropType> m_column_types_price; // The Price Column types in order
+
+protected:
+    const char* get_group_prefix (void) override;
 };
 
 using preset_vec_price = std::vector<std::shared_ptr<CsvPriceImpSettings>>;
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
index ccac10b..a0a679a 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
@@ -42,7 +42,7 @@ extern "C"
 #include "gnc-ui-util.h"
 }
 
-const std::string settings_type{"TRANS"};
+constexpr auto group_prefix = "Import csv,transaction - ";
 
 #define CSV_COL_TYPES    "ColumnTypes"
 
@@ -57,7 +57,6 @@ static std::shared_ptr<CsvTransImpSettings> create_int_no_preset(void)
 {
     auto preset = std::make_shared<CsvTransImpSettings>();
     preset->m_name = get_no_settings();
-    preset->m_settings_type = settings_type;
 
     return preset;
 }
@@ -114,7 +113,7 @@ const preset_vec_trans& get_import_presets_trans (void)
     for (gsize i=0; i < grouplength; i++)
     {
         auto group = std::string(groups[i]);
-        auto gp = get_prefix() + settings_type + " - ";
+        auto gp = std::string {group_prefix};
         auto pos = group.find(gp);
         if (pos == std::string::npos)
             continue;
@@ -138,7 +137,6 @@ const preset_vec_trans& get_import_presets_trans (void)
     for (auto preset_name : preset_names)
     {
         auto preset = std::make_shared<CsvTransImpSettings>();
-        preset->m_settings_type = settings_type;
         preset->m_name = preset_name;
         preset->load();
         presets_trans.push_back(preset);
@@ -160,7 +158,7 @@ CsvTransImpSettings::load (void)
     GError *key_error = nullptr;
     m_load_error = false;
     auto keyfile = gnc_state_get_current ();
-    auto group = get_prefix() + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
 
     // Start Loading the settings
     m_load_error = CsvImportSettings::load(); // load the common settings
@@ -225,7 +223,7 @@ CsvTransImpSettings::save (void)
     }
 
     auto keyfile = gnc_state_get_current ();
-    auto group = get_prefix() + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
 
     // Drop previous saved settings with this name
     g_key_file_remove_group (keyfile, group.c_str(), nullptr);
@@ -260,3 +258,9 @@ CsvTransImpSettings::remove (void)
 
     CsvImportSettings::remove();
 }
+
+const char*
+CsvTransImpSettings::get_group_prefix (void)
+{
+    return group_prefix;
+}
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
index 254a41d..8d798f7 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
@@ -64,6 +64,9 @@ void remove (void);
 Account      *m_base_account;                 // Base account
 bool          m_multi_split;                  // Assume multiple lines per transaction
 std::vector<GncTransPropType> m_column_types; // The Column types in order
+
+protected:
+    const char* get_group_prefix (void) override;
 };
 
 using preset_vec_trans = std::vector<std::shared_ptr<CsvTransImpSettings>>;
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
index 27b430a..29c28f3 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
@@ -106,11 +106,6 @@ std::string get_gnc_exp (void)
     return gnc_exp;
 }
 
-std::string get_prefix (void)
-{
-    return csv_group_prefix;
-}
-
 /**************************************************
  * load_common
  *
@@ -121,7 +116,7 @@ CsvImportSettings::load (void)
 {
     GError *key_error = nullptr;
     m_load_error = false;
-    auto group = csv_group_prefix + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
     auto keyfile = gnc_state_get_current ();
 
     m_skip_start_lines = g_key_file_get_integer (keyfile, group.c_str(), CSV_SKIP_START, &key_error);
@@ -189,7 +184,7 @@ bool
 CsvImportSettings::save (void)
 {
     auto keyfile = gnc_state_get_current ();
-    auto group = csv_group_prefix + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
 
     // Start Saving the Common settings
     g_key_file_set_string (keyfile, group.c_str(), CSV_NAME, m_name.c_str());
@@ -243,6 +238,6 @@ void
 CsvImportSettings::remove (void)
 {
     auto keyfile = gnc_state_get_current ();
-    auto group = csv_group_prefix + m_settings_type + " - " + m_name;
+    auto group = get_group_prefix() + m_name;
     g_key_file_remove_group (keyfile, group.c_str(), nullptr);
 }
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
index d226a70..b7daed0 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
@@ -72,8 +72,6 @@ bool load (void);
  */
 void remove (void);
 
-std::string   m_settings_type;                // Settings Type, TRANS, PRICE etc.
-
 // Common Settings
 std::string   m_name;                         // Name given to this preset by the user
 GncImpFileFormat m_file_format;               // CSV import Format
@@ -86,11 +84,13 @@ bool          m_skip_alt_lines;               // Skip alternate rows
 std::string   m_separators;                   // Separators for csv format
 bool          m_load_error;                   // Was there an error while parsing the state file ?
 std::vector<uint32_t> m_column_widths;        // The Column widths
+
+protected:
+    virtual const char* get_group_prefix (void) = 0;
 };
 
 std::string get_no_settings (void);
 std::string get_gnc_exp (void);
-std::string get_prefix (void);
 
 /** Check whether name can be used as a preset name.
  *  The names of the internal presets are considered reserved.

commit b577a7daf1b2e878bece8a799ddfafaeb6a0f689
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 17:20:13 2018 +0100

    Csv import settings - undo rename of common methods
    
    Use C++-style to call method with same name in parent class

diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
index 0f985ed..d3d5e03 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
@@ -150,7 +150,7 @@ CsvPriceImpSettings::load (void)
     auto group = get_prefix() + m_settings_type + " - " + m_name;
 
     // Start Loading the settings
-    m_load_error = load_common(); // load the common settings
+    m_load_error = CsvImportSettings::load(); // load the common settings
 
     gchar *key_char = g_key_file_get_string (keyfile, group.c_str(), CSV_TO_CURR, &key_error);
     if (key_char && *key_char != '\0')
@@ -216,7 +216,7 @@ CsvPriceImpSettings::save (void)
     g_key_file_remove_group (keyfile, group.c_str(), nullptr);
 
     // Start Saving the settings
-    bool error = save_common(); // save the common settings
+    bool error = CsvImportSettings::save(); // save the common settings
 
     if (error)
         return error;
@@ -254,5 +254,5 @@ CsvPriceImpSettings::remove (void)
     if (preset_is_reserved_name (m_name))
         return;
 
-    remove_common();
+    CsvImportSettings::remove();
 }
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
index da08573..ccac10b 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
@@ -163,7 +163,7 @@ CsvTransImpSettings::load (void)
     auto group = get_prefix() + m_settings_type + " - " + m_name;
 
     // Start Loading the settings
-    m_load_error = load_common(); // load the common settings
+    m_load_error = CsvImportSettings::load(); // load the common settings
 
     m_multi_split = g_key_file_get_boolean (keyfile, group.c_str(), CSV_MULTI_SPLIT, &key_error);
     m_load_error |= handle_load_error (&key_error, group);
@@ -231,7 +231,7 @@ CsvTransImpSettings::save (void)
     g_key_file_remove_group (keyfile, group.c_str(), nullptr);
 
     // Start Saving the settings
-    bool error = save_common(); // save the common settings
+    bool error = CsvImportSettings::save(); // save the common settings
 
     if (error)
         return error;
@@ -258,5 +258,5 @@ CsvTransImpSettings::remove (void)
     if (preset_is_reserved_name (m_name))
         return;
 
-    remove_common();
+    CsvImportSettings::remove();
 }
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
index d0ab9e9..27b430a 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
@@ -117,7 +117,7 @@ std::string get_prefix (void)
  * load the settings from a state key file
  **************************************************/
 bool
-CsvImportSettings::load_common (void)
+CsvImportSettings::load (void)
 {
     GError *key_error = nullptr;
     m_load_error = false;
@@ -186,7 +186,7 @@ CsvImportSettings::load_common (void)
  * save settings to a key file
  **************************************************/
 bool
-CsvImportSettings::save_common (void)
+CsvImportSettings::save (void)
 {
     auto keyfile = gnc_state_get_current ();
     auto group = csv_group_prefix + m_settings_type + " - " + m_name;
@@ -240,7 +240,7 @@ CsvImportSettings::save_common (void)
 }
 
 void
-CsvImportSettings::remove_common (void)
+CsvImportSettings::remove (void)
 {
     auto keyfile = gnc_state_get_current ();
     auto group = csv_group_prefix + m_settings_type + " - " + m_name;
diff --git a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
index c051cc1..d226a70 100644
--- a/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
@@ -60,17 +60,17 @@ struct CsvImportSettings
  *
  *  @return true if there was a problem in saving.
  */
-bool save_common (void);
+bool save (void);
 
 /** Load the widget properties from a key File.
  *
  *  @return true if there was a problem.
  */
-bool load_common (void);
+bool load (void);
 
 /** Remove the preset from the state file.
  */
-void remove_common (void);
+void remove (void);
 
 std::string   m_settings_type;                // Settings Type, TRANS, PRICE etc.
 

commit 751a3fec43a9740b842e0f5f4ea148fd47a9ea4e
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 17:12:31 2018 +0100

    Csv importer - align file names
    
    Done in a separate commit

diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index a4355c6..5486049 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -15,17 +15,17 @@ SET(csv_import_SOURCES
   csv-account-import.c
   gnc-csv-account-map.c
   gnc-csv-gnumeric-popup.c
-  gnc-csv-tokenizer.cpp
-  gnc-csv-import-settings.cpp
-  gnc-csv-price-import-settings.cpp
-  gnc-csv-trans-import-settings.cpp
-  gnc-dummy-tokenizer.cpp
-  gnc-fw-tokenizer.cpp
-  gnc-price-import.cpp
-  gnc-price-props.cpp
+  gnc-imp-props-price.cpp
+  gnc-imp-props-tx.cpp
+  gnc-imp-settings-csv.cpp
+  gnc-imp-settings-csv-price.cpp
+  gnc-imp-settings-csv-tx.cpp
+  gnc-import-price.cpp
+  gnc-import-tx.cpp
   gnc-tokenizer.cpp
-  gnc-trans-props.cpp
-  gnc-tx-import.cpp
+  gnc-tokenizer-csv.cpp
+  gnc-tokenizer-dummy.cpp
+  gnc-tokenizer-fw.cpp
 )
 
 # Add dependency on config.h
@@ -45,17 +45,17 @@ SET(csv_import_noinst_HEADERS
   csv-account-import.h
   gnc-csv-account-map.h
   gnc-csv-gnumeric-popup.h
-  gnc-csv-tokenizer.hpp
-  gnc-csv-import-settings.hpp
-  gnc-csv-price-import-settings.hpp
-  gnc-csv-trans-import-settings.hpp
-  gnc-dummy-tokenizer.hpp
-  gnc-fw-tokenizer.hpp
-  gnc-price-import.hpp
-  gnc-price-props.hpp
+  gnc-imp-props-price.hpp
+  gnc-imp-props-tx.hpp
+  gnc-imp-settings-csv.hpp
+  gnc-imp-settings-csv-price.hpp
+  gnc-imp-settings-csv-tx.hpp
+  gnc-import-price.hpp
+  gnc-import-tx.hpp
   gnc-tokenizer.hpp
-  gnc-trans-props.hpp
-  gnc-tx-import.hpp
+  gnc-tokenizer-csv.hpp
+  gnc-tokenizer-dummy.hpp
+  gnc-tokenizer-fw.hpp
 )
 
 ADD_LIBRARY(gncmod-csv-import ${csv_import_noinst_HEADERS}
diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
index 0db5c64..a4a3ef7 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * assistant-csv-price-import.c -- An assistant for importing       *
+ * assistant-csv-price-import.cpp -- An assistant for importing     *
  *                                     Prices from a file.          *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
@@ -52,10 +52,10 @@ extern "C"
 #include "go-charmap-sel.h"
 }
 
-#include "gnc-csv-price-import-settings.hpp"
-#include "gnc-price-import.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-tokenizer.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
+#include "gnc-import-price.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-tokenizer-csv.hpp"
 
 #define MIN_COL_WIDTH 70
 #define GNC_PREFS_GROUP "dialogs.import.csv"
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index c9100de..397a353 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -59,10 +59,10 @@ extern "C"
 #include "go-charmap-sel.h"
 }
 
-#include "gnc-csv-trans-import-settings.hpp"
-#include "gnc-tx-import.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-tokenizer.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
+#include "gnc-import-tx.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-tokenizer-csv.hpp"
 
 #include <boost/locale.hpp>
 
diff --git a/gnucash/import-export/csv-imp/gnc-price-props.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-price-props.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
index 151bd38..1a3ec7b 100644
--- a/gnucash/import-export/csv-imp/gnc-price-props.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
@@ -1,6 +1,6 @@
 /********************************************************************\
- * gnc-price-props.cpp - encapsulate price properties for use       *
- *                       in the csv importer                        *
+ * gnc-imp-props-price.cpp - encapsulate price properties for use   *
+ *                           in the csv importer                    *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -37,7 +37,7 @@ extern "C" {
 #include <string>
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
-#include "gnc-price-props.hpp"
+#include "gnc-imp-props-price.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-price-props.hpp b/gnucash/import-export/csv-imp/gnc-imp-props-price.hpp
similarity index 95%
rename from gnucash/import-export/csv-imp/gnc-price-props.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-price.hpp
index 3a35861..055cc4d 100644
--- a/gnucash/import-export/csv-imp/gnc-price-props.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-price.hpp
@@ -1,6 +1,6 @@
 /********************************************************************\
- * gnc-price-props.hpp - encapsulate price properties for use       *
- *                       in the csv importer                        *
+ * gnc-imp-props-price.hpp - encapsulate price properties for use   *
+ *                           in the csv importer                    *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -58,7 +58,7 @@ enum class GncPricePropType {
 enum Result { FAILED, ADDED, DUPLICATED, REPLACED };
 
 /** Maps all column types to a string representation.
- *  The actual definition is in gnc-price-props.cpp.
+ *  The actual definition is in gnc-imp-props-price.cpp.
  *  Attention: that definition should be adjusted for any
  *  changes to enum class GncPricePropType ! */
 extern std::map<GncPricePropType, const char*> gnc_price_col_type_strs;
diff --git a/gnucash/import-export/csv-imp/gnc-trans-props.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-trans-props.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
index 2aaae34..650f4e9 100644
--- a/gnucash/import-export/csv-imp/gnc-trans-props.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-csv-imp-trans.cpp - import transactions from csv files       *
+ * gnc-imp-props-tx.cpp - import transactions from csv files        *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -41,7 +41,7 @@ extern "C" {
 #include <string>
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
-#include "gnc-trans-props.hpp"
+#include "gnc-imp-props-tx.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-trans-props.hpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-trans-props.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
index 47c23ba..ee00529 100644
--- a/gnucash/import-export/csv-imp/gnc-trans-props.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.hpp
@@ -1,6 +1,6 @@
 /********************************************************************\
- * gnc-trans-props.hpp - encapsulate transaction properties for use *
- *                       in the csv importer                        *
+ * gnc-imp-props-tx.hpp - encapsulate transaction properties for    *
+ *                        use in the csv importer                   *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
diff --git a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
index 8ebe9eb..0f985ed 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-price-import-settings.cpp -- Price CSV Import Settings   *
+ * gnc-imp-settings-csv-price.cpp -- Price CSV Import Settings      *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
  *                                                                  *
@@ -20,14 +20,14 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-price-import-settings.cpp
+/** @file gnc-imp-settings-csv-price.cpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
 */
 
-#include "gnc-csv-import-settings.hpp"
-#include "gnc-csv-price-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
 #include <sstream>
 
 extern "C"
diff --git a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
similarity index 94%
rename from gnucash/import-export/csv-imp/gnc-csv-price-import-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
index e0d52b4..f1833e5 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-price-import-settings.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-price-import-settings.hpp  -- Price CSV Import Settings  *
+ * gnc-imp-settings-csv-price.hpp  -- Price CSV Import Settings     *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
  *                                                                  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-price-import-settings.hpp
+/** @file gnc-imp-settings-csv-price.hpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
@@ -36,9 +36,9 @@ extern "C" {
 
 #include <string>
 #include <vector>
-#include "gnc-price-props.hpp"
+#include "gnc-imp-props-price.hpp"
 #include "gnc-tokenizer.hpp"
-#include "gnc-csv-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
 
 struct CsvPriceImpSettings : public CsvImportSettings
 {
diff --git a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
index 17ac2b7..da08573 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-trans-import-settings.cpp -- Trans CSV Import Settings   *
+ * gnc-imp-settings-csv-tx.cpp -- Trans CSV Import Settings      *
  *                                                                  *
  * Copyright (C) 2014 Robert Fewell                                 *
  *                                                                  *
@@ -20,14 +20,14 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-trans-import-settings.cpp
+/** @file gnc-imp-settings-csv-tx.cpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
 */
 
-#include "gnc-csv-import-settings.hpp"
-#include "gnc-csv-trans-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
 #include <sstream>
 
 extern "C"
diff --git a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
similarity index 93%
rename from gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
index c93ef3a..254a41d 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-trans-import-settings.hpp  -- Trans CSV Import Settings  *
+ * gnc-imp-settings-csv-tx.hpp  -- Trans CSV Import Settings  *
  *                                                                  *
  * Copyright (C) 2017 Robert Fewell                                 *
  *                                                                  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-trans-import-settings.hpp
+/** @file gnc-imp-settings-csv-tx.hpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
@@ -36,9 +36,9 @@ extern "C" {
 
 #include <string>
 #include <vector>
-#include "gnc-trans-props.hpp"
+#include "gnc-imp-props-tx.hpp"
 #include "gnc-tokenizer.hpp"
-#include "gnc-csv-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
 
 struct CsvTransImpSettings : public CsvImportSettings
 {
diff --git a/gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
index 7c5e362..d0ab9e9 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-import-settings.cpp -- Save and Load CSV Import Settings *
+ * gnc-imp-settings-csv.cpp -- Save and Load CSV Import Settings *
  *                                                                  *
  * Copyright (C) 2014 Robert Fewell                                 *
  *                                                                  *
@@ -20,13 +20,13 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-import-settings.cpp
+/** @file gnc-imp-settings-csv.cpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
 */
 
-#include "gnc-csv-import-settings.hpp"
+#include "gnc-imp-settings-csv.hpp"
 #include <sstream>
 
 extern "C"
diff --git a/gnucash/import-export/csv-imp/gnc-csv-import-settings.hpp b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-csv-import-settings.hpp
rename to gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
index 6102fed..c051cc1 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-import-settings.hpp
+++ b/gnucash/import-export/csv-imp/gnc-imp-settings-csv.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************\
- * gnc-csv-import-settings.hpp -- Save and Load CSV Import Settings *
+ * gnc-imp-settings-csv.hpp -- Save and Load CSV Import Settings *
  *                                                                  *
  * Copyright (C) 2014 Robert Fewell                                 *
  *                                                                  *
@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 \********************************************************************/
-/** @file gnc-csv-import-settings.hpp
+/** @file gnc-imp-settings-csv.hpp
     @brief CSV Import Settings
     @author Copyright (c) 2014 Robert Fewell
     @author Copyright (c) 2016 Geert Janssens
diff --git a/gnucash/import-export/csv-imp/gnc-price-import.cpp b/gnucash/import-export/csv-imp/gnc-import-price.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-price-import.cpp
rename to gnucash/import-export/csv-imp/gnc-import-price.cpp
index 0bc1ead..f4aa645 100644
--- a/gnucash/import-export/csv-imp/gnc-price-import.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-price.cpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-price-import.cpp - import prices from csv files              *
+ * gnc-import-price.cpp - import prices from csv files              *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -38,11 +38,11 @@ extern "C" {
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
 
-#include "gnc-price-import.hpp"
-#include "gnc-price-props.hpp"
-#include "gnc-csv-tokenizer.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-price-import-settings.hpp"
+#include "gnc-import-price.hpp"
+#include "gnc-imp-props-price.hpp"
+#include "gnc-tokenizer-csv.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-price-import.hpp b/gnucash/import-export/csv-imp/gnc-import-price.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-price-import.hpp
rename to gnucash/import-export/csv-imp/gnc-import-price.hpp
index 7d181ec..38f54cc 100644
--- a/gnucash/import-export/csv-imp/gnc-price-import.hpp
+++ b/gnucash/import-export/csv-imp/gnc-import-price.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-price-import.hpp - import prices from csv files              *
+ * gnc-import-price.hpp - import prices from csv files              *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -22,7 +22,7 @@
 /** @file
      @brief Class to import prices from CSV or fixed width files
      *
-     gnc-price-import.hpp
+     gnc-import-price.hpp
      @author Copyright (c) 2015 Geert Janssens <geert at kobaltwit.be>
      @author Copyright (c) 2017 Robert Fewell
  */
@@ -41,8 +41,8 @@ extern "C" {
 #include <memory>
 
 #include "gnc-tokenizer.hpp"
-#include "gnc-price-props.hpp"
-#include "gnc-csv-price-import-settings.hpp"
+#include "gnc-imp-props-price.hpp"
+#include "gnc-imp-settings-csv-price.hpp"
 #include <boost/optional.hpp>
 
 /* A set of currency formats that the user sees. */
diff --git a/gnucash/import-export/csv-imp/gnc-tx-import.cpp b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-tx-import.cpp
rename to gnucash/import-export/csv-imp/gnc-import-tx.cpp
index 3b65944..ae9383e 100644
--- a/gnucash/import-export/csv-imp/gnc-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-tx-import.cpp - import transactions from csv or fixed-width  *
+ * gnc-import-tx.cpp - import transactions from csv or fixed-width  *
  *                     files                                        *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
@@ -35,11 +35,11 @@ extern "C" {
 #include <boost/regex.hpp>
 #include <boost/regex/icu.hpp>
 
-#include "gnc-tx-import.hpp"
-#include "gnc-trans-props.hpp"
-#include "gnc-csv-tokenizer.hpp"
-#include "gnc-fw-tokenizer.hpp"
-#include "gnc-csv-trans-import-settings.hpp"
+#include "gnc-import-tx.hpp"
+#include "gnc-imp-props-tx.hpp"
+#include "gnc-tokenizer-csv.hpp"
+#include "gnc-tokenizer-fw.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
 
 G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT;
 
diff --git a/gnucash/import-export/csv-imp/gnc-tx-import.hpp b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-tx-import.hpp
rename to gnucash/import-export/csv-imp/gnc-import-tx.hpp
index 4fc339c..0e20854 100644
--- a/gnucash/import-export/csv-imp/gnc-tx-import.hpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-tx-import.hpp - import transactions from csv files       *
+ * gnc-import-tx.hpp - import transactions from csv files           *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -22,7 +22,7 @@
 /** @file
      @brief Class to import transactions from CSV or fixed width files
      *
-     gnc-tx-import.hpp
+     gnc-import-tx.hpp
      @author Copyright (c) 2015 Geert Janssens <geert at kobaltwit.be>
  */
 
@@ -42,8 +42,8 @@ extern "C" {
 #include <memory>
 
 #include "gnc-tokenizer.hpp"
-#include "gnc-trans-props.hpp"
-#include "gnc-csv-trans-import-settings.hpp"
+#include "gnc-imp-props-tx.hpp"
+#include "gnc-imp-settings-csv-tx.hpp"
 #include <boost/optional.hpp>
 
 
diff --git a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
similarity index 98%
rename from gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
index 4812511..402900a 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
@@ -1,4 +1,4 @@
-#include "gnc-csv-tokenizer.hpp"
+#include "gnc-tokenizer-csv.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.hpp
similarity index 96%
rename from gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-csv.hpp
index af1f37b..ef75632 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-csv-tokenizer.hpp - takes a csv file and converts it into a  *
+ * gnc-tokenizer-csv.hpp - takes a csv file and converts it into a  *
  *                         two-dimensional vector of strings (table)*
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
@@ -27,7 +27,7 @@
      However, no gnucash specific interpretation is done yet, that's up
      to the code using this class.
      *
-     gnc-csv-tokenizer.hpp
+     gnc-tokenizer-csv.hpp
      @author Copyright (c) 2015 Geert Janssens <geert at kobaltwit.be>
  */
 
diff --git a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
similarity index 94%
rename from gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
index c54517e..1da593b 100644
--- a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
@@ -1,4 +1,4 @@
-#include "gnc-dummy-tokenizer.hpp"
+#include "gnc-tokenizer-dummy.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.hpp
similarity index 91%
rename from gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-dummy.hpp
index 805d86e..5bedfee 100644
--- a/gnucash/import-export/csv-imp/gnc-dummy-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-dummy.hpp
@@ -1,8 +1,7 @@
 /********************************************************************\
- * gnc-dummy-tokenizer.hpp - takes a file and converts it into a       *
+ * gnc-tokenizer-dummy.hpp - takes a file and converts it into a    *
  *                        two-dimensional vector of strings (table) *
- *                        splitting the contents on fixed width     *
- *                        positions                                 *
+ *                        each row will only have one single column *
  *                                                                  *
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *
@@ -29,7 +28,7 @@
      This is just a dummy that can be used as long as the file format isn't
      specified yet by the user.
      *
-     gnc-dummy-tokenizer.hpp
+     gnc-tokenizer-dummy.hpp
      @author Copyright (c) 2016 Geert Janssens <geert at kobaltwit.be>
  */
 
diff --git a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
similarity index 99%
rename from gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
index 18fb2f5..9ec8612 100644
--- a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
@@ -1,4 +1,4 @@
-#include "gnc-fw-tokenizer.hpp"
+#include "gnc-tokenizer-fw.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
similarity index 97%
rename from gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp
rename to gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
index 6465a8c..d2eca2e 100644
--- a/gnucash/import-export/csv-imp/gnc-fw-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-fw.hpp
@@ -1,5 +1,5 @@
 /********************************************************************\
- * gnc-fw-tokenizer.hpp - takes a file and converts it into a       *
+ * gnc-tokenizer-fw.hpp - takes a file and converts it into a       *
  *                        two-dimensional vector of strings (table) *
  *                        splitting the contents on fixed width     *
  *                        positions                                 *
@@ -30,7 +30,7 @@
      However, no gnucash specific interpretation is done yet, that's up
      to the code using this class.
      *
-     gnc-fw-tokenizer.hpp
+     gnc-tokenizer-fw.hpp
      @author Copyright (c) 2015 Geert Janssens <geert at kobaltwit.be>
  */
 
diff --git a/gnucash/import-export/csv-imp/gnc-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
index f9f27e1..7b14a2d 100644
--- a/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer.cpp
@@ -1,7 +1,7 @@
 #include "gnc-tokenizer.hpp"
-#include "gnc-csv-tokenizer.hpp"
-#include "gnc-dummy-tokenizer.hpp"
-#include "gnc-fw-tokenizer.hpp"
+#include "gnc-tokenizer-csv.hpp"
+#include "gnc-tokenizer-dummy.hpp"
+#include "gnc-tokenizer-fw.hpp"
 
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index 9778475..c97902a 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -26,8 +26,8 @@
 
 #include <guid.hpp>
 #include "../gnc-tokenizer.hpp"
-#include "../gnc-csv-tokenizer.hpp"
-#include "../gnc-fw-tokenizer.hpp"
+#include "../gnc-tokenizer-csv.hpp"
+#include "../gnc-tokenizer-fw.hpp"
 #include <gtest/gtest.h>
 #include <iostream>
 #include <fstream>      // fstream
diff --git a/gnucash/import-export/csv-imp/test/test-tx-import.cpp b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
index 76a4362..60d7ec1 100644
--- a/gnucash/import-export/csv-imp/test/test-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
@@ -24,8 +24,8 @@
 
 #include <guid.hpp>
 #include "../gnc-tokenizer.hpp"
-#include "../gnc-csv-tokenizer.hpp"
-#include "../gnc-fw-tokenizer.hpp"
+#include "../gnc-tokenizer-csv.hpp"
+#include "../gnc-tokenizer-fw.hpp"
 #include <gtest/gtest.h>
 #include <iostream>
 #include <fstream>      // fstream
@@ -34,7 +34,7 @@
 #include <stdlib.h>     /* getenv */
 
 /* Add specific headers for this class */
-#include "../gnc-tx-import.hpp"
+#include "../gnc-import-tx.hpp"
 
 //typedef struct
 //{
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d9f7bc8..0e02226 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -307,19 +307,19 @@ gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
 gnucash/import-export/csv-imp/csv-account-import.c
 gnucash/import-export/csv-imp/gnc-csv-account-map.c
 gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
-gnucash/import-export/csv-imp/gnc-csv-import-settings.cpp
-gnucash/import-export/csv-imp/gnc-csv-price-import-settings.cpp
-gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
-gnucash/import-export/csv-imp/gnc-csv-trans-import-settings.cpp
-gnucash/import-export/csv-imp/gnc-dummy-tokenizer.cpp
-gnucash/import-export/csv-imp/gnc-fw-tokenizer.cpp
+gnucash/import-export/csv-imp/gnc-import-price.cpp
+gnucash/import-export/csv-imp/gnc-import-tx.cpp
+gnucash/import-export/csv-imp/gnc-imp-props-price.cpp
+gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp
+gnucash/import-export/csv-imp/gnc-imp-settings-csv.cpp
+gnucash/import-export/csv-imp/gnc-imp-settings-csv-price.cpp
+gnucash/import-export/csv-imp/gnc-imp-settings-csv-tx.cpp
 gnucash/import-export/csv-imp/gncmod-csv-import.c
 gnucash/import-export/csv-imp/gnc-plugin-csv-import.c
-gnucash/import-export/csv-imp/gnc-price-import.cpp
-gnucash/import-export/csv-imp/gnc-price-props.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp
-gnucash/import-export/csv-imp/gnc-trans-props.cpp
-gnucash/import-export/csv-imp/gnc-tx-import.cpp
+gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
+gnucash/import-export/csv-imp/gnc-tokenizer-dummy.cpp
+gnucash/import-export/csv-imp/gnc-tokenizer-fw.cpp
 gnucash/import-export/customer-import/dialog-customer-import.c
 gnucash/import-export/customer-import/dialog-customer-import-gui.c
 gnucash/import-export/customer-import/gncmod-customer-import.c

commit e71f561236787f0ca7d1bb812c5959d0c83476a8
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 15:31:12 2018 +0100

    Bug 793467 - GnuCash crashes when trying to open a binary file instead of a CSV
    
    The cause was an uncaught exception from boost::tokenizer.
    Fix and add test case.

diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
index 53643ee..0db5c64 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -717,7 +717,7 @@ CsvImpPriceAssist::file_confirm_cb ()
     catch (std::range_error &e)
     {
         /* Parsing failed ... */
-        gnc_error_dialog (GTK_WINDOW(csv_imp_asst), "%s", e.what());
+        gnc_error_dialog (GTK_WINDOW(csv_imp_asst), "%s", _(e.what()));
         return;
     }
     /* Get settings store and populate */
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 0d33e11..c9100de 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -723,7 +723,7 @@ CsvImpTransAssist::file_confirm_cb ()
     catch (std::range_error &e)
     {
         /* Parsing failed ... */
-        gnc_error_dialog (GTK_WINDOW (csv_imp_asst), "%s", e.what());
+        gnc_error_dialog (GTK_WINDOW (csv_imp_asst), "%s", _(e.what()));
         return;
     }
 
diff --git a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp b/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
index 54532c7..4812511 100644
--- a/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
@@ -11,6 +11,10 @@
 #include <boost/locale.hpp>
 #include <boost/algorithm/string.hpp>
 
+extern "C" {
+    #include <glib/gi18n.h>
+}
+
 void
 GncCsvTokenizer::set_separators(const std::string& separators)
 {
@@ -34,33 +38,40 @@ int GncCsvTokenizer::tokenize()
     m_tokenized_contents.clear();
     std::istringstream in_stream(m_utf8_contents);
 
-    while (std::getline (in_stream, buffer))
+    try
     {
-        // --- deal with line breaks in quoted strings
-        buffer = boost::trim_copy (buffer); // Removes trailing newline and spaces
-        last_quote = buffer.find_first_of('"');
-        while (last_quote != std::string::npos)
+        while (std::getline (in_stream, buffer))
         {
-            if (last_quote == 0) // Test separately because last_quote - 1 would be out of range
-                inside_quotes = !inside_quotes;
-            else if (buffer[ last_quote - 1 ] != '\\')
-                inside_quotes = !inside_quotes;
+            // --- deal with line breaks in quoted strings
+            buffer = boost::trim_copy (buffer); // Removes trailing newline and spaces
+            last_quote = buffer.find_first_of('"');
+            while (last_quote != std::string::npos)
+            {
+                if (last_quote == 0) // Test separately because last_quote - 1 would be out of range
+                    inside_quotes = !inside_quotes;
+                else if (buffer[ last_quote - 1 ] != '\\')
+                    inside_quotes = !inside_quotes;
 
-            last_quote = buffer.find_first_of('"',last_quote+1);
-        }
+                last_quote = buffer.find_first_of('"',last_quote+1);
+            }
 
-        line.append(buffer);
-        if (inside_quotes)
-        {
-            line.append(" ");
-            continue;
-        }
-        // ---
+            line.append(buffer);
+            if (inside_quotes)
+            {
+                line.append(" ");
+                continue;
+            }
+            // ---
 
-        Tokenizer tok(line, sep);
-        vec.assign(tok.begin(),tok.end());
-        m_tokenized_contents.push_back(vec);
-        line.clear();
+            Tokenizer tok(line, sep);
+            vec.assign(tok.begin(),tok.end());
+            m_tokenized_contents.push_back(vec);
+            line.clear();
+        }
+    }
+    catch (boost::escaped_list_error &e)
+    {
+        throw (std::range_error N_("There was an error parsing the file."));
     }
 
     return 0;
diff --git a/gnucash/import-export/csv-imp/gnc-tx-import.cpp b/gnucash/import-export/csv-imp/gnc-tx-import.cpp
index a43f29c..3b65944 100644
--- a/gnucash/import-export/csv-imp/gnc-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tx-import.cpp
@@ -404,7 +404,7 @@ void GncTxImport::tokenize (bool guessColTypes)
     /* If it failed, generate an error. */
     if (m_parsed_lines.size() == 0)
     {
-        throw (std::range_error ("Tokenizing failed."));
+        throw (std::range_error (N_("There was an error parsing the file.")));
         return;
     }
 
diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index a4cf1a9..9778475 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -138,6 +138,17 @@ TEST_F (GncTokenizerTest, tokenize_from_csv_file)
  * independently.
  */
 
+/* First test whether we're properly catching boost::tokenizer throws
+ * This happens when the input data has invalid escape sequences */
+TEST_F (GncTokenizerTest, tokenize_binary_data)
+{
+    GncCsvTokenizer *csvtok = dynamic_cast<GncCsvTokenizer*>(csv_tok.get());
+    csvtok->set_separators (",");
+
+    set_utf8_contents (csv_tok, R"(\764Test,Something)");
+    EXPECT_THROW (csv_tok->tokenize(), std::range_error);
+}
+
 /* This helper function will run the parse step on the given data
  * with the parser as configured by the calling test function.
  * This allows the same code to be used with different csv test strings

commit 6fe7d8854836ceea2b58914511b7743b2dcdd1d4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 14:24:02 2018 +0100

    Enable test to handle attempt to load non-existing file in csv importer

diff --git a/gnucash/import-export/csv-imp/gnc-tokenizer.hpp b/gnucash/import-export/csv-imp/gnc-tokenizer.hpp
index c7916df..fb68bd3 100644
--- a/gnucash/import-export/csv-imp/gnc-tokenizer.hpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer.hpp
@@ -73,7 +73,7 @@ public:
     const std::string& encoding();
     virtual int  tokenize() = 0;
     const std::vector<StrVec>& get_tokens();
-    
+
 protected:
     std::string m_utf8_contents;
     std::vector<StrVec> m_tokenized_contents;
diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index 65c2d27..a4cf1a9 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -84,16 +84,15 @@ std::string GncTokenizerTest::get_filepath(const std::string& filename)
         return std::string(srcdir) + "/" + filename;
 }
 
-//TEST_F (GncTokenizerTest, load_file_nonexisting)
-//{
-//
-//    auto file1 = get_filepath ("notexist.csv");
-//
-//    /* Test loading of a non-existing file */
-//    // FIXME determine what is actually thrown as I can't find it by trial and error
-//    EXPECT_THROW (fw_tok->load_file (file1), std::ios_base::failure);
-//    EXPECT_THROW (csv_tok->load_file (file1), std::ios_base::failure);
-//}
+TEST_F (GncTokenizerTest, load_file_nonexisting)
+{
+
+    auto file1 = get_filepath ("notexist.csv");
+
+    /* Test loading of a non-existing file */
+    EXPECT_THROW (fw_tok->load_file (file1), std::ios_base::failure);
+    EXPECT_THROW (csv_tok->load_file (file1), std::ios_base::failure);
+}
 
 TEST_F (GncTokenizerTest, load_file_existing)
 {

commit 89c1534d5184cd3f499fc8e3e654b8eb43583e1b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 14:06:33 2018 +0100

    Csv import - improve memory handling in the assistant class
    
    Make it more RAII, in that whatever the class allocates, it should
    also deallocate. This simplifies a couple of memory handling cases.
    The only exception is the generic import matcher that for some reason
    has chosen to deallocate itself. To be fixed when more importers are
    converted to c++

diff --git a/gnucash/gtkbuilder/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade
index d465787..ed111e6 100644
--- a/gnucash/gtkbuilder/assistant-csv-price-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-price-import.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="end_row_adj">
@@ -39,17 +39,11 @@
     <property name="default_width">400</property>
     <property name="default_height">500</property>
     <signal name="apply" handler="csv_price_imp_assist_finish_cb" swapped="no"/>
-    <signal name="cancel" handler="csv_price_imp_assist_cancel_cb" swapped="no"/>
+    <signal name="cancel" handler="csv_price_imp_assist_close_cb" swapped="no"/>
     <signal name="close" handler="csv_price_imp_assist_close_cb" swapped="no"/>
-    <signal name="destroy" handler="csv_price_imp_assist_destroy_cb" swapped="no"/>
+    <signal name="destroy" handler="csv_price_imp_assist_close_cb" swapped="no"/>
     <signal name="prepare" handler="csv_price_imp_assist_prepare_cb" swapped="no"/>
     <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
       <object class="GtkLabel" id="start_page">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
index 3a7300b..157f25d 100644
--- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="account_match_store">
@@ -29,9 +29,9 @@
     <property name="default_width">400</property>
     <property name="default_height">500</property>
     <signal name="apply" handler="csv_tximp_assist_finish_cb" swapped="no"/>
-    <signal name="cancel" handler="csv_tximp_assist_cancel_cb" swapped="no"/>
+    <signal name="cancel" handler="csv_tximp_assist_close_cb" swapped="no"/>
     <signal name="close" handler="csv_tximp_assist_close_cb" swapped="no"/>
-    <signal name="destroy" handler="csv_tximp_assist_destroy_cb" swapped="no"/>
+    <signal name="destroy" handler="csv_tximp_assist_close_cb" swapped="no"/>
     <signal name="prepare" handler="csv_tximp_assist_prepare_cb" swapped="no"/>
     <child>
       <object class="GtkLabel" id="start_page">
diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
index 6cf25bb..53643ee 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -76,7 +76,7 @@ class  CsvImpPriceAssist
 {
 public:
     CsvImpPriceAssist ();
-    ~CsvImpPriceAssist () = default;
+    ~CsvImpPriceAssist ();
 
     /* Delete copy and move constructor/assignments
      * We don't want gui elements to be moved around or copied at all */
@@ -188,8 +188,6 @@ private:
 extern "C"
 {
 void csv_price_imp_assist_prepare_cb (GtkAssistant  *assistant, GtkWidget *page, CsvImpPriceAssist* info);
-void csv_price_imp_assist_destroy_cb (GtkWidget *object, CsvImpPriceAssist* info);
-void csv_price_imp_assist_cancel_cb (GtkAssistant *gtkassistant, CsvImpPriceAssist* info);
 void csv_price_imp_assist_close_cb (GtkAssistant *gtkassistant, CsvImpPriceAssist* info);
 void csv_price_imp_assist_finish_cb (GtkAssistant *gtkassistant, CsvImpPriceAssist* info);
 void csv_price_imp_file_confirm_cb (GtkWidget *button, CsvImpPriceAssist *info);
@@ -219,19 +217,6 @@ csv_price_imp_assist_prepare_cb (GtkAssistant *assistant, GtkWidget *page,
 }
 
 void
-csv_price_imp_assist_destroy_cb (GtkWidget *object, CsvImpPriceAssist* info)
-{
-    gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_PRICE_CM_CLASS, info);
-    delete info;
-}
-
-void
-csv_price_imp_assist_cancel_cb (GtkAssistant *assistant, CsvImpPriceAssist* info)
-{
-    gnc_close_gui_component_by_data (ASSISTANT_CSV_IMPORT_PRICE_CM_CLASS, info);
-}
-
-void
 csv_price_imp_assist_close_cb (GtkAssistant *assistant, CsvImpPriceAssist* info)
 {
     gnc_close_gui_component_by_data (ASSISTANT_CSV_IMPORT_PRICE_CM_CLASS, info);
@@ -678,6 +663,14 @@ CsvImpPriceAssist::CsvImpPriceAssist ()
     gnc_window_adjust_for_screen (GTK_WINDOW(csv_imp_asst));
 }
 
+/*******************************************************
+ * Assistant Destructor
+ *******************************************************/
+CsvImpPriceAssist::~CsvImpPriceAssist ()
+{
+    gtk_widget_destroy (GTK_WIDGET(csv_imp_asst));
+}
+
 /**************************************************
  * Code related to the file chooser page
  **************************************************/
@@ -1847,14 +1840,15 @@ void
 CsvImpPriceAssist::assist_compmgr_close ()
 {
     gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(csv_imp_asst));
-    gtk_widget_destroy (GTK_WIDGET(csv_imp_asst));
 }
 
 static void
 csv_price_imp_close_handler (gpointer user_data)
 {
     auto info = (CsvImpPriceAssist*)user_data;
+    gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_PRICE_CM_CLASS, info);
     info->assist_compmgr_close();
+    delete info;
 }
 
 /********************************************************************\
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index ecc11e4..0d33e11 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -79,45 +79,60 @@ static QofLogModule log_module = GNC_MOD_ASSISTANT;
 /* A note on memory management
  *
  * This source file is mixture of several completely different memory models
- * - it defines a c++ class, which is managed the c++ way
- * - the c++ class encapsulates a gtk based dialog, which is managed in
- *   a GObject memory management way.
- * - gnucash manages gui objects via its "Component Manager". Dialogs/windows are
+ * - it defines a c++ class which is managed the c++ way
+ * - the c++ class encapsulates a gtk based assistant which is managed according to
+ *   the GObject/Gtk memory model.
+ * - gnucash manages gui objects via its "Component Manager". Dialogs and windows are
  *   registered with this component manager when they are opened and the component
- *   manager handles the dialog's and window's lifecycle. When the dialog is closed
+ *   manager handles the lifecycle of toplevel widgets. When a dialog is closed
  *   the component manager invokes a close handler which is responsible for cleaning up.
  *
- * Care must be taken in places where these objects intersect. Here is how it is
+ * Care must be taken in places where these models intersect. Here is how it is
  * handled for this source file:
- * - There is only one entry point to start this assistant: gnc_file_csv_trans_import
- * - This function will create the C++ class using the c++ "new" method and will register the
- *   created class pointer in the component manager. This works because the component
- *   manager just stores the pointer, it doesn't act on it directly in any way.
- * - When the assistant finishes or is closed, the component manager will invoke a
+ * - First in the context of the import assistant the gnucash component manager is
+ *   merely a wrapper to keep track of which gui objects exist so they can be cleanly
+ *   destroyed. But the component manager itself doesn't do any memory management
+ *   on the objects it tracks. Instead it delegates this back to the objects themselves
+ *   via callbacks which the objects have to supply. It merely helps in the coordination.
+ *   So we can further ignore it in the memory management discussion.
+ *
+ * - Next there is only one entry point to start this assistant: gnc_file_csv_trans_import
+ * - The full assistant functionality is wrapped in a C++ class using RAII.
+ * - The entry point function will create one instance of this class using the c++
+ *   "new" method. This in turn will create several objects like a (GObject managed)
+ *   GtkAssistant, and a few C++ member objects.
+ * - The entry point function will also register the created object in the
+ *   component manager. This works because the (plain C) component manager just stores
+ *   the (C++) pointer to the object, it doesn't act on it directly in any way.
+ * - When the assistant is closed the component manager will invoke a
  *   close handler on the class pointer. We supply this close handler ourselves
- *   in csv_tximp_close_handler. That function will initiate the gtk dialog (more on that below)
- *   destruction, which in turn will trigger a c++ "delete" on the c++ class. It only
- *   happens after the widget destruction because it may still be used at that point.
- * - Note the component's manager only benefit in this context is that at gnucash shutdown
+ *   in csv_tximp_close_handler. Aside from some component management administration
+ *   the essential action of this function is to (c++) "delete"
+ *   the class object again. As the C++ class implements RAII this destruction will take care
+ *   of freeing all the member objects it manages.
+ * - Note the component manager's only benefit in this context is that at gnucash shutdown
  *   all still open dialogs can be closed cleanly. Whether this benefit is enough to
  *   justify the added complexity is debatable. However currently the calling code is not
- *   c++ yet, so an RAII based alternative using unique_ptr is currently not possible yet.
+ *   c++ yet so we can't use RAII in the calling object to better handle this right now.
  *
- * - Next the c++ class constructor will create widgets in a gobject way. The main widget
- *   is a GtkDialog. All other widgets are configured as children of this dialog widget, making
- *   the dialog responsible for the lifecycle of the widgets.
- * - When this dialog is closed, the component manager will call our "close"
- *   callback function. As mentioned before this close handler will trigger the dialog
- *   widget's destruction using gtk_widget_destroy (matching its gtk_widget_create called by
- *   gtkbuilder). This will free all memory used by the dialog and its child widgets.
- *   It will also will trigger the c++ based destruction of the c++ assistant object as written above.
+ * - Let's zoom in on the c++ member objects and in particular the GtkAssistant and related objects.
+ *   These are created the gtk way in the c++ class constructor. That means the main GtkAssistant widget
+ *   will be responsible for the lifecycle of its child widgets.
+ * - Thanks to the RAII implementation the destruction of this widget is commanded in the c++ class
+ *   destructor. This gets activated when the user clicks the assistant's close button via the component
+ *   manager callback mechanism as mentioned above.
  *
  * - There is one case that needs some additional attention. At some point the csv importer assistant hands
- *   over control to a generic importer (created via gnc_gen_trans_assist_new). This generic importer does
- *   its own memory management. gnc_gen_trans_assist_new creates the generic importer object via g_new0,
- *   so it should be freed at some point with g_free. This is done in the function gnc_gen_trans_list_delete.
- *   If the generic importer is allowed to take over that function will eventually be called internally,
- *   otherwise our own code will run it in CsvImpTransAssist::assist_finish.
+ *   over control to a generic import matcher (created via gnc_gen_trans_assist_new). This generic import
+ *   matcher unfortunately destroys itself when run. However it is not run in all our possible user scenarios.
+ *   This means we sometimes have to free it and sometimes we don't. This could have been
+ *   avoided if we didn't have to track the object across several gtk callback functions and
+ *   instead just create it only right before using it. To handle this we start with RAII:
+ *   the c++ class object assumes ownership of the generic import matcher object and the class destructor will
+ *   attempt to free it. This is safe both if the object is effectively allocated or when it's nullified.
+ *   Then to handle the case were the generic import matcher will free the matcher object, the c++ class object
+ *   will release ownership of the generic pointer object right before starting the generic import matcher.
+ *
  *   TODO this is pretty confusing and should be cleaned up when we rewrite the generic importer.
  */
 
@@ -125,7 +140,7 @@ class  CsvImpTransAssist
 {
 public:
     CsvImpTransAssist ();
-    ~CsvImpTransAssist () = default;
+    ~CsvImpTransAssist ();
 
     /* Delete copy and move constructor/assignments
      * We don't want gui elements to be moved around or copied at all */
@@ -141,7 +156,7 @@ public:
     void assist_doc_page_prepare ();
     void assist_match_page_prepare ();
     void assist_summary_page_prepare ();
-    void assist_finish (bool canceled);
+    void assist_finish ();
     void assist_compmgr_close ();
 
     void file_confirm_cb ();
@@ -252,8 +267,6 @@ private:
 extern "C"
 {
 void csv_tximp_assist_prepare_cb (GtkAssistant  *assistant, GtkWidget *page, CsvImpTransAssist* info);
-void csv_tximp_assist_destroy_cb (GtkWidget *object, CsvImpTransAssist* info);
-void csv_tximp_assist_cancel_cb (GtkAssistant *gtkassistant, CsvImpTransAssist* info);
 void csv_tximp_assist_close_cb (GtkAssistant *gtkassistant, CsvImpTransAssist* info);
 void csv_tximp_assist_finish_cb (GtkAssistant *gtkassistant, CsvImpTransAssist* info);
 void csv_tximp_file_confirm_cb (GtkWidget *button, CsvImpTransAssist *info);
@@ -285,20 +298,6 @@ csv_tximp_assist_prepare_cb (GtkAssistant *assistant, GtkWidget *page,
 }
 
 void
-csv_tximp_assist_destroy_cb (GtkWidget *object, CsvImpTransAssist* info)
-{
-    gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS, info);
-    delete info;
-}
-
-void
-csv_tximp_assist_cancel_cb (GtkAssistant *assistant, CsvImpTransAssist* info)
-{
-    info->assist_finish (true);
-    gnc_close_gui_component_by_data (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS, info);
-}
-
-void
 csv_tximp_assist_close_cb (GtkAssistant *assistant, CsvImpTransAssist* info)
 {
     gnc_close_gui_component_by_data (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS, info);
@@ -307,7 +306,7 @@ csv_tximp_assist_close_cb (GtkAssistant *assistant, CsvImpTransAssist* info)
 void
 csv_tximp_assist_finish_cb (GtkAssistant *assistant, CsvImpTransAssist* info)
 {
-    info->assist_finish (false);
+    info->assist_finish ();
 }
 
 
@@ -661,6 +660,21 @@ CsvImpTransAssist::CsvImpTransAssist ()
     new_book = gnc_is_new_book();
 }
 
+
+/*******************************************************
+ * Assistant Destructor
+ *******************************************************/
+CsvImpTransAssist::~CsvImpTransAssist ()
+{
+    /* This function is safe to call on a null pointer */
+    gnc_gen_trans_list_delete (gnc_csv_importer_gui);
+    /* The call above frees gnc_csv_importer_gui but can't nullify it.
+     * Do it here so noone accidentally can access it still */
+    gnc_csv_importer_gui = nullptr;
+    gtk_widget_destroy (GTK_WIDGET(csv_imp_asst));
+}
+
+
 /**************************************************
  * Code related to the file chooser page
  **************************************************/
@@ -1940,7 +1954,7 @@ CsvImpTransAssist::assist_doc_page_prepare ()
     cancel_button = gtk_button_new_with_mnemonic (_("_Cancel"));
     gtk_assistant_add_action_widget (csv_imp_asst, cancel_button);
     g_signal_connect (cancel_button, "clicked",
-                     G_CALLBACK(csv_tximp_assist_cancel_cb), this);
+                     G_CALLBACK(csv_tximp_assist_close_cb), this);
     gtk_widget_show (GTK_WIDGET(cancel_button));
 }
 
@@ -2031,18 +2045,21 @@ CsvImpTransAssist::assist_prepare_cb (GtkWidget *page)
 
 
 void
-CsvImpTransAssist::assist_finish (bool canceled)
+CsvImpTransAssist::assist_finish ()
 {
     /* Start the import */
-    if (canceled || tx_imp->m_transactions.empty())
+    if (!tx_imp->m_transactions.empty())
     {
-        gnc_gen_trans_list_delete (gnc_csv_importer_gui);
-        /* The call above frees gnc_csv_importer_gui. NULL it here
-         * so noone accidentally can use access it still */
-        gnc_csv_importer_gui = NULL;
+        /* The call to gnc_gen_trans_assist_start below will free the
+         * object passed into it. To avoid our c++ destructor from
+         * attempting a second free on that object, we'll release
+         * our own reference to it here  before passing it to
+         * gnc_gen_trans_assist_start.
+         */
+        auto local_csv_imp_gui = gnc_csv_importer_gui;
+        gnc_csv_importer_gui = nullptr;
+        gnc_gen_trans_assist_start (local_csv_imp_gui);
     }
-    else
-        gnc_gen_trans_assist_start (gnc_csv_importer_gui);
 }
 
 
@@ -2050,7 +2067,6 @@ void
 CsvImpTransAssist::assist_compmgr_close ()
 {
     gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(csv_imp_asst));
-    gtk_widget_destroy (GTK_WIDGET(csv_imp_asst));
 }
 
 
@@ -2058,7 +2074,9 @@ static void
 csv_tximp_close_handler (gpointer user_data)
 {
     auto info = (CsvImpTransAssist*)user_data;
+    gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS, info);
     info->assist_compmgr_close();
+    delete info;
 }
 
 /********************************************************************\

commit 1449d4ca688bd41691d7854eae40574eef230b5e
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 8 10:46:07 2018 +0100

    Add some background info on memory management in CSV importers
    
    As the assistant code combines multiple memory management models care should be taken
    not to mix them up. The notes should give some insights in how to do this.
    
    Also fix a few minor issues
    - delete default copy and move constructor/assignment for the assistant gui class
    - nullify a freed pointer

diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
index cccbd24..6cf25bb 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -64,10 +64,26 @@ extern "C"
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_ASSISTANT;
 
+/* Note on memory management
+ *
+ * The same notes as for assistant-csv-trans-import.cpp appy to
+ * this assistant as well. Please read the note at the top of that
+ * file to understand important details about the use of several
+ * memory management models in one file.
+ */
+
 class  CsvImpPriceAssist
 {
 public:
     CsvImpPriceAssist ();
+    ~CsvImpPriceAssist () = default;
+
+    /* Delete copy and move constructor/assignments
+     * We don't want gui elements to be moved around or copied at all */
+    CsvImpPriceAssist(const CsvImpPriceAssist&) = delete;            // copy constructor
+    CsvImpPriceAssist& operator=(const CsvImpPriceAssist&) = delete; // copy assignment
+    CsvImpPriceAssist(CsvImpPriceAssist&&) = delete;                 // move constructor
+    CsvImpPriceAssist& operator=(CsvImpPriceAssist&&) = delete;      // move assignment
 
     void assist_prepare_cb (GtkWidget *page);
     void assist_file_page_prepare ();
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 8b7c550..ecc11e4 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -75,10 +75,64 @@ namespace bl = boost::locale;
 /* This static indicates the debugging module that this .o belongs to.  */
 static QofLogModule log_module = GNC_MOD_ASSISTANT;
 
+
+/* A note on memory management
+ *
+ * This source file is mixture of several completely different memory models
+ * - it defines a c++ class, which is managed the c++ way
+ * - the c++ class encapsulates a gtk based dialog, which is managed in
+ *   a GObject memory management way.
+ * - gnucash manages gui objects via its "Component Manager". Dialogs/windows are
+ *   registered with this component manager when they are opened and the component
+ *   manager handles the dialog's and window's lifecycle. When the dialog is closed
+ *   the component manager invokes a close handler which is responsible for cleaning up.
+ *
+ * Care must be taken in places where these objects intersect. Here is how it is
+ * handled for this source file:
+ * - There is only one entry point to start this assistant: gnc_file_csv_trans_import
+ * - This function will create the C++ class using the c++ "new" method and will register the
+ *   created class pointer in the component manager. This works because the component
+ *   manager just stores the pointer, it doesn't act on it directly in any way.
+ * - When the assistant finishes or is closed, the component manager will invoke a
+ *   close handler on the class pointer. We supply this close handler ourselves
+ *   in csv_tximp_close_handler. That function will initiate the gtk dialog (more on that below)
+ *   destruction, which in turn will trigger a c++ "delete" on the c++ class. It only
+ *   happens after the widget destruction because it may still be used at that point.
+ * - Note the component's manager only benefit in this context is that at gnucash shutdown
+ *   all still open dialogs can be closed cleanly. Whether this benefit is enough to
+ *   justify the added complexity is debatable. However currently the calling code is not
+ *   c++ yet, so an RAII based alternative using unique_ptr is currently not possible yet.
+ *
+ * - Next the c++ class constructor will create widgets in a gobject way. The main widget
+ *   is a GtkDialog. All other widgets are configured as children of this dialog widget, making
+ *   the dialog responsible for the lifecycle of the widgets.
+ * - When this dialog is closed, the component manager will call our "close"
+ *   callback function. As mentioned before this close handler will trigger the dialog
+ *   widget's destruction using gtk_widget_destroy (matching its gtk_widget_create called by
+ *   gtkbuilder). This will free all memory used by the dialog and its child widgets.
+ *   It will also will trigger the c++ based destruction of the c++ assistant object as written above.
+ *
+ * - There is one case that needs some additional attention. At some point the csv importer assistant hands
+ *   over control to a generic importer (created via gnc_gen_trans_assist_new). This generic importer does
+ *   its own memory management. gnc_gen_trans_assist_new creates the generic importer object via g_new0,
+ *   so it should be freed at some point with g_free. This is done in the function gnc_gen_trans_list_delete.
+ *   If the generic importer is allowed to take over that function will eventually be called internally,
+ *   otherwise our own code will run it in CsvImpTransAssist::assist_finish.
+ *   TODO this is pretty confusing and should be cleaned up when we rewrite the generic importer.
+ */
+
 class  CsvImpTransAssist
 {
 public:
     CsvImpTransAssist ();
+    ~CsvImpTransAssist () = default;
+
+    /* Delete copy and move constructor/assignments
+     * We don't want gui elements to be moved around or copied at all */
+    CsvImpTransAssist(const CsvImpTransAssist&) = delete;            // copy constructor
+    CsvImpTransAssist& operator=(const CsvImpTransAssist&) = delete; // copy assignment
+    CsvImpTransAssist(CsvImpTransAssist&&) = delete;                 // move constructor
+    CsvImpTransAssist& operator=(CsvImpTransAssist&&) = delete;      // move assignment
 
     void assist_prepare_cb (GtkWidget *page);
     void assist_file_page_prepare ();
@@ -584,7 +638,10 @@ CsvImpTransAssist::CsvImpTransAssist ()
     match_page  = GTK_WIDGET(gtk_builder_get_object (builder, "match_page"));
     match_label = GTK_WIDGET(gtk_builder_get_object (builder, "match_label"));
 
-    /* Create the generic transaction importer GUI. */
+    /* Create the generic transaction importer GUI.
+       Note, this will call g_new0 internally. The returned object is g_freed again
+       either directly by the main matcher or in our assistant_finish code of the matcher
+       is never reached. */
     gnc_csv_importer_gui = gnc_gen_trans_assist_new (match_page, nullptr, false, 42);
 
     /* Summary Page */
@@ -1978,7 +2035,12 @@ CsvImpTransAssist::assist_finish (bool canceled)
 {
     /* Start the import */
     if (canceled || tx_imp->m_transactions.empty())
+    {
         gnc_gen_trans_list_delete (gnc_csv_importer_gui);
+        /* The call above frees gnc_csv_importer_gui. NULL it here
+         * so noone accidentally can use access it still */
+        gnc_csv_importer_gui = NULL;
+    }
     else
         gnc_gen_trans_assist_start (gnc_csv_importer_gui);
 }

commit 612cb5c69f1b50913d92504cbd1dd35ae55c5bf2
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 8 04:20:36 2018 +0000

    Fix transient parent warnings for various import dialogs

diff --git a/gnucash/gtkbuilder/dialog-bi-import-gui.glade b/gnucash/gtkbuilder/dialog-bi-import-gui.glade
index 66a7ffd..7cab394 100644
--- a/gnucash/gtkbuilder/dialog-bi-import-gui.glade
+++ b/gnucash/gtkbuilder/dialog-bi-import-gui.glade
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="bi_import_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Import transactions from text file</property>
     <property name="type_hint">dialog</property>
diff --git a/gnucash/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
index cef519f..8d675b5 100644
--- a/gnucash/gtkbuilder/dialog-customer-import-gui.glade
+++ b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
@@ -5,7 +5,6 @@
   <object class="GtkDialog" id="customer_import_dialog">
     <property name="width_request">500</property>
     <property name="height_request">500</property>
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of dialog">Import customers or vendors from text file</property>
     <property name="type_hint">dialog</property>
diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index d12dc36..9ffe7f6 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -8,7 +8,6 @@
     <property name="icon_name">gnc-account-new</property>
   </object>
   <object class="GtkDialog" id="account_picker_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Select Account</property>
     <property name="default_width">800</property>
@@ -721,7 +720,6 @@
     <property name="text" translatable="yes">Double click on the transaction to change the matching transaction to reconcile, or the destination account of the auto-balance split (if required).</property>
   </object>
   <object class="GtkDialog" id="matcher_help_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Transaction List Help</property>
diff --git a/gnucash/import-export/bi-import/dialog-bi-import-gui.c b/gnucash/import-export/bi-import/dialog-bi-import-gui.c
index c7f302e..d57a8e7 100644
--- a/gnucash/import-export/bi-import/dialog-bi-import-gui.c
+++ b/gnucash/import-export/bi-import/dialog-bi-import-gui.c
@@ -120,6 +120,8 @@ gnc_plugin_bi_import_showGUI (GtkWindow *parent)
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(gui->dialog), "GncBillImportDialog");
 
+    gtk_window_set_transient_for (GTK_WINDOW (gui->dialog), parent);
+
     gui->book = gnc_get_current_book();
 
     gui->regexp = g_string_new ( "^(?<id>[^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billing_id>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)$");
diff --git a/gnucash/import-export/customer-import/dialog-customer-import-gui.c b/gnucash/import-export/customer-import/dialog-customer-import-gui.c
index a416086..5293721 100644
--- a/gnucash/import-export/customer-import/dialog-customer-import-gui.c
+++ b/gnucash/import-export/customer-import/dialog-customer-import-gui.c
@@ -74,7 +74,7 @@ static void gnc_info2_dialog (GtkWidget *parent, const gchar *title, const gchar
 
 
 CustomerImportGui *
-gnc_plugin_customer_import_showGUI(void)
+gnc_plugin_customer_import_showGUI(GtkWindow *parent)
 {
     CustomerImportGui *gui;
     //gktbuilderXML *xml;
@@ -107,6 +107,8 @@ gnc_plugin_customer_import_showGUI(void)
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(gui->dialog), "GncCustomerImportDialog");
 
+    gtk_window_set_transient_for (GTK_WINDOW (gui->dialog), parent);
+
     gui->regexp = g_string_new ( "^(?<id>[^;]+);(?<company>[^;]*);(?<name>[^;]+);(?<addr1>[^;]+);?(?<addr2>[^;]*);?(?<addr3>[^;]*);?(?<addr4>[^;]*);?(?<phone>[^;]*);?(?<fax>[^;]*);?(?<email>[^;]*);?(?<shipname>[^;]*);?(?<shipaddr1>[^;]*);?(?<shipaddr2>[^;]*);?(?<shipaddr3>[^;]*);?(?<shipaddr4>[^;]*);?(?<shipphone>[^;]*);?(?<shipfax>[^;]*);?(?<shipemail>[^;]*)");
     gui->book = gnc_get_current_book();
 
diff --git a/gnucash/import-export/customer-import/dialog-customer-import-gui.h b/gnucash/import-export/customer-import/dialog-customer-import-gui.h
index 757f12d..346d818 100644
--- a/gnucash/import-export/customer-import/dialog-customer-import-gui.h
+++ b/gnucash/import-export/customer-import/dialog-customer-import-gui.h
@@ -39,7 +39,7 @@ typedef struct _customer_import_gui CustomerImportGui;
 /**
  * File chooser
  */
-CustomerImportGui *gnc_plugin_customer_import_showGUI(void);
+CustomerImportGui *gnc_plugin_customer_import_showGUI (GtkWindow *parent);
 
 G_END_DECLS
 
diff --git a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
index 1099490..0586a74 100644
--- a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
+++ b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c
@@ -110,7 +110,7 @@ gnc_plugin_customer_import_cmd_test (GtkAction *action, GncMainWindowActionData
     ENTER ("action %p, main window data %p", action, data);
     g_message ("customer_import");
 
-    gnc_plugin_customer_import_showGUI();
+    gnc_plugin_customer_import_showGUI (GTK_WINDOW(data->window));
 
     LEAVE (" ");
 }
diff --git a/gnucash/import-export/import-account-matcher.c b/gnucash/import-export/import-account-matcher.c
index 5373ef8..36fb7c6 100644
--- a/gnucash/import-export/import-account-matcher.c
+++ b/gnucash/import-export/import-account-matcher.c
@@ -143,7 +143,12 @@ gnc_import_add_account(GtkWidget *button, AccountPickerDialog *picker)
 {
     Account *selected_account, *new_account;
     GList * valid_types = NULL;
-    GtkWindow *parent = GTK_WINDOW (gtk_widget_get_toplevel (button));
+    GtkWindow *parent = NULL;
+
+    if (picker->dialog != NULL)
+        parent = GTK_WINDOW (picker->dialog);
+    else
+        parent = GTK_WINDOW (picker->assistant);
 
     /*DEBUG("Begin");  */
     if (picker->new_account_default_type != ACCT_TYPE_NONE)
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index ae55178..627d218 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -567,9 +567,8 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
     g_assert (heading_label != NULL);
 
-    /* if (parent)
-      gtk_window_set_transient_for (GTK_WINDOW (info->dialog),
-                  GTK_WINDOW (parent));*/
+    if (parent)
+        gtk_window_set_transient_for (GTK_WINDOW (info->dialog), GTK_WINDOW (parent));
 
     if (heading)
         gtk_label_set_text (GTK_LABEL (heading_label), heading);
diff --git a/gnucash/import-export/ofx/gnc-ofx-import.c b/gnucash/import-export/ofx/gnc-ofx-import.c
index 5a37e15..47d822c 100644
--- a/gnucash/import-export/ofx/gnc-ofx-import.c
+++ b/gnucash/import-export/ofx/gnc-ofx-import.c
@@ -586,7 +586,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
                 investment_account_onlineid = g_strdup_printf( "%s%s",
 							       data.account_id,
 							       data.unique_id);
-                investment_account = gnc_import_select_account(NULL,
+                investment_account = gnc_import_select_account(
+                                     gnc_gen_trans_list_widget(gnc_ofx_importer_gui),
                                      investment_account_onlineid,
                                      1,
                                      investment_account_text,
@@ -934,7 +935,8 @@ int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data)
                                   "%s \"%s\"",
                                   account_type_name,
                                   data.account_name);
-        gnc_import_select_account(NULL, data.account_id, 1,
+        gnc_import_select_account(gnc_gen_trans_list_widget(gnc_ofx_importer_gui),
+                                  data.account_id, 1,
                                   account_description, default_commodity,
                                   default_type, NULL, NULL);
         g_free(account_description);
@@ -1013,7 +1015,7 @@ void gnc_file_ofx_import (GtkWindow *parent)
         DEBUG("Filename found: %s", selected_filename);
 
         /* Create the Generic transaction importer GUI. */
-        gnc_ofx_importer_gui = gnc_gen_trans_list_new(NULL, NULL, FALSE, 42);
+        gnc_ofx_importer_gui = gnc_gen_trans_list_new (GTK_WIDGET(parent), NULL, FALSE, 42);
 
         /* Look up the needed preferences */
         auto_create_commodity =

commit 59ae8571429e0a65ddfb2f92126ea2efb94055eb
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 8 04:19:16 2018 +0000

    Fix transient parent warnings for report dialogs

diff --git a/gnucash/gtkbuilder/dialog-custom-report.glade b/gnucash/gtkbuilder/dialog-custom-report.glade
index 3fd47b3..c7b0411 100644
--- a/gnucash/gtkbuilder/dialog-custom-report.glade
+++ b/gnucash/gtkbuilder/dialog-custom-report.glade
@@ -6,6 +6,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Saved Report Configurations</property>
+    <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
diff --git a/gnucash/gtkbuilder/dialog-report.glade b/gnucash/gtkbuilder/dialog-report.glade
index 222bafb..4479db0 100644
--- a/gnucash/gtkbuilder/dialog-report.glade
+++ b/gnucash/gtkbuilder/dialog-report.glade
@@ -424,7 +424,6 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="edit_report_size">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Report Size</property>
     <property name="resizable">False</property>
@@ -576,7 +575,6 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="select_style_sheet_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Select HTML Style Sheet</property>
     <property name="default_width">300</property>
@@ -705,7 +703,6 @@
     </data>
   </object>
   <object class="GtkDialog" id="new_style_sheet_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">New Style Sheet</property>
     <property name="modal">True</property>
diff --git a/gnucash/report/report-gnome/dialog-custom-report.c b/gnucash/report/report-gnome/dialog-custom-report.c
index 8f09a2a..980cf01 100644
--- a/gnucash/report/report-gnome/dialog-custom-report.c
+++ b/gnucash/report/report-gnome/dialog-custom-report.c
@@ -503,6 +503,8 @@ static CustomReportDialog *gnc_ui_custom_report_internal(GncMainWindow * window)
     set_reports_view_and_model(crd);
     crd->window = window;
 
+    gtk_window_set_transient_for (GTK_WINDOW (crd->dialog), GTK_WINDOW(window));
+
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(crd->dialog), "GncCustomReportDialog");
 
diff --git a/gnucash/report/report-gnome/dialog-report-column-view.c b/gnucash/report/report-gnome/dialog-report-column-view.c
index 8c508f3..76e0b9d 100644
--- a/gnucash/report/report-gnome/dialog-report-column-view.c
+++ b/gnucash/report/report-gnome/dialog-report-column-view.c
@@ -36,6 +36,7 @@
 #include "guile-mappings.h"
 #include "gnc-guile-utils.h"
 #include "gnc-report.h"
+#include "gnc-ui.h"
 
 enum available_cols
 {
@@ -309,7 +310,7 @@ gnc_column_view_edit_options(SCM options, SCM view)
         gnc_column_view_edit * r = g_new0(gnc_column_view_edit, 1);
         GtkBuilder *builder;
 
-        r->optwin = gnc_options_dialog_new(NULL, NULL);
+        r->optwin = gnc_options_dialog_new (NULL, GTK_WINDOW(gnc_ui_get_main_window (NULL)));
 
         /* Hide the generic dialog page list. */
         gtk_widget_hide(gnc_options_page_list(r->optwin));
@@ -601,6 +602,9 @@ gnc_column_view_edit_size_cb(GtkButton * button, gpointer user_data)
     gnc_builder_add_from_file (builder, "dialog-report.glade", "edit_report_size");
     dlg = GTK_WIDGET(gtk_builder_get_object (builder, "edit_report_size"));
 
+    gtk_window_set_transient_for (GTK_WINDOW(dlg),
+                         GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET(button))));
+
     /* get the spinner widgets */
     rowspin = GTK_WIDGET(gtk_builder_get_object (builder, "row_spin"));
     colspin = GTK_WIDGET(gtk_builder_get_object (builder, "col_spin"));
diff --git a/gnucash/report/report-gnome/dialog-report-style-sheet.c b/gnucash/report/report-gnome/dialog-report-style-sheet.c
index ebd8a1e..148cd7b 100644
--- a/gnucash/report/report-gnome/dialog-report-style-sheet.c
+++ b/gnucash/report/report-gnome/dialog-report-style-sheet.c
@@ -417,7 +417,7 @@ gnc_style_sheet_select_dialog_event_cb (GtkWidget *widget,
 
 
 static StyleSheetDialog *
-gnc_style_sheet_select_dialog_create(void)
+gnc_style_sheet_select_dialog_create(GtkWindow *parent)
 {
     StyleSheetDialog  * ss = g_new0(StyleSheetDialog, 1);
     GtkBuilder        * builder;
@@ -429,6 +429,8 @@ gnc_style_sheet_select_dialog_create(void)
 
     ss->toplevel   = GTK_WIDGET(gtk_builder_get_object (builder, "select_style_sheet_dialog"));
 
+    gtk_window_set_transient_for (GTK_WINDOW (ss->toplevel), GTK_WINDOW(parent));
+
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(ss->toplevel), "GncStyleSheetDialog");
 
@@ -461,7 +463,7 @@ gnc_style_sheet_select_dialog_create(void)
 
 
 void
-gnc_style_sheet_dialog_open(void)
+gnc_style_sheet_dialog_open(GtkWindow *parent)
 {
     if (gnc_style_sheet_dialog)
     {
@@ -470,7 +472,7 @@ gnc_style_sheet_dialog_open(void)
     else
     {
         gnc_style_sheet_dialog =
-            gnc_style_sheet_select_dialog_create();
+            gnc_style_sheet_select_dialog_create(parent);
     }
 }
 
diff --git a/gnucash/report/report-gnome/dialog-report-style-sheet.h b/gnucash/report/report-gnome/dialog-report-style-sheet.h
index 1b41116..42f0c77 100644
--- a/gnucash/report/report-gnome/dialog-report-style-sheet.h
+++ b/gnucash/report/report-gnome/dialog-report-style-sheet.h
@@ -26,6 +26,6 @@
 
 typedef struct _stylesheetdialog StyleSheetDialog;
 
-void gnc_style_sheet_dialog_open(void);
+void gnc_style_sheet_dialog_open(GtkWindow *parent);
 
 #endif
diff --git a/gnucash/report/stylesheets/gnc-plugin-stylesheets.c b/gnucash/report/stylesheets/gnc-plugin-stylesheets.c
index 17061d1..923a0a4 100644
--- a/gnucash/report/stylesheets/gnc-plugin-stylesheets.c
+++ b/gnucash/report/stylesheets/gnc-plugin-stylesheets.c
@@ -147,7 +147,7 @@ static void
 gnc_plugin_stylesheets_cmd_edit_style_sheet (GtkAction *action,
         GncMainWindowActionData *data)
 {
-    gnc_style_sheet_dialog_open();
+    gnc_style_sheet_dialog_open(GTK_WINDOW (data->window));
 }
 
 /************************************************************

commit 6cbf5dbba5778ff0df1417db9accf5c450c03c88
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 8 04:17:00 2018 +0000

    Fix transient parent warnings for various business dialogs

diff --git a/gnucash/gnome-utils/dialog-tax-table.c b/gnucash/gnome-utils/dialog-tax-table.c
index 0274167..dddce0b 100644
--- a/gnucash/gnome-utils/dialog-tax-table.c
+++ b/gnucash/gnome-utils/dialog-tax-table.c
@@ -680,7 +680,7 @@ find_handler (gpointer find_data, gpointer user_data)
 
 /* Create a tax-table window */
 TaxTableWindow *
-gnc_ui_tax_table_window_new (QofBook *book)
+gnc_ui_tax_table_window_new (GtkWindow *parent, QofBook *book)
 {
     TaxTableWindow *ttw;
     GtkBuilder *builder;
@@ -716,6 +716,8 @@ gnc_ui_tax_table_window_new (QofBook *book)
     ttw->names_view = GTK_WIDGET(gtk_builder_get_object (builder, "tax_tables_view"));
     ttw->entries_view = GTK_WIDGET(gtk_builder_get_object (builder, "tax_table_entries"));
 
+    gtk_window_set_transient_for (GTK_WINDOW (ttw->dialog), parent);
+
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(ttw->dialog), "GncTaxTableDialog");
 
@@ -786,13 +788,13 @@ gnc_ui_tax_table_window_destroy (TaxTableWindow *ttw)
 
 /* Create a new tax-table by name */
 GncTaxTable *
-gnc_ui_tax_table_new_from_name (QofBook *book, const char *name)
+gnc_ui_tax_table_new_from_name (GtkWindow *parent, QofBook *book, const char *name)
 {
     TaxTableWindow *ttw;
 
     if (!book) return NULL;
 
-    ttw = gnc_ui_tax_table_window_new (book);
+    ttw = gnc_ui_tax_table_window_new (parent, book);
     if (!ttw) return NULL;
 
     return new_tax_table_dialog (ttw, TRUE, NULL, name);
diff --git a/gnucash/gnome-utils/dialog-tax-table.h b/gnucash/gnome-utils/dialog-tax-table.h
index abbb545..c90a740 100644
--- a/gnucash/gnome-utils/dialog-tax-table.h
+++ b/gnucash/gnome-utils/dialog-tax-table.h
@@ -29,10 +29,10 @@ typedef struct _taxtable_window TaxTableWindow;
 #include "gncTaxTable.h"
 
 /* Create a new tax-table by name */
-GncTaxTable * gnc_ui_tax_table_new_from_name (QofBook *book, const char *name);
+GncTaxTable * gnc_ui_tax_table_new_from_name (GtkWindow *parent, QofBook *book, const char *name);
 
 /* Create a tax-table window */
-TaxTableWindow * gnc_ui_tax_table_window_new (QofBook *book);
+TaxTableWindow * gnc_ui_tax_table_window_new (GtkWindow *parent, QofBook *book);
 
 /* Destroy a tax-table window */
 void gnc_ui_tax_table_window_destroy (TaxTableWindow *ttw);
diff --git a/gnucash/gnome-utils/gnome-utils.i b/gnucash/gnome-utils/gnome-utils.i
index 5246cd8..c5c4fe3 100644
--- a/gnucash/gnome-utils/gnome-utils.i
+++ b/gnucash/gnome-utils/gnome-utils.i
@@ -78,4 +78,4 @@ void gnc_window_show_progress (const char *message, double percentage);
 
 gboolean gnucash_ui_is_running(void);
 
-TaxTableWindow * gnc_ui_tax_table_window_new (QofBook *book);
+TaxTableWindow * gnc_ui_tax_table_window_new (GtkWindow *parent, QofBook *book);
diff --git a/gnucash/gnome/dialog-billterms.c b/gnucash/gnome/dialog-billterms.c
index 0a935d3..38bb656 100644
--- a/gnucash/gnome/dialog-billterms.c
+++ b/gnucash/gnome/dialog-billterms.c
@@ -741,7 +741,7 @@ find_handler (gpointer find_data, gpointer user_data)
 
 /* Create a billterms window */
 BillTermsWindow *
-gnc_ui_billterms_window_new (QofBook *book)
+gnc_ui_billterms_window_new (GtkWindow *parent, QofBook *book)
 {
     BillTermsWindow *btw;
     GtkBuilder *builder;
@@ -783,6 +783,8 @@ gnc_ui_billterms_window_new (QofBook *book)
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(btw->dialog), "GncBillTermsDialog");
 
+    gtk_window_set_transient_for (GTK_WINDOW (btw->dialog), parent);
+
     /* Initialize the view */
     view = GTK_TREE_VIEW(btw->terms_view);
     store = gtk_list_store_new (NUM_BILL_TERM_COLS, G_TYPE_STRING, G_TYPE_POINTER);
@@ -842,13 +844,13 @@ gnc_ui_billterms_window_destroy (BillTermsWindow *btw)
 #if 0
 /* Create a new billterms by name */
 GncBillTerm *
-gnc_ui_billterms_new_from_name (QofBook *book, const char *name)
+gnc_ui_billterms_new_from_name (GtkWindow *parent, QofBook *book, const char *name)
 {
     BillTermsWindow *btw;
 
     if (!book) return NULL;
 
-    btw = gnc_ui_billterms_window_new (book);
+    btw = gnc_ui_billterms_window_new (parent, book);
     if (!btw) return NULL;
 
     return new_billterm_dialog (btw, NULL, name);
diff --git a/gnucash/gnome/dialog-billterms.h b/gnucash/gnome/dialog-billterms.h
index 71dc883..1bbcb7e 100644
--- a/gnucash/gnome/dialog-billterms.h
+++ b/gnucash/gnome/dialog-billterms.h
@@ -29,7 +29,7 @@ typedef struct _billterms_window BillTermsWindow;
 #include "qof.h"
 
 /* Create a billterms window */
-BillTermsWindow * gnc_ui_billterms_window_new (QofBook *book);
+BillTermsWindow * gnc_ui_billterms_window_new (GtkWindow *parent, QofBook *book);
 
 /* Destroy a billterms window */
 void gnc_ui_billterms_window_destroy (BillTermsWindow *ttw);
diff --git a/gnucash/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c
index e1b6d57..5efa09b 100644
--- a/gnucash/gnome/gnc-plugin-business.c
+++ b/gnucash/gnome/gnc-plugin-business.c
@@ -779,7 +779,7 @@ gnc_plugin_business_cmd_tax_tables (GtkAction *action,
     g_return_if_fail (mw != NULL);
     g_return_if_fail (GNC_IS_PLUGIN_BUSINESS (mw->data));
 
-    gnc_ui_tax_table_window_new (gnc_get_current_book());
+    gnc_ui_tax_table_window_new (GTK_WINDOW (mw->window), gnc_get_current_book());
 }
 
 static void
@@ -789,7 +789,7 @@ gnc_plugin_business_cmd_billing_terms (GtkAction *action,
     g_return_if_fail (mw != NULL);
     g_return_if_fail (GNC_IS_PLUGIN_BUSINESS (mw->data));
 
-    gnc_ui_billterms_window_new (gnc_get_current_book());
+    gnc_ui_billterms_window_new (GTK_WINDOW (mw->window), gnc_get_current_book());
 }
 
 
diff --git a/gnucash/gtkbuilder/dialog-billterms.glade b/gnucash/gtkbuilder/dialog-billterms.glade
index b84d653..313262d 100644
--- a/gnucash/gtkbuilder/dialog-billterms.glade
+++ b/gnucash/gtkbuilder/dialog-billterms.glade
@@ -440,7 +440,6 @@
     </child>
   </object>
   <object class="GtkDialog" id="terms_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Terms</property>
     <property name="type_hint">dialog</property>
@@ -798,7 +797,6 @@
     </data>
   </object>
   <object class="GtkDialog" id="edit_term_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
@@ -990,7 +988,6 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="new_term_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
diff --git a/gnucash/gtkbuilder/dialog-tax-table.glade b/gnucash/gtkbuilder/dialog-tax-table.glade
index 077ea18..7c94459 100644
--- a/gnucash/gtkbuilder/dialog-tax-table.glade
+++ b/gnucash/gtkbuilder/dialog-tax-table.glade
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="tax_table_window_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Tax Tables</property>
     <property name="type_hint">normal</property>
diff --git a/gnucash/register/ledger-core/gncEntryLedgerControl.c b/gnucash/register/ledger-core/gncEntryLedgerControl.c
index c95f05a..b36e44d 100644
--- a/gnucash/register/ledger-core/gncEntryLedgerControl.c
+++ b/gnucash/register/ledger-core/gncEntryLedgerControl.c
@@ -766,7 +766,7 @@ static gboolean gnc_entry_ledger_traverse (VirtualLocation *p_new_virt_loc,
 
         ledger->full_refresh = FALSE;
 
-        table = gnc_ui_tax_table_new_from_name (ledger->book, name);
+        table = gnc_ui_tax_table_new_from_name (GTK_WINDOW (ledger->parent), ledger->book, name);
         if (!table)
             break;
 

commit 95329f23544c3ad6fa95e61ae6f5cb9fcb84e201
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 8 04:14:30 2018 +0000

    Fix transient parent warnings for various dialogs

diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index 9c41dca..ae697c3 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -1291,11 +1291,12 @@ opening_equity_cb (GtkWidget *w, gpointer data)
  * gnc_account_window_create                                        *
  *   creates a window to create a new account.                      *
  *                                                                  *
+ * Args:   parent - the parent window dialog                        *
  * Args:   aw - the information structure for this window           *
  * Return: the created window                                       *
  \*******************************************************************/
 static void
-gnc_account_window_create(AccountWindow *aw)
+gnc_account_window_create(GtkWindow *parent, AccountWindow *aw)
 {
     GtkWidget *amount;
     GtkWidget *date_edit;
@@ -1315,6 +1316,9 @@ gnc_account_window_create(AccountWindow *aw)
     aw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "account_dialog"));
     awo = G_OBJECT (aw->dialog);
 
+    if (parent)
+        gtk_window_set_transient_for (GTK_WINDOW (aw->dialog), parent);
+
     // Set the style context for this dialog so it can be easily manipulated with css
     gnc_widget_set_style_context (GTK_WIDGET(aw->dialog), "GncAccountDialog");
 
@@ -1616,9 +1620,7 @@ gnc_ui_new_account_window_internal (GtkWindow *parent,
         aw->next_name = subaccount_names + 1;
     }
 
-    gnc_account_window_create (aw);
-    gtk_window_set_transient_for (GTK_WINDOW (aw->dialog), parent);
-    
+    gnc_account_window_create (parent, aw);
     gnc_account_to_ui (aw);
 
     gnc_resume_gui_refresh ();
@@ -1854,8 +1856,7 @@ gnc_ui_edit_account_window(GtkWindow *parent, Account *account)
 
     gnc_suspend_gui_refresh ();
 
-    gnc_account_window_create (aw);
-    gtk_window_set_transient_for (GTK_WINDOW (aw->dialog), parent);
+    gnc_account_window_create (parent, aw);
     gnc_account_to_ui (aw);
 
     gnc_resume_gui_refresh ();
diff --git a/gnucash/gnome/dialog-find-transactions.c b/gnucash/gnome/dialog-find-transactions.c
index 48ffa2e..4c25ae7 100644
--- a/gnucash/gnome/dialog-find-transactions.c
+++ b/gnucash/gnome/dialog-find-transactions.c
@@ -90,7 +90,7 @@ free_ftd_cb (gpointer user_data)
 }
 
 GNCSearchWindow *
-gnc_ui_find_transactions_dialog_create(GNCLedgerDisplay * orig_ledg)
+gnc_ui_find_transactions_dialog_create(GtkWindow *parent, GNCLedgerDisplay * orig_ledg)
 {
     QofIdType type = GNC_ID_SPLIT;
     struct _ftd_data *ftd;
@@ -98,7 +98,6 @@ gnc_ui_find_transactions_dialog_create(GNCLedgerDisplay * orig_ledg)
     QofQuery *start_q, *show_q = NULL;
     gboolean num_action =
                 qof_book_use_split_action_for_num_field(gnc_get_current_book());
-    GtkWindow *parent = GTK_WINDOW(gnc_ledger_display_get_parent(orig_ledg));
 
     /* Build parameter list in reverse order */
     if (params == NULL)
diff --git a/gnucash/gnome/dialog-find-transactions.h b/gnucash/gnome/dialog-find-transactions.h
index 81cd3be..d4a150c 100644
--- a/gnucash/gnome/dialog-find-transactions.h
+++ b/gnucash/gnome/dialog-find-transactions.h
@@ -28,6 +28,6 @@
 #include "dialog-search.h"
 
 GNCSearchWindow *
-gnc_ui_find_transactions_dialog_create(GNCLedgerDisplay * ledger);
+gnc_ui_find_transactions_dialog_create (GtkWindow *parent, GNCLedgerDisplay * ledger);
 
 #endif
diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c
index d44cec7..5e50f6b 100644
--- a/gnucash/gnome/gnc-plugin-basic-commands.c
+++ b/gnucash/gnome/gnc-plugin-basic-commands.c
@@ -665,7 +665,7 @@ gnc_main_window_cmd_tools_find_transactions (GtkAction *action, GncMainWindowAct
     gnc_ui_find_transactions_dialog_create2 (NULL);
     /*################## Added for Reg2 #################*/
 #else
-    gnc_ui_find_transactions_dialog_create (NULL);
+    gnc_ui_find_transactions_dialog_create (GTK_WINDOW(data->window), NULL);
 #endif
 }
 
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 57372d4..619d42b 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -2981,12 +2981,14 @@ gnc_plugin_page_register_cmd_find_transactions (GtkAction *action,
         GncPluginPageRegister *page)
 {
     GncPluginPageRegisterPrivate *priv;
+    GtkWindow *window;
 
     g_return_if_fail(GNC_IS_PLUGIN_PAGE_REGISTER(page));
 
     ENTER("(action %p, page %p)", action, page);
     priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE(page);
-    gnc_ui_find_transactions_dialog_create(priv->ledger);
+    window = GTK_WINDOW(gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page)));
+    gnc_ui_find_transactions_dialog_create (window, priv->ledger);
     LEAVE(" ");
 }
 
@@ -3087,6 +3089,8 @@ gnc_plugin_page_register_cmd_void_transaction (GtkAction *action,
     dialog = GTK_WIDGET(gtk_builder_get_object (builder, "void_transaction_dialog"));
     entry = GTK_WIDGET(gtk_builder_get_object (builder, "reason"));
 
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), window);
+
     result = gtk_dialog_run(GTK_DIALOG(dialog));
     if (result == GTK_RESPONSE_OK)
     {
diff --git a/gnucash/gtkbuilder/dialog-reset-warnings.glade b/gnucash/gtkbuilder/dialog-reset-warnings.glade
index e565d08..c6afbae 100644
--- a/gnucash/gtkbuilder/dialog-reset-warnings.glade
+++ b/gnucash/gtkbuilder/dialog-reset-warnings.glade
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="reset_warnings_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Reset Warnings</property>
diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
index d690887..20bf4e0 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-register.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="filter_by_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" comments="Filter register by... Dialog">Filter register by...</property>
@@ -518,7 +517,6 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="sort_by_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" comments="Sort register by Dialog">Sort register by...</property>
@@ -873,7 +871,6 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="duplicate_transaction_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" comments="Duplicate Transaction Dialog">Duplicate Transaction</property>
@@ -1058,7 +1055,6 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="void_transaction_dialog">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Void Transaction</property>

commit 6f587f8c160e8dfbcfd0a54ebc53aaebbd4c7dcd
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Wed Mar 7 20:59:09 2018 +0100

    clean up of account hierarchy templates for "de_DE"

diff --git a/accounts/de_DE/acctchrt_auto.gnucash-xea b/accounts/de_DE/acctchrt_auto.gnucash-xea
index f85ac65..a7d9cb6 100644
--- a/accounts/de_DE/acctchrt_auto.gnucash-xea
+++ b/accounts/de_DE/acctchrt_auto.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Autobesitz
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Ausgaben von Autobesitzern
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Diese Auswahl erstellt Konten, die Ausgaben für ein Auto repräsentieren.
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Autobesitz
+</gnc-act:title>
+<gnc-act:short-description>
+  Ausgaben von Autobesitzern
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Diese Auswahl erstellt Konten, die Ausgaben für ein Auto repräsentieren.
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -166,8 +199,5 @@
   <act:description>KFZ Versicherungen</act:description>
   <act:parent type="new">8fc4ba994d32d90d7a9a9112ee37f3f6</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_autoloan.gnucash-xea b/accounts/de_DE/acctchrt_autoloan.gnucash-xea
index e3e08f9..b6b530e 100644
--- a/accounts/de_DE/acctchrt_autoloan.gnucash-xea
+++ b/accounts/de_DE/acctchrt_autoloan.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Kredit Auto
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Kredit für Autokauf
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Falls Sie einen Kredit zum Autokauf besitzen, können Sie mit dieser Auswahl die passenden Konten bekommen.
-  </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Kredit Auto
+</gnc-act:title>
+<gnc-act:short-description>
+  Kredit für Autokauf
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Falls Sie einen Kredit zum Autokauf besitzen, können Sie mit dieser Auswahl die passenden Konten bekommen.
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -122,8 +155,5 @@
   <act:description>Kreditzinsen für Autokauf</act:description>
   <act:parent type="new">8fc4ba994d32d90d7a9a9112ee37f3f6</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_brokerage.gnucash-xea b/accounts/de_DE/acctchrt_brokerage.gnucash-xea
index 7a06558..e80d217 100644
--- a/accounts/de_DE/acctchrt_brokerage.gnucash-xea
+++ b/accounts/de_DE/acctchrt_brokerage.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Aktienhandel
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Konten zum Handel mit Aktien und Fonds
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Mit dieser Auswahl werden Konten zum Handel mit Aktien und Aktienfonds erstellt.
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Aktienhandel
+</gnc-act:title>
+<gnc-act:short-description>
+  Konten zum Handel mit Aktien und Fonds
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Mit dieser Auswahl werden Konten zum Handel mit Aktien und Aktienfonds erstellt.
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -172,8 +205,5 @@
   <act:description>Komissionen im Aktienhandel</act:description>
   <act:parent type="new">18ca785b6fcd2895427459c233a47c57</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_common.gnucash-xea b/accounts/de_DE/acctchrt_common.gnucash-xea
index f499969..280619e 100644
--- a/accounts/de_DE/acctchrt_common.gnucash-xea
+++ b/accounts/de_DE/acctchrt_common.gnucash-xea
@@ -1,15 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Allgemeine Konten
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Grundlegende Kontenstruktur
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    Die meisten Anwender benötigen diese grundlegende Kontenstruktur. Sie finden hier die allgemein üblichen Konten wie Giro-, Sparkonto, Bargeld, Kreditkarte, Erträge und verschiedene Ausgaben. Wenn Sie aber einen SKR verwenden wollen, brauchen Sie sie nicht.
-  </gnc-act:long-description>
-  <gnc-act:start-selected>1</gnc-act:start-selected>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Allgemeine Konten
+</gnc-act:title>
+<gnc-act:short-description>
+  Grundlegende Kontenstruktur
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Die meisten Anwender benötigen diese grundlegende Kontenstruktur. Sie finden hier die allgemein üblichen Konten wie Giro-, Sparkonto, Bargeld, Kreditkarte, Erträge und verschiedene Ausgaben. Wenn Sie aber einen SKR verwenden wollen, brauchen Sie sie nicht.
+</gnc-act:long-description>
+<gnc-act:start-selected>1</gnc-act:start-selected>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -811,8 +844,5 @@
   <act:description>Anfangsbestand</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_full.gnucash-xea b/accounts/de_DE/acctchrt_full.gnucash-xea
index 4b6af1c..dde38e3 100644
--- a/accounts/de_DE/acctchrt_full.gnucash-xea
+++ b/accounts/de_DE/acctchrt_full.gnucash-xea
@@ -1,14 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Alle Konten
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Alle vorgeschlagenen Konten
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Dies ist die komplette Liste aller vorgeschlagenen Konten.
-  </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Alle Konten
+</gnc-act:title>
+<gnc-act:short-description>
+  Alle vorgeschlagenen Konten
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Dies ist die komplette Liste aller vorgeschlagenen Konten.
+</gnc-act:long-description>
+<gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -1159,8 +1193,5 @@
   <act:description>Anfangsbestand</act:description>
   <act:parent type="new">320d3cf62b418db6281c3cd8ec2e95c7</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_houseown.gnucash-xea b/accounts/de_DE/acctchrt_houseown.gnucash-xea
index 6b767f4..65ec05b 100644
--- a/accounts/de_DE/acctchrt_houseown.gnucash-xea
+++ b/accounts/de_DE/acctchrt_houseown.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Hausbesitz
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Konten für Hausbesitzer/innen
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Konten für Hausbesitzer/innen
-  </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Hausbesitz
+</gnc-act:title>
+<gnc-act:short-description>
+  Konten für Hausbesitzer/innen
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Konten für Hausbesitzer/innen
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -200,8 +233,5 @@
   <act:description>Reparaturen</act:description>
   <act:parent type="new">b413c76bf6939070b97f7fed1c4fd367</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_investment.gnucash-xea b/accounts/de_DE/acctchrt_investment.gnucash-xea
index aa5bbbc..a0a431f 100644
--- a/accounts/de_DE/acctchrt_investment.gnucash-xea
+++ b/accounts/de_DE/acctchrt_investment.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Geldanlagen
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Konten für Geldanlagen
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Konten für Investitionen in Geldanlagen: Bausparvertrag, Lebensversicherung, Festgeld, Investmentfonds.
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Geldanlagen
+</gnc-act:title>
+<gnc-act:short-description>
+  Konten für Geldanlagen
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Konten für Investitionen in Geldanlagen: Bausparvertrag, Lebensversicherung, Festgeld, Investmentfonds.
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -205,8 +238,5 @@
   <act:description>Lebensversicherung</act:description>
   <act:parent type="new">b0dbf43ea99f54e0a9f94a535b10941b</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_kids.gnucash-xea b/accounts/de_DE/acctchrt_kids.gnucash-xea
index 887521c..6bd2fbe 100644
--- a/accounts/de_DE/acctchrt_kids.gnucash-xea
+++ b/accounts/de_DE/acctchrt_kids.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Kinder
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Konten im Zusammenhang mit Kindern
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Kindergeld, Kindergarten
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Kinder
+</gnc-act:title>
+<gnc-act:short-description>
+  Konten im Zusammenhang mit Kindern
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Kindergeld, Kindergarten
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -88,8 +121,5 @@
   <act:description>Kindergarten</act:description>
   <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_otherasset.gnucash-xea b/accounts/de_DE/acctchrt_otherasset.gnucash-xea
index ec7d35b..76bd8a3 100644
--- a/accounts/de_DE/acctchrt_otherasset.gnucash-xea
+++ b/accounts/de_DE/acctchrt_otherasset.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Sonstige Sachanlage
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Sonstige Sachanlagen
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Sonstige Sachanlagen
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Sonstige Sachanlage
+</gnc-act:title>
+<gnc-act:short-description>
+  Sonstige Sachanlagen
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Sonstige Sachanlagen
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -60,8 +93,5 @@
   <act:description>Sonstige Sachanlagen</act:description>
   <act:parent type="new">f7b3424631deed453984e6f5c5569669</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_otherloan.gnucash-xea b/accounts/de_DE/acctchrt_otherloan.gnucash-xea
index ae5e978..07479a7 100644
--- a/accounts/de_DE/acctchrt_otherloan.gnucash-xea
+++ b/accounts/de_DE/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Sonstiger Kredit
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Sonstige Kredite
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Weitere Kredite
-  </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Sonstiger Kredit
+</gnc-act:title>
+<gnc-act:short-description>
+  Sonstige Kredite
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Weitere Kredite
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -60,8 +93,5 @@
   <act:description>Sonstige Kredite</act:description>
   <act:parent type="new">13df44e66790069c74d563946aa0394e</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_skr03.gnucash-xea b/accounts/de_DE/acctchrt_skr03.gnucash-xea
index 8d141fa..f774dbd 100644
--- a/accounts/de_DE/acctchrt_skr03.gnucash-xea
+++ b/accounts/de_DE/acctchrt_skr03.gnucash-xea
@@ -31,6 +31,7 @@
   xmlns:tte="http://www.gnucash.org/XML/tte"
   xmlns:entry="http://www.gnucash.org/XML/entry"
   xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
   <gnc-act:title>
     Kontenrahmen SKR03
   </gnc-act:title>
@@ -41,6 +42,7 @@
     Beta Version des Kontenrahmes SKR03 zum Erweitern und Umstrukturieren. Der Kontenrahmen sollte den eigenen Bedürfnissen angepasst werden was Struktur und Kontenbezeichnungen angeht. WICHTIG!: Die Privatkonten fließen nicht in die Berechnung des Berichtes Bilanz, sind jedoch im Bericht Bilanz aufgeführt. Die im Bericht Bilanz aufgeführte Passiva "Gewinnrücklagen" gibt den Saldo der GuV aus. Die Anlage dieses Kontenrahmens wurde von der Firma LiHAS - Linuxhaus Stuttgart - unterstützt.
   </gnc-act:long-description>
   <gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
   <gnc:account version="2.0.0">
     <act:name>Root Account</act:name>
     <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -1398,8 +1400,5 @@
     <act:code>1890</act:code>
     <act:parent type="new">b9ae1b059749ea81c757a9adad39db1b</act:parent>
   </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_skr04.gnucash-xea b/accounts/de_DE/acctchrt_skr04.gnucash-xea
index 1030b1b..832a337 100644
--- a/accounts/de_DE/acctchrt_skr04.gnucash-xea
+++ b/accounts/de_DE/acctchrt_skr04.gnucash-xea
@@ -31,6 +31,7 @@
   xmlns:tte="http://www.gnucash.org/XML/tte"
   xmlns:entry="http://www.gnucash.org/XML/entry"
   xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
   <gnc-act:title>
     Kontenrahmen SKR04
   </gnc-act:title>
@@ -41,6 +42,7 @@
     BETA-Version eines Kontenrahmes SKR04 für 2005.  Mehr Informationen unter http://wiki.gnucash.org/wiki/De/SKR04
   </gnc-act:long-description>
   <gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
   <gnc:account version="2.0.0">
     <act:name>Root Account</act:name>
     <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -26072,8 +26074,5 @@
     </act:slots>
     <act:parent type="new">e57d948c9a884e179bd090118b9212f8</act:parent>
   </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_skr49.gnucash-xea b/accounts/de_DE/acctchrt_skr49.gnucash-xea
index 9e20230..33446b2 100644
--- a/accounts/de_DE/acctchrt_skr49.gnucash-xea
+++ b/accounts/de_DE/acctchrt_skr49.gnucash-xea
@@ -31,6 +31,7 @@
   xmlns:ts="http://www.gnucash.org/XML/ts"
   xmlns:tte="http://www.gnucash.org/XML/tte"
   xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
 <gnc-act:title>
   Kontenrahmen SKR49
 </gnc-act:title>
@@ -48,6 +49,7 @@
   Formalia für GnuCash-Vorlagen: Frank H. Ellenberger 2009
 </gnc-act:long-description>
 <gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">e24772da4864456b196be5a6301c6756</act:id>
@@ -16893,8 +16895,5 @@
   <act:description>Umgebuchte Ausgaben bisheriger Zweckbetriebe </act:description>
   <act:parent type="new">8268da381a30e25c7c483162066858d4</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_studium.gnucash-xea b/accounts/de_DE/acctchrt_studium.gnucash-xea
index 514fc5f..b43d07b 100644
--- a/accounts/de_DE/acctchrt_studium.gnucash-xea
+++ b/accounts/de_DE/acctchrt_studium.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Studium
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Konten für Studentinnen und Studenten
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      BAFöG, Studiengebühren
-  </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Studium
+</gnc-act:title>
+<gnc-act:short-description>
+  Konten für Studentinnen und Studenten
+</gnc-act:short-description>
+<gnc-act:long-description>
+  BAFöG, Studiengebühren
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -133,8 +166,5 @@
   <act:description>Studiengebühren</act:description>
   <act:parent type="new">5416a78a11e81e963990cd6a398e5022</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea b/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
index feb7cf1..2c946d8 100644
--- a/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
+++ b/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea
@@ -31,6 +31,7 @@
   xmlns:tte="http://www.gnucash.org/XML/tte"
   xmlns:entry="http://www.gnucash.org/XML/entry"
   xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
   <gnc-act:title>
     Kontenrahmen für Wohnungswirtschaft
   </gnc-act:title>
@@ -41,12 +42,13 @@
     BETA-Version eines allgemeinen Kontenrahmes für Wohnungswirtschaft, bearbeitet von Christoph Franzen. Fehlermeldungen an ChristophFranzen at gmx.net .
   </gnc-act:long-description>
   <gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
-  <gnc:account version="2.0.0">
-    <act:name>Root Account</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>Root Account</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>0 Anlagevermögen</act:name>
   <act:id type="new">5dfd1f9eb05cbb673ebfe7cb3a9fdda9</act:id>
@@ -9612,8 +9614,5 @@
   </act:slots>
   <act:parent type="new">6d7edd606e6f0aa8e56c5694161e64c7</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>

commit edd89aafd030503589037e4dae20419bcfc8a90b
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Wed Mar 7 20:54:18 2018 +0100

    clean up of account hierarchy templates for "C"

diff --git a/accounts/C/acctchrt_brokerage.gnucash-xea b/accounts/C/acctchrt_brokerage.gnucash-xea
index c71e0eb..106931a 100644
--- a/accounts/C/acctchrt_brokerage.gnucash-xea
+++ b/accounts/C/acctchrt_brokerage.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-     Investment Accounts
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Brokerage account with related investment accounts (stock, bond, mutual fund, index fund, interest, dividend)
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have investments (stock, bond, mutual fund, index fund, interest, dividend).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Investment Accounts
+</gnc-act:title>
+<gnc-act:short-description>
+  Brokerage account with related investment accounts (stock, bond, mutual fund, index fund, interest, dividend)
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have investments (stock, bond, mutual fund, index fund, interest, dividend).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -182,8 +215,5 @@
   <act:description>Commissions</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_business.gnucash-xea b/accounts/C/acctchrt_business.gnucash-xea
index 0d96eec..630f98d 100644
--- a/accounts/C/acctchrt_business.gnucash-xea
+++ b/accounts/C/acctchrt_business.gnucash-xea
@@ -1,15 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Business Accounts
-    </gnc-act:title>
-    <gnc-act:short-description>
-     Full chart of accounts for a business.
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-     Users running a business want to select this instead of other choices.  This includes all the accounts you need to run most businesses, including Payables, Receivables, Income, and Expenses.
-    </gnc-act:long-description>
-    <gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Business Accounts
+</gnc-act:title>
+<gnc-act:short-description>
+  Full chart of accounts for a business.
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Users running a business want to select this instead of other choices.  This includes all the accounts you need to run most businesses, including Payables, Receivables, Income, and Expenses.
+</gnc-act:long-description>
+<gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -1406,8 +1439,5 @@
   </act:slots>
   <act:parent type="new">87e02e757b32b3059652cfe09fe9ae00</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_carloan.gnucash-xea b/accounts/C/acctchrt_carloan.gnucash-xea
index 0dde038..1ae1c88 100644
--- a/accounts/C/acctchrt_carloan.gnucash-xea
+++ b/accounts/C/acctchrt_carloan.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Car Loan 
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Accounts for car loan and associated interest
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have a car loan (car loan, car loan interest).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Car Loan
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for car loan and associated interest
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have a car loan (car loan, car loan interest).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -99,9 +132,5 @@
   <act:description>Vehicle Loan Interest</act:description>
   <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_cdmoneymkt.gnucash-xea b/accounts/C/acctchrt_cdmoneymkt.gnucash-xea
index 44fa23c..5695319 100644
--- a/accounts/C/acctchrt_cdmoneymkt.gnucash-xea
+++ b/accounts/C/acctchrt_cdmoneymkt.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      CD and Money Market
-    </gnc-act:title>
-    <gnc-act:short-description>
-     Accounts for CD and money market investments
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have CDs or money market accounts (CD, CD interest, money market, money market interest).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  CD and Money Market
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for CD and money market investments
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have CDs or money market accounts (CD, CD interest, money market, money market interest).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -121,8 +154,5 @@
   <act:description>Money Market Interest</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_checkbook.gnucash-xea b/accounts/C/acctchrt_checkbook.gnucash-xea
index 5a417d8..91167f3 100644
--- a/accounts/C/acctchrt_checkbook.gnucash-xea
+++ b/accounts/C/acctchrt_checkbook.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      A Simple Checkbook
-    </gnc-act:title>
-    <gnc-act:short-description>
-     The minimal set of accounts to use GnuCash.
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-     Use this if you just want to balance your checkbook.  Later on, you can start tracking income and expenses in more detail if you feel the need.
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  A Simple Checkbook
+</gnc-act:title>
+<gnc-act:short-description>
+  The minimal set of accounts to use GnuCash.
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Use this if you just want to balance your checkbook.  Later on, you can start tracking income and expenses in more detail if you feel the need.
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -117,9 +150,5 @@
   <act:description>Opening Balances</act:description>
   <act:parent type="new">b8b72887da1adf889f171923d23efbdd</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_childcare.gnucash-xea b/accounts/C/acctchrt_childcare.gnucash-xea
index ad1871a..bd337a0 100644
--- a/accounts/C/acctchrt_childcare.gnucash-xea
+++ b/accounts/C/acctchrt_childcare.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Childcare Expenses
-    </gnc-act:title>
-    <gnc-act:short-description>
-      An account for tracking childcare costs
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have childcare expenses.
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Childcare Expenses
+</gnc-act:title>
+<gnc-act:short-description>
+  An account for tracking childcare costs
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have childcare expenses.
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -43,8 +76,5 @@
   <act:description>Childcare</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_common.gnucash-xea b/accounts/C/acctchrt_common.gnucash-xea
index 215ba66..835e653 100644
--- a/accounts/C/acctchrt_common.gnucash-xea
+++ b/accounts/C/acctchrt_common.gnucash-xea
@@ -1,15 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Common Accounts
-    </gnc-act:title>
-    <gnc-act:short-description>
-      A basic set of accounts most commonly used
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    Most users will want to select this set of accounts.  It includes most commonly used accounts (checking, savings, cash, credit card, income, common expenses).
-  </gnc-act:long-description>    
-  <gnc-act:start-selected>1</gnc-act:start-selected>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Common Accounts
+</gnc-act:title>
+<gnc-act:short-description>
+  A basic set of accounts most commonly used
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Most users will want to select this set of accounts.  It includes most commonly used accounts (checking, savings, cash, credit card, income, common expenses).
+</gnc-act:long-description>
+<gnc-act:start-selected>1</gnc-act:start-selected>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -745,8 +778,5 @@
   <act:description>Opening Balances</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_eduloan.gnucash-xea b/accounts/C/acctchrt_eduloan.gnucash-xea
index 7f43fd5..b38f681 100644
--- a/accounts/C/acctchrt_eduloan.gnucash-xea
+++ b/accounts/C/acctchrt_eduloan.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Education Loan 
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Accounts for school loan and associated interest
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have an educational loan (education loan, education loan interest).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Education Loan
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for school loan and associated interest
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have an educational loan (education loan, education loan interest).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -99,8 +132,5 @@
   <act:description>Education Loan Interest</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_fixedassets.gnucash-xea b/accounts/C/acctchrt_fixedassets.gnucash-xea
index c2e4c39..6cd5677 100644
--- a/accounts/C/acctchrt_fixedassets.gnucash-xea
+++ b/accounts/C/acctchrt_fixedassets.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Fixed Assets
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Accounts for tracking large fixed assets
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have large fixed assets (house, vehicle, vacation home, other assets).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Fixed Assets
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for tracking large fixed assets
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have large fixed assets (house, vehicle, vacation home, other assets).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -82,8 +115,5 @@
   <act:description>Vehicle</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_full.gnucash-xea b/accounts/C/acctchrt_full.gnucash-xea
index 394b574..0bacd85 100644
--- a/accounts/C/acctchrt_full.gnucash-xea
+++ b/accounts/C/acctchrt_full.gnucash-xea
@@ -1,11 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Full Chart        
-    </gnc-act:title>
-    <gnc-act:short-description>
-     Full chart of accounts contains all default accounts.
-    </gnc-act:short-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Full Chart
+</gnc-act:title>
+<gnc-act:short-description>
+  Full chart of accounts contains all default accounts.
+</gnc-act:short-description>
+<gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -1357,8 +1391,5 @@
   <act:description>Opening Balances</act:description>
   <act:parent type="new">68d4074f91295062c0b773b4ae8de6bd</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_homeloan.gnucash-xea b/accounts/C/acctchrt_homeloan.gnucash-xea
index 9e2c954..b8f4ec3 100644
--- a/accounts/C/acctchrt_homeloan.gnucash-xea
+++ b/accounts/C/acctchrt_homeloan.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Home Mortgage Loan
-    </gnc-act:title>
-    <gnc-act:short-description>
-     Accounts for home loan and associated interest 
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have a home loan (mortgage loan, mortgage interest).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Home Mortgage Loan
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for home loan and associated interest
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have a home loan (mortgage loan, mortgage interest).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -99,8 +132,5 @@
   <act:description>Mortgage Interest</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_homeown.gnucash-xea b/accounts/C/acctchrt_homeown.gnucash-xea
index aedc427..219751e 100644
--- a/accounts/C/acctchrt_homeown.gnucash-xea
+++ b/accounts/C/acctchrt_homeown.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Homeowner Expenses
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Expenses associated with owning a home
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you own a home. This set provides a group of accounts to track home expenses (insurance, taxes, home repair).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Homeowner Expenses
+</gnc-act:title>
+<gnc-act:short-description>
+  Expenses associated with owning a home
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you own a home. This set provides a group of accounts to track home expenses (insurance, taxes, home repair).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -87,8 +120,5 @@
   <act:description>Property Tax</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_otherloan.gnucash-xea b/accounts/C/acctchrt_otherloan.gnucash-xea
index 0bd8ac1..b088563 100644
--- a/accounts/C/acctchrt_otherloan.gnucash-xea
+++ b/accounts/C/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Other Loans       
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Accounts for tracking other loans and associated interest
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have something other than a home loan (other loan, other loan interest).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Other Loans
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for tracking other loans and associated interest
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have something other than a home loan (other loan, other loan interest).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -99,8 +132,5 @@
   <act:description>Other Interest</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_renter.gnucash-xea b/accounts/C/acctchrt_renter.gnucash-xea
index e0d3935..c9d1b98 100644
--- a/accounts/C/acctchrt_renter.gnucash-xea
+++ b/accounts/C/acctchrt_renter.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Renter Expenses
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Expenses associated with renting a home
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you rent a home or apartment (rent, renter's insurance).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Renter Expenses
+</gnc-act:title>
+<gnc-act:short-description>
+  Expenses associated with renting a home
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you rent a home or apartment (rent, renter's insurance).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -65,8 +98,5 @@
   <act:description>Rent</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_retiremt.gnucash-xea b/accounts/C/acctchrt_retiremt.gnucash-xea
index 9ccf899..4e51ace 100644
--- a/accounts/C/acctchrt_retiremt.gnucash-xea
+++ b/accounts/C/acctchrt_retiremt.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Retirement Accounts
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Retirement account with related investment subaccounts
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have retirement accounts (stock, bond, mutual fund, index fund).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Retirement Accounts
+</gnc-act:title>
+<gnc-act:short-description>
+  Retirement account with related investment subaccounts
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have retirement accounts (stock, bond, mutual fund, index fund).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -114,8 +147,5 @@
   <act:description>Mutual Fund</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_spouseinc.gnucash-xea b/accounts/C/acctchrt_spouseinc.gnucash-xea
index 1934bda..e41b4cc 100644
--- a/accounts/C/acctchrt_spouseinc.gnucash-xea
+++ b/accounts/C/acctchrt_spouseinc.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Spouse Income
-    </gnc-act:title>
-    <gnc-act:short-description>
-     Accounts for tracking spouse's income separately
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have a working spouse (salary (spouse), taxes (spouse)).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Spouse Income
+</gnc-act:title>
+<gnc-act:short-description>
+  Accounts for tracking spouse's income separately
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have a working spouse (salary (spouse), taxes (spouse)).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -126,8 +159,5 @@
   <act:description>State/Province</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>
diff --git a/accounts/C/acctchrt_spouseretire.gnucash-xea b/accounts/C/acctchrt_spouseretire.gnucash-xea
index 2f953de..8218eb1 100644
--- a/accounts/C/acctchrt_spouseretire.gnucash-xea
+++ b/accounts/C/acctchrt_spouseretire.gnucash-xea
@@ -1,14 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Spouse Retirement Accounts
-    </gnc-act:title>
-    <gnc-act:short-description>
-     Retirement account with related investment accounts for spouse
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-    You would want to select this set of accounts if you have investments in a spouse's name (stock, bond, mutual fund, index fund, interest, dividend).
-  </gnc-act:long-description>    
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Spouse Retirement Accounts
+</gnc-act:title>
+<gnc-act:short-description>
+  Retirement account with related investment accounts for spouse
+</gnc-act:short-description>
+<gnc-act:long-description>
+  You would want to select this set of accounts if you have investments in a spouse's name (stock, bond, mutual fund, index fund, interest, dividend).
+</gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -114,8 +147,5 @@
   <act:description>Mutual Fund</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
-</gnc-account-example>
 
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
+</gnc-account-example>

commit 3fce50a29e77b5f4f962ef8384c5cafe5ed9bedb
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Wed Mar 7 16:47:08 2018 +0000

    Fix Segmentation fault when going to File->New
    
    When selecting the File->New with existing register pages open a crash
    can happen as the register pages get closed forcing a page-changed
    signal to queue the page focus function when there is no page. Add a
    call to remove the page focus function in the ..destroy_widget function.
    
    Also with the addition of g_idle_remove before the add when page-changed
    is emitted the page focus function only gets run once.

diff --git a/gnucash/gnome/gnc-plugin-account-tree.c b/gnucash/gnome/gnc-plugin-account-tree.c
index c9ebc0c..ef7d621 100644
--- a/gnucash/gnome/gnc-plugin-account-tree.c
+++ b/gnucash/gnome/gnc-plugin-account-tree.c
@@ -142,6 +142,7 @@ gnc_plugin_account_tree_main_window_page_changed (GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the tree view
+        g_idle_remove_by_data (GNC_PLUGIN_PAGE_ACCOUNT_TREE (plugin_page));
         g_idle_add ((GSourceFunc)gnc_plugin_page_account_tree_focus,
                       GNC_PLUGIN_PAGE_ACCOUNT_TREE (plugin_page));
     }
diff --git a/gnucash/gnome/gnc-plugin-budget.c b/gnucash/gnome/gnc-plugin-budget.c
index b885fb9..5d7aeb5 100644
--- a/gnucash/gnome/gnc-plugin-budget.c
+++ b/gnucash/gnome/gnc-plugin-budget.c
@@ -143,6 +143,7 @@ gnc_plugin_budget_main_window_page_changed (GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the tree view
+        g_idle_remove_by_data (GNC_PLUGIN_PAGE_BUDGET (plugin_page));
         g_idle_add ((GSourceFunc)gnc_plugin_page_budget_focus,
                       GNC_PLUGIN_PAGE_BUDGET (plugin_page));
     }
diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c
index 4269f51..d4dbd5c 100644
--- a/gnucash/gnome/gnc-plugin-page-account-tree.c
+++ b/gnucash/gnome/gnc-plugin-page-account-tree.c
@@ -776,6 +776,9 @@ gnc_plugin_page_account_tree_destroy_widget (GncPluginPage *plugin_page)
     // Destroy the filter override hash table
     g_hash_table_destroy(priv->fd.filter_override);
 
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (GNC_PLUGIN_PAGE_ACCOUNT_TREE (plugin_page));
+
     if (priv->widget)
     {
         g_object_unref(G_OBJECT(priv->widget));
diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c
index f39f2c4..f17249e 100644
--- a/gnucash/gnome/gnc-plugin-page-budget.c
+++ b/gnucash/gnome/gnc-plugin-page-budget.c
@@ -474,6 +474,9 @@ gnc_plugin_page_budget_destroy_widget (GncPluginPage *plugin_page)
     ENTER("page %p", plugin_page);
     priv = GNC_PLUGIN_PAGE_BUDGET_GET_PRIVATE(plugin_page);
 
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (GNC_PLUGIN_PAGE_BUDGET (plugin_page));
+
     if (priv->budget_view)
     {
         if (priv->delete_budget)
diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c
index f58b700..a4f2f89 100644
--- a/gnucash/gnome/gnc-plugin-page-invoice.c
+++ b/gnucash/gnome/gnc-plugin-page-invoice.c
@@ -452,7 +452,7 @@ gnc_plugin_page_invoice_focus (InvoiceWindow *iw)
 
     if (!GNUCASH_IS_REGISTER(regWidget))
         return FALSE;
-    
+
     sheet = gnucash_register_get_sheet (GNUCASH_REGISTER(regWidget));
 
     // Test for the sheet being read only
@@ -495,6 +495,7 @@ gnc_plugin_page_invoice_main_window_page_changed (GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the sheet
+        g_idle_remove_by_data (priv->iw);
         g_idle_add ((GSourceFunc)gnc_plugin_page_invoice_focus, priv->iw);
     }
 }
@@ -583,6 +584,9 @@ gnc_plugin_page_invoice_destroy_widget (GncPluginPage *plugin_page)
                                  gnc_plugin_page_invoice_summarybar_position_changed,
                                  page);
 
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (priv->iw);
+
     if (priv->widget == NULL)
     {
         LEAVE("");
diff --git a/gnucash/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c
index ae76292..389c779 100644
--- a/gnucash/gnome/gnc-plugin-page-owner-tree.c
+++ b/gnucash/gnome/gnc-plugin-page-owner-tree.c
@@ -425,6 +425,7 @@ gnc_plugin_page_owner_main_window_page_changed (GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the tree view
+        g_idle_remove_by_data (GTK_TREE_VIEW (priv->tree_view));
         g_idle_add ((GSourceFunc)gnc_plugin_page_owner_focus,
                       GTK_TREE_VIEW (priv->tree_view));
     }
@@ -732,6 +733,9 @@ gnc_plugin_page_owner_tree_destroy_widget (GncPluginPage *plugin_page)
     page = GNC_PLUGIN_PAGE_OWNER_TREE (plugin_page);
     priv = GNC_PLUGIN_PAGE_OWNER_TREE_GET_PRIVATE(page);
 
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (GTK_TREE_VIEW (priv->tree_view));
+
     if (priv->widget)
     {
         g_object_unref(G_OBJECT(priv->widget));
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 57372d4..bcf8cb9 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -1262,6 +1262,10 @@ gnc_plugin_page_register_destroy_widget (GncPluginPage *plugin_page)
                                  GNC_PREF_SUMMARYBAR_POSITION_BOTTOM,
                                  gnc_plugin_page_register_summarybar_position_changed,
                                  page);
+
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (GNC_PLUGIN_PAGE_REGISTER (plugin_page));
+
     if (priv->widget == NULL)
         return;
 
diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c
index cc0bf04..06597b3 100644
--- a/gnucash/gnome/gnc-plugin-page-sx-list.c
+++ b/gnucash/gnome/gnc-plugin-page-sx-list.c
@@ -246,6 +246,7 @@ gnc_plugin_page_sx_list_main_window_page_changed (GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the tree view
+        g_idle_remove_by_data (GTK_TREE_VIEW (priv->tree_view));
         g_idle_add ((GSourceFunc)gnc_plugin_page_sx_list_focus,
                       GTK_TREE_VIEW (priv->tree_view));
     }
@@ -543,6 +544,9 @@ gnc_plugin_page_sx_list_destroy_widget (GncPluginPage *plugin_page)
     page = GNC_PLUGIN_PAGE_SX_LIST (plugin_page);
     priv = GNC_PLUGIN_PAGE_SX_LIST_GET_PRIVATE(page);
 
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (GTK_TREE_VIEW (priv->tree_view));
+
     if (priv->widget)
     {
         g_object_unref(G_OBJECT(priv->widget));
diff --git a/gnucash/gnome/gnc-plugin-register.c b/gnucash/gnome/gnc-plugin-register.c
index 19f1ccc..5a97160 100644
--- a/gnucash/gnome/gnc-plugin-register.c
+++ b/gnucash/gnome/gnc-plugin-register.c
@@ -161,6 +161,7 @@ gnc_plugin_register_main_window_page_changed(GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the register
+        g_idle_remove_by_data (GNC_PLUGIN_PAGE_REGISTER (plugin_page));
         g_idle_add ((GSourceFunc)gnc_plugin_page_register_focus,
                       GNC_PLUGIN_PAGE_REGISTER (plugin_page));
     }
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index 909e83f..9a95335 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -296,6 +296,7 @@ gnc_plugin_page_report_main_window_page_changed (GncMainWindow *window,
 
         // The page changed signal is emitted multiple times so we need
         // to use an idle_add to change the focus to the webkit widget
+        g_idle_remove_by_data (widget);
         g_idle_add ((GSourceFunc)gnc_plugin_page_report_focus, widget);
     }
 }
@@ -797,12 +798,18 @@ static void
 gnc_plugin_page_report_destroy_widget(GncPluginPage *plugin_page)
 {
     GncPluginPageReportPrivate *priv;
+    GtkWidget *widget;
 
     // FIXME: cleanup other resources.
 
     PINFO("destroy widget");
     priv = GNC_PLUGIN_PAGE_REPORT_GET_PRIVATE(plugin_page);
 
+    widget = gnc_html_get_widget(priv->html);
+
+    // Remove the page focus idle function if present
+    g_idle_remove_by_data (widget);
+
     if (priv->component_manager_id)
     {
         gnc_unregister_gui_component(priv->component_manager_id);

commit f8fd9dd27244a6572238884b76de2de5989bf065
Merge: 2acb6da e766c71
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Wed Mar 7 05:37:42 2018 +0100

    Merge branch 'maint' into unstable
    PR #303


commit e766c71acca476817e50c81a29980b0565bee19c
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Tue Mar 6 20:28:08 2018 +0100

    Remove the unnecessary comments:
    <!-- Local variables: -->
    <!-- mode: xml        -->
    <!-- End:             -->
    
    
    This comments are to help emacs recognize that the files are xml
    since they don't have 'xml' as an extension

diff --git a/accounts/ru/acctchrt_auto.gnucash-xea b/accounts/ru/acctchrt_auto.gnucash-xea
index cebb90f..9d6c2a7 100644
--- a/accounts/ru/acctchrt_auto.gnucash-xea
+++ b/accounts/ru/acctchrt_auto.gnucash-xea
@@ -178,7 +178,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_autoloan.gnucash-xea b/accounts/ru/acctchrt_autoloan.gnucash-xea
index 366d4b5..28089a1 100644
--- a/accounts/ru/acctchrt_autoloan.gnucash-xea
+++ b/accounts/ru/acctchrt_autoloan.gnucash-xea
@@ -140,7 +140,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_common.gnucash-xea b/accounts/ru/acctchrt_common.gnucash-xea
index f0b7f38..9108c22 100644
--- a/accounts/ru/acctchrt_common.gnucash-xea
+++ b/accounts/ru/acctchrt_common.gnucash-xea
@@ -846,7 +846,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_homeloan.gnucash-xea
index 7eef5de..339a0b6 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_homeloan.gnucash-xea
@@ -140,7 +140,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_homeown.gnucash-xea b/accounts/ru/acctchrt_homeown.gnucash-xea
index a460e4e..84ae7d9 100644
--- a/accounts/ru/acctchrt_homeown.gnucash-xea
+++ b/accounts/ru/acctchrt_homeown.gnucash-xea
@@ -134,7 +134,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_kids.gnucash-xea b/accounts/ru/acctchrt_kids.gnucash-xea
index d3fe3d5..da5fdb8 100644
--- a/accounts/ru/acctchrt_kids.gnucash-xea
+++ b/accounts/ru/acctchrt_kids.gnucash-xea
@@ -151,7 +151,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_otherloan.gnucash-xea b/accounts/ru/acctchrt_otherloan.gnucash-xea
index c854aeb..e39c011 100644
--- a/accounts/ru/acctchrt_otherloan.gnucash-xea
+++ b/accounts/ru/acctchrt_otherloan.gnucash-xea
@@ -140,7 +140,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->
diff --git a/accounts/ru/acctchrt_renter.gnucash-xea b/accounts/ru/acctchrt_renter.gnucash-xea
index 1f21d78..aa7f95a 100644
--- a/accounts/ru/acctchrt_renter.gnucash-xea
+++ b/accounts/ru/acctchrt_renter.gnucash-xea
@@ -95,7 +95,3 @@
 </gnc:account>
 
 </gnc-account-example>
-
-<!-- Local variables: -->
-<!-- mode: xml        -->
-<!-- End:             -->

commit 2acb6da2b846e06e345b92f50a30d2d998bbeeb0
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 6 10:13:06 2018 -0800

    Bug 794083 - gnucash-2.7.5: cmake+make build installs Makefile

diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt
index 884ee14..90c61d3 100644
--- a/data/pixmaps/CMakeLists.txt
+++ b/data/pixmaps/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash
-    PATTERN Makefile.* EXCLUDE
+    PATTERN Makefile* EXCLUDE
     PATTERN CMake* EXCLUDE
     PATTERN CTest* EXCLUDE
     PATTERN cmake* EXCLUDE
@@ -8,7 +8,7 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADI
 )
 FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION ${DATADIR_BUILD}/gnucash
-    PATTERN Makefile.* EXCLUDE
+    PATTERN Makefile* EXCLUDE
     PATTERN CMake* EXCLUDE
     PATTERN CTest* EXCLUDE
     PATTERN cmake* EXCLUDE

commit 5520fae838bfddc92385c85706e741a753458c5d
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 6 09:56:13 2018 -0800

    Bug 793941 - 2.7.4: test failure on i686: 59 - test-gnc-timezone
    
    Don't test before 1916, that's not a common GnuCash use-case.

diff --git a/libgnucash/engine/test/gtest-gnc-timezone.cpp b/libgnucash/engine/test/gtest-gnc-timezone.cpp
index 5c46b26..963466c 100644
--- a/libgnucash/engine/test/gtest-gnc-timezone.cpp
+++ b/libgnucash/engine/test/gtest-gnc-timezone.cpp
@@ -142,26 +142,10 @@ TEST(gnc_timezone_constructors, test_IANA_Belize_tz)
 TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
 {
     TimeZoneProvider tzp("Australia/Perth");
-    for (int year = 1893; year < 2048; ++year)
+    for (int year = 1916; year < 2048; ++year)
     {
         auto tz = tzp.get(year);
-#ifdef __LP64__
-        if (year < 1895)
-        {
-            EXPECT_EQ(tz->std_zone_abbrev(), "LMT");
-            EXPECT_FALSE(tz->has_dst());
-            EXPECT_EQ(tz->base_utc_offset().total_seconds(), 27804);
-        }
-        else if (year < 1916)
-#else
-        if (year < 1916)
-#endif
-        {
-            EXPECT_EQ(tz->std_zone_abbrev(), "AWST");
-            EXPECT_FALSE(tz->has_dst());
-            EXPECT_EQ(tz->base_utc_offset().total_seconds(), 28800);
-        }
-        else if (year < 1917)
+        if (year < 1917)
         {
             EXPECT_EQ(tz->std_zone_abbrev(), "AWST");
             EXPECT_TRUE(tz->has_dst());
@@ -204,20 +188,10 @@ TEST(gnc_timezone_constructors, test_IANA_Perth_tz)
 TEST(gnc_timezone_constructors, test_IANA_Minsk_tz)
 {
     TimeZoneProvider tzp("Europe/Minsk");
-    for (int year = 1870; year < 2020; ++year)
+    for (int year = 1916; year < 2020; ++year)
     {
         auto tz = tzp.get(year);
-#ifdef __LP64__
-        if (year < 1879)
-        {
-            EXPECT_EQ(tz->std_zone_abbrev(), "LMT");
-            EXPECT_FALSE(tz->has_dst());
-            EXPECT_EQ(tz->base_utc_offset().total_seconds(), 6616);
-        }
-        else if (year < 1924)
-#else
         if (year < 1924)
-#endif
         {
             EXPECT_EQ(tz->std_zone_abbrev(), "MMT");
             EXPECT_FALSE(tz->has_dst());

commit 36d729652b2bc456cf04b92d3f7588e8bf25266d
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 6 09:48:22 2018 -0800

    Speed up GUID equality comparison.

diff --git a/libgnucash/engine/guid.cpp b/libgnucash/engine/guid.cpp
index 43b32fb..c58b49a 100644
--- a/libgnucash/engine/guid.cpp
+++ b/libgnucash/engine/guid.cpp
@@ -412,9 +412,7 @@ GUID::operator < (GUID const & other) noexcept
 
 bool operator == (GUID const & lhs, GncGUID const & rhs) noexcept
 {
-    auto ret = std::mismatch (lhs.begin (), lhs.end (), rhs.reserved);
-    return ret.first == lhs.end ();
-
+    return lhs.implementation == GUID(rhs).implementation;
 }
 
 bool
diff --git a/libgnucash/engine/guid.hpp b/libgnucash/engine/guid.hpp
index 837d509..3a79852 100644
--- a/libgnucash/engine/guid.hpp
+++ b/libgnucash/engine/guid.hpp
@@ -55,6 +55,7 @@ struct GUID
     auto begin () const noexcept -> decltype (implementation.begin ());
     auto end () const noexcept -> decltype (implementation.end ());
     bool operator < (GUID const &) noexcept;
+    friend bool operator == (GUID const &, GncGUID const &) noexcept;
     friend bool operator != (GUID const &, GUID const &) noexcept;
 };
 

commit 25585de07792dd43f38af2d1ead350620814e045
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Mar 6 14:42:43 2018 +0000

    Bug 794031, enable placeholder toggle and provide callback
    
    The text for this account tree view specifies "If you would like an
    account to be a placeholder account, click the checkbox for that
    account." but they were not enabled and no call back was defined so
    enabled the toggle button and provide callback.

diff --git a/gnucash/gnome/assistant-hierarchy.c b/gnucash/gnome/assistant-hierarchy.c
index 5f9a873..ff5ff05 100644
--- a/gnucash/gnome/assistant-hierarchy.c
+++ b/gnucash/gnome/assistant-hierarchy.c
@@ -887,6 +887,34 @@ placeholder_cell_data_func (GtkTreeViewColumn *tree_column,
     gtk_cell_renderer_toggle_set_active(GTK_CELL_RENDERER_TOGGLE(cell), willbe_placeholder);
 }
 
+static void
+placeholder_cell_toggled (GtkCellRendererToggle *cell_renderer,
+                          gchar *path, gpointer user_data)
+{
+    gboolean state;
+    Account *account;
+    GtkTreePath  *treepath;
+    hierarchy_data *data = (hierarchy_data *)user_data;
+
+    g_return_if_fail(data != NULL);
+
+    treepath = gtk_tree_path_new_from_string (path);
+
+    account = gnc_tree_view_account_get_account_from_path (data->final_account_tree, treepath);
+
+    state = gtk_cell_renderer_toggle_get_active (cell_renderer);
+
+    if (account)
+        xaccAccountSetPlaceholder (account, !state);
+
+    // if placeholder set, set balance to zero
+    if (!state)
+    {
+        set_final_balance (data->balance_hash, account, gnc_numeric_zero());
+        qof_event_gen (QOF_INSTANCE(account), QOF_EVENT_MODIFY, NULL);
+    }
+    gtk_tree_path_free (treepath);
+}
 
 static void
 use_existing_account_data_func(GtkTreeViewColumn *tree_column,
@@ -985,9 +1013,14 @@ on_final_account_prepare (hierarchy_data  *data)
     {
         renderer = gtk_cell_renderer_toggle_new();
         g_object_set(G_OBJECT (renderer),
-                     "activatable", FALSE,
-                     "sensitive", FALSE,
+                     "activatable", TRUE,
+                     "sensitive", TRUE,
                      NULL);
+
+        g_signal_connect (G_OBJECT (renderer), "toggled",
+                          G_CALLBACK (placeholder_cell_toggled),
+                          data);
+
         column = gtk_tree_view_column_new_with_attributes(_("Placeholder"),
                  renderer, NULL);
         gtk_tree_view_column_set_cell_data_func (column, renderer,

commit 25fc4d9bbd5b2a9bd2073254847ebdf4284a00d4
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Mar 6 14:40:32 2018 +0000

    Bug 793699 - start_spath could be used uninitialised
    
    Make sure the start_spath is declared within the while loop and also
    freed.

diff --git a/gnucash/gnome-utils/gnc-tree-view-split-reg.c b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
index 0506270..a309cbe 100644
--- a/gnucash/gnome-utils/gnc-tree-view-split-reg.c
+++ b/gnucash/gnome-utils/gnc-tree-view-split-reg.c
@@ -3812,13 +3812,11 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
     GncTreeViewSplitReg *view = GNC_TREE_VIEW_SPLIT_REG (widget);
     GncTreeModelSplitReg *model;
     GtkTreeViewColumn *col;
-    GtkTreePath *spath, *start_spath;
+    GtkTreePath *spath;
     GtkTreePath *start_path, *end_path;
     gboolean editing = FALSE;
     gboolean step_off = FALSE;
     gboolean trans_changed = FALSE;
-    gint *start_indices;
-    gint *next_indices;
     Transaction *btrans, *ctrans, *hetrans;
     gboolean goto_blank = FALSE;
     gboolean next_trans = TRUE;
@@ -4029,8 +4027,9 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
         while (!editing && !step_off) // lets step over non editable columns
         {
             // Create a copy of the path we started with.
-            start_spath = gtk_tree_path_copy (spath);
-            start_indices = gtk_tree_path_get_indices (start_spath);
+            GtkTreePath *start_spath = gtk_tree_path_copy (spath);
+            gint *start_indices = gtk_tree_path_get_indices (start_spath);
+            gint *next_indices;
 
             {
                 gchar *string = gtk_tree_path_to_string (start_spath);
@@ -4077,6 +4076,7 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
                 // Test for transaction changed.
                 if (gtv_sr_transaction_changed (view))
                 {
+                    gtk_tree_path_free (start_spath);
                     gtk_tree_path_free (spath);
                     return TRUE;
                 }
@@ -4090,8 +4090,8 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
             }
             // Is this an editable cell ?
             editing = gtv_sr_get_editing (col);
+            gtk_tree_path_free (start_spath);
         }
-        gtk_tree_path_free (start_spath);
         gtk_tree_path_free (spath);
         return TRUE;
         break;

commit d95eb0f7f3dcda5e2abae2c01bab7c3fc8189445
Merge: 30fb1dc 6457b2e
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Tue Mar 6 05:58:07 2018 +0100

    Merge branch 'maint' into unstable
    PR #300


commit 6457b2ebe560298518948abac31602a2515001b6
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Mon Mar 5 23:04:04 2018 +0100

    Adjustment of Account Hierarchy Templates.
    (mentioned in PR #293 on GitHub)
    
    1) Added namespace section (header)
    2) Added missing placeholder

diff --git a/accounts/ru/acctchrt_auto.gnucash-xea b/accounts/ru/acctchrt_auto.gnucash-xea
index c679221..cebb90f 100644
--- a/accounts/ru/acctchrt_auto.gnucash-xea
+++ b/accounts/ru/acctchrt_auto.gnucash-xea
@@ -1,14 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Автомобиль
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Расходы на автомобиль
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для учёта расходов связанных с автомобилем.
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Автомобиль
+</gnc-act:title>
+<gnc-act:short-description>
+  Расходы на автомобиль
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для учёта расходов связанных с автомобилем.
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
@@ -60,6 +92,12 @@
   </act:commodity>
   <act:description>Расходы на автомобиль</act:description>
   <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Сборы</act:name>
diff --git a/accounts/ru/acctchrt_autoloan.gnucash-xea b/accounts/ru/acctchrt_autoloan.gnucash-xea
index e42eeb7..366d4b5 100644
--- a/accounts/ru/acctchrt_autoloan.gnucash-xea
+++ b/accounts/ru/acctchrt_autoloan.gnucash-xea
@@ -1,14 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Кредит на автомобиль
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Кредит на автомобиль
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для учёта расходов связанных с оплатой кредита на автомобиль.
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Кредит на автомобиль
+</gnc-act:title>
+<gnc-act:short-description>
+  Кредит на автомобиль
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для учёта расходов связанных с оплатой кредита на автомобиль.
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
diff --git a/accounts/ru/acctchrt_common.gnucash-xea b/accounts/ru/acctchrt_common.gnucash-xea
index 37715e6..f0b7f38 100644
--- a/accounts/ru/acctchrt_common.gnucash-xea
+++ b/accounts/ru/acctchrt_common.gnucash-xea
@@ -1,15 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Общие счета
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Базовый набор наиболее используемых счетов
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
-    </gnc-act:long-description>
-    <gnc-act:start-selected>1</gnc-act:start-selected>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Общие счета
+</gnc-act:title>
+<gnc-act:short-description>
+  Базовый набор наиболее используемых счетов
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
+</gnc-act:long-description>
+<gnc-act:start-selected>1</gnc-act:start-selected>
 
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
@@ -139,6 +171,12 @@
   </act:commodity>
   <act:description>Премия</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Заработная плата</act:name>
@@ -183,6 +221,12 @@
   </act:commodity>
   <act:description>Процентный доход</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Чековые проценты</act:name>
@@ -416,6 +460,12 @@
   </act:commodity>
   <act:description>Развлечения</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Музыка и кино</act:name>
@@ -493,6 +543,12 @@
   </act:commodity>
   <act:description>Страхование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Медицинское страхование</act:name>
@@ -715,6 +771,12 @@
   </act:commodity>
   <act:description>Коммунальные услуги</act:description>
   <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Электричество</act:name>
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_homeloan.gnucash-xea
index d8e26a5..7eef5de 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_homeloan.gnucash-xea
@@ -1,14 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Кредит на недвижимость
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Кредит на недвижимость
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для учёта расходов связанных с оплатой кредита на недвижимость.
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Кредит на недвижимость
+</gnc-act:title>
+<gnc-act:short-description>
+  Кредит на недвижимость
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для учёта расходов связанных с оплатой кредита на недвижимость.
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
diff --git a/accounts/ru/acctchrt_homeown.gnucash-xea b/accounts/ru/acctchrt_homeown.gnucash-xea
index 362dc4b..a460e4e 100644
--- a/accounts/ru/acctchrt_homeown.gnucash-xea
+++ b/accounts/ru/acctchrt_homeown.gnucash-xea
@@ -1,14 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <gnc-account-example>
-    <gnc-act:title>
-      Дом/Квартира
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Расходы связанные с домовладением
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для учёта расходов связанных с владением квартирой или домом (страховка, налоги и ремонт).
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Дом/Квартира
+</gnc-act:title>
+<gnc-act:short-description>
+  Расходы связанные с домовладением
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для учёта расходов связанных с владением квартирой или домом (страховка, налоги и ремонт).
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
@@ -43,6 +75,12 @@
   </act:commodity>
   <act:description>Страхование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Страхование имущества</act:name>
@@ -65,6 +103,12 @@
   </act:commodity>
   <act:description>Налоги</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Налог на имущество</act:name>
diff --git a/accounts/ru/acctchrt_kids.gnucash-xea b/accounts/ru/acctchrt_kids.gnucash-xea
index 21b6841..d3fe3d5 100644
--- a/accounts/ru/acctchrt_kids.gnucash-xea
+++ b/accounts/ru/acctchrt_kids.gnucash-xea
@@ -1,14 +1,46 @@
-<?xml version="1.0" encoding="utf-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Дети
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Расходы на детей
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для учёта расходов связанных с детьми.
-    </gnc-act:long-description>
+<?xml version="1.0" encoding="UTF-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Дети
+</gnc-act:title>
+<gnc-act:short-description>
+  Расходы на детей
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для учёта расходов связанных с детьми.
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
diff --git a/accounts/ru/acctchrt_otherloan.gnucash-xea b/accounts/ru/acctchrt_otherloan.gnucash-xea
index 13d58c6..c854aeb 100644
--- a/accounts/ru/acctchrt_otherloan.gnucash-xea
+++ b/accounts/ru/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Другие кредиты
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Различные кредиты и связанные с ними платежи
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для различных кредитов и связанных с ними платежей.
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Другие кредиты
+</gnc-act:title>
+<gnc-act:short-description>
+  Различные кредиты и связанные с ними платежи
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для различных кредитов и связанных с ними платежей.
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
diff --git a/accounts/ru/acctchrt_renter.gnucash-xea b/accounts/ru/acctchrt_renter.gnucash-xea
index 061bbc7..1f21d78 100644
--- a/accounts/ru/acctchrt_renter.gnucash-xea
+++ b/accounts/ru/acctchrt_renter.gnucash-xea
@@ -1,14 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
-    <gnc-act:title>
-      Аренда
-    </gnc-act:title>
-    <gnc-act:short-description>
-      Расходы связанные с арендой недвижимости
-    </gnc-act:short-description>
-    <gnc-act:long-description>
-      Счета для учёта расходов связанных с арендой дома или квартиры.
-    </gnc-act:long-description>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  Аренда
+</gnc-act:title>
+<gnc-act:short-description>
+  Расходы связанные с арендой недвижимости
+</gnc-act:short-description>
+<gnc-act:long-description>
+  Счета для учёта расходов связанных с арендой дома или квартиры.
+</gnc-act:long-description>
 
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>

commit 30fb1dc4799225a5e27d21dc3a214d072878c43a
Merge: ddba926 21ea6d5
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 16:57:00 2018 +0100

    Merge branch 'unstable-bugfix' of https://github.com/christopherlam/gnucash into unstable


commit ddba926e4900ec81aee25714ba505840b25afdc6
Merge: e2d69b1 a72e0bd
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 16:56:07 2018 +0100

    Merge branch 'unstable-transfer-02' of https://github.com/DiMan/gnucash into unstable


commit e2d69b174ec9dca538285ceb00c45a2bc38e0daa
Merge: 8a33864 7ef8e6d
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 16:54:24 2018 +0100

    Merge branch 'master' of https://github.com/nielsegberts/gnucash into unstable


commit 8a33864168b359bac600f881190c6a0f97b88868
Merge: 580ce72 41d79f4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 16:52:55 2018 +0100

    Merge branch 'cpack' of https://github.com/TheBiggerGuy/gnucash into unstable


commit 41d79f4ef324210a70d8c63c28d844861cb8cf35
Author: Guy Taylor <thebigguy.co.uk at gmail.com>
Date:   Mon Mar 5 15:38:41 2018 +0000

    Fix CPack package version number
    
    Currently running "ninja-build package" produces a file with and incorrect
    version number. This patch passes the CMake version variables into CPack to get
    the correct filename.
    
    Old "gnucash-0.1.1-Linux.tar.gz" new "gnucash-2.7.5-Linux.tar.gz"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 670fe8f..86607a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -921,6 +921,11 @@ ENDIF()
 # ############################################################
 # Package creation rules
 
+SET(CPACK_PACKAGE_VERSION_MAJOR "${GNUCASH_MAJOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${GNUCASH_MINOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${GNUCASH_MICRO_VERSION}")
+SET(CPACK_PACKAGE_VERSION "${VERSION}")
+
 IF(UNIX)
   SET(CPACK_GENERATOR "TGZ")
 ENDIF(UNIX)

commit 21ea6d56bf70a85ad1c76a914677b9f05fd34830
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Mar 5 07:45:03 2018 +0800

    Modernise chart colours
    
    This commit changes chart colours from the dated CSS defaults to
    modern colours as suggested by http://clrs.cc/

diff --git a/gnucash/report/report-system/html-utilities.scm b/gnucash/report/report-system/html-utilities.scm
index 2357036..62224c2 100644
--- a/gnucash/report/report-system/html-utilities.scm
+++ b/gnucash/report/report-system/html-utilities.scm
@@ -106,12 +106,20 @@
                           value)))
 
 (define (gnc:assign-colors num-colors)
-  (define base-colors '("red" "orange" "yellow" "green"
-                        "cyan" "blue" "purple" "magenta" 
-			"orchid" "khaki" "gold" "orange"
-			"red3" "orange3" "yellow3" "green3"
-                        "cyan3" "blue3" "purple3" "magenta3" 
-  			"orchid3" "khaki3" "gold3" "orange3"))
+  ;; default CSS colours
+  ;; (define base-colors '("red" "orange" "yellow" "green"
+  ;;                       "cyan" "blue" "purple" "magenta"
+  ;;                       "orchid" "khaki" "gold" "orange"
+  ;;                       "red3" "orange3" "yellow3" "green3"
+  ;;                       "cyan3" "blue3" "purple3" "magenta3"
+  ;;                       "orchid3" "khaki3" "gold3" "orange3"))
+
+  ;; new base-colors from http://clrs.cc/ and flatuicolors.com
+  (define base-colors (list "#FF4136" "#FF851B" "#FFDC00" "#2ECC40"
+                            "#0074D9" "#001f3f" "#85144b" "#7FDBFF"
+                            "#F012BE" "#3D9970" "#39CCCC" "#f39c12"
+                            "#e74c3c" "#e67e22" "#9b59b6" "#8e44ad"
+                            "#16a085" "#d35400"))
   (define (assign-colors i)
     (if (<= num-colors i)
         '()
diff --git a/gnucash/report/standard-reports/average-balance.scm b/gnucash/report/standard-reports/average-balance.scm
index 2d96d33..ad6e785 100644
--- a/gnucash/report/standard-reports/average-balance.scm
+++ b/gnucash/report/standard-reports/average-balance.scm
@@ -479,7 +479,7 @@
                                   (append col-labels 
                                           (list (list-ref columns 2))))
                             (set! col-colors
-                                  (append col-colors (list "blue")))
+                                  (append col-colors (list "#0074D9")))
                             (set! all-zeros? #f)))))
                 
                 
@@ -495,7 +495,7 @@
                                   (append col-labels 
                                           (list (list-ref columns 7))))
                             (set! col-colors
-                                  (append col-colors (list "green")))
+                                  (append col-colors (list "#2ECC40")))
                             (set! all-zeros? #f)))))
 
                 (if (memq 'GLPlot plot-type)
@@ -515,7 +515,7 @@
                                   (append col-labels 
                                           (list (list-ref columns 5))))
                             (set! col-colors
-                                  (append col-colors (list "black")))
+                                  (append col-colors (list "#111111")))
                             
                             ;; credit
                             (gnc:html-barchart-append-column! 
@@ -525,7 +525,7 @@
                                   (append col-labels 
                                           (list (list-ref columns 6))))
                             (set! col-colors
-                                  (append col-colors (list "red")))
+                                  (append col-colors (list "#FF4136")))
                             (set! all-zeros? #f)))))
                 
                 (if (not all-zeros?)
diff --git a/gnucash/report/standard-reports/budget-barchart.scm b/gnucash/report/standard-reports/budget-barchart.scm
index 05b721c..6ba3697 100644
--- a/gnucash/report/standard-reports/budget-barchart.scm
+++ b/gnucash/report/standard-reports/budget-barchart.scm
@@ -156,7 +156,7 @@
         (gnc:html-barchart-set-col-labels!
           chart (list (_ "Budget") (_ "Actual")))
         (gnc:html-barchart-set-col-colors!
-          chart '("blue" "red"))
+          chart '("#0074D9" "#FF4136"))
       )
       ;; else
       (begin
@@ -169,7 +169,7 @@
         (gnc:html-linechart-set-col-labels!
           chart (list (_ "Budget") (_ "Actual")))
         (gnc:html-linechart-set-col-colors!
-          chart '("blue" "red"))
+          chart '("#0074D9" "#FF4136"))
       )
     )
 
diff --git a/gnucash/report/standard-reports/cashflow-barchart.scm b/gnucash/report/standard-reports/cashflow-barchart.scm
index 28738d9..7666e23 100644
--- a/gnucash/report/standard-reports/cashflow-barchart.scm
+++ b/gnucash/report/standard-reports/cashflow-barchart.scm
@@ -334,9 +334,9 @@
                   ))
           (gnc:html-barchart-set-col-colors!
            chart (append
-                  (if show-in? '("blue") '())
-                  (if show-out? '("red") '())
-                  (if show-net? '("green") '())
+                  (if show-in? '("#0074D9") '())
+                  (if show-out? '("#FF4136") '())
+                  (if show-net? '("#2ECC40") '())
                   ))
           (gnc:report-percent-done 95)
 
diff --git a/gnucash/report/standard-reports/net-barchart.scm b/gnucash/report/standard-reports/net-barchart.scm
index d424263..53dd3ba 100644
--- a/gnucash/report/standard-reports/net-barchart.scm
+++ b/gnucash/report/standard-reports/net-barchart.scm
@@ -375,9 +375,9 @@
        (gnc:html-barchart-set-col-colors!
         chart (append
                (if show-sep?
-                   '("blue" "red") '())
+                   '("#0074D9" "#FF4136") '())
                (if show-net?
-                   '("green") '())))
+                   '("#2ECC40") '())))
 
        ;; URLs for income/expense or asset/liabilities bars.
 ;;       (if show-sep?
diff --git a/gnucash/report/standard-reports/net-linechart.scm b/gnucash/report/standard-reports/net-linechart.scm
index 7d2d554..ec8f23a 100644
--- a/gnucash/report/standard-reports/net-linechart.scm
+++ b/gnucash/report/standard-reports/net-linechart.scm
@@ -418,9 +418,9 @@
        (gnc:html-linechart-set-col-colors!
         chart (append
                (if show-sep?
-                   '("blue" "red") '())
+                   '("#0074D9" "#FF4136") '())
                (if show-net?
-                   '("green") '())))
+                   '("#2ECC40") '())))
 
         ;; Set the line width and markers
         (gnc:html-linechart-set-line-width!

commit 22517f98cec657c2fbb81ad539a1bd19bc680fef
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Mar 4 14:56:35 2018 +0800

    taxtxf: schemify

diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
index 321501e..ef7e6b5 100644
--- a/gnucash/report/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/locale-specific/us/taxtxf.scm
@@ -3184,12 +3184,9 @@
                            from-date
                            to-date
                            tax-year
-                           (if (gnc:txf-get-tax-entity-type-description
-                                       (string->symbol tax-entity-type))
-                               (gnc:txf-get-tax-entity-type-description
-                                       (string->symbol tax-entity-type))
-                               "None specified"
-                           )
+                           (or (gnc:txf-get-tax-entity-type-description
+                                (string->symbol tax-entity-type))
+                               "None specified")
                      )))))
 
              (if (not (null? txf-invalid-alist))

commit 41322ec3d8ab6af48143a9489aa6ab9da54988c3
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Mar 4 08:36:39 2018 +0800

    <br> to <br/> and ~s to ~a

diff --git a/gnucash/report/business-reports/fancy-invoice.scm b/gnucash/report/business-reports/fancy-invoice.scm
index 2cc8f20..64c36c2 100644
--- a/gnucash/report/business-reports/fancy-invoice.scm
+++ b/gnucash/report/business-reports/fancy-invoice.scm
@@ -635,10 +635,10 @@
     (gnc:html-table-append-row!
      table
      (list
-      (string-expand (gnc:owner-get-address-dep owner) #\newline "<br>")))
+      (string-expand (gnc:owner-get-address-dep owner) #\newline "<br/>")))
     (gnc:html-table-append-row!
      table
-     (list "<br>"))
+     (list "<br/>"))
     (for-each
      (lambda (order)
        (let* ((reference (gncOrderGetReference order)))
@@ -722,7 +722,7 @@
 	'attribute (list "align" "right")
 	'attribute (list "width" "33%"))
     (gnc:html-table-append-row!
-     table (list (string-expand (string-append (if addy addy "") (if id (string-append "\n" id) "")) #\newline "<br>")
+     table (list (string-expand (string-append (if addy addy "") (if id (string-append "\n" id) "")) #\newline "<br/>")
 		 (string-expand
 		  (string-append (if phone
 				     (string-append (_ "Phone:") " " phone)
@@ -730,7 +730,7 @@
 				 (if fax (string-append (if phone "\n" "")
 							(_ "Fax:") " " fax)
 				     ""))
-		  #\newline "<br>" )
+		  #\newline "<br/>" )
 		 (if url (string-append (_ "Web:") " " url) "")))
 
 ;; oli-custom - I didn't want today's date on the invoice.
@@ -863,20 +863,20 @@
                       (due-date (gncInvoiceGetDateDue invoice)))
 		  (set! date-table (make-date-table))
 		  (gnc:html-table-append-row!
-                  ;; Translators: %s below is "Invoice" or "Bill" or even the
+                  ;; Translators: ~a below is "Invoice" or "Bill" or even the
                   ;; custom title from the options. The next column contains
                   ;; the number of the document.
-                  date-table (list (format #f (_ "~s #") title) (gncInvoiceGetID invoice)))
-                  ;; Translators: The first %s below is "Invoice" or
+                  date-table (list (format #f (_ "~a #") title) (gncInvoiceGetID invoice)))
+                  ;; Translators: The first ~a below is "Invoice" or
                   ;; "Bill" or even the custom title from the
                   ;; options. This string sucks for i18n, but I don't
                   ;; have a better solution right now without breaking
                   ;; other people's invoices.
-		  (make-date-row! date-table (format #f (_ "~s Date") title) post-date date-format)
-		  (make-date-row! date-table (_ "Due Date") due-date date-format)
+		  (make-date-row! date-table (format #f (_ "~a Date") title) post-date date-format)
+		  (make-date-row! date-table (_ "Due Date") due-date date-format)
 		  date-table)
 		(gnc:make-html-text
-                 (string-append title "<br>"
+                 (string-append title "<br/>"
                                 (_ "Invoice in progress...")))))
 
 	  (gnc:html-table-append-row!
@@ -910,7 +910,7 @@
 		       (gnc:make-html-text
 			(string-append
 			 (_ "Reference") ": "
-			 (string-expand billing-id #\newline "<br>"))))
+			 (string-expand billing-id #\newline "<br/>"))))
 		      (make-break! document)))))
 
 	  (if (opt-val "Display" "Billing Terms")
@@ -922,7 +922,7 @@
 		     (gnc:make-html-text
 		      (string-append
 		       (_ "Terms") ": "
-		       (string-expand terms #\newline "<br>")))))))
+		       (string-expand terms #\newline "<br/>")))))))
 
 	  (make-break! document)
 
@@ -948,7 +948,7 @@
 		 document
 		 (gnc:make-html-text
 		  (string-append name-str  ": "
-		  (string-expand name #\newline "<br>")))))))
+		  (string-expand name #\newline "<br/>")))))))
 
 	  (make-break! document)
 
@@ -960,13 +960,13 @@
 		 document
 		 (gnc:make-html-text
 		  (string-append contact-str  ": "
-		  (string-expand contact #\newline "<br>")))))))
+		  (string-expand contact #\newline "<br/>")))))))
 
 	  (gnc:html-document-add-object!
 	   document
 	   (gnc:make-html-text
 	    (gnc:html-markup-br)
-	    (string-expand (opt-val "Display" "Extra Notes") #\newline "<br>")
+	    (string-expand (opt-val "Display" "Extra Notes") #\newline "<br/>")
 	    (gnc:html-markup-br))))
 
 	; else
diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm
index 8ec2dad..260d02a 100644
--- a/gnucash/report/business-reports/job-report.scm
+++ b/gnucash/report/business-reports/job-report.scm
@@ -478,10 +478,10 @@
     (gnc:html-table-append-row!
      table
      (list
-      (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "<br>")))
+      (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "<br/>")))
     (gnc:html-table-append-row!
      table
-     (list "<br>"))
+     (list "<br/>"))
     (set-last-row-style!
      table "td"
      'attribute (list "valign" "top"))
@@ -521,7 +521,7 @@
     (gnc:html-table-append-row! table (list (if name name "")))
     (gnc:html-table-append-row! table (list (string-expand
 					     (if addy addy "")
-					     #\newline "<br>")))
+					     #\newline "<br/>")))
     (gnc:html-table-append-row! table (list
 				       (strftime
 					date-format
diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
index bb0d067..321501e 100644
--- a/gnucash/report/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/locale-specific/us/taxtxf.scm
@@ -3176,11 +3176,10 @@
                      "center"
                      (gnc:html-markup/format
                       (string-append (if (and (gnc-get-current-book-tax-name)
-                                              (not (string=? ""
-                                              (gnc-get-current-book-tax-name))))
-                                         "Tax Name: %s<BR>"
+                                              (not (string-null? (gnc-get-current-book-tax-name))))
+                                         "Tax Name: ~a<br/>"
                                          "~a")
-                      "Period from ~a to ~s<BR>Tax Year ~a<BR>Tax Entity Type: %s<BR>All amounts in USD unless otherwise noted")
+                      "Period from ~a to ~a<br/>Tax Year ~a<br/>Tax Entity Type: ~a<br/>All amounts in USD unless otherwise noted")
                            (gnc-get-current-book-tax-name)
                            from-date
                            to-date
@@ -3199,7 +3198,7 @@
                     doc (gnc:make-html-text
                           (gnc:html-markup-p
                            (gnc:html-markup/format
-                      "<BR>The following Account(s) have errors with their Income Tax code assignments (use 'Edit->Tax Report Options' to correct):"))))
+                      "<br/>The following Account(s) have errors with their Income Tax code assignments (use 'Edit->Tax Report Options' to correct):"))))
                    (gnc:html-document-add-object! doc error-table)
                     (gnc:html-table-append-row!
                       error-table
@@ -3262,7 +3261,7 @@
                     doc (gnc:make-html-text
                           (gnc:html-markup-p
                            (gnc:html-markup/format
-                      " <BR> "))))
+                      " <br/> "))))
                  )
              )
 
@@ -3453,29 +3452,29 @@
                         (gnc:html-markup-p
                          (gnc:html-markup/format
                           (string-append
-                             "Selected Report Options:<BR>"
+                             "Selected Report Options:<br/>"
                              ;; selected accounts
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; suppress 0.00 values
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; full acct names
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; transfer detail
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; TXF detail
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; action:memo detail
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; transaction detail
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; special dates
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; currency conversion date
-                             "      ~a <BR>"
+                             "      ~a <br/>"
                              ;; alternate transaction shading
                              (if (gnc-html-engine-supports-css)
                                  ""
-                                 "      ~a <BR>"
+                                 "      ~a <br/>"
                              ))
                              (if (not (null? user-sel-accnts))
                                  "Subset of accounts"
diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/standard-reports/income-statement.scm
index c57e2a2..412b1d6 100644
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/standard-reports/income-statement.scm
@@ -431,7 +431,7 @@
     (gnc:html-document-set-title! 
      doc (format #f
 		  (string-append "~a ~a "
-				 (_ "For Period Covering %s to %s"))
+				 (_ "For Period Covering ~a to ~a"))
 		  company-name report-title
                   (qof-print-date start-date-printable)
                   (qof-print-date end-date)))

commit 551e98435d6adc7f48703a58ad27c980a79b7f39
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Mar 4 08:10:45 2018 +0800

    remove begindate in qofquery
    
    This was producing a date corresponding to 01-01-1970. make-zdate was
    being used in aging.scm as a hack to search all splits prior to
    end-date. fix the date query logic to set begin-date match to #f.

diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm
index f09e15a..4c2dc45 100644
--- a/gnucash/report/business-reports/aging.scm
+++ b/gnucash/report/business-reports/aging.scm
@@ -322,21 +322,15 @@ more than one currency. This report is not designed to cope with this possibilit
 
 
 ;; set up the query to get the splits in the chosen account
-;; XXX: FIXME: begindate is a hack -- we currently only go back a year
 (define (setup-query query account date)
-  (let ((begindate (gnc-mktime (make-zdate)))) ;Set begindate to the start of the Epoch
-;    (gnc:debug "Account: " account)
-    (gnc:debug "begindate" begindate)
-    (gnc:debug "date" date)
-    (qof-query-set-book query (gnc-get-current-book))
-    (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
-    (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
-    (xaccQueryAddDateMatchTT query #t begindate #t date QOF-QUERY-AND)
-    (qof-query-set-sort-order query
-			      (list SPLIT-TRANS TRANS-DATE-POSTED)
-			      '() '())
-    (qof-query-set-sort-increasing query #t #t #t)))
-
+  (qof-query-set-book query (gnc-get-current-book))
+  (gnc:query-set-match-non-voids-only! query (gnc-get-current-book))
+  (xaccQueryAddSingleAccountMatch query account QOF-QUERY-AND)
+  (xaccQueryAddDateMatchTT query #f 0 #t date QOF-QUERY-AND)
+  (qof-query-set-sort-order query
+                            (list SPLIT-TRANS TRANS-DATE-POSTED)
+                            '() '())
+  (qof-query-set-sort-increasing query #t #t #t))
 
 (define (aging-options-generator options)
   (let* ((add-option 
diff --git a/libgnucash/app-utils/app-utils.scm b/libgnucash/app-utils/app-utils.scm
index f80776e..a3d838a 100644
--- a/libgnucash/app-utils/app-utils.scm
+++ b/libgnucash/app-utils/app-utils.scm
@@ -221,8 +221,7 @@
 (export gnc:time64-ge-date)
 (export gnc:make-date-interval-list)
 (export gnc:make-date-list)
-(export make-zdate)
-(export SecDelta )
+(export SecDelta)
 (export DayDelta)
 (export WeekDelta )
 (export TwoWeekDelta)

commit 580ce72da73ea6ee914fba5e988f7fbf83644241
Merge: 3350824 fc5bdfa
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Mon Mar 5 03:40:48 2018 +0100

    Merge branch 'maint' into unstable

diff --cc gnucash/gnome/reconcile-view.c
index 9e205eb,0000000..99829f9
mode 100644,000000..100644
--- a/gnucash/gnome/reconcile-view.c
+++ b/gnucash/gnome/reconcile-view.c
@@@ -1,995 -1,0 +1,996 @@@
 +/********************************************************************\
 + * reconcile-view.c -- A view of accounts to be reconciled for      *
 + *                     GnuCash.                                     *
 + * Copyright (C) 1998,1999 Jeremy Collins	                    *
 + * Copyright (C) 1998-2000 Linas Vepstas                            *
 + * Copyright (C) 2012 Robert Fewell                                 *
 + *                                                                  *
 + * This program is free software; you can redistribute it and/or    *
 + * modify it under the terms of the GNU General Public License as   *
 + * published by the Free Software Foundation; either version 2 of   *
 + * the License, or (at your option) any later version.              *
 + *                                                                  *
 + * This program is distributed in the hope that it will be useful,  *
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
 + * GNU General Public License for more details.                     *
 + *                                                                  *
 + * You should have received a copy of the GNU General Public License*
 + * along with this program; if not, contact:                        *
 + *                                                                  *
 + * Free Software Foundation           Voice:  +1-617-542-5942       *
 + * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 + * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 +\********************************************************************/
 +
 +#include <config.h>
 +
 +#include <gtk/gtk.h>
 +#include <glib/gi18n.h>
 +#include <gdk/gdkkeysyms.h>
 +
 +#include "gnc-date.h"
 +#include "qof.h"
 +#include "qofbook.h"
 +#include "Transaction.h"
 +#include "gnc-ui-util.h"
 +#include "gnc-prefs.h"
 +#include "reconcile-view.h"
 +#include "search-param.h"
 +#include "gnc-component-manager.h"
 +
 +#define GNC_PREF_CHECK_CLEARED "check-cleared"
 +
 +/* Signal codes */
 +enum
 +{
 +    TOGGLE_RECONCILED,
 +    LINE_SELECTED,
 +    DOUBLE_CLICK_SPLIT,
 +    LAST_SIGNAL
 +};
 +
 +
 +/** Static Globals ****************************************************/
 +static GNCQueryViewClass *parent_class = NULL;
 +static guint reconcile_view_signals[LAST_SIGNAL] = {0};
 +
 +/** Static function declarations **************************************/
 +static void gnc_reconcile_view_init (GNCReconcileView *view);
 +static void gnc_reconcile_view_class_init (GNCReconcileViewClass *klass);
 +static void gnc_reconcile_view_finalize (GObject *object);
 +static gpointer gnc_reconcile_view_is_reconciled (gpointer item, gpointer user_data);
 +static void gnc_reconcile_view_line_toggled (GNCQueryView *qview, gpointer item, gpointer user_data);
 +static void gnc_reconcile_view_double_click_entry (GNCQueryView *qview, gpointer item, gpointer user_data);
 +static void gnc_reconcile_view_row_selected (GNCQueryView *qview, gpointer item, gpointer user_data);
 +static gboolean gnc_reconcile_view_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data);
 +static gboolean gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y, gboolean keyboard_mode,
 +					 GtkTooltip* tooltip, gpointer* user_data);
 +
 +GType
 +gnc_reconcile_view_get_type (void)
 +{
 +    static GType gnc_reconcile_view_type = 0;
 +
 +    if (gnc_reconcile_view_type == 0)
 +    {
 +        static const GTypeInfo gnc_reconcile_view_info =
 +        {
 +            sizeof (GNCReconcileViewClass),
 +            NULL,
 +            NULL,
 +            (GClassInitFunc) gnc_reconcile_view_class_init,
 +            NULL,
 +            NULL,
 +            sizeof (GNCReconcileView),
 +            0,
 +            (GInstanceInitFunc) gnc_reconcile_view_init
 +        };
 +
 +        gnc_reconcile_view_type = g_type_register_static (GNC_TYPE_QUERY_VIEW,
 +                                  "GncReconcileView",
 +                                  &gnc_reconcile_view_info, 0);
 +    }
 +    return gnc_reconcile_view_type;
 +}
 +
 +
 +static gboolean
 +gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y,
 +	gboolean keyboard_mode, GtkTooltip *tooltip, gpointer *user_data)
 +{
 +    GtkTreeModel* model;
 +    GtkTreeIter iter;
 +
 +    // If the Description is longer than can be display, show it in a tooltip
 +    if (gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (qview), &x, &y, keyboard_mode, &model, NULL, &iter))
 +    {
 +        GtkTreeViewColumn *col;
 +        GList *cols;
 +        gint col_pos, col_width;
 +	gchar* desc_text = NULL;
 +
 +        /* Are we in keyboard tooltip mode, displays tooltip below/above treeview CTRL+F1 */
 +        if (keyboard_mode == FALSE)
 +        {
 +            if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (qview), x, y, NULL, &col, NULL, NULL) == FALSE)
 +                return FALSE;
 +        }
 +        else
 +            gtk_tree_view_get_cursor (GTK_TREE_VIEW (qview), NULL, &col);
 +
 +        cols = gtk_tree_view_get_columns (GTK_TREE_VIEW (qview));
 +        col_width = gtk_tree_view_column_get_width (col);
 +        col_pos = g_list_index (cols, col);
 +        g_list_free (cols);
 +
 +        /* If column is not description, do not show tooltip */
 +        if (col_pos != 2)
 +            return FALSE;
 +
 +        gtk_tree_model_get (model, &iter, 3, &desc_text, -1);
 +
 +        if (desc_text)
 +        {
 +            PangoLayout* layout;
 +            gint text_width;
 +            gint root_x, root_y;
 +            gint cur_x, cur_y;
 +
 +            layout = gtk_widget_create_pango_layout (GTK_WIDGET (qview), desc_text);
 +            pango_layout_get_pixel_size (layout, &text_width, NULL);
 +            g_object_unref (layout);
 +
 +            /* If text_width + 10 <= column_width, do not show tooltip */
 +            if ((text_width + 10) <= col_width)
 +            {
 +                g_free (desc_text);
 +                return FALSE;
 +            }
 +
 +            if (keyboard_mode == FALSE)
 +            {
 +#if GTK_CHECK_VERSION(3,20,0)
 +                GdkSeat *seat;
 +#else
 +                GdkDeviceManager *device_manager;
 +#endif
 +                GdkDevice *pointer;
 +                GdkScreen *screen;
 +                GtkWindow *tip_win = NULL;
 +                GdkWindow *parent_window;
 +                GList *win_list, *node;
 +
 +                parent_window = gtk_widget_get_parent_window (GTK_WIDGET (qview));
 +
 +#if GTK_CHECK_VERSION(3,20,0)
 +                seat = gdk_display_get_default_seat (gdk_window_get_display (parent_window));
 +                pointer = gdk_seat_get_pointer (seat);
 +#else
 +                device_manager = gdk_display_get_device_manager (gdk_window_get_display (parent_window));
 +                pointer = gdk_device_manager_get_client_pointer (device_manager);
 +#endif
 +
 +                gdk_window_get_device_position (parent_window, pointer, &cur_x, &cur_y, NULL);
 +
 +                gdk_window_get_origin (parent_window, &root_x, &root_y);
 +
 +                screen = gtk_widget_get_screen (GTK_WIDGET (qview));
 +
 +                /* Get a list of toplevel windows */
 +                win_list = gtk_window_list_toplevels ();
 +
 +                /* Look for the gtk-tooltip window, we do this as gtk_widget_get_tooltip_window
 +                   does not seem to work for the default tooltip window, custom yes */
 +                for (node = win_list;  node != NULL;  node = node->next)
 +                {
 +                    if (g_strcmp0 (gtk_widget_get_name (node->data), "gtk-tooltip") == 0)
 +                    tip_win = node->data;
 +                }
 +                g_list_free (win_list);
 +
 +	        gtk_tooltip_set_text (tooltip, desc_text);
 +
 +                if (GTK_IS_WINDOW (tip_win))
 +                {
 +#if GTK_CHECK_VERSION(3,22,0)
 +                    GdkMonitor *mon;
 +#else
 +                    gint monitor_num;
 +#endif
 +                    GdkRectangle monitor;
 +                    GtkRequisition requisition;
 +                    gint x, y;
 +
 +                    gtk_widget_get_preferred_size (GTK_WIDGET (tip_win), &requisition, NULL);
 +
 +                    x = root_x + cur_x + 10;
 +                    y = root_y + cur_y + 10;
 +
 +#if GTK_CHECK_VERSION(3,22,0)
 +                    mon = gdk_display_get_monitor_at_point (gdk_display_get_default(), x, y);
 +                    gdk_monitor_get_geometry (mon, &monitor);
 +#else
 +                    monitor_num = gdk_screen_get_monitor_at_point (screen, x, y);
 +                    gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
 +#endif
 +
 +                    if (x + requisition.width > monitor.x + monitor.width)
 +                        x -= x - (monitor.x + monitor.width) + requisition.width;
 +                    else if (x < monitor.x)
 +                        x = monitor.x;
 +
 +                    if (y + requisition.height > monitor.y + monitor.height)
 +                        y -= y - (monitor.y + monitor.height) + requisition.height;
 +
 +                    gtk_window_move (tip_win, x, y);
 +                }
 +            }
 +	    gtk_tooltip_set_text (tooltip, desc_text);
 +            g_free (desc_text);
 +	    return TRUE;
 +        }
 +    }
 +    return FALSE;
 +}
 +
 +
 +/****************************************************************************\
 + * gnc_reconcile_view_new                                                   *
 + *   creates the account tree                                               *
 + *                                                                          *
 + * Args: account        - the account to use in filling up the splits.      *
 + *       type           - the type of view, RECLIST_DEBIT or RECLIST_CREDIT *
 + *       statement_date - date of statement                                 *
 + * Returns: the account tree widget, or NULL if there was a problem.        *
 +\****************************************************************************/
 +static void
 +gnc_reconcile_view_construct (GNCReconcileView *view, Query *query)
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW (view);
 +    GtkTreeViewColumn *col;
 +    GtkTreeSelection  *selection;
 +    GList             *renderers;
 +    GtkCellRenderer   *cr0;
 +    gboolean           inv_sort = FALSE;
 +
 +    if (view->view_type == RECLIST_CREDIT)
 +        inv_sort = TRUE;
 +
 +    /* Construct the view */
 +    gnc_query_view_construct (qview, view->column_list, query);
 +    gnc_query_view_set_numerics (qview, TRUE, inv_sort);
 +
 +    /* Set the description field to have spare space */
 +    col = gtk_tree_view_get_column (GTK_TREE_VIEW (qview), 2);
 +    gtk_tree_view_column_set_expand (col, TRUE);
 +
 +    /* Get the renderer of the description column and set ellipsize value */
 +    renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (col));
 +    cr0 = g_list_nth_data (renderers, 0);
 +    g_list_free (renderers);
 +    g_object_set (cr0, "ellipsize", PANGO_ELLIPSIZE_END, NULL );
 +
 +    gtk_widget_set_has_tooltip (GTK_WIDGET (qview), TRUE);
 +
 +    /* Set the selection method */
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
 +
 +    /* Now set up the signals for the QueryView */
 +    g_signal_connect (G_OBJECT (qview), "column_toggled",
 +                      G_CALLBACK (gnc_reconcile_view_line_toggled), view);
 +    g_signal_connect (G_OBJECT (qview), "double_click_entry",
 +                      G_CALLBACK (gnc_reconcile_view_double_click_entry), view);
 +    g_signal_connect (G_OBJECT (qview), "row_selected",
 +                      G_CALLBACK (gnc_reconcile_view_row_selected), view);
 +    g_signal_connect (G_OBJECT (qview), "key_press_event",
 +                      G_CALLBACK (gnc_reconcile_view_key_press_cb), view);
 +    g_signal_connect (G_OBJECT (qview), "query-tooltip",
 +                      G_CALLBACK (gnc_reconcile_view_tooltip_cb), view);
 +}
 +
 +
 +GtkWidget *
 +gnc_reconcile_view_new (Account *account, GNCReconcileViewType type,
 +                       time64 statement_date)
 +{
 +    GNCReconcileView *view;
 +    GtkListStore     *liststore;
 +    gboolean          include_children, auto_check;
 +    GList            *accounts = NULL;
 +    GList            *splits;
 +    Query            *query;
 +
 +    g_return_val_if_fail (account, NULL);
 +    g_return_val_if_fail ((type == RECLIST_DEBIT) ||
 +                         (type == RECLIST_CREDIT), NULL);
 +
 +    view = g_object_new (GNC_TYPE_RECONCILE_VIEW, NULL);
 +
 +    /* Create the list store with 6 columns and add to treeview,
 +       column 0 will be a pointer to the entry */
 +    liststore = gtk_list_store_new (6, G_TYPE_POINTER, G_TYPE_STRING, 
 +                G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN );
 +    gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (liststore));
 +    g_object_unref (liststore);
 +
 +    view->account = account;
 +    view->view_type = type;
 +    view->statement_date = statement_date;
 +
 +    query = qof_query_create_for (GNC_ID_SPLIT);
 +    qof_query_set_book (query, gnc_get_current_book ());
 +
 +    include_children = xaccAccountGetReconcileChildrenStatus (account);
 +    if (include_children)
 +        accounts = gnc_account_get_descendants (account);
 +
 +    /* match the account */
 +    accounts = g_list_prepend (accounts, account);
 +
 +    xaccQueryAddAccountMatch (query, accounts, QOF_GUID_MATCH_ANY, QOF_QUERY_AND);
 +
 +    g_list_free (accounts);
 +
 +    /* limit the matches to CREDITs and DEBITs only, depending on the type */
 +    if (type == RECLIST_CREDIT)
 +        xaccQueryAddValueMatch(query, gnc_numeric_zero (),
 +                               QOF_NUMERIC_MATCH_CREDIT,
 +                               QOF_COMPARE_GTE, QOF_QUERY_AND);
 +    else
 +        xaccQueryAddValueMatch(query, gnc_numeric_zero (),
 +                               QOF_NUMERIC_MATCH_DEBIT,
 +                               QOF_COMPARE_GTE, QOF_QUERY_AND);
 +
 +    /* limit the matches only to Cleared and Non-reconciled splits */
 +    xaccQueryAddClearedMatch (query, CLEARED_NO | CLEARED_CLEARED, QOF_QUERY_AND);
 +
 +    /* Initialize the QueryList */
 +    gnc_reconcile_view_construct (view, query);
 +
 +    /* find the list of splits to auto-reconcile */
 +    auto_check = gnc_prefs_get_bool (GNC_PREFS_GROUP_RECONCILE, GNC_PREF_CHECK_CLEARED);
 +
 +    if (auto_check)
 +    {
++        time64 statement_date_day_end = gnc_time64_get_day_end(statement_date);
 +        for (splits = qof_query_run (query); splits; splits = splits->next)
 +        {
 +            Split *split = splits->data;
 +            char recn = xaccSplitGetReconcile (split);
 +            time64 trans_date = xaccTransGetDate (xaccSplitGetParent (split));
 +
 +            /* Just an extra verification that our query is correct ;) */
 +            g_assert (recn == NREC || recn == CREC);
 +
 +            if (recn == CREC &&
- 		gnc_difftime (trans_date, statement_date) <= 0)
++		gnc_difftime (trans_date, statement_date_day_end) <= 0)
 +		g_hash_table_insert (view->reconciled, split, split);
 +        }
 +    }
 +
 +    /* Free the query -- we don't need it anymore */
 +    qof_query_destroy (query);
 +
 +    return GTK_WIDGET (view);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_init (GNCReconcileView *view)
 +{
 +    GNCSearchParamSimple *param;
 +    GList          *columns = NULL;
 +    gboolean num_action =
 +                qof_book_use_split_action_for_num_field(gnc_get_current_book());
 +
 +    view->reconciled = g_hash_table_new (NULL, NULL);
 +    view->account = NULL;
 +    view->sibling = NULL;
 +
 +    param = gnc_search_param_simple_new();
 +    gnc_search_param_set_param_fcn (param, QOF_TYPE_BOOLEAN,
 +                                    gnc_reconcile_view_is_reconciled, view);
 +    gnc_search_param_set_title ((GNCSearchParam *) param, _("Reconciled:R") + 11);
 +    gnc_search_param_set_justify ((GNCSearchParam *) param, GTK_JUSTIFY_CENTER);
 +    gnc_search_param_set_passive ((GNCSearchParam *) param, TRUE);
 +    gnc_search_param_set_non_resizeable ((GNCSearchParam *) param, TRUE);
 +    columns = g_list_prepend (columns, param);
 +    columns = gnc_search_param_prepend_with_justify (columns, _("Amount"),
 +              GTK_JUSTIFY_RIGHT,
 +              NULL, GNC_ID_SPLIT,
 +              SPLIT_AMOUNT, NULL);
 +    columns = gnc_search_param_prepend (columns, _("Description"), NULL,
 +                                        GNC_ID_SPLIT, SPLIT_TRANS,
 +                                        TRANS_DESCRIPTION, NULL);
 +    columns = num_action ?
 +              gnc_search_param_prepend_with_justify (columns, _("Num"),
 +              GTK_JUSTIFY_CENTER,
 +              NULL, GNC_ID_SPLIT,
 +              SPLIT_ACTION, NULL) :
 +              gnc_search_param_prepend_with_justify (columns, _("Num"),
 +              GTK_JUSTIFY_CENTER,
 +              NULL, GNC_ID_SPLIT,
 +              SPLIT_TRANS, TRANS_NUM, NULL);
 +    columns = gnc_search_param_prepend (columns, _("Date"), NULL, GNC_ID_SPLIT,
 +                                        SPLIT_TRANS, TRANS_DATE_POSTED, NULL);
 +
 +    view->column_list = columns;
 +}
 +
 +
 +static void
 +gnc_reconcile_view_class_init (GNCReconcileViewClass *klass)
 +{
 +    GObjectClass    *object_class;
 +
 +    object_class =  G_OBJECT_CLASS (klass);
 +
 +    parent_class = g_type_class_peek_parent (klass);
 +
 +    reconcile_view_signals[TOGGLE_RECONCILED] =
 +        g_signal_new("toggle_reconciled",
 +                     G_OBJECT_CLASS_TYPE (object_class),
 +                     G_SIGNAL_RUN_FIRST,
 +                     G_STRUCT_OFFSET (GNCReconcileViewClass,
 +                                      toggle_reconciled),
 +                     NULL, NULL,
 +                     g_cclosure_marshal_VOID__POINTER,
 +                     G_TYPE_NONE, 1,
 +                     G_TYPE_POINTER);
 +
 +    reconcile_view_signals[LINE_SELECTED] =
 +        g_signal_new("line_selected",
 +                     G_OBJECT_CLASS_TYPE (object_class),
 +                     G_SIGNAL_RUN_FIRST,
 +                     G_STRUCT_OFFSET (GNCReconcileViewClass,
 +                                      line_selected),
 +                     NULL, NULL,
 +                     g_cclosure_marshal_VOID__POINTER,
 +                     G_TYPE_NONE, 1,
 +                     G_TYPE_POINTER);
 +
 +    reconcile_view_signals[DOUBLE_CLICK_SPLIT] =
 +        g_signal_new("double_click_split",
 +                     G_OBJECT_CLASS_TYPE (object_class),
 +                     G_SIGNAL_RUN_FIRST,
 +                     G_STRUCT_OFFSET (GNCReconcileViewClass,
 +                                      double_click_split),
 +                     NULL, NULL,
 +                     g_cclosure_marshal_VOID__POINTER,
 +                     G_TYPE_NONE, 1,
 +                     G_TYPE_POINTER);
 +
 +    object_class->finalize = gnc_reconcile_view_finalize;
 +
 +    klass->toggle_reconciled = NULL;
 +    klass->line_selected = NULL;
 +    klass->double_click_split = NULL;
 +}
 +
 +
 +static void
 +gnc_reconcile_view_toggle_split (GNCReconcileView *view, Split *split)
 +{
 +    Split *current;
 +
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +    g_return_if_fail (view->reconciled != NULL);
 +
 +    current = g_hash_table_lookup (view->reconciled, split);
 +
 +    if (current == NULL)
 +        g_hash_table_insert (view->reconciled, split, split);
 +    else
 +        g_hash_table_remove (view->reconciled, split);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_toggle_children (Account *account, GNCReconcileView *view, Split *split)
 +{
 +    GList       *child_accounts, *node;
 +    Transaction *transaction;
 +
 +    /*
 +     * Need to get all splits in this transaction and identify any that are
 +     * in the same hierarchy as the account being reconciled (not necessarily
 +     * the account this split is from.)
 +     *
 +     * For each of these splits toggle them all to the same state.
 +     */
 +    child_accounts = gnc_account_get_descendants (account);
 +    child_accounts = g_list_prepend (child_accounts, account);
 +    transaction = xaccSplitGetParent (split);
 +    for (node = xaccTransGetSplitList (transaction); node; node = node->next)
 +    {
 +        Split *other_split;
 +        Account *other_account;
 +        GNCReconcileView *current_view;
 +
 +        GtkTreeModel *model;
 +        GtkTreeIter   iter;
 +        gboolean      valid;
 +        gpointer      pointer;
 +
 +        other_split = node->data;
 +        other_account = xaccSplitGetAccount (other_split);
 +        if (other_split == split)
 +            continue;
 +        /* Check this 'other' account in in the same hierarchy */
 +        if (!g_list_find (child_accounts, other_account))
 +            continue;
 +        /* Search our sibling view for this split first.  We search the
 +         * sibling list first because that it where it is most likely to be.
 +         */
 +        current_view = view->sibling;
 +        if (!gnc_query_view_item_in_view (GNC_QUERY_VIEW (current_view), other_split))
 +        {
 +            /* Not in the sibling view, try this view */
 +            current_view = view;
 +            if (!gnc_query_view_item_in_view (GNC_QUERY_VIEW (current_view), other_split))
 +                /* We can't find it, nothing more I can do about it */
 +                continue;
 +        }
 +
 +        /* Found the other split. Toggle the reconciled check mark in the view... */
 +        model = gtk_tree_view_get_model (GTK_TREE_VIEW (current_view));
 +        valid = gtk_tree_model_get_iter_first (model, &iter);
 +
 +        while (valid)
 +        {
 +            // Walk through the list, reading each row
 +            gtk_tree_model_get (model, &iter, 0, &pointer, -1);
 +
 +            if(pointer == other_split)
 +            {
 +                gboolean toggled;
 +                gtk_tree_model_get (model, &iter, 5, &toggled, -1);
 +                gtk_list_store_set (GTK_LIST_STORE (model), &iter, 5, !toggled, -1);
 +                break;
 +            }
 +
 +            valid = gtk_tree_model_iter_next (model, &iter);
 +        }
 +
 +        /* ...and toggle its reconciled state in the internal hash */
 +        gnc_reconcile_view_toggle_split (current_view, other_split);
 +    }
 +    g_list_free (child_accounts);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_toggle (GNCReconcileView *view, Split *split)
 +{
 +    gboolean include_children;
 +
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +    g_return_if_fail (view->reconciled != NULL);
 +
 +    gnc_reconcile_view_toggle_split (view, split);
 +
 +    include_children = xaccAccountGetReconcileChildrenStatus (view->account);
 +    if (include_children)
 +        gnc_reconcile_view_toggle_children (view->account, view, split);
 +
 +    g_signal_emit (G_OBJECT (view),
 +                   reconcile_view_signals[TOGGLE_RECONCILED], 0, split);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_line_toggled (GNCQueryView *qview,
 +                                 gpointer item,
 +                                 gpointer user_data)
 +{
 +    GNCReconcileView *view;
 +    GtkTreeModel     *model;
 +    GtkTreeIter       iter;
 +    gpointer          entry;
 +
 +    g_return_if_fail (user_data);
 +    g_return_if_fail (GNC_IS_QUERY_VIEW (qview));
 +
 +    view = user_data;
 +
 +    model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview));
 +    gtk_tree_model_iter_nth_child (model, &iter, NULL, qview->toggled_row);
 +    gtk_list_store_set (GTK_LIST_STORE (model), &iter, qview->toggled_column, GPOINTER_TO_INT(item), -1);
 +    gtk_tree_model_get (model, &iter, 0, &entry, -1);
 +
 +    gnc_reconcile_view_toggle (view, entry);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_double_click_entry (GNCQueryView *qview,
 +                                       gpointer item,
 +                                       gpointer user_data)
 +{
 +    GNCReconcileView *view;
 +    /* item is the entry */
 +    g_return_if_fail (user_data);
 +    g_return_if_fail (GNC_IS_QUERY_VIEW (qview));
 +
 +    view = user_data;
 +
 +    g_signal_emit(G_OBJECT (view),
 +                  reconcile_view_signals[DOUBLE_CLICK_SPLIT], 0, item);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_row_selected (GNCQueryView *qview,
 +                                 gpointer item,
 +                                 gpointer user_data)
 +{
 +    GNCReconcileView *view;
 +    /* item is the number of selected entries */
 +    g_return_if_fail(user_data);
 +    g_return_if_fail(GNC_IS_QUERY_VIEW(qview));
 +
 +    view = user_data;
 +
 +    g_signal_emit(G_OBJECT(view),
 +                  reconcile_view_signals[LINE_SELECTED], 0, item);
 +}
 +
 +
 +void
 +gnc_reconcile_view_set_list ( GNCReconcileView  *view, gboolean reconcile)
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW(view);
 +    GtkTreeSelection  *selection;
 +    GtkTreeModel      *model;
 +    gpointer           entry;
 +    gboolean           toggled;
 +    GList             *node;
 +    GList             *list_of_rows;
 +
 +    model =  gtk_tree_view_get_model (GTK_TREE_VIEW (qview));
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    list_of_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 +
 +    /* We get a list of TreePaths */
 +    for(node = list_of_rows; node; node = node->next)
 +    {
 +        GtkTreeIter iter;
 +        if(gtk_tree_model_get_iter(model, &iter, node->data))
 +        {
 +            /* now iter is a valid row iterator */
 +            gtk_tree_model_get (model, &iter, 0, &entry, -1);
 +            gtk_tree_model_get (model, &iter, 5, &toggled, -1);
 +
 +            gtk_list_store_set (GTK_LIST_STORE (model), &iter, 5, reconcile, -1);
 +
 +            if(reconcile != toggled)
 +                gnc_reconcile_view_toggle (view, entry);
 +        }
 +        gtk_tree_path_free(node->data);
 +    }
 +    g_list_free(list_of_rows);
 +}
 +
 +
 +gint 
 +gnc_reconcile_view_num_selected (GNCReconcileView  *view )
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW(view);
 +    GtkTreeSelection  *selection;
 +
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    return gtk_tree_selection_count_selected_rows (selection);
 +}
 +
 +
 +static gboolean
 +gnc_reconcile_view_set_toggle (GNCReconcileView  *view)
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW(view);
 +    GtkTreeSelection  *selection;
 +    GtkTreeModel      *model;
 +    gboolean           toggled;
 +    GList             *node;
 +    GList             *list_of_rows;
 +    gint               num_toggled = 0;
 +    gint               num_selected = 0;
 +
 +    model =  gtk_tree_view_get_model (GTK_TREE_VIEW (qview));
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    list_of_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 +    num_selected = gtk_tree_selection_count_selected_rows (selection);
 +
 +    /* We get a list of TreePaths */
 +    for(node = list_of_rows; node; node = node->next)
 +    {
 +        GtkTreeIter iter;
 +        toggled = FALSE;
 +        if(gtk_tree_model_get_iter(model, &iter, node->data))
 +        {
 +            /* now iter is a valid row iterator */
 +            gtk_tree_model_get (model, &iter, 5, &toggled, -1);
 +
 +            if(toggled)
 +                num_toggled++;
 +        }
 +        gtk_tree_path_free(node->data);
 +    }
 +    g_list_free(list_of_rows);
 +
 +    if(num_toggled == num_selected)
 +        return FALSE;
 +    else
 +        return TRUE;
 +}
 +
 +
 +static gboolean
 +gnc_reconcile_view_key_press_cb (GtkWidget *widget, GdkEventKey *event,
 +                            gpointer user_data)
 +{
 +    GNCReconcileView  *view = GNC_RECONCILE_VIEW(user_data);
 +    gboolean           toggle;
 +
 +    switch (event->keyval)
 +    {
 +    case GDK_KEY_space:
 +        g_signal_stop_emission_by_name (widget, "key_press_event");
 +
 +        toggle = gnc_reconcile_view_set_toggle (view);
 +        gnc_reconcile_view_set_list (view, toggle);
 +        return TRUE;
 +        break;
 +
 +    default:
 +        return FALSE;
 +    }
 +}
 +
 +
 +static void
 +gnc_reconcile_view_finalize (GObject *object)
 +{
 +    GNCReconcileView *view = GNC_RECONCILE_VIEW (object);
 +
 +    if (view->reconciled != NULL)
 +    {
 +        g_hash_table_destroy (view->reconciled);
 +        view->reconciled = NULL;
 +    }
 +    G_OBJECT_CLASS (parent_class)->finalize (object);
 +}
 +
 +
 +gint
 +gnc_reconcile_view_get_num_splits (GNCReconcileView *view)
 +{
 +    g_return_val_if_fail (view != NULL, 0);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), 0);
 +
 +    return gnc_query_view_get_num_entries (GNC_QUERY_VIEW (view));
 +}
 +
 +
 +Split *
 +gnc_reconcile_view_get_current_split (GNCReconcileView *view)
 +{
 +    g_return_val_if_fail (view != NULL, NULL);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), NULL);
 +
 +    return gnc_query_view_get_selected_entry (GNC_QUERY_VIEW (view));
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_is_reconciled                                 *
 + *   Is the item a reconciled split?                                *
 + *                                                                  *
 + * Args: item      - the split to be checked                        *
 + *       user_data - a pointer to the GNCReconcileView              *
 + * Returns: whether the split is to be reconciled.                  *
 +\********************************************************************/
 +static gpointer
 +gnc_reconcile_view_is_reconciled (gpointer item, gpointer user_data)
 +{
 +    GNCReconcileView *view = user_data;
 +    Split *current;
 +
 +    g_return_val_if_fail (item, NULL);
 +    g_return_val_if_fail (view, NULL);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), NULL);
 +
 +    if (!view->reconciled)
 +        return NULL;
 +
 +    current = g_hash_table_lookup (view->reconciled, item);
 +    return GINT_TO_POINTER (current != NULL);
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_refresh                                       *
 + *   refreshes the view                                             *
 + *                                                                  *
 + * Args: view - view to refresh                                     *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +static void
 +grv_refresh_helper (gpointer key, gpointer value, gpointer user_data)
 +{
 +    GNCReconcileView *view = user_data;
 +    GNCQueryView *qview = GNC_QUERY_VIEW (view);
 +
 +    if (!gnc_query_view_item_in_view (qview, key))
 +        g_hash_table_remove (view->reconciled, key);
 +}
 +
 +void
 +gnc_reconcile_view_refresh (GNCReconcileView *view)
 +{
 +    GNCQueryView *qview;
 +
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    qview = GNC_QUERY_VIEW (view);
 +    gnc_query_view_refresh (qview);
 +
 +    /* Now verify that everything in the reconcile hash is still in qview */
 +    if (view->reconciled)
 +        g_hash_table_foreach (view->reconciled, grv_refresh_helper, view);
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_reconciled_balance                            *
 + *   returns the reconciled balance of the view                     *
 + *                                                                  *
 + * Args: view - view to get reconciled balance of                   *
 + * Returns: reconciled balance (gnc_numeric)                        *
 +\********************************************************************/
 +static void
 +grv_balance_hash_helper (gpointer key, gpointer value, gpointer user_data)
 +{
 +    Split *split = key;
 +    gnc_numeric *total = user_data;
 +
 +    *total = gnc_numeric_add_fixed (*total, xaccSplitGetAmount (split));
 +}
 +
 +gnc_numeric
 +gnc_reconcile_view_reconciled_balance (GNCReconcileView *view)
 +{
 +    gnc_numeric total = gnc_numeric_zero ();
 +
 +    g_return_val_if_fail (view != NULL, total);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), total);
 +
 +    if (view->reconciled == NULL)
 +        return total;
 +
 +    g_hash_table_foreach (view->reconciled, grv_balance_hash_helper, &total);
 +
 +    return gnc_numeric_abs (total);
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_commit                                        *
 + *   Commit the reconcile information in the view. Only change the  *
 + *   state of those items marked as reconciled.  All others should  *
 + *   retain their previous state (none, cleared, voided, etc.).     *
 + *                                                                  *
 + * Args: view - view to commit                                      *
 + *       date - date to set as the reconcile date                   *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +static void
 +grv_commit_hash_helper (gpointer key, gpointer value, gpointer user_data)
 +{
 +    Split *split = key;
 +    time64 *date = user_data;
 +
 +    xaccSplitSetReconcile (split, YREC);
 +    xaccSplitSetDateReconciledSecs (split, *date);
 +}
 +
 +void
 +gnc_reconcile_view_commit (GNCReconcileView *view, time64 date)
 +{
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    if (view->reconciled == NULL)
 +        return;
 +
 +    gnc_suspend_gui_refresh();
 +    g_hash_table_foreach (view->reconciled, grv_commit_hash_helper, &date);
 +    gnc_resume_gui_refresh();
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_postpone                                      *
 + *   postpone the reconcile information in the view by setting      *
 + *   reconciled splits to cleared status                            *
 + *                                                                  *
 + * Args: view - view to commit                                      *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +void
 +gnc_reconcile_view_postpone (GNCReconcileView *view)
 +{
 +    GtkTreeModel *model;
 +    GtkTreeIter   iter;
 +    int           num_splits;
 +    int           i;
 +    gpointer      entry = NULL;
 +
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    if (view->reconciled == NULL)
 +        return;
 +
 +    model = gtk_tree_view_get_model (GTK_TREE_VIEW (GNC_QUERY_VIEW (view)));
 +    gtk_tree_model_get_iter_first (model, &iter);
 +
 +    num_splits = gnc_query_view_get_num_entries (GNC_QUERY_VIEW (view));
 +
 +    gnc_suspend_gui_refresh();
 +    for (i = 0; i < num_splits; i++)
 +    {
 +        char recn;
 +
 +        gtk_tree_model_get (model, &iter, 0, &entry, -1);
 +
 +        // Don't change splits past reconciliation date that haven't been
 +        // set to be reconciled
 +        if (gnc_difftime (view->statement_date,
 +			  xaccTransGetDate (xaccSplitGetParent (entry))) >= 0 ||
 +                g_hash_table_lookup (view->reconciled, entry))
 +        {
 +            recn = g_hash_table_lookup (view->reconciled, entry) ? CREC : NREC;
 +            xaccSplitSetReconcile (entry, recn);
 +        }
 +        gtk_tree_model_iter_next (model, &iter);
 +    }
 +    gnc_resume_gui_refresh();
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_unselect_all                                  *
 + *   unselect all splits in the view                                *
 + *                                                                  *
 + * Args: view - view to unselect all                                *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +void
 +gnc_reconcile_view_unselect_all(GNCReconcileView *view)
 +{
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    gnc_query_view_unselect_all (GNC_QUERY_VIEW (view));
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_changed                                       *
 + *   returns true if any splits have been reconciled                *
 + *                                                                  *
 + * Args: view - view to get changed status for                      *
 + * Returns: true if any reconciled splits                           *
 +\********************************************************************/
 +gboolean
 +gnc_reconcile_view_changed (GNCReconcileView *view)
 +{
 +    g_return_val_if_fail (view != NULL, FALSE);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), FALSE);
 +
 +    return g_hash_table_size (view->reconciled) != 0;
 +}
 +

commit fc5bdfa10b9aa38ca37ed841cfed697149d75f4c
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Sat Mar 3 22:08:39 2018 +0100

    Revision and expansion of accounts for the Russian language.
    In addition, replacing of commodity: USD => RUB.
    
    Cherrypicked from unstable and adjusted to main

diff --git a/accounts/ru/CMakeLists.txt b/accounts/ru/CMakeLists.txt
index a2a87d1..e8d4128 100644
--- a/accounts/ru/CMakeLists.txt
+++ b/accounts/ru/CMakeLists.txt
@@ -1,7 +1,11 @@
 SET(account_DATA
+  acctchrt_auto.gnucash-xea
+  acctchrt_autoloan.gnucash-xea
   acctchrt_common.gnucash-xea
   acctchrt_homeloan.gnucash-xea
   acctchrt_homeown.gnucash-xea
+  acctchrt_kids.gnucash-xea
+  acctchrt_otherloan.gnucash-xea
   acctchrt_renter.gnucash-xea)
 
 SET_DIST_LIST(RU_DIST ${account_DATA} Makefile.am CMakeLists.txt)
diff --git a/accounts/ru/Makefile.am b/accounts/ru/Makefile.am
index 0aee455..6d9326c 100644
--- a/accounts/ru/Makefile.am
+++ b/accounts/ru/Makefile.am
@@ -2,9 +2,13 @@
 accountdir = ${GNC_ACCOUNTS_DIR}/ru
 
 account_DATA = \
+  acctchrt_auto.gnucash-xea \
+  acctchrt_autoloan.gnucash-xea \
   acctchrt_common.gnucash-xea \
   acctchrt_homeloan.gnucash-xea \
   acctchrt_homeown.gnucash-xea \
+  acctchrt_kids.gnucash-xea \
+  acctchrt_otherloan.gnucash-xea \
   acctchrt_renter.gnucash-xea
 
 EXTRA_DIST = \
diff --git a/accounts/ru/acctchrt_auto.gnucash-xea b/accounts/ru/acctchrt_auto.gnucash-xea
new file mode 100644
index 0000000..c679221
--- /dev/null
+++ b/accounts/ru/acctchrt_auto.gnucash-xea
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Автомобиль
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на автомобиль
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с автомобилем.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Головной счет</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>Расходы</act:name>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспорт</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автомобиль</act:name>
+  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы на автомобиль</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Сборы</act:name>
+  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Сборы</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Топливо</act:name>
+  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Топливо</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Парковка</act:name>
+  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Парковка</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Ремонт и обслуживание</act:name>
+  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Ремонт и обслуживание</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Гараж</act:name>
+  <act:id type="new">5630f036a6b1aa8f37d4fdc51e7632a2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Гараж</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспортный налог</act:name>
+  <act:id type="new">6b242114ac2c3a1bda48df1f6b4db3fe</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспортный налог</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автостраховка</act:name>
+  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Страхование автотранспорта</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_autoloan.gnucash-xea
similarity index 68%
copy from accounts/ru/acctchrt_homeloan.gnucash-xea
copy to accounts/ru/acctchrt_autoloan.gnucash-xea
index 1d0b11b..e42eeb7 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_autoloan.gnucash-xea
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на автомобиль
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на автомобиль
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на автомобиль.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
-  <act:name>Root Account</act:name>
+  <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
   <act:type>ROOT</act:type>
   <act:commodity-scu>0</act:commodity-scu>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,32 +51,32 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Автокредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
     <slot>
       <slot:key>placeholder</slot:key>
       <slot:value type="string">true</slot:value>
     </slot>
   </act:slots>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Проценты</act:name>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на автомобиль</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_common.gnucash-xea b/accounts/ru/acctchrt_common.gnucash-xea
index c304444..37715e6 100644
--- a/accounts/ru/acctchrt_common.gnucash-xea
+++ b/accounts/ru/acctchrt_common.gnucash-xea
@@ -7,9 +7,10 @@
       Базовый набор наиболее используемых счетов
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Большинство пользователей предпочитает этот набор счетов. Он включает наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
-  </gnc-act:long-description>    
-  <gnc-act:start-selected>1</gnc-act:start-selected>
+      Наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
+    </gnc-act:long-description>
+    <gnc-act:start-selected>1</gnc-act:start-selected>
+
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -22,7 +23,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Активы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -39,7 +40,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Текущие активы</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
@@ -56,7 +57,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековый счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -67,7 +68,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитный счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -78,18 +79,18 @@
   <act:type>CASH</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Наличные</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Долги</act:name>
+  <act:name>Обязательства</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Долги</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -106,7 +107,7 @@
   <act:type>CREDIT</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Кредитная карта</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
@@ -117,7 +118,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Доходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -129,15 +130,37 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
+  <act:name>Работа</act:name>
+  <act:id type="new">558d76b1e4eb0ede3dd364ed705e9617</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Премия</act:description>
+  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Заработная плата</act:name>
+  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Заработная плата</act:description>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
   <act:name>Премия</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Премия</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Полученные подарки</act:name>
@@ -145,7 +168,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Полученные подарки</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -156,7 +179,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Процентный доход</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -167,7 +190,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековые проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -178,7 +201,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы с процентов</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -189,7 +212,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитные проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -200,29 +223,18 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Заработная плата</act:name>
-  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
-  <act:type>INCOME</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Заработная плата</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -234,158 +246,165 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Корректировка</act:name>
-  <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Корректировка</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Автомобиль</act:name>
-  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:name>Образование</act:name>
+  <act:id type="new">8b686c37652f2a3222642bfa27d34f83</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Расходы на автомобиль</act:description>
+  <act:description>Образование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Сборы</act:name>
-  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:name>Книги</act:name>
+  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Сборы</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Книги</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Топливо</act:name>
-  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:name>Учёба</act:name>
+  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Топливо</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Учёба</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Парковка</act:name>
-  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:name>Подписки</act:name>
+  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Парковка</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Подписки</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт и обслуживание</act:name>
-  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:name>Связь и телевидение</act:name>
+  <act:id type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ремонт и обслуживание</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Связь и телевидение</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Банковское обслуживание</act:name>
-  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
+  <act:name>Кабельное телевидение</act:name>
+  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Банковское обслуживание</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Кабельное телевидение</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Книги</act:name>
-  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
+  <act:name>Телефон</act:name>
+  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Книги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Телефон</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Кабельное телевидение</act:name>
-  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
+  <act:name>Интернет услуги</act:name>
+  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Кабельное телевидение</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Интернет услуги</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Благотворительность</act:name>
-  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
+  <act:name>Одежда</act:name>
+  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Благотворительность</act:description>
+  <act:description>Одежда</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Одежда</act:name>
-  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
+  <act:name>Техника</act:name>
+  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Одежда</act:description>
+  <act:description>Техника</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Компьютер</act:name>
-  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
+  <act:name>Пропитание</act:name>
+  <act:id type="new">2ad4ce1b4f373af407b8a6c81075334e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Компьютер</act:description>
+  <act:description>Пропитание</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Обеды</act:name>
+  <act:name>Столовая</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Обеды</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Столовая</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Учёба</act:name>
-  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
+  <act:name>Продукты</act:name>
+  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Учёба</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Продукты</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Развлечения</act:name>
@@ -393,7 +412,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Развлечения</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -404,7 +423,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Музыка и кино</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -415,7 +434,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Отдых</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -426,42 +445,42 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Путешествия</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подарки</act:name>
-  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
+  <act:name>Спорт</act:name>
+  <act:id type="new">d5b698225b04b3f8d8fdb387033e3329</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подарки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Спорт</act:description>
+  <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хозтовары</act:name>
-  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
+  <act:name>Подарки</act:name>
+  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хозтовары</act:description>
+  <act:description>Подарки</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хобби</act:name>
-  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
+  <act:name>Хозтовары</act:name>
+  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хобби</act:description>
+  <act:description>Хозтовары</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -470,54 +489,54 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Автостраховка</act:name>
-  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:name>Медицинское страхование</act:name>
+  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Автостраховка</act:description>
+  <act:description>Медицинское страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Медстраховка</act:name>
-  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
+  <act:name>Пенсионное страхование</act:name>
+  <act:id type="new">491e31dcfa7d1193b9c385bff97512e1</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Медстраховка</act:description>
+  <act:description>Пенсионное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование жизни</act:name>
-  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
+  <act:name>Социальное страхование</act:name>
+  <act:id type="new">2e9dc34fd27bbf937b7d89c6db859dba</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование жизни</act:description>
+  <act:description>Социальное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Химчистка/прачечная</act:name>
-  <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
+  <act:name>Страхование жизни</act:name>
+  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Химчистка/прачечная</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Страхование жизни</act:description>
+  <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Медицинские расходы</act:name>
@@ -525,7 +544,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Медицинские расходы</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -536,131 +555,155 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Разное</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Интернет услуги</act:name>
-  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
+  <act:name>Хобби</act:name>
+  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Интернет услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Хобби</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Телефон</act:name>
-  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
+  <act:name>Разное</act:name>
+  <act:id type="new">12f44aff5aeb8aba7be4d3b033aaa1d4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Телефон</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Разное</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественный транспорт</act:name>
-  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
+  <act:name>Благотворительность</act:name>
+  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественный транспорт</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Благотворительность</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подписки</act:name>
-  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
+  <act:name>Банковское обслуживание</act:name>
+  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подписки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Банковское обслуживание</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Питание</act:name>
-  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Питание</act:description>
+  <act:description>Транспорт</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Налоги</act:name>
-  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
+  <act:name>Общественный транспорт</act:name>
+  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Налоги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Общественный транспорт</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Федеральные</act:name>
-  <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
+  <act:name>Налоги</act:name>
+  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Федеральные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Налоги</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
-<!-- <gnc:account version="2.0.0">
-  <act:name>Medicare</act:name>
-  <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
+<gnc:account version="2.0.0">
+  <act:name>Другие налоги</act:name>
+  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Medicare</act:description>
+  <act:description>Другие налоги</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
-</gnc:account> -->
+</gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Другие налоги</act:name>
-  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
+  <act:name>Подоходный налог</act:name>
+  <act:id type="new">910d257186603830d831bfdaf03a4e0b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Другие налоги</act:description>
+  <act:description>Подоходный налог</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественная безопасность</act:name>
-  <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественная безопасность</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Проживание</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Региональные</act:name>
-  <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
+  <act:name>Ремонт</act:name>
+  <act:id type="new">89d7a0008e9ee88095385186302b1f7b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Региональные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Ремонт</act:description>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Коммунальные услуги</act:name>
@@ -668,10 +711,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Коммунальные услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Электричество</act:name>
@@ -679,7 +722,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Электричество</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -690,7 +733,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вывоз мусора</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -701,7 +744,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Газ</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -712,27 +755,21 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вода</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Собственные средства</act:name>
-  <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
-  <act:type>EQUITY</act:type>
+  <act:name>Другие сборы</act:name>
+  <act:id type="new">a8577e227433f26572033068bc7777f5</act:id>
+  <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Собственные средства</act:description>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
-  <act:slots>
-    <slot>
-      <slot:key>placeholder</slot:key>
-      <slot:value type="string">true</slot:value>
-    </slot>
-  </act:slots>
+  <act:description>Другие сборы</act:description>
+  <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Начальное сальдо</act:name>
@@ -740,11 +777,12 @@
   <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Остаток средств на начало периода</act:description>
-  <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_homeloan.gnucash-xea
index 1d0b11b..d8e26a5 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_homeloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на недвижимость
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на недвижимость
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на недвижимость.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Ипотечный кредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на ипотеку</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_homeown.gnucash-xea b/accounts/ru/acctchrt_homeown.gnucash-xea
index 99c0bf5..362dc4b 100644
--- a/accounts/ru/acctchrt_homeown.gnucash-xea
+++ b/accounts/ru/acctchrt_homeown.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
+    <gnc-account-example>
     <gnc-act:title>
-      Расходы домовладельца
+      Дом/Квартира
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с домовладением
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Вы можете выбрать этот набор счетов если являетесь домовладельцем. Этот набор предоставляет группу счетов, позволяющую управлять такими расходами, как страховка, налоги и ремонт.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с владением квартирой или домом (страховка, налоги и ремонт).
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -17,11 +18,11 @@
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,36 +34,25 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт дома</act:name>
-  <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Ремонт дома</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Страхование</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страховка дома</act:name>
+  <act:name>Страхование имущества</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страховка дома</act:description>
+  <act:description>Страхование имущества</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -71,10 +61,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налоги</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Налог на имущество</act:name>
@@ -82,11 +72,23 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налог на имущество</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Земельный налог</act:name>
+  <act:id type="new">6c5c05753e3a6b5eaeb63045ed218374</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Земельный налог</act:description>
+  <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
+</gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_kids.gnucash-xea b/accounts/ru/acctchrt_kids.gnucash-xea
new file mode 100644
index 0000000..21b6841
--- /dev/null
+++ b/accounts/ru/acctchrt_kids.gnucash-xea
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Дети
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на детей
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с детьми.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Root Account</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>Доходы</act:name>
+  <act:id type="new">724c2a1128e49b0b28304d372b19f5a1</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Доходы</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Помощь</act:name>
+  <act:id type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Материальная помощь</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">724c2a1128e49b0b28304d372b19f5a1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Пособие на ребёнка</act:name>
+  <act:id type="new">ff445bf61420de7b5df2637060837151</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Пособие на ребёнка</act:description>
+  <act:parent type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Расходы</act:name>
+  <act:id type="new">bc39f4d37eb75353f4f971e80b9d2818</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Дети</act:name>
+  <act:id type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Дети</act:description>
+  <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Школа</act:name>
+  <act:id type="new">88533a6a943b55551c3fff6043406a67</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Школа</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Детский сад</act:name>
+  <act:id type="new">5208f9c1e3d68a73ce0a6eda91ba5c61</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Детский сад</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_otherloan.gnucash-xea
similarity index 69%
copy from accounts/ru/acctchrt_homeloan.gnucash-xea
copy to accounts/ru/acctchrt_otherloan.gnucash-xea
index 1d0b11b..13d58c6 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Другие кредиты
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Различные кредиты и связанные с ними платежи
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для различных кредитов и связанных с ними платежей.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Кредит (потребительский)</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за другие кредиты</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_renter.gnucash-xea b/accounts/ru/acctchrt_renter.gnucash-xea
index d1b1d2d..061bbc7 100644
--- a/accounts/ru/acctchrt_renter.gnucash-xea
+++ b/accounts/ru/acctchrt_renter.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Арендные расходы
+      Аренда
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с арендой недвижимости
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если арендуете дом, квартиру или другую недвижимость.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с арендой дома или квартиры.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,26 +34,21 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование</act:name>
-  <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование</act:description>
+  <act:description>Проживание</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Страховка аренды</act:name>
-  <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Страховка аренды</act:description>
-  <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Арендная плата</act:name>
@@ -60,11 +56,12 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Арендная плата</act:description>
-  <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->

commit a72e0bdd5ed40a7306f67508b61c640748177aa8
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Sun Mar 4 14:09:24 2018 +0100

    Add spacing between border and text in dialog "New Accounts Hierarchy Setup".
    
    There is no spacing between the text and the frame in the dialog
    "New File" > "New Accounts Hierarchy Setup". In some cases - when
    changing the window size - the text appears next to the frame.
    It does not look very clean. As a solution, I have defined here a small spacing: 5px.

diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade
index 497c7fd..8e48b56 100644
--- a/gnucash/gtkbuilder/assistant-hierarchy.glade
+++ b/gnucash/gtkbuilder/assistant-hierarchy.glade
@@ -14,6 +14,8 @@
       <object class="GtkLabel" id="intro_page_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">5</property>
+        <property name="margin_right">5</property>
         <property name="label" translatable="yes">This assistant will help you create a set of GnuCash accounts for your assets (such as investments, checking or savings accounts), liabilities (such as loans) and different kinds of income and expenses you might have.
 
 You can pick a set of accounts here that seem close to your needs. After the assistant completes you will be able to add, rename, modify, and remove accounts, at any time later on. You will also be able to add sub-accounts, as well as move accounts (along with their sub-accounts) from one parent to another.
@@ -111,6 +113,8 @@ Please choose the currency to use for new accounts.</property>
           <object class="GtkLabel" id="pickAccountsDescriptionLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
             <property name="label" translatable="yes">
 Select categories that correspond to the ways that you foresee you will use GnuCash. Each category you select will cause several accounts to be created.
 
@@ -346,6 +350,8 @@ Select categories that correspond to the ways that you foresee you will use GnuC
           <object class="GtkLabel" id="finalAccountLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
             <property name="label" translatable="yes">
 If you would like to change an account's name, click on the row containing the account, then click on the account name and change it.
 
@@ -392,6 +398,8 @@ If you would like an account to have an opening balance, click on the row contai
       <object class="GtkLabel" id="finish_page_label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">5</property>
+        <property name="margin_right">5</property>
         <property name="label" translatable="yes">Press `Apply' to create your new accounts. You will then be able to save them to a file or database.
 
 Press `Back' to review your selections.

commit 51e2511223eb0873f342f0153929ef53d849d0eb
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Mar 4 19:16:39 2018 +0800

    Bug 765846 - Expense Over Time for subaccounts: An error occurred while running the report
    
    fix crash if acc-depth too low

diff --git a/src/report/standard-reports/category-barchart.scm b/src/report/standard-reports/category-barchart.scm
index 45f7f92..c6396f4 100644
--- a/src/report/standard-reports/category-barchart.scm
+++ b/src/report/standard-reports/category-barchart.scm
@@ -264,15 +264,25 @@ developing over time"))
     (define (show-acct? a)
       (member a accounts))
 
+    (define tree-depth (if (equal? account-levels 'all)
+                           (gnc:get-current-account-tree-depth)
+                           account-levels))
+
+    (define the-acount-destination-alist
+      (account-destination-alist accounts account-types tree-depth))
+
     ;;(gnc:debug accounts)
     (if (not (null? accounts))
-        
+
+        (if (null? the-acount-destination-alist)
+            (gnc:html-document-add-object!
+             document
+             (gnc:html-make-empty-data-warning
+              report-title (gnc:report-id report-obj)))
+
         ;; Define more helper variables.
         (let* ((commodity-list #f)
                (exchange-fn #f)
-               (tree-depth (if (equal? account-levels 'all)
-                               (gnc:get-current-account-tree-depth)
-                               account-levels))
                (averaging-fraction-func (gnc:date-get-fraction-func averaging-selection))
                (interval-fraction-func (gnc:date-get-fraction-func interval))
                (averaging-multiplier
@@ -368,10 +378,7 @@ developing over time"))
 	  (define (apply-sign account x)
 	    (if (reverse-balance? account) (- x) x))
           (define (calculate-report accounts progress-range)
-	    (let* ((the-acount-destination-alist (account-destination-alist accounts
-									    account-types
-									    tree-depth))
-		   (account-reformat
+	    (let* ((account-reformat
 		    (if do-intervals?
 			(lambda (account result)
 			  (map (lambda (collector datepair)
@@ -644,7 +651,7 @@ developing over time"))
            (gnc:html-document-add-object!
             document
             (gnc:html-make-empty-data-warning
-	     report-title (gnc:report-id report-obj)))))
+	     report-title (gnc:report-id report-obj))))))
         
 	;; else if no accounts selected
         (gnc:html-document-add-object! 

commit 18f0d053b04f463263f67bbe16bbd8ee2979a818
Author: Christian Stimming <christian at cstimming.de>
Date:   Sun Mar 4 00:18:39 2018 +0100

    Fix auto-selection of splits in reconcile
    
    Really use all splits of any given day. Up to now usually the splits
    of the given date were not or not all included, as the time comparison
    didn't correctly ignore any given time-of-day of the splits. Instead,
    all possible time-of-days should be included.

diff --git a/src/gnome/reconcile-view.c b/src/gnome/reconcile-view.c
index e8ea5b1..454c636 100644
--- a/src/gnome/reconcile-view.c
+++ b/src/gnome/reconcile-view.c
@@ -328,6 +328,7 @@ gnc_reconcile_view_new (Account *account, GNCReconcileViewType type,
 
     if (auto_check)
     {
+        time64 statement_date_day_end = gnc_time64_get_day_end(statement_date);
         for (splits = qof_query_run (query); splits; splits = splits->next)
         {
             Split *split = splits->data;
@@ -338,7 +339,7 @@ gnc_reconcile_view_new (Account *account, GNCReconcileViewType type,
             g_assert (recn == NREC || recn == CREC);
 
             if (recn == CREC &&
-		gnc_difftime (trans_date, statement_date) <= 0)
+		gnc_difftime (trans_date, statement_date_day_end) <= 0)
 		g_hash_table_insert (view->reconciled, split, split);
         }
     }

commit 335082480d106226aef1397ed6be2ceb80febeb8
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Sat Mar 3 22:08:39 2018 +0100

    Revision and expansion of accounts for the Russian language.
    In addition, replacing of commodity: USD => RUB.

diff --git a/data/accounts/ru/CMakeLists.txt b/data/accounts/ru/CMakeLists.txt
index 0466b71..52c7293 100644
--- a/data/accounts/ru/CMakeLists.txt
+++ b/data/accounts/ru/CMakeLists.txt
@@ -1,7 +1,11 @@
 SET(account_DATA
+  acctchrt_auto.gnucash-xea
+  acctchrt_autoloan.gnucash-xea
   acctchrt_common.gnucash-xea
   acctchrt_homeloan.gnucash-xea
   acctchrt_homeown.gnucash-xea
+  acctchrt_kids.gnucash-xea
+  acctchrt_otherloan.gnucash-xea
   acctchrt_renter.gnucash-xea)
 
 SET_DIST_LIST(RU_DIST ${account_DATA} CMakeLists.txt)
diff --git a/data/accounts/ru/acctchrt_auto.gnucash-xea b/data/accounts/ru/acctchrt_auto.gnucash-xea
new file mode 100644
index 0000000..c679221
--- /dev/null
+++ b/data/accounts/ru/acctchrt_auto.gnucash-xea
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Автомобиль
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на автомобиль
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с автомобилем.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Головной счет</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>Расходы</act:name>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспорт</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автомобиль</act:name>
+  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы на автомобиль</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Сборы</act:name>
+  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Сборы</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Топливо</act:name>
+  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Топливо</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Парковка</act:name>
+  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Парковка</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Ремонт и обслуживание</act:name>
+  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Ремонт и обслуживание</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Гараж</act:name>
+  <act:id type="new">5630f036a6b1aa8f37d4fdc51e7632a2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Гараж</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспортный налог</act:name>
+  <act:id type="new">6b242114ac2c3a1bda48df1f6b4db3fe</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспортный налог</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автостраховка</act:name>
+  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Страхование автотранспорта</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/data/accounts/ru/acctchrt_homeloan.gnucash-xea b/data/accounts/ru/acctchrt_autoloan.gnucash-xea
similarity index 68%
copy from data/accounts/ru/acctchrt_homeloan.gnucash-xea
copy to data/accounts/ru/acctchrt_autoloan.gnucash-xea
index 1d0b11b..e42eeb7 100644
--- a/data/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/data/accounts/ru/acctchrt_autoloan.gnucash-xea
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на автомобиль
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на автомобиль
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на автомобиль.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
-  <act:name>Root Account</act:name>
+  <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
   <act:type>ROOT</act:type>
   <act:commodity-scu>0</act:commodity-scu>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,32 +51,32 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Автокредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
     <slot>
       <slot:key>placeholder</slot:key>
       <slot:value type="string">true</slot:value>
     </slot>
   </act:slots>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Проценты</act:name>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на автомобиль</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_common.gnucash-xea b/data/accounts/ru/acctchrt_common.gnucash-xea
index c304444..37715e6 100644
--- a/data/accounts/ru/acctchrt_common.gnucash-xea
+++ b/data/accounts/ru/acctchrt_common.gnucash-xea
@@ -7,9 +7,10 @@
       Базовый набор наиболее используемых счетов
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Большинство пользователей предпочитает этот набор счетов. Он включает наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
-  </gnc-act:long-description>    
-  <gnc-act:start-selected>1</gnc-act:start-selected>
+      Наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
+    </gnc-act:long-description>
+    <gnc-act:start-selected>1</gnc-act:start-selected>
+
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -22,7 +23,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Активы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -39,7 +40,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Текущие активы</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
@@ -56,7 +57,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековый счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -67,7 +68,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитный счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -78,18 +79,18 @@
   <act:type>CASH</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Наличные</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Долги</act:name>
+  <act:name>Обязательства</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Долги</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -106,7 +107,7 @@
   <act:type>CREDIT</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Кредитная карта</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
@@ -117,7 +118,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Доходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -129,15 +130,37 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
+  <act:name>Работа</act:name>
+  <act:id type="new">558d76b1e4eb0ede3dd364ed705e9617</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Премия</act:description>
+  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Заработная плата</act:name>
+  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Заработная плата</act:description>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
   <act:name>Премия</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Премия</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Полученные подарки</act:name>
@@ -145,7 +168,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Полученные подарки</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -156,7 +179,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Процентный доход</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -167,7 +190,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековые проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -178,7 +201,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы с процентов</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -189,7 +212,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитные проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -200,29 +223,18 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Заработная плата</act:name>
-  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
-  <act:type>INCOME</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Заработная плата</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -234,158 +246,165 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Корректировка</act:name>
-  <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Корректировка</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Автомобиль</act:name>
-  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:name>Образование</act:name>
+  <act:id type="new">8b686c37652f2a3222642bfa27d34f83</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Расходы на автомобиль</act:description>
+  <act:description>Образование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Сборы</act:name>
-  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:name>Книги</act:name>
+  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Сборы</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Книги</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Топливо</act:name>
-  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:name>Учёба</act:name>
+  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Топливо</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Учёба</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Парковка</act:name>
-  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:name>Подписки</act:name>
+  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Парковка</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Подписки</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт и обслуживание</act:name>
-  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:name>Связь и телевидение</act:name>
+  <act:id type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ремонт и обслуживание</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Связь и телевидение</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Банковское обслуживание</act:name>
-  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
+  <act:name>Кабельное телевидение</act:name>
+  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Банковское обслуживание</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Кабельное телевидение</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Книги</act:name>
-  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
+  <act:name>Телефон</act:name>
+  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Книги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Телефон</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Кабельное телевидение</act:name>
-  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
+  <act:name>Интернет услуги</act:name>
+  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Кабельное телевидение</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Интернет услуги</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Благотворительность</act:name>
-  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
+  <act:name>Одежда</act:name>
+  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Благотворительность</act:description>
+  <act:description>Одежда</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Одежда</act:name>
-  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
+  <act:name>Техника</act:name>
+  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Одежда</act:description>
+  <act:description>Техника</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Компьютер</act:name>
-  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
+  <act:name>Пропитание</act:name>
+  <act:id type="new">2ad4ce1b4f373af407b8a6c81075334e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Компьютер</act:description>
+  <act:description>Пропитание</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Обеды</act:name>
+  <act:name>Столовая</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Обеды</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Столовая</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Учёба</act:name>
-  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
+  <act:name>Продукты</act:name>
+  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Учёба</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Продукты</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Развлечения</act:name>
@@ -393,7 +412,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Развлечения</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -404,7 +423,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Музыка и кино</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -415,7 +434,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Отдых</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -426,42 +445,42 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Путешествия</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подарки</act:name>
-  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
+  <act:name>Спорт</act:name>
+  <act:id type="new">d5b698225b04b3f8d8fdb387033e3329</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подарки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Спорт</act:description>
+  <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хозтовары</act:name>
-  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
+  <act:name>Подарки</act:name>
+  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хозтовары</act:description>
+  <act:description>Подарки</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хобби</act:name>
-  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
+  <act:name>Хозтовары</act:name>
+  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хобби</act:description>
+  <act:description>Хозтовары</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -470,54 +489,54 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Автостраховка</act:name>
-  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:name>Медицинское страхование</act:name>
+  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Автостраховка</act:description>
+  <act:description>Медицинское страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Медстраховка</act:name>
-  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
+  <act:name>Пенсионное страхование</act:name>
+  <act:id type="new">491e31dcfa7d1193b9c385bff97512e1</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Медстраховка</act:description>
+  <act:description>Пенсионное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование жизни</act:name>
-  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
+  <act:name>Социальное страхование</act:name>
+  <act:id type="new">2e9dc34fd27bbf937b7d89c6db859dba</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование жизни</act:description>
+  <act:description>Социальное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Химчистка/прачечная</act:name>
-  <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
+  <act:name>Страхование жизни</act:name>
+  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Химчистка/прачечная</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Страхование жизни</act:description>
+  <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Медицинские расходы</act:name>
@@ -525,7 +544,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Медицинские расходы</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -536,131 +555,155 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Разное</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Интернет услуги</act:name>
-  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
+  <act:name>Хобби</act:name>
+  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Интернет услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Хобби</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Телефон</act:name>
-  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
+  <act:name>Разное</act:name>
+  <act:id type="new">12f44aff5aeb8aba7be4d3b033aaa1d4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Телефон</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Разное</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественный транспорт</act:name>
-  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
+  <act:name>Благотворительность</act:name>
+  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественный транспорт</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Благотворительность</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подписки</act:name>
-  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
+  <act:name>Банковское обслуживание</act:name>
+  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подписки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Банковское обслуживание</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Питание</act:name>
-  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Питание</act:description>
+  <act:description>Транспорт</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Налоги</act:name>
-  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
+  <act:name>Общественный транспорт</act:name>
+  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Налоги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Общественный транспорт</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Федеральные</act:name>
-  <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
+  <act:name>Налоги</act:name>
+  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Федеральные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Налоги</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
-<!-- <gnc:account version="2.0.0">
-  <act:name>Medicare</act:name>
-  <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
+<gnc:account version="2.0.0">
+  <act:name>Другие налоги</act:name>
+  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Medicare</act:description>
+  <act:description>Другие налоги</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
-</gnc:account> -->
+</gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Другие налоги</act:name>
-  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
+  <act:name>Подоходный налог</act:name>
+  <act:id type="new">910d257186603830d831bfdaf03a4e0b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Другие налоги</act:description>
+  <act:description>Подоходный налог</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественная безопасность</act:name>
-  <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественная безопасность</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Проживание</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Региональные</act:name>
-  <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
+  <act:name>Ремонт</act:name>
+  <act:id type="new">89d7a0008e9ee88095385186302b1f7b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Региональные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Ремонт</act:description>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Коммунальные услуги</act:name>
@@ -668,10 +711,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Коммунальные услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Электричество</act:name>
@@ -679,7 +722,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Электричество</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -690,7 +733,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вывоз мусора</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -701,7 +744,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Газ</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -712,27 +755,21 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вода</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Собственные средства</act:name>
-  <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
-  <act:type>EQUITY</act:type>
+  <act:name>Другие сборы</act:name>
+  <act:id type="new">a8577e227433f26572033068bc7777f5</act:id>
+  <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Собственные средства</act:description>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
-  <act:slots>
-    <slot>
-      <slot:key>placeholder</slot:key>
-      <slot:value type="string">true</slot:value>
-    </slot>
-  </act:slots>
+  <act:description>Другие сборы</act:description>
+  <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Начальное сальдо</act:name>
@@ -740,11 +777,12 @@
   <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Остаток средств на начало периода</act:description>
-  <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_homeloan.gnucash-xea b/data/accounts/ru/acctchrt_homeloan.gnucash-xea
index 1d0b11b..d8e26a5 100644
--- a/data/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/data/accounts/ru/acctchrt_homeloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на недвижимость
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на недвижимость
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на недвижимость.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Ипотечный кредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на ипотеку</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_homeown.gnucash-xea b/data/accounts/ru/acctchrt_homeown.gnucash-xea
index 99c0bf5..362dc4b 100644
--- a/data/accounts/ru/acctchrt_homeown.gnucash-xea
+++ b/data/accounts/ru/acctchrt_homeown.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
+    <gnc-account-example>
     <gnc-act:title>
-      Расходы домовладельца
+      Дом/Квартира
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с домовладением
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Вы можете выбрать этот набор счетов если являетесь домовладельцем. Этот набор предоставляет группу счетов, позволяющую управлять такими расходами, как страховка, налоги и ремонт.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с владением квартирой или домом (страховка, налоги и ремонт).
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -17,11 +18,11 @@
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,36 +34,25 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт дома</act:name>
-  <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Ремонт дома</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Страхование</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страховка дома</act:name>
+  <act:name>Страхование имущества</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страховка дома</act:description>
+  <act:description>Страхование имущества</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -71,10 +61,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налоги</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Налог на имущество</act:name>
@@ -82,11 +72,23 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налог на имущество</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Земельный налог</act:name>
+  <act:id type="new">6c5c05753e3a6b5eaeb63045ed218374</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Земельный налог</act:description>
+  <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
+</gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_kids.gnucash-xea b/data/accounts/ru/acctchrt_kids.gnucash-xea
new file mode 100644
index 0000000..21b6841
--- /dev/null
+++ b/data/accounts/ru/acctchrt_kids.gnucash-xea
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Дети
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на детей
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с детьми.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Root Account</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>Доходы</act:name>
+  <act:id type="new">724c2a1128e49b0b28304d372b19f5a1</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Доходы</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Помощь</act:name>
+  <act:id type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Материальная помощь</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">724c2a1128e49b0b28304d372b19f5a1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Пособие на ребёнка</act:name>
+  <act:id type="new">ff445bf61420de7b5df2637060837151</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Пособие на ребёнка</act:description>
+  <act:parent type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Расходы</act:name>
+  <act:id type="new">bc39f4d37eb75353f4f971e80b9d2818</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Дети</act:name>
+  <act:id type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Дети</act:description>
+  <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Школа</act:name>
+  <act:id type="new">88533a6a943b55551c3fff6043406a67</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Школа</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Детский сад</act:name>
+  <act:id type="new">5208f9c1e3d68a73ce0a6eda91ba5c61</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Детский сад</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/data/accounts/ru/acctchrt_homeloan.gnucash-xea b/data/accounts/ru/acctchrt_otherloan.gnucash-xea
similarity index 69%
copy from data/accounts/ru/acctchrt_homeloan.gnucash-xea
copy to data/accounts/ru/acctchrt_otherloan.gnucash-xea
index 1d0b11b..13d58c6 100644
--- a/data/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/data/accounts/ru/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Другие кредиты
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Различные кредиты и связанные с ними платежи
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для различных кредитов и связанных с ними платежей.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Кредит (потребительский)</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за другие кредиты</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_renter.gnucash-xea b/data/accounts/ru/acctchrt_renter.gnucash-xea
index d1b1d2d..061bbc7 100644
--- a/data/accounts/ru/acctchrt_renter.gnucash-xea
+++ b/data/accounts/ru/acctchrt_renter.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Арендные расходы
+      Аренда
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с арендой недвижимости
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если арендуете дом, квартиру или другую недвижимость.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с арендой дома или квартиры.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,26 +34,21 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование</act:name>
-  <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование</act:description>
+  <act:description>Проживание</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Страховка аренды</act:name>
-  <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Страховка аренды</act:description>
-  <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Арендная плата</act:name>
@@ -60,11 +56,12 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Арендная плата</act:description>
-  <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->

commit 2d983c6703a5133333660a8729ab5bbd598f500f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Mar 3 00:22:07 2018 +0800

    bugfix gnc_ui_new_account_window
    
    parent -> parent_acct
    fixes bug introduced in c76efd656ecdd77571102af57e936fc4ce4be97b

diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index 3bd0827..9c41dca 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -1892,14 +1892,14 @@ gnc_ui_edit_account_window(GtkWindow *parent, Account *account)
  * opens up a window to create a new account
  *
  * Args:    book - containing book for the new account
- *        parent - The initial parent for the new account (optional)
+ *   parent_acct - The initial parent for the new account (optional)
  */
 void
 gnc_ui_new_account_window (GtkWindow *parent, QofBook *book,
                            Account *parent_acct)
 {
     g_return_if_fail(book != NULL);
-    if (parent && book)
+    if (parent_acct && book)
         g_return_if_fail(gnc_account_get_book(parent_acct) == book);
 
     gnc_ui_new_account_window_internal (parent, book, parent_acct, NULL, NULL,

commit e4884cdf096360fe8eb5456dfefda4dd7947b3c7
Merge: 13e6880 cf73c93
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 1 19:59:34 2018 +0100

    Merge branch 'maint' into unstable
    
    Ignoring changes in obsolete test-flat-bayes.c (was removed before on unstable)


commit cf73c93bdf4a9ba0e87ca7b3b9d9952b073ecdf4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 1 19:58:07 2018 +0100

    Bug 792008 - gnucash 2.6.19 fails to build
    
    Replace g_assert_true with g_assert for now

diff --git a/src/import-export/test/test-flat-bayes.c b/src/import-export/test/test-flat-bayes.c
index b00608b..06f4319 100644
--- a/src/import-export/test/test-flat-bayes.c
+++ b/src/import-export/test/test-flat-bayes.c
@@ -171,7 +171,7 @@ group_account_name_and_guid_in_mixed_case (Fixture * fixture, gconstpointer pDat
      * If the grouping by account name and guid is *not* working properly, this test will fail.
      */
     chosen = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1);
-    g_assert_true (chosen == fixture->account1);
+    g_assert (chosen == fixture->account1);
 }
 
 /*
@@ -191,7 +191,7 @@ read_flat_bayes (Fixture * fixture, gconstpointer pData)
     kvp_frame_set_slot (frame, path, count_value);
     kvp_value_delete (count_value);
     chosen = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1);
-    g_assert_true (chosen == fixture->account1);
+    g_assert (chosen == fixture->account1);
 }
 
 static void
@@ -208,7 +208,7 @@ write_flat_bayes (Fixture * fixture, gconstpointer pData)
     frame = qof_instance_get_slots (QOF_INSTANCE (fixture->account1));
     count_value = kvp_frame_get_slot (frame, path);
     count = kvp_value_get_gint64 (count_value);
-    g_assert_true (count == 2);
+    g_assert (count == 2);
 }
 
 /*
@@ -223,7 +223,7 @@ find_normal_bayes_account (Fixture * fixture, gconstpointer pData)
     gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1);
     gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1);
     acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1);
-    g_assert_true (acc == fixture->account1);
+    g_assert (acc == fixture->account1);
 }
 
 static void
@@ -239,7 +239,7 @@ find_flat_bayes_account (Fixture * fixture, gconstpointer pData)
     gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1);
     gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account2);
     acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1);
-    g_assert_true (acc == fixture->account1);
+    g_assert (acc == fixture->account1);
 }
 
 static void
@@ -255,7 +255,7 @@ find_guid_bayes_account (Fixture * fixture, gconstpointer pData)
     gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account1);
     gnc_imap_add_account_bayes (fixture->map1, fixture->tokens1, fixture->account2);
     acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1);
-    g_assert_true (acc == fixture->account1);
+    g_assert (acc == fixture->account1);
 }
 
 static void
@@ -264,7 +264,7 @@ find_normal_bayes_when_non_exists (Fixture * fixture, gconstpointer pData)
     KvpFrame * frame;
     Account * acc;
     acc = gnc_imap_find_account_bayes (fixture->map1, fixture->tokens1);
-    g_assert_true (acc == NULL);
+    g_assert (acc == NULL);
 }
 
 static gchar const * suitename = "/import-export/test-flat-bayes";

commit 13e6880b34086b514c8e9cbb95d15c0d257f3553
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 1 18:31:49 2018 +0100

    Bug 745941 - Review of po Headers / make pot

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 969d0e6..27c639d 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -147,6 +147,8 @@ IF(BUILDING_FROM_VCS)
            -D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
            -D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
            -D PACKAGE=${PACKAGE}
+           -D PACKAGE_NAME=${PACKAGE_NAME}
+           -D PACKAGE_VERSION=${PACKAGE_VERSION}
            -D XGETTEXT=${XGETTEXT}
            -P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake
         DEPENDS ${gnucash_pot_depends}
diff --git a/po/gnucash-pot.cmake b/po/gnucash-pot.cmake
index c3db591..1658f54 100644
--- a/po/gnucash-pot.cmake
+++ b/po/gnucash-pot.cmake
@@ -27,6 +27,9 @@ execute_process(
                         --keyword=translate:1c,2,2t
                         --keyword=translate:1,2,3t
                         --keyword=translate:1c,2,3,4t
+                        --package-name=${PACKAGE_NAME}
+                        --package-version=${PACKAGE_VERSION}
+                        --msgid-bugs-address=https://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash&component=Translations
   WORKING_DIRECTORY ${PO_BIN_DIR}
   RESULT_VARIABLE GNUCASH_POT_RESULT
 )

commit a64e40dac33bdf1ca2a6d8f280724f08ad2b48ae
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sun Feb 18 19:53:29 2018 +0100

    Properly detect git in case of linked worktree

diff --git a/util/gnc-vcs-info b/util/gnc-vcs-info
index 803d905..1e5658c 100755
--- a/util/gnc-vcs-info
+++ b/util/gnc-vcs-info
@@ -95,7 +95,7 @@ fi
 
 # Maybe it's git?
 real_gitdir="${real_srcdir}"/.git
-if test -d "${real_gitdir}"
+if test -d "${real_gitdir}" || test -e "${real_gitdir}"
 then
   # If we're only interested in the vcs type, then we're done here
   if [ "$request" = "type" ]

commit 546b54c976d770a99e3b76f7130ac4b01a3e508c
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Mar 1 21:23:55 2018 +0800

    TR: Show "Grand Total" only if it has been generated.

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index a04c1d0..c216b28 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -1703,7 +1703,9 @@ tags within description, notes or memo. ")
                  (string-join (map (lambda (row)
                                      (row->html row list-of-cols))
                                    list-of-rows) "")
-                 (row->html 'row-total list-of-cols)
+                 (if (memq 'row-total (grid-rows grid))
+                     (row->html 'row-total list-of-cols)
+                     "")
                  "</tbody></table>\n"))
 
 

commit cb18d3ca422ee3c31f6a42b099c9f82fb30b685c
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Mar 1 19:10:18 2018 +0800

    test-TR: Add dual-column testing

diff --git a/gnucash/report/standard-reports/test/test-transaction.scm b/gnucash/report/standard-reports/test/test-transaction.scm
index a9f5c5c..7297851 100644
--- a/gnucash/report/standard-reports/test/test-transaction.scm
+++ b/gnucash/report/standard-reports/test/test-transaction.scm
@@ -661,8 +661,21 @@
       ;; test debit/credit dual columns
       (set! options (default-testing-options))
       (set-option! options "Display" "Amount" 'double)
+      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Sorting" "Primary Key" 'date)
+      (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none)
       (let* ((sxml (options->sxml options "dual columns"))) ;out-29.html
-        #f)
+        (test-equal "dual amount column, with original currency headers"
+          (list "Date" "Num" "Description" "Memo/Notes" "Account"
+                "Debit" "USD" "Credit" "USD" "Debit" "Credit")
+          (get-row-col sxml 0 #f))
+        (test-equal "dual amount column, grand totals available"
+          (list "Grand Total" " " " " " " " " "$2,280.00" "$2,280.00")
+          (get-row-col sxml -1 #f))
+        (test-equal "dual amount column, first transaction correct"
+          (list "01/03/18" "$103 income" "Root.Asset.Bank" "\n" "$103.00" " " "\n" "$103.00" " ")
+          (get-row-col sxml 1 #f)))
       )
 
     (test-end "display options")

commit 4f98391a27cf4bea69958a234d8a1b0afc98a6c4
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Jan 5 22:45:21 2018 +1100

    test-TR: unit tests
    
    initial attempt

diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 25ce314..fd58191 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -7,6 +7,7 @@ SET(scm_test_standard_reports_SOURCES
 )
 
 set(scm_test_with_srfi64_SOURCES
+  test-transaction.scm
 )
 
 SET(scm_test_report_SUPPORT
diff --git a/gnucash/report/standard-reports/test/test-transaction.scm b/gnucash/report/standard-reports/test/test-transaction.scm
new file mode 100644
index 0000000..a9f5c5c
--- /dev/null
+++ b/gnucash/report/standard-reports/test/test-transaction.scm
@@ -0,0 +1,864 @@
+(use-modules (gnucash gnc-module))
+(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash engine test test-extras))
+(use-modules (gnucash report standard-reports transaction))
+(use-modules (gnucash report stylesheets))
+(use-modules (gnucash report report-system))
+(use-modules (gnucash report report-system test test-extras))
+(use-modules (srfi srfi-64))
+(use-modules (sxml simple))
+(use-modules (sxml xpath))
+(use-modules (system vm coverage)
+             (system vm vm))
+
+;; Guide to the test-transaction.scm
+
+;; This test-transation will implement regression testing for most
+;; features from transction.scm as of March 2018. It requires SRFI-64
+;; (present in guile-2.0.10 or later), SXML, and VM.  SRFI-64 and SXML
+;; are mandatory and has tremendously eased creation of tests. The VM
+;; modules are only required to perform coverage analysis of this test
+;; suite.
+;;
+;; By default the (run-test) entry point will run (run-test-proper)
+;; which sets the SRFI-64 test runner, and initiates the proper test suite
+;; in (null-test) and (trep-tests). Please note the tests will all call
+;; (options->sxml) which in turn generates the transaction report, and
+;; dumps the output at /tmp/out-XX.html for review.
+
+;; For coverage analysis, please amend (run-test) (if #f ...) to (if
+;; #t ...)  and this will run (coverage-test) instead, which will
+;; generate the coverage report in /tmp/lcov.info -- the latter can be
+;; converted to an html report using genhtml from
+;; http://ltp.sourceforge.net/coverage/lcov.php
+
+;; Please note the with-code-coverage has changed guile-2.0 to 2.2
+;; which does not require specifying the VM; I have no experience
+;; running in guile 2.2 and cannot confirm syntax.
+
+;; copied from transaction.scm
+(define trep-uuid "2fe3b9833af044abb929a88d5a59620f")
+
+;; Explicitly set locale to make the report output predictable
+(setlocale LC_ALL "C")
+
+(define (test-runner)
+  (let ((runner (test-runner-null))
+        (num-passed 0)
+        (num-failed 0))
+    (test-runner-on-test-end! runner
+      (lambda (runner)
+        (format #t "[~a] line:~a, test: ~a\n"
+                (test-result-ref runner 'result-kind)
+                (test-result-ref runner 'source-line)
+                (test-runner-test-name runner))
+        (case (test-result-kind runner)
+          ((pass xpass) (set! num-passed (1+ num-passed)))
+          ((fail xfail)
+           (if (test-result-ref runner 'expected-value)
+               (format #t "~a\n -> expected: ~s\n -> obtained: ~s\n"
+                       (string-join (test-runner-group-path runner) "/")
+                       (test-result-ref runner 'expected-value)
+                       (test-result-ref runner 'actual-value)))
+           (set! num-failed (1+ num-failed)))
+          (else #t))))
+    (test-runner-on-final! runner
+      (lambda (runner)
+        (format #t "Source:~a\npass = ~a, fail = ~a\n"
+                (test-result-ref runner 'source-file) num-passed num-failed)
+        (zero? num-failed)))
+    runner))
+
+(define (run-test)
+  (if #f
+      (coverage-test)
+      (run-test-proper)))
+
+(define (coverage-test)
+  (define %test-vm (make-vm))
+  (add-to-load-path "/home/chris/sources/gnucash/gnucash/report/standard-reports")
+  (call-with-values
+      (lambda()
+        (with-code-coverage %test-vm run-test-proper))
+    (lambda (data result)
+      (let ((port (open-output-file "/tmp/lcov.info")))
+        (coverage-data->lcov data port)
+        (close port)))))
+
+(define (run-test-proper)
+  (test-runner-factory test-runner)
+  (test-begin "transaction.scm")
+  (null-test)
+  (trep-tests)
+  ;; (test-end) must be run as the last function, it will
+  ;; return #f if any of the tests have failed.
+  (test-end "transaction.scm"))
+
+;;
+;; CANDIDATES FOR INCLUSION IN TEST-EXTRAS.SCM
+;;
+(define (logger . items)
+  (define (strify item)
+    (format #f "~s" item))
+  (format #t "LOGGER: ~a\n" (string-join (map strify items) " "))
+  items)
+
+(define (str->num str)
+  (string->number
+   (string-filter
+    (lambda (c) (or (char-numeric? c)
+                    (memv c '(#\- #\.))))
+    str)))
+
+(define counter
+  (let ((count 0))
+    (lambda ()
+      (set! count (1+ count))
+      count)))
+
+(define (options->sxml options test-title)
+  ;; options object -> sxml tree
+  ;;
+  ;; This function abstracts the whole transaction report renderer.
+  ;; It also catches XML parsing errors, dumping the options changed.
+  ;;
+  ;; It also dumps the render into /tmp/out-N.html where N is a counter
+  (let* ((template (gnc:find-report-template trep-uuid))
+         (report (constructor trep-uuid "bar" options #t #t #f #f ""))
+         (renderer (gnc:report-template-renderer template))
+         (document (renderer report)))
+    (gnc:html-document-set-style-sheet! document (gnc:report-stylesheet report))
+    (if test-title
+        (gnc:html-document-set-title! document test-title))
+    (let* ((filename (format #f "/tmp/out-~a.html" (counter)))
+           (render (gnc:html-document-render document))
+           (outfile (open-file filename "w")))
+      (display render outfile)
+      (close-output-port outfile)
+      (catch 'parser-error
+        (lambda () (xml->sxml render))
+        (lambda (k . args)
+          (test-assert k #f)            ; XML parse error doesn't cause a crash but logs as a failure
+          (format #t "see render output at ~a\n~a" filename (gnc:render-options-changed options #t)))))))
+
+(define (get-row-col sxml row col)
+  ;; sxml, row & col (numbers or #f) -> list-of-string
+  ;;
+  ;; from an SXML table tree with tr/th/td elements, retrieve row/col
+  ;; if row  =  0 retrieve <tr><th> elements
+  ;; if row  = #f retrieve whole <td> col, excludes <th> cols
+  ;; if col  = #f retrieve whole <tr> row
+  ;; if both = #f retrieve all text elements
+  ;;
+  ;; NOTE: This will retrieve cells from the first table in the tree.
+  ;; If there are multiple tables, I recommend that the tree is first
+  ;; pruned to the desired table via e.g. '(// (table 2)) then sent as
+  ;; argument to this function.
+  (let ((xpath (cond
+                ((not (or row col))             '(// (table 1) // tr // *text*))
+                ((not row)                      `(// (table 1) // tr // (td ,col) // *text*))
+                ((and (equal? row 0) (not col)) '(// (table 1) // tr // th // *text*))
+                ((not col)                      `(// (table 1) // (tr ,row) // td // *text*))
+                ((equal? row 0)                 `(// (table 1) // tr // (th ,col) // *text*))
+                (else                           `(// (table 1) // (tr ,row) // (td ,col) // *text*)))))
+    ((sxpath xpath) sxml)))
+;;
+;; END CANDIDATES
+;;
+
+(define constructor (record-constructor <report>))
+
+(define (set-option! options section name value)
+  (let ((option (gnc:lookup-option options section name)))
+    (if option
+        (gnc:option-set-value option value)
+        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
+(define (opt-val options section name)
+  (let ((option (gnc:lookup-option options section name)))
+    (if option
+        (gnc:option-value option)
+        (test-assert (format #f "wrong-option ~a ~a" section name) #f))))
+
+(define structure
+  (list "Root" (list (cons 'type ACCT-TYPE-ASSET))
+        (list "Asset"
+              (list "Bank")
+              (list "GBP Bank")
+              (list "USD Bank")
+              (list "Wallet"))
+        (list "Income" (list (cons 'type ACCT-TYPE-INCOME)))
+        (list "Expenses" (list (cons 'type ACCT-TYPE-EXPENSE)))
+        (list "Liabilities" (list (cons 'type ACCT-TYPE-LIABILITY)))
+        ))
+
+(define (null-test)
+  ;; This null-test tests for the presence of report.
+  (let ((options (gnc:make-report-options trep-uuid)))
+    (test-assert "null-test" (options->sxml options "null-test")))) ;out-1.html
+
+(define (trep-tests)
+  ;; This function will perform implementation testing on the transaction report.
+  (let* ((env (create-test-env))
+         (account-alist (env-create-account-structure-alist env structure))
+         (bank (cdr (assoc "Bank" account-alist)))
+         (gbp-bank (cdr (assoc "GBP Bank" account-alist)))
+         (usd-bank (cdr (assoc "USD Bank" account-alist)))
+         (wallet (cdr (assoc "Wallet" account-alist)))
+         (income (cdr (assoc "Income" account-alist)))
+         (expense (cdr (assoc "Expenses" account-alist)))
+         (liability (cdr (assoc "Liabilities" account-alist)))
+         (YEAR (gnc:time64-get-year (gnc:get-today)))
+         (foreign1 (gnc-commodity-table-lookup
+                    (gnc-commodity-table-get-table (gnc-account-get-book bank))
+                    (gnc-commodity-get-namespace (xaccAccountGetCommodity bank))
+                    "USD"))
+         (foreign2 (gnc-commodity-table-lookup
+                    (gnc-commodity-table-get-table (gnc-account-get-book bank))
+                    (gnc-commodity-get-namespace (xaccAccountGetCommodity bank))
+                    "GBP")))
+
+    (define (default-testing-options)
+      ;; To ease testing of transaction report, we will set default
+      ;; options for generating reports. We will elable extra columns
+      ;; for Exporting, disable generation of informational text, and
+      ;; disable indenting. These options will be tested separately as
+      ;; the first test group. By default, we'll select the modern dates.
+      (let ((options (gnc:make-report-options trep-uuid)))
+        (set-option! options "Accounts" "Accounts" (list bank))
+        (set-option! options "Sorting" "Add indenting columns" #f)
+        (set-option! options "General" "Add options summary" 'always)
+        (set-option! options "General" "Table for Exporting" #t)
+        (set-option! options "General" "Start Date" (cons 'relative 'start-cal-year))
+        (set-option! options "General" "End Date" (cons 'relative 'end-cal-year))
+        options))
+
+    ;; This will make all accounts use default currency (I think depends on locale)
+    (for-each
+     (lambda(pair)
+       (xaccAccountSetCommodity (cdr pair) (gnc-default-report-currency)))
+     account-alist)
+
+    ;; Here we set foreign banks' currencies
+    (with-account
+     gbp-bank
+     (lambda ()
+       (xaccAccountSetCode gbp-bank "01-GBP")
+       (xaccAccountSetCommodity gbp-bank foreign2)))
+
+    (with-account
+     usd-bank
+     (lambda ()
+       (xaccAccountSetCode usd-bank "02-USD")
+       (xaccAccountSetCommodity usd-bank foreign1)))
+
+    ;; We will fill the transaction report with crafted dummy
+    ;; transactions for producing repeatable reports.
+
+    ;; old transactions for testing absolute dates, sorting, and
+    ;; filtering options.
+    (env-transfer env 01 01 1970 bank expense       5   #:description "desc-1" #:num "trn1" #:memo "memo-3")
+    (env-transfer env 31 12 1969 income bank       10   #:description "desc-2" #:num "trn2" #:void-reason "void" #:notes "notes3")
+    (env-transfer env 31 12 1969 income bank       29   #:description "desc-3" #:num "trn3"
+                  #:reconcile (cons #\c (gnc-dmy2time64 01 03 1970)))
+    (env-transfer env 01 02 1970 bank expense      15   #:description "desc-4" #:num "trn4" #:notes "notes2" #:memo "memo-1")
+    (env-transfer env 10 01 1970 liability expense 10   #:description "desc-5" #:num "trn5" #:void-reason "any")
+    (env-transfer env 10 01 1970 liability expense 11   #:description "desc-6" #:num "trn6" #:notes "notes1")
+    (env-transfer env 10 02 1970 bank liability     8   #:description "desc-7" #:num "trn7" #:notes "notes1" #:memo "memo-2"
+                  #:reconcile (cons #\y (gnc-dmy2time64 01 03 1970)))
+
+    ;; a single 3-split transaction dated 14/02/1971
+    ;; $100 from bank
+    ;;  $80 to expenses
+    ;;  $20 to wallet
+    (let ((txn (xaccMallocTransaction (gnc-get-current-book)))
+          (split-1 (xaccMallocSplit  (gnc-get-current-book)))
+          (split-2 (xaccMallocSplit  (gnc-get-current-book)))
+          (split-3 (xaccMallocSplit  (gnc-get-current-book))))
+      (xaccTransBeginEdit txn)
+      (xaccTransSetDescription txn "$100bank -> $80expenses + $20wallet")
+      (xaccTransSetCurrency txn (xaccAccountGetCommodity bank))
+      (xaccTransSetDate txn 14 02 1971)
+      (xaccSplitSetParent split-1 txn)
+      (xaccSplitSetParent split-2 txn)
+      (xaccSplitSetParent split-3 txn)
+      (xaccSplitSetAccount split-1 bank)
+      (xaccSplitSetAccount split-2 expense)
+      (xaccSplitSetAccount split-3 wallet)
+      (xaccSplitSetValue split-1 -100)
+      (xaccSplitSetValue split-2 80)
+      (xaccSplitSetValue split-3 20)
+      (xaccSplitSetAmount split-1 -100)
+      (xaccSplitSetAmount split-2 80)
+      (xaccSplitSetAmount split-3 20)
+      (xaccTransSetNotes txn "multisplit")
+      (xaccTransCommitEdit txn))
+
+    ;; A couple of transactions which involve foreign currency
+    ;; conversions. We'll set the currencies to GBP and USD.
+    (env-transfer-foreign env 15 01 2000 gbp-bank usd-bank 10 14 #:description "GBP 10 to USD 14")
+    (env-transfer-foreign env 15 02 2000 usd-bank gbp-bank  9  6 #:description "USD 9 to GBP 6")
+
+    ;; new transactions for testing relative dates. every month in the
+    ;; year will have 2 income transactions for $103 and $109 dated on
+    ;; the 3rd and 9th respectively, and 1 expense transaction for $22
+    ;; on the 15th. We will assume that the test suite will always be
+    ;; run in modern times, otherwise these transactions will be mixed
+    ;; up with the old transactions above. The year end net bank balance
+    ;; should be (* 12 (+ 103 109 -22)) = $2280.
+    (for-each (lambda (m)
+                (env-transfer env 03 (1+ m) YEAR income bank  103 #:description "$103 income")
+                (env-transfer env 15 (1+ m) YEAR bank expense  22 #:description "$22 expense")
+                (env-transfer env 09 (1+ m) YEAR income bank  109 #:description "$109 income"))
+              (iota 12))
+
+    ;; (for-each (lambda (s)
+    ;;             (format #t "~a '~a' ~a ~a from/to ~a\n"
+    ;;                     (qof-print-date (xaccTransGetDate (xaccSplitGetParent s)))
+    ;;                     (xaccTransGetDescription (xaccSplitGetParent s))
+    ;;                     (gnc-commodity-get-mnemonic (xaccAccountGetCommodity (xaccSplitGetAccount s)))
+    ;;                     (xaccSplitGetAmount s)
+    ;;                     (xaccAccountGetName (xaccSplitGetAccount (xaccSplitGetOtherSplit s)))
+    ;;                     ))
+    ;;           (xaccAccountGetSplitList bank))
+
+    ;; Finally we can begin testing
+    (test-begin "general options")
+
+    (let* ((options (default-testing-options))
+           (sxml (options->sxml options "general options")) ;out-2.html
+           (default-headers '("Date" "Num" "Description" "Memo/Notes" "Account" "Amount")))
+      (test-equal "default headers"
+        default-headers
+        (get-row-col sxml 0 #f))
+      (test-equal "last row has same number of cols as header"
+        (length default-headers)
+        (length (get-row-col sxml -1 #f)))
+      (test-equal "grand total present"
+        '("Grand Total")
+        (get-row-col sxml -1 1))
+      (test-equal "grand total is $2,280.00"
+        '("$2,280.00")
+        (get-row-col sxml -1 -1)))
+
+    ;; dual columns
+    (let ((options (default-testing-options)))
+      (set-option! options "Sorting" "Add indenting columns" #t)
+      (set-option! options "General" "Table for Exporting" #f)
+      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "General" "Add options summary" 'never)
+      (set-option! options "Sorting" "Primary Key" 'account-name)
+      (set-option! options "Sorting" "Primary Subtotal" #t)
+      (set-option! options "Sorting" "Secondary Key" 'date)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'monthly)
+      (let ((sxml (options->sxml options "test basic column headers, and original currency"))) ;out-3.html
+        (test-equal "default headers, indented, includes common-currency"
+          '(" " " " "Date" "Num" "Description" "Memo/Notes" "Account" "Amount" "USD" "Amount")
+          (get-row-col sxml 0 #f))
+        (test-equal "grand total present, no blank cells, and is $2,280 in both common-currency and original-currency"
+          '("Grand Total" "$2,280.00" "$2,280.00")
+          (get-row-col sxml -1 #f))
+        (test-equal "account total present, and is $2,280 in original-currency"
+          '("$2,280.00")
+          (get-row-col sxml -3 -1))
+        (test-equal "month total present, and is $190 in original-currency"
+          '("$190.00")
+          (get-row-col sxml 6 -1))
+        ))
+
+    (test-end "general options")
+
+    (test-begin "accounts selectors and filtering")
+
+    (let ((options (default-testing-options)))
+      (set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))
+
+      ;; Filter Account Name Filters
+      (set-option! options "Filter" "Account Name Filter" "Expenses")
+      (let ((sxml (options->sxml options "accounts filter expenses"))) ;out-4.html
+        (test-equal "account name filter to 'expenses', sum = $31.00"
+          '("$31.00")
+          (get-row-col sxml -1 -1)))
+
+      (set-option! options "Filter" "Account Name Filter" "Expen.es")
+      (let ((sxml (options->sxml options "accounts filter expen.es"))) ;out-5.html
+        (test-equal "account name filter to 'expen.es', blank report"
+          '()
+          (get-row-col sxml #f #f)))
+
+      (set-option! options "Filter" "Use regular expressions for account name filter" #t)
+      (let ((sxml (options->sxml options "accounts filter expen.es regex"))) ;out-6.html
+        (test-equal "account name filter to 'expen.es' and switch on regex filter, sum = $31.00"
+          '("$31.00")
+          (get-row-col sxml -1 -1)))
+
+      ;; Test Transaction Filters
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))
+      (set-option! options "Filter" "Transaction Filter" "desc-3")
+      (let ((sxml (options->sxml options "transaction filter to ponies"))) ;out-7.html
+        (test-equal "transaction filter in bank to 'desc-3', sum = $29.00"
+          '("$29.00")
+          (get-row-col sxml -1 -1)))
+
+      (set-option! options "Filter" "Transaction Filter" "not.s?")
+      (let ((sxml (options->sxml options "transaction filter not.s?"))) ;out-8.html
+        (test-equal "transaction filter in bank to 'not.s?', blank report"
+          '()
+          (get-row-col sxml #f #f)))
+
+      (set-option! options "Filter" "Use regular expressions for transaction filter" #t)
+      (let ((sxml (options->sxml options "transaction filter not.s? regex"))) ;out-9.html
+        (test-equal "transaction filter in bank to 'not.s?' and switch regex, sum = -$23.00"
+          '("-$23.00")
+          (get-row-col sxml -1 -1)))
+
+      ;; Test Reconcile Status Filters
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))      
+      (set-option! options "Filter" "Reconcile Status" 'unreconciled)
+      (let ((sxml (options->sxml options "unreconciled"))) ;out-10.html
+        (test-equal "filter unreconciled only, sum = -$20.00"
+          '("-$20.00")
+          (get-row-col sxml -1 -1)))
+
+      (set-option! options "Filter" "Reconcile Status" 'cleared)
+      (let ((sxml (options->sxml options "cleared"))) ;out-11.html
+        (test-equal "filter cleared only, sum = $29.00"
+          '("$29.00")
+          (get-row-col sxml -1 -1)))
+
+      (set-option! options "Filter" "Reconcile Status" 'reconciled)
+      (let ((sxml (options->sxml options "reconciled"))) ;out-12.html
+        (test-equal "filter reconciled only, sum = -$8.00"
+          '("-$8.00")
+          (get-row-col sxml -1 -1)))
+
+      ;; Test Accounts Filters
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))      
+      (set-option! options "Accounts" "Filter By..." (list income))
+      (set-option! options "Accounts" "Filter Type" 'include)
+      (let ((sxml (options->sxml options "including bank-income accts only"))) ;out-13.html
+        (test-equal "filter includes bank-income, sum = -$29.00"
+          '("$29.00")
+          (get-row-col sxml -1 -1)))
+
+      (set-option! options "Accounts" "Filter Type" 'exclude)
+      (let ((sxml (options->sxml options "bank exclude bank-income accts"))) ;out-14.html
+        (test-equal "filter excludes bank-income, sum = -$28.00"
+          '("-$28.00")
+          (get-row-col sxml -1 -1)))
+
+      ;; Test Void Transaction Filters
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))      
+      (set-option! options "Filter" "Void Transactions" 'void-only)
+      (let ((sxml (options->sxml options "void only"))) ;out-15.html
+        (test-equal "filter void-transactions only, sum = -$10.00"
+          '("$10.00")
+          (get-row-col sxml -1 -1)))
+
+      (set-option! options "Filter" "Void Transactions" 'both)
+      (let ((sxml (options->sxml options "both void and non-void"))) ;out-16.html
+        (test-equal "filter void-transactions only, sum = $11.00"
+          '("$11.00")
+          (get-row-col sxml -1 -1))))
+
+    (test-end "accounts selectors and filtering")
+
+    (test-begin "display options")
+
+    (let ((options (default-testing-options)))
+      ;; Disable most Display/* columns
+      (for-each
+       (lambda (name)
+         (set-option! options "Display" name #f))
+       (list "Date" "Reconciled Date" "Num" "Description" "Memo" "Notes"
+             "Account Name" "Other Account Name" "Shares" "Price" "Running Balance"
+             "Totals"))
+      (let ((sxml (options->sxml options "all columns off"))) ;out-17.html
+        (test-assert "all display columns off, except amount and subtotals are enabled, there should be 2 columns"
+          (= (length ((sxpath '(// (table 1) // (tr 1) // th)) sxml))
+             (length ((sxpath '(// (table 1) // (tr 4) // td)) sxml))
+             (length ((sxpath '(// (table 1) // (tr -1) // td)) sxml))
+             2)))
+
+      (set-option! options "Sorting" "Primary Subtotal" #f)
+      (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none)
+      (set-option! options "Sorting" "Secondary Subtotal" #f)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'none)
+      (let ((sxml (options->sxml options "only amounts"))) ;out-18.html
+        (test-assert "all display columns off, and no subtotals, but amount enabled, there should be 1 column"
+          (= (length ((sxpath '(// (table 1) // (tr 1) // th)) sxml))
+             (length ((sxpath '(// (table 1) // (tr 4) // td)) sxml))
+             (length ((sxpath '(// (table 1) // (tr -1) // td)) sxml))
+             1)))
+
+      (set-option! options "Display" "Amount" 'none)
+      (let ((sxml (options->sxml options "no columns"))) ;out-19.html
+        (test-assert "all display columns off, without amount nor subtotals, there should be 0 column"
+          (= (length ((sxpath '(// (table 1) // (tr 1) // th)) sxml))
+             (length ((sxpath '(// (table 1) // (tr 4) // td)) sxml))
+             (length ((sxpath '(// (table 1) // (tr -1) // td)) sxml))
+             0)))
+
+      (set-option! options "Sorting" "Primary Subtotal" #t)
+      (set-option! options "Sorting" "Primary Subtotal for Date Key" 'weekly)
+      (set-option! options "Sorting" "Secondary Subtotal" #t)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'weekly)
+      (let ((sxml (options->sxml options "subtotals only"))) ;out-20.html
+        (test-assert "all display columns including amount are disabled, but subtotals are enabled, there should be 1 column"
+          (= (length ((sxpath '(// (table 1) // (tr 1) // th)) sxml))
+             (length ((sxpath '(// (table 1) // (tr -1) // td)) sxml))
+             1)))
+
+      ;; Reset to test with full columns
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))
+      (set-option! options "Sorting" "Primary Key" 'reconciled-status)
+      (set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
+      (for-each
+       (lambda (name)
+         (set-option! options "Display" name #t))
+       (list "Date" "Reconciled Date" "Num" "Description" "Memo" "Notes"
+             "Account Name" "Other Account Name" "Shares" "Price" "Running Balance"
+             "Totals" "Use Full Other Account Name" "Use Full Account Name"))
+      (let* ((sxml (options->sxml options "all columns on"))) ;out-21.html
+        (test-equal "all display columns on, displays correct columns"
+          (list "Date" "Reconciled Date" "Num" "Description" "Memo/Notes" "Account"
+                "Transfer from/to" "Shares" "Price" "Amount" "Running Balance")
+          (get-row-col sxml 0 #f))
+        (test-assert "reconciled dates must be 01/03/70 or whitespace"
+          (and-map
+           (lambda (reconcile-date-string)
+             (or (string=? (string-trim-both reconcile-date-string)
+                           (qof-print-date (gnc-dmy2time64 01 03 1970)))
+                 (string-null? (string-trim-both reconcile-date-string))))
+           (get-row-col sxml #f 2)))
+        (test-equal "reconciled status subtotal"
+          (list "Total For Unreconciled" " " " " " " " " " " " " " " " " "$0.00" " ")
+          (get-row-col sxml -3 #f))
+        )
+
+      ;; Customized test for multi-line, with default display cols.
+      ;; This option should return a single transaction with 2 splits
+      ;; in 2 lines.
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 13 02 1971)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 15 02 1971)))
+      (set-option! options "Display" "Detail Level" 'multi-line)
+      (set-option! options "Display" "Totals" #f)
+      (set-option! options "Sorting" "Primary Subtotal" #f)
+      (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none)
+      (set-option! options "Sorting" "Secondary Subtotal" #f)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'none)
+      (let* ((sxml (options->sxml options "multiline"))) ;out-22.html
+        (test-assert "multi line transaction with 1st split have same memo"
+          (apply string=? (get-row-col sxml #f 4)))
+
+        ;; the following sxpath will retrieve all text from <a href> of the
+        ;; last <td> in the table. This retrieves the amounts.
+        (test-equal "multi-line amounts must total to zero"
+          0.0
+          (apply + (map str->num ((sxpath '(// (table 1) // tr // (td -1) // a // *text*)) sxml)))))
+
+      ;; Remove expense multisplit, transaction is not shown
+      (set-option! options "Accounts" "Filter By..." (list expense))
+      (set-option! options "Accounts" "Filter Type" 'exclude)
+      (let* ((sxml (options->sxml options "multiline, filtered out"))) ;out-23.html
+        (test-equal "multi-line has been excluded"
+          '()
+          (get-row-col sxml #f #f)))
+
+      ;; Testing for original currency amount display as well as
+      ;; dual-column subtotals
+      (set! options (default-testing-options))
+      (set-option! options "Accounts" "Accounts" (list usd-bank gbp-bank))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 2000)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 2000)))
+      (set-option! options "General" "Common Currency" #t)
+      (set-option! options "General" "Show original currency amount" #t)
+      (let* ((sxml (options->sxml options "single column, with original currency headers"))) ;out-24.html
+        (test-equal "single amount column, with original currency headers"
+          (list "Date" "Num" "Description" "Memo/Notes" "Account"
+                "Amount" "USD" "Amount")
+          (get-row-col sxml 0 #f)))
+
+      (set-option! options "Display" "Amount" 'double)
+      (set-option! options "Display" "Account Name" #t)
+      (set-option! options "Display" "Account Code" #t)
+      (set-option! options "Display" "Other Account Name" #t)
+      (set-option! options "Display" "Other Account Code" #t)
+      (let* ((sxml (options->sxml options "dual column"))) ;out-25.html
+        ;; Note. It's difficult to test converted monetary
+        ;; amounts. Although I've set transfers from USD/GBP, the
+        ;; transfers do not update the pricedb automatically,
+        ;; therefore converted amounts are displayed as $0. We are not
+        ;; testing the pricedb so it does not seem fair to test its
+        ;; output here too.
+        (test-equal "dual amount headers"
+          (list "Date" "Num" "Description" "Memo/Notes" "Account" "Transfer from/to"
+                "Debit" "USD" "Credit" "USD" "Debit" "Credit")
+          (get-row-col sxml 0 #f))
+        (test-equal "Account Name and Code displayed"
+          (list "01-GBP Root.Asset.GBP Bank")
+          (get-row-col sxml 2 5))
+        (test-equal "Other Account Name and Code displayed"
+          (list "01-GBP GBP Bank")
+          (get-row-col sxml 7 6))
+        (test-equal "GBP original currency totals = £4"
+          (list 4.0)
+          (map str->num (get-row-col sxml 5 10)))
+        (test-assert "USD original currency totals = $5"
+          (equal?
+           (list 5.0)
+           (map str->num (get-row-col sxml 9 7))
+           (map str->num (get-row-col sxml 9 9))))
+        )
+
+      ;; This test group will test sign reversal strategy. We will
+      ;; display all transactions in the 1969-1970 series, sorted by
+      ;; account name, then by description. This will ensure
+      ;; consistent order and we can query each amount individually.
+      (set! options (default-testing-options))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))
+      (set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
+      (set-option! options "Display" "Sign Reverses" 'none)
+      (set-option! options "Filter" "Void Transactions" 'both)
+      (set-option! options "Sorting" "Primary Key" 'account-name)
+      (set-option! options "Sorting" "Primary Subtotal" #f)
+      (set-option! options "Sorting" "Secondary Key" 'description)
+      (set-option! options "Sorting" "Secondary Subtotal" #f)
+      (let* ((sxml (options->sxml options "sign-reversal is none, correct signs of amounts?"))) ;out-26.html
+        (test-equal "sign-reversal is none, correct signs of amounts"
+          '(#f #t #t #f #f #t #t #t #t #f #f #f #f #t)
+          (map (lambda (s) (not (string-contains s "-")))
+               ((sxpath '(// (table 1) // tr // (td -1) // a // *text*)) sxml))))
+
+      (set-option! options "Display" "Sign Reverses" 'income-expense)
+      (let* ((sxml (options->sxml options "sign-reversal is income-expense, correct signs of amounts?"))) ;out-27.html
+        (test-equal "sign-reversal is income-expense, correct signs of amounts"
+          '(#f #t #t #f #f #f #f #f #f #t #t #f #f #t)
+          (map (lambda (s) (not (string-contains s "-")))
+               ((sxpath '(// (table 1) // tr // (td -1) // a // *text*)) sxml))))
+
+      (set-option! options "Display" "Sign Reverses" 'credit-accounts)
+      (let* ((sxml (options->sxml options "sign-reversal is credit-accounts, correct signs of amounts?"))) ;out-28.html
+        (test-equal "sign-reversal is credit-accounts, correct signs of amounts"
+          '(#f #t #t #f #f #t #t #t #t #t #t #t #t #f)
+          (map (lambda (s) (not (string-contains s "-")))
+               ((sxpath '(// (table 1) // tr // (td -1) // a // *text*)) sxml))))
+
+      ;; test debit/credit dual columns
+      (set! options (default-testing-options))
+      (set-option! options "Display" "Amount" 'double)
+      (let* ((sxml (options->sxml options "dual columns"))) ;out-29.html
+        #f)
+      )
+
+    (test-end "display options")
+
+    (test-begin "sorting options")
+
+    (let ((options (default-testing-options)))
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))
+      ;;(set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
+      (set-option! options "Accounts" "Accounts" (list bank))
+      (set-option! options "Display" "Totals" #f)
+      (set-option! options "Display" "Other Account Name" #t)
+      (set-option! options "Filter" "Void Transactions" 'both)
+      (set-option! options "Sorting" "Primary Subtotal" #f)
+      (set-option! options "Sorting" "Primary Subtotal for Date Key" 'none)
+      (set-option! options "Sorting" "Secondary Key" 'none)
+      (set-option! options "Sorting" "Secondary Subtotal" #f)
+
+      (set-option! options "Sorting" "Primary Key" 'date)
+      (let* ((sxml (options->sxml options "sorting=date"))) ;out-30.html
+        (test-equal "dates are sorted"
+          '("12/31/69" "12/31/69" "01/01/70" "02/01/70" "02/10/70")
+          (get-row-col sxml #f 1)))
+
+      (set-option! options "Sorting" "Primary Key" 'number)
+      (let* ((sxml (options->sxml options "sorting=number"))) ;out-31.html
+        (test-equal "sort by number"
+          '("trn1" "trn2" "trn3" "trn4" "trn7")
+          (get-row-col sxml #f 2)))
+
+      (set-option! options "Sorting" "Primary Key" 'reconciled-status)
+      (let* ((sxml (options->sxml options "sorting=reconciled-status"))) ;out-32.html
+        (test-equal "sort by reconciled status"
+          '("desc-2" "desc-7" "desc-3" "desc-1" "desc-4")
+          (get-row-col sxml #f 3)))
+
+      (set-option! options "Sorting" "Primary Key" 'memo)
+      (let* ((sxml (options->sxml options "sorting=memo"))) ;out-33.html
+        (test-equal "sort by memo"
+          '("notes3" "memo-1" "memo-2" "memo-3")
+          (get-row-col sxml #f 4)))
+
+      (set-option! options "Sorting" "Primary Key" 'account-name)
+      (let* ((sxml (options->sxml options "sorting=account-name"))) ;out-34.html
+        (test-assert "account names are sorted"
+          (sorted? (get-row-col sxml #f 5) string<?)))
+
+      (set-option! options "Sorting" "Primary Key" 'corresponding-acc-name)
+      (let* ((sxml (options->sxml options "sorting=corresponding-acc-name"))) ;out-35.html
+        (test-equal "sort by corresponding-acc-name"
+          '("Expenses" "Expenses" "Income" "Income" "Liabilities")
+          (get-row-col sxml #f 6)))
+
+      (set-option! options "Sorting" "Primary Key" 'amount)
+      (let* ((sxml (options->sxml options "sorting=amount"))) ;out-36.html
+        (test-equal "sort by amount"
+          '("-$15.00" "-$8.00" "-$5.00" "$10.00" "$29.00")
+          ((sxpath '(// (table 1) // tr // (td -1) // a // *text*)) sxml)))
+
+      (set! options (default-testing-options))
+      (set-option! options "Sorting" "Add indenting columns" #t)
+      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "Sorting" "Primary Key" 'account-name)
+      (set-option! options "Sorting" "Primary Subtotal" #t)
+      (set-option! options "Sorting" "Secondary Key" 'date)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'monthly)
+      (set-option! options "Display" "Totals" #t)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'quarterly)
+      (set-option! options "Sorting" "Show subtotals only (hide transactional data)" #t)
+      (let* ((sxml (options->sxml options "sorting=account-name, date-quarterly, subtotals only"))) ;out-37.html
+        (test-equal "sorting=account-name, date-quarterly, subtotals only"
+          '("$570.00" "$570.00" "$570.00" "$570.00" "$2,280.00" "$2,280.00")
+          (get-row-col sxml #f -1)))
+
+      (set! options (default-testing-options))
+      (set-option! options "Accounts" "Accounts" (gnc-account-get-descendants (gnc-account-get-root bank)))
+      (set-option! options "Display" "Totals" #t)
+      (set-option! options "Display" "Amount" 'double)
+      (set-option! options "General" "Show original currency amount" #t)
+      (set-option! options "General" "Table for Exporting" #f)
+      (set-option! options "Sorting" "Add indenting columns" #t)
+      (set-option! options "Sorting" "Primary Key" 'account-name)
+      (set-option! options "Sorting" "Primary Subtotal" #t)
+      (set-option! options "Sorting" "Secondary Key" 'date)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'quarterly)
+      (set-option! options "Sorting" "Show Informal Debit/Credit Headers" #t)
+      (set-option! options "Sorting" "Show Account Description" #t)
+      (let* ((sxml (options->sxml options "sorting=date"))) ;out-38.html
+        (test-equal "expense acc friendly headers"
+          '("\n" "Expenses" "Expense" "Rebate")
+          (get-row-col sxml 47 #f))
+        (test-equal "income acc friendly headers"
+          '("\n" "Income" "Charge" "Income")
+          (get-row-col sxml 69 #f)))
+
+      (set-option! options "Accounts" "Accounts" (list bank))
+      (set-option! options "Display" "Totals" #f)
+      (set-option! options "Sorting" "Show subtotals only (hide transactional data)" #t)
+      (let* ((sxml (options->sxml options "sorting=date quarterly"))) ;out-39.html
+        (test-equal "quarterly subtotals are correct"
+          '("$570.00" "$570.00" "$570.00" "$570.00")
+          (get-row-col sxml #f 4)))
+
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'monthly)
+      (let* ((sxml (options->sxml options "sorting=date monthly"))) ;out-40.html
+        (test-equal "monthly subtotals are correct"
+          '("$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00")
+          (get-row-col sxml #f 4)))
+
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'yearly)
+      (let* ((sxml (options->sxml options "sorting=date yearly"))) ;out-41.html
+        (test-equal "yearly subtotals are correct"
+          '("$2,280.00")
+          (get-row-col sxml #f 4)))
+
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 31 12 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1972)))
+      (set-option! options "Sorting" "Show subtotals only (hide transactional data)" #f)
+      (set-option! options "Filter" "Void Transactions" 'both)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'daily)
+      (let* ((sxml (options->sxml options "sorting=date"))) ;out-42.html
+        (test-equal "daily subtotals are correct"
+          '("$39.00")
+          (get-row-col sxml 5 4)))
+
+      (set-option! options "Sorting" "Show subtotals only (hide transactional data)" #t)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'weekly)
+      (let* ((sxml (options->sxml options "sorting=date weekly"))) ;out-43.html
+        (test-equal "weekly subtotals are correct (1)"
+          '("$34.00" "$89.00")
+          (get-row-col sxml #f 4))
+        (test-equal "weekly subtotals are correct (2)"
+          '("$15.00" "$8.00" "$100.00")
+          (get-row-col sxml #f 5))))
+
+    (test-end "sorting options")
+
+    (test-begin "subtotal table")
+
+    (let ((options (default-testing-options)))
+      (set-option! options "Accounts" "Accounts" (list bank income expense))
+      (set-option! options "General" "Start Date" (cons 'relative 'start-cal-year))
+      (set-option! options "General" "End Date" (cons 'relative 'end-cal-year))
+      (set-option! options "Display" "Subtotal Table" #t)
+      (set-option! options "Sorting" "Primary Key" 'account-name)
+      (set-option! options "Sorting" "Primary Subtotal" #t)
+      (set-option! options "Sorting" "Secondary Key" 'date)
+      (set-option! options "Sorting" "Secondary Subtotal for Date Key" 'monthly)
+      (let ((sxml (options->sxml options "subtotal table"))) ;out-44.html
+        (test-equal "summary bank-row is correct"
+          (list "Bank" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00"
+                "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$190.00" "$2,280.00")
+          (get-row-col sxml 1 #f))
+        (test-equal "summary expense-row is correct"
+          (list "Expenses" "$22.00" "$22.00" "$22.00" "$22.00" "$22.00" "$22.00"
+                "$22.00" "$22.00" "$22.00" "$22.00" "$22.00" "$22.00" "$264.00")
+          (get-row-col sxml 2 #f))
+        (test-equal "summary income-row is correct"
+          (list "Income" "-$212.00" "-$212.00" "-$212.00" "-$212.00" "-$212.00"
+                "-$212.00" "-$212.00" "-$212.00" "-$212.00" "-$212.00" "-$212.00"
+                "-$212.00" "-$2,544.00")
+          (get-row-col sxml 3 #f))
+        (test-equal "summary total-row is correct"
+          (list "Grand Total" "$0.00")
+          (get-row-col sxml 4 #f)))
+
+      (set-option! options "General" "Start Date" (cons 'absolute (gnc-dmy2time64 01 01 1969)))
+      (set-option! options "General" "End Date" (cons 'absolute (gnc-dmy2time64 31 12 1970)))
+      (let ((sxml (options->sxml options "sparse subtotal table"))) ;out-45.html
+        (test-equal "sparse summary-table - row 1"
+          (list "Bank" "$29.00" "-$5.00" "-$23.00" "$1.00")
+          (get-row-col sxml 1 #f))
+        (test-equal "sparse summary-table - row 2"
+          (list "Expenses" "$16.00" "$15.00" "$31.00")
+          (get-row-col sxml 2 #f))
+        (test-equal "sparse summary-table - row 3"
+          (list "Income" "-$29.00" "-$29.00")
+          (get-row-col sxml 3 #f))
+        (test-equal "sparse summary-table - row 4"
+          (list "Grand Total" "$3.00")
+          (get-row-col sxml 4 #f))
+        (test-equal "sparse summary-table - col 1"
+          (list "Bank" "Expenses" "Income" "Grand Total")
+          (get-row-col sxml #f 1))
+        (test-equal "sparse summary-table - col 2"
+          (list "$29.00" "-$29.00")
+          (get-row-col sxml #f 2))
+        (test-equal "sparse summary-table - col 3"
+          (list "-$5.00" "$16.00")
+          (get-row-col sxml #f 3))
+        (test-equal "sparse summary-table - col 4"
+          (list "-$23.00" "$15.00")
+          (get-row-col sxml #f 4))
+        (test-equal "sparse summary-table - col 5"
+          (list "$1.00" "$31.00" "-$29.00" "$3.00")
+          (get-row-col sxml #f 5))))
+    (test-end "subtotal table")
+    ))
diff --git a/libgnucash/engine/test/test-extras.scm b/libgnucash/engine/test/test-extras.scm
index d9a8636..1d76b19 100644
--- a/libgnucash/engine/test/test-extras.scm
+++ b/libgnucash/engine/test/test-extras.scm
@@ -47,6 +47,8 @@
 (export env-string)
 (export env-select-price-source)
 (export env-any-date)
+(export env-transfer)
+(export env-transfer-foreign)
 (export env-create-transaction)
 (export env-create-account)
 (export env-create-root-account)
@@ -154,12 +156,82 @@
 			(xaccSplitSetAmount split-2 (gnc-numeric-neg aaa))
 			(xaccSplitSetValue split-1 aaa)
 			(xaccSplitSetValue split-2 (gnc-numeric-neg aaa))
-
 			))
     ;(format #t "tx ~a\n" (map xaccSplitGetAmount (list split-1 split-2)))
     ;(format #t "tx ~a\n" (map xaccSplitGetValue (list split-1 split-2)))
     txn))
 
+(define* (env-transfer-foreign
+          env
+          DD MM YY         ; day/month/year
+          debit            ; account-from
+          credit           ; account-to
+          amount1          ; amount-from
+          amount2          ; amount-to
+          #:key            ; - the following are optional -
+          description      ; string: description (def = "ponies")
+          void-reason      ; string: void-reason (def = not-voided)
+          reconcile        ; pair  : (cons reconciled reconciled-date)
+          num              ; string: num field   (def = null)
+          notes            ; string: notes       (def = null)
+          memo             ; string: memo        (def = null)
+          )
+  (let ((txn (xaccMallocTransaction (gnc-get-current-book)))
+	(split-1 (xaccMallocSplit  (gnc-get-current-book)))
+	(split-2 (xaccMallocSplit  (gnc-get-current-book))))
+    (xaccTransBeginEdit txn)
+    (xaccTransSetDescription txn (or description "ponies"))
+    (xaccTransSetCurrency txn (xaccAccountGetCommodity debit))
+    (xaccTransSetDate txn DD MM YY)
+    (xaccSplitSetParent split-1 txn)
+    (xaccSplitSetParent split-2 txn)
+    (xaccSplitSetAccount split-1 debit)
+    (xaccSplitSetAccount split-2 credit)
+    (xaccSplitSetValue split-1 (- amount1))
+    (xaccSplitSetValue split-2 amount1)
+    (xaccSplitSetAmount split-1 (- amount1))
+    (xaccSplitSetAmount split-2 amount2)
+    (if reconcile
+        (begin
+          (xaccSplitSetReconcile split-1 (car reconcile))
+          (xaccSplitSetReconcile split-2 (car reconcile))
+          (xaccSplitSetDateReconciledSecs split-1 (cdr reconcile))
+          (xaccSplitSetDateReconciledSecs split-2 (cdr reconcile))))
+    (if num
+        (begin
+          (gnc-set-num-action txn split-1 num num)
+          (gnc-set-num-action txn split-2 num num)))
+    (if void-reason (xaccTransVoid txn void-reason))
+    (if notes (xaccTransSetNotes txn notes))
+    (if memo
+        (begin
+          (xaccSplitSetMemo split-1 memo)
+          (xaccSplitSetMemo split-2 memo)))
+    (xaccTransCommitEdit txn)
+    txn))
+
+(define* (env-transfer
+          env
+          DD MM YY         ; day/month/year
+          debit            ; account-from
+          credit           ; account-to
+          amount           ; amount
+          #:key            ; - the following are optional -
+          description      ; string: description (def = "ponies")
+          void-reason      ; string: void-reason (def = not-voided)
+          reconcile        ; char  : reconciled  (default = n)
+          num              ; string: num field   (def = null)
+          notes            ; string: notes       (def = null)
+          memo             ; string: memo        (def = null)
+          )
+  (env-transfer-foreign
+   env DD MM YY debit credit amount amount
+   #:description description
+   #:void-reason void-reason
+   #:reconcile reconcile
+   #:num num
+   #:memo memo
+   #:notes notes))
 
 (define (env-create-root-account env type commodity)
   (env-create-account env type commodity (gnc-get-current-root-account)))

commit 51768500833d3b2df269b8497512d24849b7aa3f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Jan 19 15:23:57 2018 +0800

    TR ENH: Add "Subtotal Summary Grid"
    
    The subtotal summary-grid will tabulate subtotals - prime-sortkey
    vertically, sec-sortkey horizontally. This will be useful, for
    example, with prime-sortkey = accounts, sec-sortkey = date,
    sec-subtotal = monthly... will produce a monthly time series
    spreadsheet.
    
    Introduces grid datastructure.
    
    This is a simple list, each element is a vector
    (vector row col data).
    
    In the Transaction Report, row and col are defined
    as a pair (cons sortvalue subtotal-heading), whereas:
    - sortvalue = string/number used to sort the grid headers,
    - subtotal-heading = string used as grid header row/col
    - data = the gnc-monetary collector.

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 249b01c..a04c1d0 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -16,6 +16,7 @@
 ;;   and enable multiple data columns
 ;; - add support for indenting for better grouping
 ;; - add defaults suitable for a reconciliation report
+;; - add subtotal summary grid
 ;;
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   
@@ -40,6 +41,7 @@
 
 (use-modules (gnucash utilities)) 
 (use-modules (srfi srfi-1))
+(use-modules (srfi srfi-11))
 (use-modules (srfi srfi-13))
 (use-modules (ice-9 regex))
 (use-modules (gnucash gnc-module))
@@ -60,6 +62,7 @@
 
 ;;Display
 (define optname-detail-level (N_ "Detail Level"))
+(define optname-grid (N_ "Subtotal Table"))
 
 ;;Sorting
 (define pagename-sorting (N_ "Sorting"))
@@ -773,6 +776,10 @@ tags within description, notes or memo. ")
        amount-is-single?)
 
       (gnc-option-db-set-option-selectable-by-name
+       options gnc:pagename-display optname-grid
+       amount-is-single?)
+
+      (gnc-option-db-set-option-selectable-by-name
        options gnc:pagename-display (N_ "Use Full Other Account Name")
        (and disp-other-accname? detail-is-single?))
 
@@ -808,6 +815,7 @@ tags within description, notes or memo. ")
       (list (N_ "Shares")                       "k"  (_ "Display the number of shares?") #f)
       (list (N_ "Price")                        "l"  (_ "Display the shares price?") #f)
       ;; note the "Amount" multichoice option in between here
+      (list optname-grid                        "m5" (_ "Display a subtotal summary table. This requires Display/Amount being 'single") #f)
       (list (N_ "Running Balance")              "n"  (_ "Display a running balance?") #f)
       (list (N_ "Totals")                       "o"  (_ "Display the totals?") #t)))
 
@@ -1240,11 +1248,12 @@ tags within description, notes or memo. ")
                                    "</b>")))
                         calculated-cells))
             (addto! row-contents (gnc:make-html-table-cell/size
-                                    1 (+ right-indent width-left-columns width-right-columns) data)))
+                                  1 (+ right-indent width-left-columns width-right-columns) data)))
+
         (if (not (column-uses? 'subtotals-only))
             (gnc:html-table-append-row/markup! table subheading-style (reverse row-contents)))))
 
-    (define (add-subtotal-row subtotal-string subtotal-collectors subtotal-style level)
+    (define (add-subtotal-row subtotal-string subtotal-collectors subtotal-style level row col)
       (let* ((row-contents '())
              (left-indent (case level
                             ((total) 0)
@@ -1319,6 +1328,10 @@ tags within description, notes or memo. ")
                       columns
                       merge-list)))
 
+        ;; we only wish to add the first column into the grid.
+        (if (pair? columns)
+            (set! grid (grid-add grid row col (car columns))))
+
         ;;first row
         (for-each (lambda (cell) (addto! row-contents cell))
                   (gnc:html-make-empty-cells left-indent))
@@ -1512,7 +1525,7 @@ tags within description, notes or memo. ")
                    1 (+ indent-level width-left-columns width-right-columns)
                    (gnc:make-html-text (gnc:html-markup-hr)))))
 
-                (add-subtotal-row (render-grand-total) total-collectors def:grand-total-style 'total)))
+                (add-subtotal-row (render-grand-total) total-collectors def:grand-total-style 'total 'row-total 'col-total)))
 
           (let* ((current (car splits))
                  (rest (cdr splits))
@@ -1563,14 +1576,21 @@ tags within description, notes or memo. ")
                                            (render-summary current 'secondary #f))
                                           secondary-subtotal-collectors
                                           def:secondary-subtotal-style
-                                          'secondary)
+                                          'secondary
+                                          (cons (primary-subtotal-comparator current)
+                                                (render-summary current 'primary #f))
+                                          (cons (secondary-subtotal-comparator current)
+                                                (render-summary current 'secondary #f)))
                         (for-each (lambda (coll) (coll 'reset #f #f))
                                   secondary-subtotal-collectors)))
                   (add-subtotal-row (total-string
                                      (render-summary current 'primary #f))
                                     primary-subtotal-collectors
                                     def:primary-subtotal-style
-                                    'primary)
+                                    'primary
+                                    (cons (primary-subtotal-comparator current)
+                                          (render-summary current 'primary #f))
+                                    'col-total)
                   (for-each (lambda (coll) (coll 'reset #f #f))
                             primary-subtotal-collectors)
                   (if next
@@ -1590,7 +1610,13 @@ tags within description, notes or memo. ")
                                               (render-summary current 'secondary #f))
                                              secondary-subtotal-collectors
                                              def:secondary-subtotal-style
-                                             'secondary)
+                                             'secondary
+                                             (if primary-subtotal-comparator
+                                                 (cons (primary-subtotal-comparator current)
+                                                       (render-summary current 'primary #f))
+                                                 (cons #f ""))
+                                             (cons (secondary-subtotal-comparator current)
+                                                   (render-summary current 'secondary #f)))
                            (for-each (lambda (coll) (coll 'reset #f #f))
                                      secondary-subtotal-collectors)
                            (if next
@@ -1599,6 +1625,8 @@ tags within description, notes or memo. ")
 
             (do-rows-with-subtotals rest (not odd-row?)))))
 
+    (define grid (make-grid))
+
     (gnc:html-table-set-col-headers! table (concatenate (list
                                                          (gnc:html-make-empty-cells indent-level)
                                                          headings-left-columns
@@ -1614,7 +1642,70 @@ tags within description, notes or memo. ")
 
     (do-rows-with-subtotals splits #t)
 
-    table))
+    (values table
+            grid)))
+
+
+;; grid data structure
+(define (make-grid)
+  '())
+(define (grid-get grid row col)    ; grid filter - get all row/col - if #f then retrieve whole row/col
+  (filter
+   (lambda (cell)
+     (and (or (not row) (equal? row (vector-ref cell 0)))
+          (or (not col) (equal? col (vector-ref cell 1)))))
+   grid))
+(define (grid-del grid row col)    ; grid filter - del all row/col - if #f then delete whole row/col - CAREFUL!
+  (filter
+   (lambda (cell)
+     (not (and (or (not row) (equal? row (vector-ref cell 0)))
+               (or (not col) (equal? col (vector-ref cell 1))))))
+   grid))
+(define (grid-rows grid)
+  (delete-duplicates (map (lambda (cell) (vector-ref cell 0)) grid)))
+(define (grid-cols grid)
+  (delete-duplicates (map (lambda (cell) (vector-ref cell 1)) grid)))
+(define (grid-add grid row col data)            ;-> misonomer - we don't 'add' to existing data,
+  (set! grid (grid-del grid row col))           ;we simply delete old data stored at row/col and 
+  (set! grid (cons (vector row col data) grid)) ;add again. this is fine because the grid should
+  grid)                                         ;never have duplicate data in the trep.
+(define (grid->html grid list-of-rows list-of-cols)
+  (define (cell->html cell)
+    (if (pair? cell)
+        (string-append "<td class=\"number-cell\">"
+                       (string-join (map gnc:monetary->string
+                                         (vector-ref (car cell) 2))
+                                    "<br/>\n")
+                       "</td>\n")
+        "<td></td>\n"))
+  (define (row->html row list-of-cols)
+    (string-append "<tr><td>"
+                   (if (eq? row 'row-total)
+                       (_ "Grand Total")
+                       (cdr row))
+                   "</td>\n"
+                   (string-join (map
+                                 (lambda (col) (cell->html (grid-get grid row col)))
+                                 list-of-cols) "")
+                   (cell->html (grid-get grid row 'col-total))
+                   "</tr>\n"))
+  (string-append "<table class=\"summary-table\"><caption>"
+                 optname-grid
+                 "</caption><thead><tr>"
+                 "<th></th>\n"
+                 (string-join (map (lambda (col)
+                                     (string-append "<th class=\"column-heading-right\">"
+                                                    (cdr col)
+                                                    "</th>\n")) list-of-cols) "")
+                 "<th class=\"column-heading-right\">"
+                 (_ "Total")
+                 "</th>\n</tr>\n</thead><tbody>"
+                 (string-join (map (lambda (row)
+                                     (row->html row list-of-cols))
+                                   list-of-rows) "")
+                 (row->html 'row-total list-of-cols)
+                 "</tbody></table>\n"))
+
 
 ;; ;;;;;;;;;;;;;;;;;;;;
 ;; Here comes the renderer function for this report.
@@ -1843,7 +1934,7 @@ tags within description, notes or memo. ")
                      document
                      (gnc:render-options-changed options))))
 
-              (let ((table (make-split-table splits options custom-calculated-cells)))
+              (let-values (((table grid) (make-split-table splits options custom-calculated-cells)))
 
                 (gnc:html-document-set-title! document report-title)
 
@@ -1856,6 +1947,17 @@ tags within description, notes or memo. ")
                             (qof-print-date begindate)
                             (qof-print-date enddate)))))
 
+                (if (and (opt-val gnc:pagename-display optname-grid)
+                         (eq? (opt-val gnc:pagename-display (N_ "Amount")) 'single))
+                    (let* ((generic<? (lambda (a b)
+                                        (cond ((string? (car a)) (string<? (car a) (car b)))
+                                              ((number? (car a)) (< (car a) (car b)))
+                                              (else (gnc:error "unknown sortvalue")))))
+                           (list-of-rows (stable-sort! (delete 'row-total (grid-rows grid)) generic<?))
+                           (list-of-cols (stable-sort! (delete 'col-total (grid-cols grid)) generic<?)))
+                      (gnc:html-document-add-object!
+                       document (grid->html grid list-of-rows list-of-cols))))
+
                 (if (eq? infobox-display 'always)
                     (gnc:html-document-add-object!
                      document

commit dd0553af6a8213bf2c645a5a625a8a917c06fc76
Merge: 93f8920 8fef1ad
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Mar 1 13:01:29 2018 +0100

    Merge branch 'scheme-progress-1' of https://github.com/christopherlam/gnucash into unstable


commit 8fef1adcc415bd3dfd5d943740802067e91c79f0
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 28 22:10:38 2018 +0800

    date-utilities: bugfix weekly render
    
    This was introduced by 48bdab3.

diff --git a/libgnucash/app-utils/date-utilities.scm b/libgnucash/app-utils/date-utilities.scm
index ffad895..1729d08 100644
--- a/libgnucash/app-utils/date-utilities.scm
+++ b/libgnucash/app-utils/date-utilities.scm
@@ -91,19 +91,7 @@
                           604800))
          (begin-string (qof-print-date (+ beginweekt64 345600)))
          (end-string (qof-print-date (+ beginweekt64 864000))))
-    (format #f (_ "~s to ~s") begin-string end-string)))
-    
-;  (let ((begin-string (qof-print-date
-;                       (+ (* (gnc:date-get-week
-;                              (gnc:time64-start-day-time
-;                               (gnc-mktime datevec)))
-;                             604800) 345600)))
-;        (end-string (qof-print-date
-;                     (+ (* (gnc:date-get-week
-;                            (gnc:time64-start-day-time
-;                             (gnc-mktime datevec)))
-;                           604800) 864000))))
-;    (format #f (_ "~s to ~s") begin-string end-string)))
+    (format #f (_ "~a to ~a") begin-string end-string)))
 
 ;; is leap year?
 (define (gnc:leap-year? year)

commit 93f892072ca52fed5d140566693d4d0f1f001e68
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Feb 28 19:45:49 2018 -0700

    Bug 793947 - Impossible to render printable invoice
    
    gncInvoiceGetID returs a char*, so ~a is indeed the correct code.
    Odd that the scheme sprintf used %d to format it.

diff --git a/gnucash/report/business-reports/easy-invoice.scm b/gnucash/report/business-reports/easy-invoice.scm
index 4e4a68c..8ebf791 100644
--- a/gnucash/report/business-reports/easy-invoice.scm
+++ b/gnucash/report/business-reports/easy-invoice.scm
@@ -713,7 +713,7 @@
 	       (begin
 	        (set! credit-note? #t)
 	        (set! default-title (_ "Credit Note"))))))
-	  (set! title (format #f (_"~a #~d") (title-string default-title custom-title)
+	  (set! title (format #f (_"~a #~a") (title-string default-title custom-title)
 			       (gncInvoiceGetID invoice)))))
 
 ;    (gnc:html-document-set-title! document title)
@@ -734,7 +734,7 @@
         (add-html! document "<td align='left'>")
         (add-html! document "<b><u>")
 	(add-html! document title)
-;;	(add-html! document (format #f (_ "Invoice #~d")
+;;	(add-html! document (format #f (_ "Invoice #~a")
 ;;				     (gncInvoiceGetID invoice)))
         (add-html! document "</u></b></td>")
         (add-html! document "<td align='right'>")
diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index 96236ae..8b5c503 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -686,7 +686,7 @@
 
     (set! title (title-string default-title custom-title))))
 
-    (gnc:html-document-set-title! document (format #f (_"~a #~d") title
+    (gnc:html-document-set-title! document (format #f (_"~a #~a") title
 						    (gncInvoiceGetID invoice)))
 
     (if (not (null? invoice))

commit 7054cc83bc0aae8ad14b3cfaa193935988489bda
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 28 06:11:30 2018 +0800

    Bug 793898 - 2.7.4: Incorrect copyright statement in gnucash/report/standard-reports/sx-summary.scm
    
    no copyright claim was intended

diff --git a/gnucash/report/standard-reports/daily-reports.scm b/gnucash/report/standard-reports/daily-reports.scm
index c87eccf..5339ff2 100644
--- a/gnucash/report/standard-reports/daily-reports.scm
+++ b/gnucash/report/standard-reports/daily-reports.scm
@@ -2,7 +2,6 @@
 ;; daily-reports.scm: reports based on the day of the week
 ;;
 ;; Copyright (C) 2003, Andy Wingo <wingo at pobox dot com>
-;; Christopher Lam upgrade to time64 (2017)
 ;;
 ;; based on account-piecharts.scm by Robert Merkel (rgmerk at mira.net)
 ;; and Christian Stimming <stimming at tu-harburg.de> with
diff --git a/gnucash/report/standard-reports/sx-summary.scm b/gnucash/report/standard-reports/sx-summary.scm
index 550ae99..2891ad7 100644
--- a/gnucash/report/standard-reports/sx-summary.scm
+++ b/gnucash/report/standard-reports/sx-summary.scm
@@ -5,7 +5,6 @@
 ;; Copyright 2004 David Montenegro <sunrise2000 at comcast.net>
 ;; Copyright 2001 Christian Stimming <stimming at tu-harburg.de>
 ;; Copyright 2000-2001 Bill Gribble <grib at gnumatic.com>
-;; Copyright 2017 Christopher Lam upgrade to time64
 ;;    
 ;; This program is free software; you can redistribute it and/or    
 ;; modify it under the terms of the GNU General Public License as   

commit 872aa6b74023aecdc04ca766d09666ad4321a651
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Feb 24 20:31:42 2018 +0800

    TR: change multichoice values from list to symbols
    
    Context: https://wiki.gnucash.org/logs/2018/02/24.html#T05:43:50
    
    Summary: I had formerly set some multichoice values to be a list.
    However I think options.scm cannot handle list values. They must be
    scheme symbols. It wasn't clear to me during TR refactoring and
    development.
    
    The root cause is in options.scm multichoice handling, whereby it's
    trying to compare the option value with (eq?); in scheme (eq? (list
    "A") (list "A")) is always #f.
    
    https://github.com/Gnucash/gnucash/blob/06ad55cae981111e8858238229e2605f4c05b0d2/libgnucash/app-utils/options.scm#L911
    is the relevant old code.

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index b08f4cb..249b01c 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -318,25 +318,30 @@ in the Options panel."))
                 (cons 'tip (_ "Show both (and include void transactions in totals)."))))))
 
 (define reconcile-status-list
-  ;; value will be either #f to disable reconciled-status filter
-  ;; or a list of xaccSplitGetReconcile values. e.g. value can
-  ;; be '(#\c #\y) to retrieve list of cleared and reconciled splits.
   (list
-   (cons  #f (list
-              (cons 'text (_ "All"))
-              (cons 'tip (_ "Show All Transactions"))))
+   (cons 'all
+         (list
+          (cons 'text (_ "All"))
+          (cons 'tip (_ "Show All Transactions"))
+          (cons 'filter-types #f)))
 
-   (cons '(#\n) (list
-                 (cons 'text (_ "Unreconciled"))
-                 (cons 'tip (_ "Unreconciled only"))))
+   (cons 'unreconciled
+         (list
+          (cons 'text (_ "Unreconciled"))
+          (cons 'tip (_ "Unreconciled only"))
+          (cons 'filter-types (list #\n))))
 
-   (cons '(#\c) (list
-                 (cons 'text (_ "Cleared"))
-                 (cons 'tip (_ "Cleared only"))))
+   (cons 'cleared
+         (list
+          (cons 'text (_ "Cleared"))
+          (cons 'tip (_ "Cleared only"))
+          (cons 'filter-types (list #\c))))
 
-   (cons '(#\y) (list
-                 (cons 'text (_ "Reconciled"))
-                 (cons 'tip (_ "Reconciled only"))))))
+   (cons 'reconciled
+         (list
+          (cons 'text (_ "Reconciled"))
+          (cons 'tip (_ "Reconciled only"))
+          (cons 'filter-types (list #\y))))))
 
 
 (define ascending-list
@@ -460,17 +465,17 @@ Credit Card, and Income accounts."))
    (gnc:make-multichoice-option
     gnc:pagename-general optname-infobox-display
     "h" (_ "Add summary of options.")
-    '(no-match)
+    'no-match
     ;; This is an alist of conditions for displaying the infobox
     ;; 'no-match for empty-report
     ;; 'match for generated report
-    (list (vector '(no-match)
+    (list (vector 'no-match
                   (_ "If no transactions matched")
                   (_ "Display summary if no transactions were matched."))
-          (vector '(no-match match)
+          (vector 'always
                   (_ "Always")
                   (_ "Always display summary."))
-          (vector '()
+          (vector 'never
                   (_ "Never")
                   (_ "Disable report summary.")))))
 
@@ -515,7 +520,7 @@ tags within description, notes or memo. ")
    (gnc:make-multichoice-option
     pagename-filter optname-reconcile-status
     "j1" (_ "Filter by reconcile status.")
-    #f
+    'all
     (keylist->vectorlist reconcile-status-list)))
 
   (gnc:register-trep-option
@@ -1669,7 +1674,9 @@ tags within description, notes or memo. ")
          (transaction-matcher (opt-val pagename-filter optname-transaction-matcher))
          (transaction-matcher-regexp (and (opt-val pagename-filter optname-transaction-matcher-regex)
                                           (make-regexp transaction-matcher)))
-         (reconcile-status-filter (opt-val pagename-filter optname-reconcile-status))
+         (reconcile-status-filter (keylist-get-info reconcile-status-list
+                                                    (opt-val pagename-filter optname-reconcile-status)
+                                                    'filter-types))
          (report-title (opt-val gnc:pagename-general gnc:optname-reportname))
          (primary-key (opt-val pagename-sorting optname-prime-sortkey))
          (primary-order (opt-val pagename-sorting optname-prime-sortorder))
@@ -1756,7 +1763,7 @@ tags within description, notes or memo. ")
                document
                empty-report-message))
 
-          (if (member 'no-match infobox-display)
+          (if (memq infobox-display '(always no-match))
               (gnc:html-document-add-object!
                document
                (gnc:render-options-changed options))))
@@ -1815,8 +1822,9 @@ tags within description, notes or memo. ")
                                      (match? (xaccSplitGetMemo split)))
                                  (or (not custom-split-filter)     ; #f = ignore custom-split-filter
                                      (custom-split-filter split))
-                                 (or (not reconcile-status-filter) ; #f = ignore next filter
-                                     (member (xaccSplitGetReconcile split) reconcile-status-filter)))))
+                                 (or (not reconcile-status-filter) ; #f = ignore reconcile-status-filter
+                                     (memv (xaccSplitGetReconcile split)
+                                           reconcile-status-filter)))))
                         splits))
 
           (if (null? splits)
@@ -1830,7 +1838,7 @@ tags within description, notes or memo. ")
                   report-title (gnc:report-id report-obj)
                   NO-MATCHING-TRANS-HEADER NO-MATCHING-TRANS-TEXT))
 
-                (if (member 'no-match infobox-display)
+                (if (memq infobox-display '(always no-match))
                     (gnc:html-document-add-object!
                      document
                      (gnc:render-options-changed options))))
@@ -1848,7 +1856,7 @@ tags within description, notes or memo. ")
                             (qof-print-date begindate)
                             (qof-print-date enddate)))))
 
-                (if (member 'match infobox-display)
+                (if (eq? infobox-display 'always)
                     (gnc:html-document-add-object!
                      document
                      (gnc:render-options-changed options)))

commit 90fb712c7f0e7b8a2e68350faee80c6cf041fbd4
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 28 06:47:08 2018 +0800

    TR: make no-report-data message consistent with initial no-account

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index aa636c8..b08f4cb 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -1823,11 +1823,12 @@ tags within description, notes or memo. ")
 
               ;; error condition: no splits found
               (begin
+
                 (gnc:html-document-add-object!
                  document
-                 (gnc:make-html-text
-                  (gnc:html-markup-h2 NO-MATCHING-TRANS-HEADER)
-                  (gnc:html-markup-p NO-MATCHING-TRANS-TEXT)))
+                 (gnc:html-make-generic-warning
+                  report-title (gnc:report-id report-obj)
+                  NO-MATCHING-TRANS-HEADER NO-MATCHING-TRANS-TEXT))
 
                 (if (member 'no-match infobox-display)
                     (gnc:html-document-add-object!

commit 840e1f8b02578308da8c5ca6dd807686d97da8a9
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 28 06:22:54 2018 +0800

    TR: simplify no-account-after-filtering stage

diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm
index 9227cb7..aa636c8 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/standard-reports/transaction.scm
@@ -1744,19 +1744,17 @@ tags within description, notes or memo. ")
         ;; error condition: no accounts specified or obtained after filtering
         (begin
 
-            ;; error condition: no accounts specified
-            (begin
-
+          (gnc:html-document-add-object!
+           document
+           (gnc:html-make-no-account-warning
+            report-title (gnc:report-id report-obj)))
+
+          ;; if an empty-report-message is passed by a derived report to
+          ;; the renderer, display it here.
+          (if empty-report-message
               (gnc:html-document-add-object!
                document
-               (gnc:html-make-no-account-warning report-title (gnc:report-id report-obj)))
-
-              ;; if an empty-report-message is passed by a derived report to
-              ;; the renderer, display it here.
-              (if empty-report-message
-                  (gnc:html-document-add-object!
-                   document
-                   empty-report-message)))
+               empty-report-message))
 
           (if (member 'no-match infobox-display)
               (gnc:html-document-add-object!

commit 7ef8e6d4890a80637634b931dfea740f80d271a0
Author: Niels <gitlab at nielsegberts.nl>
Date:   Wed Feb 28 00:32:41 2018 +0000

    Fix fall through in Account.cpp
    
    Found with -Wimplicit-fallthrough, but older versions of GCC don't support it. So it will take some effort to add it to the build config.
    
    I think it did not result in a reproducible bug.

diff --git a/libgnucash/engine/Account.cpp b/libgnucash/engine/Account.cpp
index 312b04b..e5325ab 100644
--- a/libgnucash/engine/Account.cpp
+++ b/libgnucash/engine/Account.cpp
@@ -409,6 +409,7 @@ gnc_account_get_property (GObject         *object,
         break;
     case PROP_SORT_REVERSED:
         g_value_set_boolean(value, xaccAccountGetSortReversed(account));
+        break;
     case PROP_LOT_NEXT_ID:
         /* Pre-set the value in case the frame is empty */
         g_value_set_int64 (value, 0);
@@ -533,6 +534,7 @@ gnc_account_set_property (GObject         *object,
         break;
     case PROP_SORT_REVERSED:
         xaccAccountSetSortReversed(account, g_value_get_boolean(value));
+        break;
     case PROP_LOT_NEXT_ID:
         qof_instance_set_path_kvp (QOF_INSTANCE (account), value, {"lot-mgmt", "next-id"});
         break;

commit d8d552ee8a1cf9c1237b36ac953b7873ba14c91f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Feb 24 20:54:50 2018 +0800

    options.scm: tidy (gnc:render-options-changed)
    
    This small change introduces \n into the HTML render.

diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index 9d8f109..fd82e21 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -2056,8 +2056,8 @@
             (set! row-contents (cons return-string row-contents)))))
     (gnc:options-for-each disp-option-if-changed options)
     (string-append (string-join (reverse row-contents)
-                                (if plaintext? "\n" "<br />"))
-                   (if plaintext? "\n\n" "<br /><br />"))))
+                                (if plaintext? "\n" "<br />\n"))
+                   (if plaintext? "\n\n" "<br />\n<br />\n"))))
 
 (define (gnc:send-options db_handle options)
   (gnc:options-for-each

commit 7da9a3ba58be00ace20efe32d4fca0482500705f
Merge: ad16646 8353b56
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 18:16:10 2018 +0100

    Merge branch 'reg-item' of https://github.com/Bob-IT/gnucash into unstable


commit 8353b5693ef27a658d5c0de083a5c27e5228f0ef
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Wed Feb 28 16:33:54 2018 +0000

    With register obscured the sheet kept being redrawn
    
    When the register is obscured by another window, the sheet would get
    lot of draw events. This was tracked down to getting the foreground
    colour for the item-edit widget for the state GTK_STATE_FLAG_NORMAL.
    Changed this to use the value obtained from gtk_widget_get_state_flags.

diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index 04e6da9..7a2a3b4 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -502,6 +502,7 @@ draw_text_cursor_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
     GncItemEdit *item_edit = GNC_ITEM_EDIT(user_data);
     GtkEditable *editable = GTK_EDITABLE(widget);
     GtkStyleContext *stylectxt = gtk_widget_get_style_context (GTK_WIDGET(widget));
+    GtkStateFlags flags = gtk_widget_get_state_flags (GTK_WIDGET(widget));
     gint height = gtk_widget_get_allocated_height (widget);
     const gchar *text;
     GdkRGBA *fg_color;
@@ -514,7 +515,7 @@ draw_text_cursor_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
 
     // Get the foreground color
     gdk_rgba_parse (&color, "black");
-    gtk_style_context_get_color (stylectxt, GTK_STATE_FLAG_NORMAL, &color);
+    gtk_style_context_get_color (stylectxt, flags, &color);
     fg_color = &color;
 
     text = gtk_entry_get_text (GTK_ENTRY (widget));

commit ad1664604f5415851de932ec44d0f5c64c5532c7
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 16:50:15 2018 +0100

    Cleanup namespace usage for boost::locale
    
    In a previous commit I wrongly believed xgettext might not find
    our strings if we used the fully namespaced boost::locale::translate or
    aliased bl::translate instead of just translate. However that's
    wrong, so I have changed the code to always use bl::translate.

diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 535f4ef..8b7c550 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -67,7 +67,6 @@ extern "C"
 #include <boost/locale.hpp>
 
 namespace bl = boost::locale;
-using namespace boost::locale;
 
 #define MIN_COL_WIDTH 70
 #define GNC_PREFS_GROUP "dialogs.import.csv"
@@ -1947,9 +1946,10 @@ CsvImpTransAssist::assist_summary_page_prepare ()
     gen.add_messages_path(gnc_path_get_datadir());
     gen.add_messages_domain(PACKAGE);
 
-    auto text = std::string("<span size=\"medium\"><b>");
     // FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
-    text += (bl::format (translate ("The transactions were imported from the file '{1}'.")) % m_file_name).str(gen(""));
+    auto text = std::string("<span size=\"medium\"><b>");
+    /* Translators: {1} will be replaced with a filename */
+    text += (bl::format (bl::translate ("The transactions were imported from file '{1}'.")) % m_file_name).str(gen(""));
     text += "</b></span>";
     gtk_label_set_markup (GTK_LABEL(summary_label), text.c_str());
 }
diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index d55b535..e259798 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -78,7 +78,6 @@ extern "C" {
 namespace bfs = boost::filesystem;
 namespace bst = boost::system;
 namespace bl = boost::locale;
-using namespace boost::locale;
 
 /**
  * Scrubs a filename by changing "strange" chars (e.g. those that are not
@@ -678,35 +677,35 @@ static std::string migrate_gnc_datahome()
 
     /* Step 3: inform the user of additional changes */
     if (full_copy || !succeeded.empty() || !conf_exist_vec.empty() || !failed.empty())
-        migration_msg << translate ("Notice") << std::endl << std::endl;
+        migration_msg << bl::translate ("Notice") << std::endl << std::endl;
 
     if (full_copy)
     {
         migration_msg
-        << translate ("Your gnucash metadata has been migrated.") << std::endl << std::endl
+        << bl::translate ("Your gnucash metadata has been migrated .") << std::endl << std::endl
         /* Translators: this refers to a directory name. */
-        << translate ("Old location:") << " " << old_dir.string() << std::endl
+        << bl::translate ("Old location:") << " " << old_dir.string() << std::endl
         /* Translators: this refers to a directory name. */
-        << translate ("New location:") << " " << gnc_userdata_home.string() << std::endl << std::endl
+        << bl::translate ("New location:") << " " << gnc_userdata_home.string() << std::endl << std::endl
         // Translators {1} will be replaced with the package name (typically Gnucash) at runtime
-        << bl::format (translate ("If you no longer intend to run {1} 2.6.x or older on this system you can safely remove the old directory."))
+        << bl::format (bl::translate ("If you no longer intend to run {1} 2.6.x or older on this system you can safely remove the old directory."))
         % PACKAGE_NAME;
     }
 
     if (full_copy &&
         (!succeeded.empty() || !conf_exist_vec.empty() || !failed.empty()))
         migration_msg << std::endl << std::endl
-                        << translate ("In addition:");
+                        << bl::translate ("In addition:");
 
     if (!succeeded.empty())
     {
         migration_msg << std::endl << std::endl;
         if (full_copy)
-            migration_msg << bl::format (translate ("The following file has been copied to {1} instead:",
-                                                    "The following files have been copied to {1} instead:",
-                                                    succeeded.size())) % gnc_userconfig_home.string().c_str();
+            migration_msg << bl::format (bl::translate ("The following file has been copied to {1} instead:",
+                                                        "The following files have been copied to {1} instead:",
+                                                        succeeded.size())) % gnc_userconfig_home.string().c_str();
         else
-            migration_msg << bl::format (translate ("The following file in {1} has been renamed:"))
+            migration_msg << bl::format (bl::translate ("The following file in {1} has been renamed:"))
                                          % gnc_userconfig_home.string().c_str();
 
         migration_msg << std::endl;
@@ -716,9 +715,9 @@ static std::string migrate_gnc_datahome()
     if (!conf_exist_vec.empty())
     {
         migration_msg << std::endl << std::endl
-                      << translate ("The following file has become obsolete and will be ignored:",
-                                    "The following files have become obsolete and will be ignored:",
-                                    conf_exist_vec.size())
+                      << bl::translate ("The following file has become obsolete and will be ignored:",
+                                        "The following files have become obsolete and will be ignored:",
+                                        conf_exist_vec.size())
                       << std::endl;
         for (auto obs_file : conf_exist_vec)
             migration_msg << "- " << obs_file << std::endl;
@@ -726,9 +725,9 @@ static std::string migrate_gnc_datahome()
     if (!failed.empty())
     {
         migration_msg << std::endl << std::endl
-                      << bl::format (translate ("The following file could not be moved to {1}:",
-                                                "The following files could not be moved to {1}:",
-                                                failed.size())) % gnc_userconfig_home.string().c_str()
+                      << bl::format (bl::translate ("The following file could not be moved to {1}:",
+                                                    "The following files could not be moved to {1}:",
+                                                    failed.size())) % gnc_userconfig_home.string().c_str()
                       << std::endl;
         for (auto failed_file : failed)
             migration_msg << "- " << failed_file << std::endl;

commit b71c346ef5f9afbee6d034dade75c7ca0cd0bcae
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 16:48:49 2018 +0100

    Fix typo: should read 'older version of gettext' rather than 'older version of gnucash'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81b6c13..670fe8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,7 +258,7 @@ if (ALLOW_OLD_GETTEXT)
 else (ALLOW_OLD_GETTEXT)
     find_package (Gettext 0.19.6)
     if (NOT GETTEXT_FOUND)
-        message (FATAL_ERROR "Note the build can be configured with an older version of gnucash by setting ALLOW_OLD_GETTEXT=ON but then some files will not be translated:
+        message (FATAL_ERROR "Note the build can be configured with an older version of gettext by setting ALLOW_OLD_GETTEXT=ON but then some files will not be translated:
         - gnucash.desktop (requires at least gettext 0.19)
         - gnucash.appdata.xml (requires at least gettext 0.19.6)")
     endif (NOT GETTEXT_FOUND)

commit 66abe023546579ba65ab12961229aca4a98dda6c
Merge: fbaa41a f95ae1a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 16:10:00 2018 +0100

    Merge branch 'master' of https://github.com/jeblad/gnucash into unstable


commit fbaa41ac474545c4674582f34c04d2b2eeb43ece
Merge: c186624 cd30578
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 15:44:59 2018 +0100

    Merge branch 'register-pref-update' of https://github.com/Bob-IT/gnucash into unstable


commit c1866241605bc6309706b2c85d5a4c9eeff8a0dd
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 14:25:05 2018 +0100

    Rework source directory structure for gschema, gtkbuilder and ui files
    
    There is now a directory for each respective file type directly in the gnucash source directory
    (This was already started for gschema files before).
    
    In principle all files of each type should go into these global directories. The only
    exception is if such a file belongs to an optional module. In that case the file
    remains located inside that module's directory. Currently we have ui, glade and gschema file
    exceptions in aqb and ofx importers.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index caa5c53..7dd92c9 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -22,11 +22,13 @@ int main (int argc, char** argv) {
 ADD_SUBDIRECTORY (gnome)
 ADD_SUBDIRECTORY (gnome-utils)
 ADD_SUBDIRECTORY (gnome-search)
+ADD_SUBDIRECTORY (gtkbuilder)
 ADD_SUBDIRECTORY (html)
 ADD_SUBDIRECTORY (import-export)
 ADD_SUBDIRECTORY (python)
 ADD_SUBDIRECTORY (register)
 ADD_SUBDIRECTORY (report)
+ADD_SUBDIRECTORY (ui)
 ADD_SUBDIRECTORY (gschemas)
 
 ADD_DEFINITIONS (-DHAVE_CONFIG_H)
@@ -255,6 +257,6 @@ SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-scr
                gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
                ${gnucash_EXTRA_DIST})
 
-SET(gnucash_DIST ${gnucash_DIST_local} ${gschemas_DIST} ${gnome_DIST} ${gnome_search_DIST}
-             ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST} ${report_DIST}
-             ${overrides_DIST} ${test_bin_DIST} PARENT_SCOPE)
+set (gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST} ${gnome_utils_DIST}
+    ${gschemas_DIST} ${gtkbuilder_DIST} ${html_DIST} ${import_export_DIST} ${python_DIST} ${register_DIST}
+    ${report_DIST} ${overrides_DIST} ${test_bin_DIST} ${ui_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome-search/CMakeLists.txt b/gnucash/gnome-search/CMakeLists.txt
index 3144628..772b977 100644
--- a/gnucash/gnome-search/CMakeLists.txt
+++ b/gnucash/gnome-search/CMakeLists.txt
@@ -36,7 +36,7 @@ SET (gnome_search_noinst_HEADERS
 # Add dependency on config.h
 SET_SOURCE_FILES_PROPERTIES (${gnome_search_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt  dialog-search.glade ${gnome_search_SOURCES} ${gnome_search_HEADERS}
+SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt ${gnome_search_SOURCES} ${gnome_search_HEADERS}
         ${gnome_search_noinst_HEADERS})
 SET(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE)
 
@@ -62,13 +62,3 @@ INSTALL(TARGETS gncmod-gnome-search
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 INSTALL(FILES ${gnome_search_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-
-SET(gnome_search_GLADE dialog-search.glade)
-
-INSTALL(FILES ${gnome_search_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-FILE(COPY .
-    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
-    PATTERN Makefile.* EXCLUDE
-    PATTERN CMakeLists.txt EXCLUDE)
-
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 065ec9d..855d684 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -1,7 +1,5 @@
 # Note that gnucash/gnome-utils CANNOT depend on gnucash/gnome!
 
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
 ADD_SUBDIRECTORY(test)
 
 # Command to generate the swig-gnome-utils.c wrapper file
@@ -270,5 +268,4 @@ ADD_CUSTOM_TARGET(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-
 SET_LOCAL_DIST(gnome_utils_DIST_local CMakeLists.txt ${gnome_utils_SOURCES} ${gnome_utils_HEADERS}
         ${gnome_utils_noinst_HEADERS} gnome-utils.scm gnome-utils.i gnc-menu-extensions.scm
         make-gnc-warnings-c.xsl make-gnc-warnings-h.xsl)
-SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST}
-        ${gnome_utils_ui_DIST} ${gnome_utils_gtkbuilder_DIST} PARENT_SCOPE)
+SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt b/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index 9cde018..0000000
--- a/gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-SET(gnome_utils_GLADE
-        assistant-xml-encoding.glade
-        dialog-account.glade
-        dialog-book-close.glade
-        dialog-commodity.glade
-        dialog-file-access.glade
-        dialog-object-references.glade
-        dialog-options.glade
-        dialog-preferences.glade
-        dialog-query-view.glade
-        dialog-reset-warnings.glade
-        dialog-tax-table.glade
-        dialog-totd.glade
-        dialog-transfer.glade
-        dialog-userpass.glade
-        gnc-date-format.glade
-        gnc-frequency.glade
-        gnc-recurrence.glade
-        gnc-tree-view-owner.glade
-)
-
-FILE(COPY ${gnome_utils_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${gnome_utils_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(gnome_utils_gtkbuilder_DIST CMakeLists.txt ${gnome_utils_GLADE})
diff --git a/gnucash/gnome-utils/ui/CMakeLists.txt b/gnucash/gnome-utils/ui/CMakeLists.txt
deleted file mode 100644
index 4320474..0000000
--- a/gnucash/gnome-utils/ui/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-set(gnome_utils_UI
-  gnc-main-window-ui.xml
-  gnc-windows-menu-ui-quartz.xml
-  gnc-windows-menu-ui.xml
-  osx_accel_map
-  )
-
-FILE(COPY ${gnome_utils_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${gnome_utils_UI} DESTINATION share/gnucash/ui)
-
-SET(gnome_utils_ui_DIST_local
-  CMakeLists.txt
-  ${gnome_utils_UI}
-  )
-
-SET_DIST_LIST(gnome_utils_ui_DIST ${gnome_utils_ui_DIST_local})
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index fc5f1e2..537fc60 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -1,7 +1,4 @@
 
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET (gnc_gnome_noinst_HEADERS
   assistant-acct-period.h
   assistant-hierarchy.h
@@ -216,7 +213,6 @@ ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
 
-SET_LOCAL_DIST(gnome_DIST_local
+SET_DIST_LIST(gnome_DIST
         CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
         ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
-SET(gnome_DIST ${gnome_DIST_local} ${gnome_ui_DIST} ${gnome_gtkbuilder_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome/gtkbuilder/CMakeLists.txt b/gnucash/gnome/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index a58db75..0000000
--- a/gnucash/gnome/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-SET(gnome_GLADE
-        assistant-acct-period.glade
-        assistant-hierarchy.glade
-        assistant-loan.glade
-        assistant-stock-split.glade
-        business-options-gnome.glade
-        business-prefs.glade
-        dialog-billterms.glade
-        dialog-choose-owner.glade
-        dialog-commodities.glade
-        dialog-customer.glade
-        dialog-date-close.glade
-        dialog-employee.glade
-        dialog-fincalc.glade
-        dialog-find-account.glade
-        dialog-imap-editor.glade
-        dialog-invoice.glade
-        dialog-job.glade
-        dialog-lot-viewer.glade
-        dialog-new-user.glade
-        dialog-order.glade
-        dialog-payment.glade
-        dialog-price.glade
-        dialog-print-check.glade
-        dialog-progress.glade
-        dialog-sx.glade
-        dialog-tax-info.glade
-        dialog-trans-assoc.glade
-        dialog-vendor.glade
-        gnc-plugin-page-budget.glade
-        gnc-plugin-page-register2.glade
-        gnc-plugin-page-register.glade
-        window-autoclear.glade
-        window-reconcile.glade
-)
-
-FILE(COPY ${gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${gnome_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(gnome_gtkbuilder_DIST CMakeLists.txt ${gnome_GLADE})
diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
index 9c7b1e0..9f68bb7 100644
--- a/gnucash/gschemas/CMakeLists.txt
+++ b/gnucash/gschemas/CMakeLists.txt
@@ -1,14 +1,18 @@
 
 SET(gschema_SOURCES
-  org.gnucash.dialogs.gschema.xml
   org.gnucash.dialogs.business.gschema.xml
-  org.gnucash.dialogs.commodities.gschema.xml
   org.gnucash.dialogs.checkprinting.gschema.xml
+  org.gnucash.dialogs.commodities.gschema.xml
+  org.gnucash.dialogs.export.csv.gschema.xml
+  org.gnucash.dialogs.gschema.xml
+  org.gnucash.dialogs.import.csv.gschema.xml
+  org.gnucash.dialogs.import.generic.gschema.xml
+  org.gnucash.dialogs.import.qif.gschema.xml
   org.gnucash.dialogs.reconcile.gschema.xml
   org.gnucash.dialogs.sxs.gschema.xml
   org.gnucash.dialogs.totd.gschema.xml
-  org.gnucash.gschema.xml
   org.gnucash.general.finance-quote.gschema.xml
+  org.gnucash.gschema.xml
   org.gnucash.history.gschema.xml
   org.gnucash.warnings.gschema.xml
   org.gnucash.window.pages.account.tree.gschema.xml
diff --git a/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
diff --git a/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
diff --git a/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
diff --git a/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in b/gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
rename to gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
diff --git a/gnucash/gtkbuilder/CMakeLists.txt b/gnucash/gtkbuilder/CMakeLists.txt
new file mode 100644
index 0000000..0e9667b
--- /dev/null
+++ b/gnucash/gtkbuilder/CMakeLists.txt
@@ -0,0 +1,71 @@
+set (gtkbuilder_SOURCES
+        assistant-acct-period.glade
+        assistant-csv-account-import.glade
+        assistant-csv-export.glade
+        assistant-csv-price-import.glade
+        assistant-csv-trans-import.glade
+        assistant-hierarchy.glade
+        assistant-loan.glade
+        assistant-qif-import.glade
+        assistant-stock-split.glade
+        assistant-xml-encoding.glade
+        business-options-gnome.glade
+        business-prefs.glade
+        dialog-account-picker.glade
+        dialog-account.glade
+        dialog-bi-import-gui.glade
+        dialog-billterms.glade
+        dialog-book-close.glade
+        dialog-choose-owner.glade
+        dialog-commodities.glade
+        dialog-commodity.glade
+        dialog-custom-report.glade
+        dialog-customer-import-gui.glade
+        dialog-customer.glade
+        dialog-date-close.glade
+        dialog-employee.glade
+        dialog-file-access.glade
+        dialog-fincalc.glade
+        dialog-find-account.glade
+        dialog-imap-editor.glade
+        dialog-import.glade
+        dialog-invoice.glade
+        dialog-job.glade
+        dialog-lot-viewer.glade
+        dialog-new-user.glade
+        dialog-object-references.glade
+        dialog-options.glade
+        dialog-order.glade
+        dialog-payment.glade
+        dialog-preferences.glade
+        dialog-price.glade
+        dialog-print-check.glade
+        dialog-progress.glade
+        dialog-query-view.glade
+        dialog-report.glade
+        dialog-reset-warnings.glade
+        dialog-search.glade
+        dialog-sx.glade
+        dialog-tax-info.glade
+        dialog-tax-table.glade
+        dialog-totd.glade
+        dialog-trans-assoc.glade
+        dialog-transfer.glade
+        dialog-userpass.glade
+        dialog-vendor.glade
+        gnc-date-format.glade
+        gnc-frequency.glade
+        gnc-plugin-page-budget.glade
+        gnc-plugin-page-register2.glade
+        gnc-plugin-page-register.glade
+        gnc-recurrence.glade
+        gnc-tree-view-owner.glade
+        window-autoclear.glade
+        window-reconcile.glade
+)
+
+file (COPY ${gtkbuilder_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
+
+install (FILES ${gtkbuilder_SOURCES} DESTINATION share/gnucash/gtkbuilder)
+
+SET_DIST_LIST(gtkbuilder_DIST CMakeLists.txt ${gtkbuilder_SOURCES})
diff --git a/gnucash/gnome/gtkbuilder/assistant-acct-period.glade b/gnucash/gtkbuilder/assistant-acct-period.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-acct-period.glade
rename to gnucash/gtkbuilder/assistant-acct-period.glade
diff --git a/gnucash/import-export/csv-imp/assistant-csv-account-import.glade b/gnucash/gtkbuilder/assistant-csv-account-import.glade
similarity index 100%
rename from gnucash/import-export/csv-imp/assistant-csv-account-import.glade
rename to gnucash/gtkbuilder/assistant-csv-account-import.glade
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade
similarity index 100%
rename from gnucash/import-export/csv-exp/assistant-csv-export.glade
rename to gnucash/gtkbuilder/assistant-csv-export.glade
diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade
similarity index 100%
rename from gnucash/import-export/csv-imp/assistant-csv-price-import.glade
rename to gnucash/gtkbuilder/assistant-csv-price-import.glade
diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
similarity index 100%
rename from gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
rename to gnucash/gtkbuilder/assistant-csv-trans-import.glade
diff --git a/gnucash/gnome/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
rename to gnucash/gtkbuilder/assistant-hierarchy.glade
diff --git a/gnucash/gnome/gtkbuilder/assistant-loan.glade b/gnucash/gtkbuilder/assistant-loan.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-loan.glade
rename to gnucash/gtkbuilder/assistant-loan.glade
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade
similarity index 100%
rename from gnucash/import-export/qif-imp/assistant-qif-import.glade
rename to gnucash/gtkbuilder/assistant-qif-import.glade
diff --git a/gnucash/gnome/gtkbuilder/assistant-stock-split.glade b/gnucash/gtkbuilder/assistant-stock-split.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/assistant-stock-split.glade
rename to gnucash/gtkbuilder/assistant-stock-split.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade b/gnucash/gtkbuilder/assistant-xml-encoding.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
rename to gnucash/gtkbuilder/assistant-xml-encoding.glade
diff --git a/gnucash/gnome/gtkbuilder/business-options-gnome.glade b/gnucash/gtkbuilder/business-options-gnome.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/business-options-gnome.glade
rename to gnucash/gtkbuilder/business-options-gnome.glade
diff --git a/gnucash/gnome/gtkbuilder/business-prefs.glade b/gnucash/gtkbuilder/business-prefs.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/business-prefs.glade
rename to gnucash/gtkbuilder/business-prefs.glade
diff --git a/gnucash/import-export/qif-imp/dialog-account-picker.glade b/gnucash/gtkbuilder/dialog-account-picker.glade
similarity index 100%
rename from gnucash/import-export/qif-imp/dialog-account-picker.glade
rename to gnucash/gtkbuilder/dialog-account-picker.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-account.glade
rename to gnucash/gtkbuilder/dialog-account.glade
diff --git a/gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade b/gnucash/gtkbuilder/dialog-bi-import-gui.glade
similarity index 100%
rename from gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade
rename to gnucash/gtkbuilder/dialog-bi-import-gui.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-billterms.glade b/gnucash/gtkbuilder/dialog-billterms.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-billterms.glade
rename to gnucash/gtkbuilder/dialog-billterms.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade b/gnucash/gtkbuilder/dialog-book-close.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
rename to gnucash/gtkbuilder/dialog-book-close.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-choose-owner.glade b/gnucash/gtkbuilder/dialog-choose-owner.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
rename to gnucash/gtkbuilder/dialog-choose-owner.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-commodities.glade b/gnucash/gtkbuilder/dialog-commodities.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-commodities.glade
rename to gnucash/gtkbuilder/dialog-commodities.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
rename to gnucash/gtkbuilder/dialog-commodity.glade
diff --git a/gnucash/report/report-gnome/dialog-custom-report.glade b/gnucash/gtkbuilder/dialog-custom-report.glade
similarity index 100%
rename from gnucash/report/report-gnome/dialog-custom-report.glade
rename to gnucash/gtkbuilder/dialog-custom-report.glade
diff --git a/gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
similarity index 100%
rename from gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
rename to gnucash/gtkbuilder/dialog-customer-import-gui.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-customer.glade b/gnucash/gtkbuilder/dialog-customer.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-customer.glade
rename to gnucash/gtkbuilder/dialog-customer.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-date-close.glade b/gnucash/gtkbuilder/dialog-date-close.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-date-close.glade
rename to gnucash/gtkbuilder/dialog-date-close.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-employee.glade b/gnucash/gtkbuilder/dialog-employee.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-employee.glade
rename to gnucash/gtkbuilder/dialog-employee.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade b/gnucash/gtkbuilder/dialog-file-access.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
rename to gnucash/gtkbuilder/dialog-file-access.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-fincalc.glade
rename to gnucash/gtkbuilder/dialog-fincalc.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-find-account.glade b/gnucash/gtkbuilder/dialog-find-account.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-find-account.glade
rename to gnucash/gtkbuilder/dialog-find-account.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-imap-editor.glade b/gnucash/gtkbuilder/dialog-imap-editor.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
rename to gnucash/gtkbuilder/dialog-imap-editor.glade
diff --git a/gnucash/import-export/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
similarity index 100%
rename from gnucash/import-export/dialog-import.glade
rename to gnucash/gtkbuilder/dialog-import.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-invoice.glade b/gnucash/gtkbuilder/dialog-invoice.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-invoice.glade
rename to gnucash/gtkbuilder/dialog-invoice.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-job.glade b/gnucash/gtkbuilder/dialog-job.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-job.glade
rename to gnucash/gtkbuilder/dialog-job.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade b/gnucash/gtkbuilder/dialog-lot-viewer.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
rename to gnucash/gtkbuilder/dialog-lot-viewer.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-new-user.glade b/gnucash/gtkbuilder/dialog-new-user.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-new-user.glade
rename to gnucash/gtkbuilder/dialog-new-user.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade b/gnucash/gtkbuilder/dialog-object-references.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
rename to gnucash/gtkbuilder/dialog-object-references.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-options.glade b/gnucash/gtkbuilder/dialog-options.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-options.glade
rename to gnucash/gtkbuilder/dialog-options.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-order.glade b/gnucash/gtkbuilder/dialog-order.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-order.glade
rename to gnucash/gtkbuilder/dialog-order.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-payment.glade b/gnucash/gtkbuilder/dialog-payment.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-payment.glade
rename to gnucash/gtkbuilder/dialog-payment.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
rename to gnucash/gtkbuilder/dialog-preferences.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-price.glade b/gnucash/gtkbuilder/dialog-price.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-price.glade
rename to gnucash/gtkbuilder/dialog-price.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-print-check.glade b/gnucash/gtkbuilder/dialog-print-check.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-print-check.glade
rename to gnucash/gtkbuilder/dialog-print-check.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-progress.glade b/gnucash/gtkbuilder/dialog-progress.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-progress.glade
rename to gnucash/gtkbuilder/dialog-progress.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade b/gnucash/gtkbuilder/dialog-query-view.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
rename to gnucash/gtkbuilder/dialog-query-view.glade
diff --git a/gnucash/report/report-gnome/dialog-report.glade b/gnucash/gtkbuilder/dialog-report.glade
similarity index 100%
rename from gnucash/report/report-gnome/dialog-report.glade
rename to gnucash/gtkbuilder/dialog-report.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade b/gnucash/gtkbuilder/dialog-reset-warnings.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
rename to gnucash/gtkbuilder/dialog-reset-warnings.glade
diff --git a/gnucash/gnome-search/dialog-search.glade b/gnucash/gtkbuilder/dialog-search.glade
similarity index 100%
rename from gnucash/gnome-search/dialog-search.glade
rename to gnucash/gtkbuilder/dialog-search.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-sx.glade
rename to gnucash/gtkbuilder/dialog-sx.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-tax-info.glade b/gnucash/gtkbuilder/dialog-tax-info.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-tax-info.glade
rename to gnucash/gtkbuilder/dialog-tax-info.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade b/gnucash/gtkbuilder/dialog-tax-table.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
rename to gnucash/gtkbuilder/dialog-tax-table.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-totd.glade b/gnucash/gtkbuilder/dialog-totd.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
rename to gnucash/gtkbuilder/dialog-totd.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade b/gnucash/gtkbuilder/dialog-trans-assoc.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
rename to gnucash/gtkbuilder/dialog-trans-assoc.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade b/gnucash/gtkbuilder/dialog-transfer.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
rename to gnucash/gtkbuilder/dialog-transfer.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade b/gnucash/gtkbuilder/dialog-userpass.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
rename to gnucash/gtkbuilder/dialog-userpass.glade
diff --git a/gnucash/gnome/gtkbuilder/dialog-vendor.glade b/gnucash/gtkbuilder/dialog-vendor.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/dialog-vendor.glade
rename to gnucash/gtkbuilder/dialog-vendor.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade b/gnucash/gtkbuilder/gnc-date-format.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
rename to gnucash/gtkbuilder/gnc-date-format.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade b/gnucash/gtkbuilder/gnc-frequency.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
rename to gnucash/gtkbuilder/gnc-frequency.glade
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
rename to gnucash/gtkbuilder/gnc-plugin-page-budget.glade
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
rename to gnucash/gtkbuilder/gnc-plugin-page-register.glade
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade b/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
rename to gnucash/gtkbuilder/gnc-plugin-page-register2.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade b/gnucash/gtkbuilder/gnc-recurrence.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
rename to gnucash/gtkbuilder/gnc-recurrence.glade
diff --git a/gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade b/gnucash/gtkbuilder/gnc-tree-view-owner.glade
similarity index 100%
rename from gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
rename to gnucash/gtkbuilder/gnc-tree-view-owner.glade
diff --git a/gnucash/gnome/gtkbuilder/window-autoclear.glade b/gnucash/gtkbuilder/window-autoclear.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/window-autoclear.glade
rename to gnucash/gtkbuilder/window-autoclear.glade
diff --git a/gnucash/gnome/gtkbuilder/window-reconcile.glade b/gnucash/gtkbuilder/window-reconcile.glade
similarity index 100%
rename from gnucash/gnome/gtkbuilder/window-reconcile.glade
rename to gnucash/gtkbuilder/window-reconcile.glade
diff --git a/gnucash/import-export/CMakeLists.txt b/gnucash/import-export/CMakeLists.txt
index e78a780..2a8ee1e 100644
--- a/gnucash/import-export/CMakeLists.txt
+++ b/gnucash/import-export/CMakeLists.txt
@@ -8,7 +8,6 @@ ADD_SUBDIRECTORY(bi-import)
 ADD_SUBDIRECTORY(csv-exp)
 ADD_SUBDIRECTORY(csv-imp)
 ADD_SUBDIRECTORY(customer-import)
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(log-replay)
 ADD_SUBDIRECTORY(ofx)
 ADD_SUBDIRECTORY(qif)
@@ -72,21 +71,14 @@ INSTALL(TARGETS gncmod-generic-import
 
 INSTALL(FILES ${generic_import_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
 
-SET(generic_import_GLADE dialog-import.glade)
-
-INSTALL(FILES ${generic_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-
-FILE(COPY ${generic_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET(generic_import_EXTRA_DIST generic-import-design.txt)
 
 SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt ${generic_import_SOURCES}
-        ${generic_import_HEADERS} ${generic_import_GLADE} ${generic_import_noinst_HEADERS}
+        ${generic_import_HEADERS} ${generic_import_noinst_HEADERS}
         ${generic_import_EXTRA_DIST})
 
 SET(import_export_DIST ${import_export_DIST_local} ${aqbanking_DIST} ${bi_import_DIST}
         ${csv_export_DIST} ${csv_import_DIST} ${customer_import_DIST}
-        ${generic_import_gschema_DIST} ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
+        ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
         ${test_generic_import_DIST}
         PARENT_SCOPE)
diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt
index 710fc5d..62d580e 100644
--- a/gnucash/import-export/bi-import/CMakeLists.txt
+++ b/gnucash/import-export/bi-import/CMakeLists.txt
@@ -1,7 +1,3 @@
-
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(bi_import_SOURCES
   gnc-plugin-bi-import.c
   gncmod-bi-import.c
@@ -49,5 +45,4 @@ INSTALL(TARGETS gncmod-bi-import
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_LOCAL_DIST(bi_import_DIST_local CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})
-SET(bi_import_DIST ${bi_import_DIST_local} ${bi_import_ui_DIST} ${bi_import_glade_DIST} PARENT_SCOPE)
+SET_DIST_LIST(bi_import_DIST CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})
diff --git a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index 7454750..0000000
--- a/gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(bi_import_GLADE dialog-bi-import-gui.glade)
-
-FILE(COPY ${bi_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${bi_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(bi_import_glade_DIST CMakeLists.txt ${bi_import_GLADE})
diff --git a/gnucash/import-export/bi-import/ui/CMakeLists.txt b/gnucash/import-export/bi-import/ui/CMakeLists.txt
deleted file mode 100644
index 3f75c84..0000000
--- a/gnucash/import-export/bi-import/ui/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(bi_import_UI gnc-plugin-bi-import-ui.xml)
-
-FILE(COPY ${bi_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${bi_import_UI} DESTINATION share/gnucash/ui)
-
-SET_DIST_LIST(bi_import_ui_DIST CMakeLists.txt gnc-plugin-bi-import-ui.xml)
diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt
index 2047651..9642b89 100644
--- a/gnucash/import-export/csv-exp/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/CMakeLists.txt
@@ -1,5 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
-
 SET(csv_export_SOURCES
   gncmod-csv-export.c
   gnc-plugin-csv-export.c
@@ -35,21 +33,5 @@ INSTALL(TARGETS gncmod-csv-export
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET(csv_export_GLADE assistant-csv-export.glade)
-
-INSTALL(FILES ${csv_export_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(csv_export_UI gnc-plugin-csv-export-ui.xml)
-
-INSTALL(FILES ${csv_export_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${csv_export_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${csv_export_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-SET_LOCAL_DIST(csv_export_DIST_local CMakeLists.txt 
-        ${csv_export_SOURCES} ${csv_export_noinst_HEADERS}
-        ${csv_export_GLADE} ${csv_export_UI})
-SET(csv_export_DIST ${csv_export_DIST_local} ${csv_exp_gschema_DIST} PARENT_SCOPE)
-
+SET_DIST_LIST (csv_export_DIST CMakeLists.txt
+        ${csv_export_SOURCES} ${csv_export_noinst_HEADERS})
diff --git a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
deleted file mode 100644
index 8f8abd1..0000000
--- a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SET(csv_exp_GSCHEMA org.gnucash.dialogs.export.csv.gschema.xml)
-
-add_gschema_targets("${csv_exp_GSCHEMA}")
-
-SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in)
diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt
index 0fa66a8..a4355c6 100644
--- a/gnucash/import-export/csv-imp/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/CMakeLists.txt
@@ -1,4 +1,3 @@
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET(csv_import_remote_SOURCES
@@ -93,21 +92,6 @@ INSTALL(TARGETS gncmod-csv-import
 
 # No headers to install
 
-SET(csv_import_GLADE assistant-csv-account-import.glade
-      assistant-csv-price-import.glade assistant-csv-trans-import.glade)
-
-INSTALL(FILES ${csv_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(csv_import_UI gnc-plugin-csv-import-ui.xml)
-
-INSTALL(FILES ${csv_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${csv_import_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${csv_import_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt 
-        ${csv_import_SOURCES} ${csv_import_noinst_HEADERS}
-        ${csv_import_GLADE} ${csv_import_UI})
-SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} ${csv_import_gschema_DIST} PARENT_SCOPE)
+        ${csv_import_SOURCES} ${csv_import_noinst_HEADERS})
+SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} PARENT_SCOPE)
diff --git a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
deleted file mode 100644
index e108432..0000000
--- a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-SET(csv_imp_GSCHEMA org.gnucash.dialogs.import.csv.gschema.xml)
-
-add_gschema_targets("${csv_imp_GSCHEMA}")
-
-SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in)
diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt
index 7b16594..9e7dcaf 100644
--- a/gnucash/import-export/customer-import/CMakeLists.txt
+++ b/gnucash/import-export/customer-import/CMakeLists.txt
@@ -1,6 +1,3 @@
-ADD_SUBDIRECTORY(gtkbuilder)
-ADD_SUBDIRECTORY(ui)
-
 SET(customer_import_SOURCES
   gnc-plugin-customer-import.c
   gncmod-customer-import.c
@@ -40,5 +37,4 @@ INSTALL(TARGETS gncmod-customer-import
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_LOCAL_DIST(customer_import_DIST_local CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
-SET(customer_import_DIST ${customer_import_DIST_local} ${customer_import_glade_DIST} ${customer_import_ui_DIST} PARENT_SCOPE)
+SET_DIST_LIST (customer_import_DIST CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
diff --git a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt b/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
deleted file mode 100644
index 79cbf83..0000000
--- a/gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(customer_import_GLADE dialog-customer-import-gui.glade)
-FILE(COPY ${customer_import_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-INSTALL(FILES ${customer_import_GLADE} DESTINATION share/gnucash/gtkbuilder)
-
-SET_DIST_LIST(customer_import_glade_DIST CMakeLists.txt ${customer_import_GLADE})
diff --git a/gnucash/import-export/customer-import/ui/CMakeLists.txt b/gnucash/import-export/customer-import/ui/CMakeLists.txt
deleted file mode 100644
index 73a41bb..0000000
--- a/gnucash/import-export/customer-import/ui/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(customer_import_UI gnc-plugin-customer-import-ui.xml)
-FILE(COPY ${customer_import_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
-INSTALL(FILES ${customer_import_UI} DESTINATION share/gnucash/ui)
-
-SET_DIST_LIST(customer_import_ui_DIST CMakeLists.txt ${customer_import_UI})
diff --git a/gnucash/import-export/gschemas/CMakeLists.txt b/gnucash/import-export/gschemas/CMakeLists.txt
deleted file mode 100644
index e5290f1..0000000
--- a/gnucash/import-export/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SET(generic_import_GSCHEMA org.gnucash.dialogs.import.generic.gschema.xml)
-
-add_gschema_targets("${generic_import_GSCHEMA}")
-
-SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in)
diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt
index 4e8f39d..8009605 100644
--- a/gnucash/import-export/log-replay/CMakeLists.txt
+++ b/gnucash/import-export/log-replay/CMakeLists.txt
@@ -30,12 +30,5 @@ INSTALL(TARGETS gncmod-log-replay
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET(log_replay_UI gnc-plugin-log-replay-ui.xml)
-
-INSTALL(FILES ${log_replay_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${log_replay_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
 SET_DIST_LIST(log_report_DIST CMakeLists.txt 
-        ${log_replay_SOURCES} ${log_replay_noinst_HEADERS} ${log_replay_UI})
+        ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index 1b46289..ed197ef 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -1,6 +1,5 @@
 # CMakeLists.txt for gnucash/import_export/qif-imp
 
-ADD_SUBDIRECTORY(gschemas)
 ADD_SUBDIRECTORY(test)
 
 SET (qif_import_SOURCES
@@ -90,19 +89,6 @@ GNC_ADD_SCHEME_TARGETS(scm-qif-import
   FALSE
 )
 
-SET(qif_import_GLADE assistant-qif-import.glade dialog-account-picker.glade)
-
-INSTALL(FILES ${qif_import_GLADE} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(qif_import_UI gnc-plugin-qif-import-ui.xml)
-
-INSTALL(FILES ${qif_import_UI} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${qif_import_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${qif_import_GLADE}
-  DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
 SET_LOCAL_DIST(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
-        ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2} ${qif_import_GLADE} ${qif_import_UI})
-SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} ${qif_import_gschema_DIST} PARENT_SCOPE)
+        ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
+SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} PARENT_SCOPE)
diff --git a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
deleted file mode 100644
index fa15f03..0000000
--- a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-set(qif_imp_GSCHEMA org.gnucash.dialogs.import.qif.gschema.xml)
-
-add_gschema_targets("${qif_imp_GSCHEMA}")
-
-SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in)
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index f587824..aa54fed 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -73,17 +73,6 @@ GNC_ADD_SCHEME_TARGETS(scm-report-gnome
     FALSE
 )
 
-SET(report_gnome_GLADE dialog-custom-report.glade dialog-report.glade)
-
-INSTALL(FILES ${report_gnome_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
-
-SET(report_gnome_UI gnc-plugin-page-report-ui.xml)
-
-INSTALL(FILES ${report_gnome_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${report_gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-FILE(COPY ${report_gnome_GLADE} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-
-SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS} ${report_gnome_SOURCES}
-        ${report_gnome_SCHEME} ${report_gnome_GLADE} ${report_gnome_UI})
+SET_LOCAL_DIST(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS}
+    ${report_gnome_SOURCES} ${report_gnome_SCHEME})
 SET(report_gnome_DIST ${report_gnome_DIST_local} ${test_report_gnome_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 4ece021..0ac1b97 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -73,15 +73,8 @@ GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-2
 
 ADD_CUSTOM_TARGET(scm-report-stylesheets ALL DEPENDS scm-report-stylesheets-1 scm-report-stylesheets-2)
 
-SET(stylesheets_UI gnc-plugin-stylesheets-ui.xml)
-
-INSTALL(FILES ${stylesheets_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
-
-FILE(COPY ${stylesheets_UI}
-  DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-
 SET_LOCAL_DIST(stylesheets_DIST_local CMakeLists.txt 
         ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS}
-        ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2}  ${stylesheets_UI})
+        ${stylesheets_SCHEME_1} ${stylesheets_SCHEME_2})
 
 SET(stylesheets_DIST ${stylesheets_DIST_local} ${test_stylesheets_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome/ui/CMakeLists.txt b/gnucash/ui/CMakeLists.txt
similarity index 55%
rename from gnucash/gnome/ui/CMakeLists.txt
rename to gnucash/ui/CMakeLists.txt
index 75791f7..64a2df5 100644
--- a/gnucash/gnome/ui/CMakeLists.txt
+++ b/gnucash/ui/CMakeLists.txt
@@ -1,9 +1,15 @@
-SET(gnome_UI
+set (ui_SOURCES
+      gnc-main-window-ui.xml
       gnc-plugin-account-tree-ui.xml
       gnc-plugin-basic-commands-ui.xml
+      gnc-plugin-bi-import-ui.xml
       gnc-plugin-budget-ui.xml
       gnc-plugin-business-ui.xml
+      gnc-plugin-csv-export-ui.xml
+      gnc-plugin-csv-import-ui.xml
+      gnc-plugin-customer-import-ui.xml
       gnc-plugin-file-history-ui.xml
+      gnc-plugin-log-replay-ui.xml
       gnc-plugin-page-account-tree2-ui.xml
       gnc-plugin-page-account-tree-ui.xml
       gnc-plugin-page-budget-ui.xml
@@ -11,19 +17,25 @@ SET(gnome_UI
       gnc-plugin-page-owner-tree-ui.xml
       gnc-plugin-page-register2-ui.xml
       gnc-plugin-page-register-ui.xml
+      gnc-plugin-page-report-ui.xml
       gnc-plugin-page-sx-list2-ui.xml
       gnc-plugin-page-sx-list-ui.xml
       gnc-plugin-page-sxregister-ui.xml
+      gnc-plugin-qif-import-ui.xml
       gnc-plugin-register22-ui.xml
       gnc-plugin-register2-ui.xml
       gnc-plugin-register-ui.xml
+      gnc-plugin-stylesheets-ui.xml
       gnc-reconcile-window-ui.xml
       gnc-sxed-to-create-window-ui.xml
       gnc-sxed-window-ui-full.xml
-      gnc-sxed-window-ui.xml)
+      gnc-sxed-window-ui.xml
+      gnc-windows-menu-ui-quartz.xml
+      gnc-windows-menu-ui.xml
+      osx_accel_map)
 
-FILE(COPY ${gnome_UI} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
+file (COPY ${ui_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/ui)
 
-INSTALL(FILES ${gnome_UI} DESTINATION share/gnucash/ui)
+install (FILES ${ui_SOURCES} DESTINATION share/gnucash/ui)
 
-SET_DIST_LIST(gnome_ui_DIST CMakeLists.txt ${gnome_UI})
+SET_DIST_LIST(ui_DIST CMakeLists.txt ${ui_SOURCES})
diff --git a/gnucash/gnome-utils/ui/gnc-main-window-ui.xml b/gnucash/ui/gnc-main-window-ui.xml
similarity index 100%
rename from gnucash/gnome-utils/ui/gnc-main-window-ui.xml
rename to gnucash/ui/gnc-main-window-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-account-tree-ui.xml b/gnucash/ui/gnc-plugin-account-tree-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-account-tree-ui.xml
rename to gnucash/ui/gnc-plugin-account-tree-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-basic-commands-ui.xml b/gnucash/ui/gnc-plugin-basic-commands-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-basic-commands-ui.xml
rename to gnucash/ui/gnc-plugin-basic-commands-ui.xml
diff --git a/gnucash/import-export/bi-import/ui/gnc-plugin-bi-import-ui.xml b/gnucash/ui/gnc-plugin-bi-import-ui.xml
similarity index 100%
rename from gnucash/import-export/bi-import/ui/gnc-plugin-bi-import-ui.xml
rename to gnucash/ui/gnc-plugin-bi-import-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-budget-ui.xml b/gnucash/ui/gnc-plugin-budget-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-budget-ui.xml
rename to gnucash/ui/gnc-plugin-budget-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-business-ui.xml b/gnucash/ui/gnc-plugin-business-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-business-ui.xml
rename to gnucash/ui/gnc-plugin-business-ui.xml
diff --git a/gnucash/import-export/csv-exp/gnc-plugin-csv-export-ui.xml b/gnucash/ui/gnc-plugin-csv-export-ui.xml
similarity index 100%
rename from gnucash/import-export/csv-exp/gnc-plugin-csv-export-ui.xml
rename to gnucash/ui/gnc-plugin-csv-export-ui.xml
diff --git a/gnucash/import-export/csv-imp/gnc-plugin-csv-import-ui.xml b/gnucash/ui/gnc-plugin-csv-import-ui.xml
similarity index 100%
rename from gnucash/import-export/csv-imp/gnc-plugin-csv-import-ui.xml
rename to gnucash/ui/gnc-plugin-csv-import-ui.xml
diff --git a/gnucash/import-export/customer-import/ui/gnc-plugin-customer-import-ui.xml b/gnucash/ui/gnc-plugin-customer-import-ui.xml
similarity index 100%
rename from gnucash/import-export/customer-import/ui/gnc-plugin-customer-import-ui.xml
rename to gnucash/ui/gnc-plugin-customer-import-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-file-history-ui.xml b/gnucash/ui/gnc-plugin-file-history-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-file-history-ui.xml
rename to gnucash/ui/gnc-plugin-file-history-ui.xml
diff --git a/gnucash/import-export/log-replay/gnc-plugin-log-replay-ui.xml b/gnucash/ui/gnc-plugin-log-replay-ui.xml
similarity index 100%
rename from gnucash/import-export/log-replay/gnc-plugin-log-replay-ui.xml
rename to gnucash/ui/gnc-plugin-log-replay-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-account-tree-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-account-tree-ui.xml
rename to gnucash/ui/gnc-plugin-page-account-tree-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-account-tree2-ui.xml b/gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
rename to gnucash/ui/gnc-plugin-page-account-tree2-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-budget-ui.xml b/gnucash/ui/gnc-plugin-page-budget-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-budget-ui.xml
rename to gnucash/ui/gnc-plugin-page-budget-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-invoice-ui.xml b/gnucash/ui/gnc-plugin-page-invoice-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-invoice-ui.xml
rename to gnucash/ui/gnc-plugin-page-invoice-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-owner-tree-ui.xml b/gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-owner-tree-ui.xml
rename to gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-register-ui.xml b/gnucash/ui/gnc-plugin-page-register-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-register-ui.xml
rename to gnucash/ui/gnc-plugin-page-register-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-register2-ui.xml b/gnucash/ui/gnc-plugin-page-register2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-register2-ui.xml
rename to gnucash/ui/gnc-plugin-page-register2-ui.xml
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report-ui.xml b/gnucash/ui/gnc-plugin-page-report-ui.xml
similarity index 100%
rename from gnucash/report/report-gnome/gnc-plugin-page-report-ui.xml
rename to gnucash/ui/gnc-plugin-page-report-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-sx-list-ui.xml b/gnucash/ui/gnc-plugin-page-sx-list-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-sx-list-ui.xml
rename to gnucash/ui/gnc-plugin-page-sx-list-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-sx-list2-ui.xml b/gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-sx-list2-ui.xml
rename to gnucash/ui/gnc-plugin-page-sx-list2-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-page-sxregister-ui.xml b/gnucash/ui/gnc-plugin-page-sxregister-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-page-sxregister-ui.xml
rename to gnucash/ui/gnc-plugin-page-sxregister-ui.xml
diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import-ui.xml b/gnucash/ui/gnc-plugin-qif-import-ui.xml
similarity index 100%
rename from gnucash/import-export/qif-imp/gnc-plugin-qif-import-ui.xml
rename to gnucash/ui/gnc-plugin-qif-import-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-register-ui.xml b/gnucash/ui/gnc-plugin-register-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-register-ui.xml
rename to gnucash/ui/gnc-plugin-register-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-register2-ui.xml b/gnucash/ui/gnc-plugin-register2-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-register2-ui.xml
rename to gnucash/ui/gnc-plugin-register2-ui.xml
diff --git a/gnucash/gnome/ui/gnc-plugin-register22-ui.xml b/gnucash/ui/gnc-plugin-register22-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-plugin-register22-ui.xml
rename to gnucash/ui/gnc-plugin-register22-ui.xml
diff --git a/gnucash/report/stylesheets/gnc-plugin-stylesheets-ui.xml b/gnucash/ui/gnc-plugin-stylesheets-ui.xml
similarity index 100%
rename from gnucash/report/stylesheets/gnc-plugin-stylesheets-ui.xml
rename to gnucash/ui/gnc-plugin-stylesheets-ui.xml
diff --git a/gnucash/gnome/ui/gnc-reconcile-window-ui.xml b/gnucash/ui/gnc-reconcile-window-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-reconcile-window-ui.xml
rename to gnucash/ui/gnc-reconcile-window-ui.xml
diff --git a/gnucash/gnome/ui/gnc-sxed-to-create-window-ui.xml b/gnucash/ui/gnc-sxed-to-create-window-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-sxed-to-create-window-ui.xml
rename to gnucash/ui/gnc-sxed-to-create-window-ui.xml
diff --git a/gnucash/gnome/ui/gnc-sxed-window-ui-full.xml b/gnucash/ui/gnc-sxed-window-ui-full.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-sxed-window-ui-full.xml
rename to gnucash/ui/gnc-sxed-window-ui-full.xml
diff --git a/gnucash/gnome/ui/gnc-sxed-window-ui.xml b/gnucash/ui/gnc-sxed-window-ui.xml
similarity index 100%
rename from gnucash/gnome/ui/gnc-sxed-window-ui.xml
rename to gnucash/ui/gnc-sxed-window-ui.xml
diff --git a/gnucash/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml b/gnucash/ui/gnc-windows-menu-ui-quartz.xml
similarity index 100%
rename from gnucash/gnome-utils/ui/gnc-windows-menu-ui-quartz.xml
rename to gnucash/ui/gnc-windows-menu-ui-quartz.xml
diff --git a/gnucash/gnome-utils/ui/gnc-windows-menu-ui.xml b/gnucash/ui/gnc-windows-menu-ui.xml
similarity index 100%
rename from gnucash/gnome-utils/ui/gnc-windows-menu-ui.xml
rename to gnucash/ui/gnc-windows-menu-ui.xml
diff --git a/gnucash/gnome-utils/ui/osx_accel_map b/gnucash/ui/osx_accel_map
similarity index 100%
rename from gnucash/gnome-utils/ui/osx_accel_map
rename to gnucash/ui/osx_accel_map
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8b0fe05..d9f7bc8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -87,39 +87,6 @@ gnucash/gnome/gnc-split-reg2.c
 gnucash/gnome/gnc-split-reg.c
 gnucash/gnome/gnucash.appdata.xml.in
 gnucash/gnome/gnucash.desktop.in.in
-gnucash/gnome/gtkbuilder/assistant-acct-period.glade
-gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
-gnucash/gnome/gtkbuilder/assistant-loan.glade
-gnucash/gnome/gtkbuilder/assistant-stock-split.glade
-gnucash/gnome/gtkbuilder/business-options-gnome.glade
-gnucash/gnome/gtkbuilder/business-prefs.glade
-gnucash/gnome/gtkbuilder/dialog-billterms.glade
-gnucash/gnome/gtkbuilder/dialog-choose-owner.glade
-gnucash/gnome/gtkbuilder/dialog-commodities.glade
-gnucash/gnome/gtkbuilder/dialog-customer.glade
-gnucash/gnome/gtkbuilder/dialog-date-close.glade
-gnucash/gnome/gtkbuilder/dialog-employee.glade
-gnucash/gnome/gtkbuilder/dialog-fincalc.glade
-gnucash/gnome/gtkbuilder/dialog-find-account.glade
-gnucash/gnome/gtkbuilder/dialog-imap-editor.glade
-gnucash/gnome/gtkbuilder/dialog-invoice.glade
-gnucash/gnome/gtkbuilder/dialog-job.glade
-gnucash/gnome/gtkbuilder/dialog-lot-viewer.glade
-gnucash/gnome/gtkbuilder/dialog-new-user.glade
-gnucash/gnome/gtkbuilder/dialog-order.glade
-gnucash/gnome/gtkbuilder/dialog-payment.glade
-gnucash/gnome/gtkbuilder/dialog-price.glade
-gnucash/gnome/gtkbuilder/dialog-print-check.glade
-gnucash/gnome/gtkbuilder/dialog-progress.glade
-gnucash/gnome/gtkbuilder/dialog-sx.glade
-gnucash/gnome/gtkbuilder/dialog-tax-info.glade
-gnucash/gnome/gtkbuilder/dialog-trans-assoc.glade
-gnucash/gnome/gtkbuilder/dialog-vendor.glade
-gnucash/gnome/gtkbuilder/gnc-plugin-page-budget.glade
-gnucash/gnome/gtkbuilder/gnc-plugin-page-register2.glade
-gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
-gnucash/gnome/gtkbuilder/window-autoclear.glade
-gnucash/gnome/gtkbuilder/window-reconcile.glade
 gnucash/gnome/reconcile-view.c
 gnucash/gnome/search-owner.c
 gnucash/gnome/top-level.c
@@ -127,7 +94,6 @@ gnucash/gnome/window-autoclear.c
 gnucash/gnome/window-reconcile2.c
 gnucash/gnome/window-reconcile.c
 gnucash/gnome-search/dialog-search.c
-gnucash/gnome-search/dialog-search.glade
 gnucash/gnome-search/gnc-general-search.c
 gnucash/gnome-search/gncmod-gnome-search.c
 gnucash/gnome-search/search-account.c
@@ -217,24 +183,6 @@ gnucash/gnome-utils/gnc-tree-view-split-reg.c
 gnucash/gnome-utils/gnc-tree-view-sx-list.c
 gnucash/gnome-utils/gnc-window.c
 gnucash/gnome-utils/gnome-utils.scm
-gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade
-gnucash/gnome-utils/gtkbuilder/dialog-account.glade
-gnucash/gnome-utils/gtkbuilder/dialog-book-close.glade
-gnucash/gnome-utils/gtkbuilder/dialog-commodity.glade
-gnucash/gnome-utils/gtkbuilder/dialog-file-access.glade
-gnucash/gnome-utils/gtkbuilder/dialog-object-references.glade
-gnucash/gnome-utils/gtkbuilder/dialog-options.glade
-gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
-gnucash/gnome-utils/gtkbuilder/dialog-query-view.glade
-gnucash/gnome-utils/gtkbuilder/dialog-reset-warnings.glade
-gnucash/gnome-utils/gtkbuilder/dialog-tax-table.glade
-gnucash/gnome-utils/gtkbuilder/dialog-totd.glade
-gnucash/gnome-utils/gtkbuilder/dialog-transfer.glade
-gnucash/gnome-utils/gtkbuilder/dialog-userpass.glade
-gnucash/gnome-utils/gtkbuilder/gnc-date-format.glade
-gnucash/gnome-utils/gtkbuilder/gnc-frequency.glade
-gnucash/gnome-utils/gtkbuilder/gnc-recurrence.glade
-gnucash/gnome-utils/gtkbuilder/gnc-tree-view-owner.glade
 gnucash/gnome-utils/misc-gnome-utils.c
 gnucash/gnome-utils/print-session.c
 gnucash/gnome-utils/search-param.c
@@ -244,7 +192,11 @@ gnucash/gnucash-bin.c
 gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
@@ -254,6 +206,69 @@ gnucash/gschemas/org.gnucash.history.gschema.xml.in
 gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
 gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
 gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
+gnucash/gtkbuilder/assistant-acct-period.glade
+gnucash/gtkbuilder/assistant-csv-account-import.glade
+gnucash/gtkbuilder/assistant-csv-export.glade
+gnucash/gtkbuilder/assistant-csv-price-import.glade
+gnucash/gtkbuilder/assistant-csv-trans-import.glade
+gnucash/gtkbuilder/assistant-hierarchy.glade
+gnucash/gtkbuilder/assistant-loan.glade
+gnucash/gtkbuilder/assistant-qif-import.glade
+gnucash/gtkbuilder/assistant-stock-split.glade
+gnucash/gtkbuilder/assistant-xml-encoding.glade
+gnucash/gtkbuilder/business-options-gnome.glade
+gnucash/gtkbuilder/business-prefs.glade
+gnucash/gtkbuilder/dialog-account.glade
+gnucash/gtkbuilder/dialog-account-picker.glade
+gnucash/gtkbuilder/dialog-bi-import-gui.glade
+gnucash/gtkbuilder/dialog-billterms.glade
+gnucash/gtkbuilder/dialog-book-close.glade
+gnucash/gtkbuilder/dialog-choose-owner.glade
+gnucash/gtkbuilder/dialog-commodities.glade
+gnucash/gtkbuilder/dialog-commodity.glade
+gnucash/gtkbuilder/dialog-customer.glade
+gnucash/gtkbuilder/dialog-customer-import-gui.glade
+gnucash/gtkbuilder/dialog-custom-report.glade
+gnucash/gtkbuilder/dialog-date-close.glade
+gnucash/gtkbuilder/dialog-employee.glade
+gnucash/gtkbuilder/dialog-file-access.glade
+gnucash/gtkbuilder/dialog-fincalc.glade
+gnucash/gtkbuilder/dialog-find-account.glade
+gnucash/gtkbuilder/dialog-imap-editor.glade
+gnucash/gtkbuilder/dialog-import.glade
+gnucash/gtkbuilder/dialog-invoice.glade
+gnucash/gtkbuilder/dialog-job.glade
+gnucash/gtkbuilder/dialog-lot-viewer.glade
+gnucash/gtkbuilder/dialog-new-user.glade
+gnucash/gtkbuilder/dialog-object-references.glade
+gnucash/gtkbuilder/dialog-options.glade
+gnucash/gtkbuilder/dialog-order.glade
+gnucash/gtkbuilder/dialog-payment.glade
+gnucash/gtkbuilder/dialog-preferences.glade
+gnucash/gtkbuilder/dialog-price.glade
+gnucash/gtkbuilder/dialog-print-check.glade
+gnucash/gtkbuilder/dialog-progress.glade
+gnucash/gtkbuilder/dialog-query-view.glade
+gnucash/gtkbuilder/dialog-report.glade
+gnucash/gtkbuilder/dialog-reset-warnings.glade
+gnucash/gtkbuilder/dialog-search.glade
+gnucash/gtkbuilder/dialog-sx.glade
+gnucash/gtkbuilder/dialog-tax-info.glade
+gnucash/gtkbuilder/dialog-tax-table.glade
+gnucash/gtkbuilder/dialog-totd.glade
+gnucash/gtkbuilder/dialog-trans-assoc.glade
+gnucash/gtkbuilder/dialog-transfer.glade
+gnucash/gtkbuilder/dialog-userpass.glade
+gnucash/gtkbuilder/dialog-vendor.glade
+gnucash/gtkbuilder/gnc-date-format.glade
+gnucash/gtkbuilder/gnc-frequency.glade
+gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+gnucash/gtkbuilder/gnc-plugin-page-register2.glade
+gnucash/gtkbuilder/gnc-plugin-page-register.glade
+gnucash/gtkbuilder/gnc-recurrence.glade
+gnucash/gtkbuilder/gnc-tree-view-owner.glade
+gnucash/gtkbuilder/window-autoclear.glade
+gnucash/gtkbuilder/window-reconcile.glade
 gnucash/html/gnc-html.c
 gnucash/html/gnc-html-factory.c
 gnucash/html/gnc-html-history.c
@@ -281,20 +296,14 @@ gnucash/import-export/bi-import/dialog-bi-import-gui.c
 gnucash/import-export/bi-import/dialog-bi-import-helper.c
 gnucash/import-export/bi-import/gncmod-bi-import.c
 gnucash/import-export/bi-import/gnc-plugin-bi-import.c
-gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade
 gnucash/import-export/csv-exp/assistant-csv-export.c
-gnucash/import-export/csv-exp/assistant-csv-export.glade
 gnucash/import-export/csv-exp/csv-transactions-export.c
 gnucash/import-export/csv-exp/csv-tree-export.c
 gnucash/import-export/csv-exp/gncmod-csv-export.c
 gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
-gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
 gnucash/import-export/csv-imp/assistant-csv-account-import.c
-gnucash/import-export/csv-imp/assistant-csv-account-import.glade
 gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
-gnucash/import-export/csv-imp/assistant-csv-price-import.glade
 gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
-gnucash/import-export/csv-imp/assistant-csv-trans-import.glade
 gnucash/import-export/csv-imp/csv-account-import.c
 gnucash/import-export/csv-imp/gnc-csv-account-map.c
 gnucash/import-export/csv-imp/gnc-csv-gnumeric-popup.c
@@ -311,15 +320,11 @@ gnucash/import-export/csv-imp/gnc-price-props.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp
 gnucash/import-export/csv-imp/gnc-trans-props.cpp
 gnucash/import-export/csv-imp/gnc-tx-import.cpp
-gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
 gnucash/import-export/customer-import/dialog-customer-import.c
 gnucash/import-export/customer-import/dialog-customer-import-gui.c
 gnucash/import-export/customer-import/gncmod-customer-import.c
 gnucash/import-export/customer-import/gnc-plugin-customer-import.c
-gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
-gnucash/import-export/dialog-import.glade
 gnucash/import-export/gncmod-generic-import.c
-gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
 gnucash/import-export/import-account-matcher.c
 gnucash/import-export/import-backend.c
 gnucash/import-export/import-commodity-matcher.c
@@ -342,12 +347,9 @@ gnucash/import-export/qif/qif-context.c
 gnucash/import-export/qif/qif-file.c
 gnucash/import-export/qif/qif-objects.c
 gnucash/import-export/qif-imp/assistant-qif-import.c
-gnucash/import-export/qif-imp/assistant-qif-import.glade
 gnucash/import-export/qif-imp/dialog-account-picker.c
-gnucash/import-export/qif-imp/dialog-account-picker.glade
 gnucash/import-export/qif-imp/gncmod-qif-import.c
 gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
-gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
 gnucash/import-export/qif-imp/qif-dialog-utils.scm
 gnucash/import-export/qif-imp/qif-file.scm
 gnucash/import-export/qif-imp/qif-guess-map.scm
@@ -431,9 +433,7 @@ gnucash/report/locale-specific/us/taxtxf-de_DE.scm
 gnucash/report/locale-specific/us/taxtxf.scm
 gnucash/report/locale-specific/us/us.scm
 gnucash/report/report-gnome/dialog-custom-report.c
-gnucash/report/report-gnome/dialog-custom-report.glade
 gnucash/report/report-gnome/dialog-report-column-view.c
-gnucash/report/report-gnome/dialog-report.glade
 gnucash/report/report-gnome/dialog-report-style-sheet.c
 gnucash/report/report-gnome/gncmod-report-gnome.c
 gnucash/report/report-gnome/gnc-plugin-page-report.c

commit f111e5958d5fa4fdc7747cac1af177889dde2397
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 13:40:15 2018 +0100

    Simplify POTFILES.in generation
    
    As part of this also:
    - Drop POTFILIES.ignore. Relevant lines have been moved to POTFILES.skip
    - Remove skip lines for scm file links. With intltool out of the way these are never picked up any more.

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 2e83767..969d0e6 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -27,7 +27,7 @@ FOREACH(lingua ${ALL_LINGUAS})
 ENDFOREACH()
 
 SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars
-  POTFILES.ignore POTFILES.in POTFILES.skip README gnucash-pot.cmake)
+  POTFILES.in POTFILES.skip README gnucash-pot.cmake)
 SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
 
 FOREACH(lingua ${ALL_LINGUAS})
@@ -71,46 +71,37 @@ ENDFUNCTION()
 
 
 FUNCTION(MAKE_GNUCASH_POTFILES)
-
-  SET(IGNORE_PATTERNS "gw-" "test" "experimental" "python-bindings" "swig-.*\\.c")
-
   # Create a list of candidate translation files
-  FILE(GLOB_RECURSE FILES_IN RELATIVE ${CMAKE_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in
-    ${CMAKE_SOURCE_DIR}/*.keys.in  ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.scm)
-
-  # Only consider files in the common, libgnucash, and gnucash/ directories. Also check against list of ignore patterns
-  SET(FILES "")
-  FOREACH(path ${FILES_IN})
-    STRING(REGEX MATCH "^(bindings/|common/|borrowed/|libgnucash/|gnucash/)" IS_SRC ${path})
-    IF (IS_SRC)
-      SET(IS_IGNORED FALSE)
-      FOREACH(pattern ${IGNORE_PATTERNS})
-        STRING(REGEX MATCH ${pattern} YES_IGNORE ${path})
-        IF (YES_IGNORE)
-	  SET(IS_IGNORED TRUE)
-        ENDIF()
-      ENDFOREACH(pattern)
-      IF (NOT IS_IGNORED)
-        LIST(APPEND FILES ${path})
-      ENDIF(NOT IS_IGNORED)
-    ENDIF(IS_SRC)
-  ENDFOREACH(path)
-
-  # Read in list of paths to skip from POTFILES.{skip,ignore}
-  READ_FILE_REMOVING_COMMENTS(SKIP_LINES POTFILES.skip)
-  READ_FILE_REMOVING_COMMENTS(IGNORE_LINES POTFILES.ignore)
+  file (GLOB_RECURSE FILES_IN RELATIVE ${CMAKE_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp
+    ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in.in
+    ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.appdata.xml.in
+    ${CMAKE_SOURCE_DIR}/*.keys.in ${CMAKE_SOURCE_DIR}/*.scm
+    ${CMAKE_SOURCE_DIR}/*/qofbookslots.h
+  )
 
-  # Remove the paths that are skipped or ignored
-  FOREACH(path ${SKIP_LINES} ${IGNORE_LINES})
-    list(REMOVE_ITEM FILES ${path})
-  ENDFOREACH()
+  # Only consider files in a selection of the source directories and
+  # additionally check against list of ignore patterns
+  set (GOOD_FILES "")
+  foreach (path ${FILES_IN})
+    if (${path} MATCHES "^(bindings/|borrowed/|common/|doc/|libgnucash/|gnucash/)"
+        AND
+        NOT ${path} MATCHES "gw-|test|experimental|python-bindings|swig-.*\\.c")
+        list (APPEND GOOD_FILES ${path})
+    endif ()
+  endforeach (path)
+
+  # Remove the paths that we have marked as explicitly skipped
+  READ_FILE_REMOVING_COMMENTS(SKIP_LINES POTFILES.skip)
+  foreach (path ${SKIP_LINES})
+      list(REMOVE_ITEM GOOD_FILES ${path})
+  endforeach ()
 
 
   # CMake sorting is different from UNIX sorting. Use perl to
   # sort POTFILES.in universally. This may no longer be needed
   # now we have dropped autotools support.
-  STRING(REPLACE ";" "\n" SORT_IN "${FILES}")
+  STRING(REPLACE ";" "\n" SORT_IN "${GOOD_FILES}")
   SET(SORT_IN "${SORT_IN}\n")
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in.in "${SORT_IN}")
 
@@ -120,13 +111,6 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
   )
   STRING(REPLACE "\n" ";" POTFILES "${POTFILES_IN}")
 
-  # These are manually added, because they're not picked up by the generation script
-  list(APPEND POTFILES
-    "gnucash/gnome/gnucash.appdata.xml.in"
-    "gnucash/gnome/gnucash.desktop.in.in"
-    "libgnucash/engine/qofbookslots.h"
-    "doc/tip_of_the_day.list.c")
-
   # Write out the final list.
   # intltool-update insists that this file be in the source directory. :-(
   SET(POTFILES_IN_PATH ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in)
diff --git a/po/POTFILES.ignore b/po/POTFILES.ignore
deleted file mode 100644
index fd3be29..0000000
--- a/po/POTFILES.ignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Work around the intltool-0.35.5 / automake-1.10 failures
-# due to "missing" files.  These files may be distributed.
-gnucash/gnome/gnucash.desktop.in.in
-gnucash/gnome/gnucash.desktop.in
-libgnucash/engine/iso-4217-currencies.c
-# The features in import-export/qif are still unused.
-gnucash/import-export/qif/qif-defaults.c
-gnucash/import-export/qif/qif-parse.c
-# This file is autogenerated, so it's only in the tree after an in-source build:
-gnucash/gnome-utils/gnc-warnings.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aa029c3..8b0fe05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,6 +33,7 @@ borrowed/libc/libc-missing-noop.c
 borrowed/libc/setenv.c
 borrowed/libc/strfmon.c
 borrowed/libc/strptime.c
+doc/tip_of_the_day.list.c
 gnucash/gnome/assistant-acct-period.c
 gnucash/gnome/assistant-hierarchy.c
 gnucash/gnome/assistant-loan.c
@@ -84,6 +85,8 @@ gnucash/gnome/gnc-plugin-register2.c
 gnucash/gnome/gnc-plugin-register.c
 gnucash/gnome/gnc-split-reg2.c
 gnucash/gnome/gnc-split-reg.c
+gnucash/gnome/gnucash.appdata.xml.in
+gnucash/gnome/gnucash.desktop.in.in
 gnucash/gnome/gtkbuilder/assistant-acct-period.glade
 gnucash/gnome/gtkbuilder/assistant-hierarchy.glade
 gnucash/gnome/gtkbuilder/assistant-loan.glade
@@ -667,6 +670,7 @@ libgnucash/engine/kvp-value.cpp
 libgnucash/engine/policy.c
 libgnucash/engine/qof-backend.cpp
 libgnucash/engine/qofbook.cpp
+libgnucash/engine/qofbookslots.h
 libgnucash/engine/qofchoice.cpp
 libgnucash/engine/qofclass.cpp
 libgnucash/engine/qofevent.cpp
@@ -704,7 +708,3 @@ libgnucash/tax/us/txf-help-de_DE.scm
 libgnucash/tax/us/txf-help.scm
 libgnucash/tax/us/txf.scm
 libgnucash/tax/us/us.scm
-gnucash/gnome/gnucash.appdata.xml.in
-gnucash/gnome/gnucash.desktop.in.in
-libgnucash/engine/qofbookslots.h
-doc/tip_of_the_day.list.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 3558f7b..2711f3d 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,106 +1,15 @@
 # These are files that we don't want to translate, because they are
 # not distributed.
-libgnucash/backend/xml/gncmod-backend-xml.c
 libgnucash/backend/xml/gncmod-backend-xml.cpp
 gnucash/gnome-utils/gnc-tree-model-selection.c
 
 # This file is only an example for programmers and never called:
 libgnucash/gnc-module/example/gnc-plugin.example.c
 
-# Skip softlinks to scm files. These softlinks are created in builddir
-# for testing purposes, intltool-extract isn't smart enough to ignore
-# them when bulddir and srcdir are the same, and both intltool-extract
-# and intltool-update use absolute paths to the srcdir when it's not
-# the same as builddir which messes up the file names in gnucash.pot.
+# The features in import-export/qif are still unused.
+gnucash/import-export/qif/qif-defaults.c
+gnucash/import-export/qif/qif-parse.c
 
-libgnucash/app-utils/gnucash/app-utils.scm
-libgnucash/app-utils/gnucash/gettext.scm
-libgnucash/app-utils/test/test-load-app-utils-module.scm
-libgnucash/core-utils/gnucash/core-utils.scm
-libgnucash/engine/gnucash/business-core.scm
-libgnucash/engine/gnucash/engine.scm
-libgnucash/gnc-module/gnucash/gnc-module.scm
-gnucash/gnome-utils/gnucash/gnome-utils.scm
-gnucash/import-export/qif-imp/gnucash/import-export/qif-import.scm
-gnucash/import-export/qif-imp/qif-import/qif-dialog-utils.scm
-gnucash/import-export/qif-imp/qif-import/qif-file.scm
-gnucash/import-export/qif-imp/qif-import/qif-guess-map.scm
-gnucash/import-export/qif-imp/qif-import/qif-import.scm
-gnucash/import-export/qif-imp/qif-import/qif-merge-groups.scm
-gnucash/import-export/qif-imp/qif-import/qif-objects.scm
-gnucash/import-export/qif-imp/qif-import/qif-parse.scm
-gnucash/import-export/qif-imp/qif-import/qif-to-gnc.scm
-gnucash/import-export/qif-imp/qif-import/qif-utils.scm
-gnucash/report/business-reports/gnucash/report/aging.scm
-gnucash/report/business-reports/gnucash/report/balsheet-eg.eguile.scm
-gnucash/report/business-reports/gnucash/report/balsheet-eg.scm
-gnucash/report/business-reports/gnucash/report/business-reports.scm
-gnucash/report/business-reports/gnucash/report/customer-summary.scm
-gnucash/report/business-reports/gnucash/report/easy-invoice.scm
-gnucash/report/business-reports/gnucash/report/fancy-invoice.scm
-gnucash/report/business-reports/gnucash/report/invoice.scm
-gnucash/report/business-reports/gnucash/report/job-report.scm
-gnucash/report/business-reports/gnucash/report/owner-report.scm
-gnucash/report/business-reports/gnucash/report/payables.scm
-gnucash/report/business-reports/gnucash/report/receipt.eguile.scm
-gnucash/report/business-reports/gnucash/report/receipt.scm
-gnucash/report/business-reports/gnucash/report/receivables.scm
-gnucash/report/business-reports/gnucash/report/taxinvoice.eguile.scm
-gnucash/report/business-reports/gnucash/report/taxinvoice.scm
-gnucash/report/locale-specific/us/gnucash/report/locale-specific/de_DE.scm
-gnucash/report/locale-specific/us/gnucash/report/locale-specific/us.scm
-gnucash/report/locale-specific/us/gnucash/report/taxtxf-de_DE.scm
-gnucash/report/locale-specific/us/gnucash/report/taxtxf.scm
-gnucash/report/report-gnome/gnucash/report/report-gnome.scm
-gnucash/report/report-system/gnucash/report/eguile-gnc.scm
-gnucash/report/report-system/gnucash/report/eguile-html-utilities.scm
-gnucash/report/report-system/gnucash/report/eguile-utilities.scm
-gnucash/report/report-system/gnucash/report/report-system.scm
-gnucash/report/report-system/gnucash/report/report-system/collectors.scm
-gnucash/report/report-system/gnucash/report/report-system/list-extras.scm
-gnucash/report/report-system/gnucash/report/report-system/report-collectors.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/account-piecharts.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/account-summary.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/advanced-portfolio.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/average-balance.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/balance-sheet.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/budget-balance-sheet.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/budget-barchart.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/budget-flow.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/budget-income-statement.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/budget.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/cash-flow.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/cashflow-barchart.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/category-barchart.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/daily-reports.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/equity-statement.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/general-journal.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/general-ledger.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/income-gst-statement.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/income-statement.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/net-barchart.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/net-linechart.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/portfolio.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/price-scatter.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/register.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/sx-summary.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/transaction.scm
-gnucash/report/standard-reports/gnucash/report/standard-reports/trial-balance.scm
-gnucash/report/stylesheets/gnucash/report/stylesheet-easy.scm
-gnucash/report/stylesheets/gnucash/report/stylesheet-fancy.scm
-gnucash/report/stylesheets/gnucash/report/stylesheet-footer.scm
-gnucash/report/stylesheets/gnucash/report/stylesheet-head-or-tail.scm
-gnucash/report/stylesheets/gnucash/report/stylesheet-plain.scm
-gnucash/report/stylesheets/gnucash/report/stylesheets.scm
-gnucash/report/utility-reports/gnucash/report/hello-world.scm
-gnucash/report/utility-reports/gnucash/report/utility-reports.scm
-gnucash/report/utility-reports/gnucash/report/view-column.scm
-gnucash/report/utility-reports/gnucash/report/welcome-to-gnucash.scm
-libgnucash/scm/build-config.scm
-libgnucash/scm/build-config.scm.in
-libgnucash/scm/gnucash/main.scm
-libgnucash/scm/gnucash/price-quotes.scm
-libgnucash/scm/gnucash/printf.scm
-libgnucash/tax/us/gnucash/tax/de_DE.scm
-libgnucash/tax/us/gnucash/tax/us.scm
+# These files are autogenerated, and hence not distributed
+gnucash/gnome-utils/gnc-warnings.c
+libgnucash/engine/iso-4217-currencies.c

commit c29b9c9cbf2c4bfc9617825b363e48a0e30bf202
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Feb 28 12:08:37 2018 +0100

    Remove autotools-only path exception to find reports
    
    With it we can also remove the hack to find standard reports while running
    from the build tree.

diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt
index b4875ae..4ae9284 100644
--- a/gnucash/report/standard-reports/CMakeLists.txt
+++ b/gnucash/report/standard-reports/CMakeLists.txt
@@ -59,14 +59,5 @@ GNC_ADD_SCHEME_TARGETS(scm-standard-reports-2
 
 ADD_CUSTOM_TARGET(scm-standard-reports ALL DEPENDS scm-standard-reports-2 scm-standard-reports-1)
 
-# FIXME: This is a hack since core-utils assumes an autotools build environment.
-
-SET(STD_RPT_DIR ${CMAKE_CURRENT_BINARY_DIR}/gnucash/report)
-FILE(MAKE_DIRECTORY ${STD_RPT_DIR})
-FILE(COPY standard-reports.scm DESTINATION ${STD_RPT_DIR})
-
-FILE(MAKE_DIRECTORY ${STD_RPT_DIR}/standard-reports)
-FILE(COPY ${standard_reports_SCHEME_2} DESTINATION ${STD_RPT_DIR}/standard-reports)
-
 SET_LOCAL_DIST(standard_reports_DIST_local CMakeLists.txt ${standard_reports_SCHEME} ${standard_reports_SCHEME_2})
 SET(standard_reports_DIST ${standard_reports_DIST_local} ${test_standard_reports_DIST} PARENT_SCOPE)
diff --git a/libgnucash/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
index c979c1f..e672432 100644
--- a/libgnucash/core-utils/gnc-path.c
+++ b/libgnucash/core-utils/gnc-path.c
@@ -169,30 +169,21 @@ gchar *gnc_path_get_accountsdir()
  * @returns A newly allocated string. */
 gchar *gnc_path_get_reportdir()
 {
-    gchar *result;
-    const gchar *builddir = g_getenv ("GNC_BUILDDIR");
-    if (g_getenv ("GNC_UNINSTALLED") && builddir)
-    {
-        result = g_build_filename (builddir, "gnucash", "report", NULL);
-    }
-    else
-    {
-        /* Careful: if the autoconf macro GNC_SCM_INSTALL_DIR gets changed
-         * in configure.ac, this path should probably change as well.
-         * Currently this code assumes GNC_SCM_INSTALL_DIR is set to
-         * pkgdatadir/scm
-         * We can't use the AC_MACRO GNC_SCM_INSTALL_DIR here directly
-         * because that's expanded at build time. On Windows and OS X
-         * the final path may get installed in a different location
-         * than assumed during build, invalidating the build path at
-         * runtime.
-         */
-        gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
-        result = g_build_filename (pkgdatadir, "scm",
-                                   "gnucash", "report", (char*)NULL);
-        g_free (pkgdatadir);
-    }
-    //printf("Returning stdreportsdir %s\n", result);
+    /* Careful: if the cmake variable SCHEME_INSTALLED_SOURCE_DIR gets changed
+     * in toplevel CMakeLists.txt, this path should probably change as well.
+     * Currently this code assumes SCHEME_INSTALLED_SOURCE_DIR is set to
+     * pkgdatadir/scm
+     * We can't use GNC_SCM_INSTALL_DIR directly at build time to
+     * get this information, because on Windows and OS X
+     * the final path may get installed in a different location
+     * than assumed during build, invalidating the build path at
+     * runtime.
+     */
+    gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
+    gchar *result = g_build_filename (pkgdatadir, "scm",
+                                      "gnucash", "report", (char*)NULL);
+    g_free (pkgdatadir);
+
     return result;
 }
 
@@ -203,17 +194,8 @@ gchar *gnc_path_get_reportdir()
  * @returns A newly allocated string. */
 gchar *gnc_path_get_stdreportsdir()
 {
-    gchar *result;
     gchar *reportdir = gnc_path_get_reportdir ();
-    if (g_getenv ("GNC_UNINSTALLED"))
-    {
-        result = g_build_filename (reportdir, "standard-reports", "gnucash",
-                                   "report", "standard-reports", NULL);
-    }
-    else
-    {
-        result = g_build_filename (reportdir, "standard-reports", NULL);
-    }
+    gchar *result = g_build_filename (reportdir, "standard-reports", NULL);
     g_free (reportdir);
     //printf("Returning stdreportsdir %s\n", result);
     return result;

commit e7ec3a610de37cef2e3d2ab0603c4642e91ea940
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Feb 27 23:00:30 2018 +0100

    Drop no longer used intltool related variable

diff --git a/common/cmake_modules/GncAddGSchemaTargets.cmake b/common/cmake_modules/GncAddGSchemaTargets.cmake
index 4c0a650..7e07967 100644
--- a/common/cmake_modules/GncAddGSchemaTargets.cmake
+++ b/common/cmake_modules/GncAddGSchemaTargets.cmake
@@ -1,11 +1,6 @@
 macro(add_gschema_targets _gschema_INPUTS)
   SET(_gschema_OUTPUTS "")
   set(local_depends ${gschema_depends})
-  # FIXME: I have no idea of I'm using the right options here for intltool-merge for Windows.
-  SET(INITTOOL_OPTIONS "--no-translations")
-  IF(WIN32)
-    SET(INITTOOL_OPTIONS "/tmp")
-  ENDIF(WIN32)
   SET(CMAKE_COMMAND_TMP "")
   IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
     SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)

commit 02c69a7933a9a00e9c4fb4eafc45731ec1c02e0e
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Feb 27 22:21:00 2018 +0100

    Handle situation where gettext 0.19.6 is not available
    
    By default we require gettext 0.19.6 as this is needed to generate a translated version of gnucash.desktop and gnucash.appdata.xml.
    However this version is not available on some platforms (most notably our own ubuntu 14.04LTS travis instance).
    By setting ALLOW_OLD_GETTEXT=ON, the build configuration falls back to generating untranslated versions of said files instead.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 295c40f..81b6c13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,7 @@ OPTION (DISABLE_NLS "do not use Native Language Support" OFF)
 OPTION (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF)
 OPTION (DISABLE_DEPRECATED_GTK "don't use deprecated gtk, gdk or gdk-pixbuf functions" OFF)
 OPTION (DISABLE_DEPRECATED_GNOME "don't use deprecated gnome functions" OFF)
+OPTION (ALLOW_OLD_GETTEXT "allow to configure build with a gettext version older than 0.19.6. Some files will not be translated!" OFF)
 # ############################################################
 
 # These are also settable from the command line in a similar way.
@@ -248,15 +249,27 @@ ENDIF()
 
 
 FIND_PROGRAM(GLIB_COMPILE_SCHEMAS glib-compile-schemas HINTS ${CMAKE_PREFIX_PATH}/gnome/bin)
-FIND_PROGRAM(MSGFMT msgfmt)
-
 IF (NOT GLIB_COMPILE_SCHEMAS)
   MESSAGE(SEND_ERROR "Can't find glib-compile-schemas program. Please set GLIB_COMPILE_SCHEMAS.")
 ENDIF(NOT GLIB_COMPILE_SCHEMAS)
 
-IF (NOT MSGFMT)
-  MESSAGE(SEND_ERROR "Can't find msgfmt program. Please set MSGFMT.")
-ENDIF(NOT MSGFMT)
+if (ALLOW_OLD_GETTEXT)
+    find_package (Gettext REQUIRED)
+else (ALLOW_OLD_GETTEXT)
+    find_package (Gettext 0.19.6)
+    if (NOT GETTEXT_FOUND)
+        message (FATAL_ERROR "Note the build can be configured with an older version of gnucash by setting ALLOW_OLD_GETTEXT=ON but then some files will not be translated:
+        - gnucash.desktop (requires at least gettext 0.19)
+        - gnucash.appdata.xml (requires at least gettext 0.19.6)")
+    endif (NOT GETTEXT_FOUND)
+endif (ALLOW_OLD_GETTEXT)
+
+if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19)
+    message (WARNING "Got gettext version ${GETTEXT_VERSION_STRING}, however you need at least gettext version 0.19 in order to handle translation of the gnucash.desktop file. The build will be configured with an untranslated gnucash.desktop file.")
+endif ()
+if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
+    message (WARNING "Got gettext version ${GETTEXT_VERSION_STRING}, however you need at least gettext version 0.19.6 in order to handle translation of the gnucash.appdata file. The build will be configured with an untranslated gnucash.appdata file.")
+endif ()
 
 FIND_PATH (REGEX_INCLUDE_PATH NAMES regex.h
 		  PATHS /usr/include /opt/gnome/include)
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index be1ceb7..fc5f1e2 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -167,15 +167,24 @@ IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
   SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
 ENDIF()
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT gnucash.appdata.xml
-    COMMAND ${CMAKE_COMMAND_TMP}
-      LC_ALL=C
-      ${MSGFMT} --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+
+if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
+    # Gettext is too old to be able to merge an appdata file.
+    # Fall back to providing an unmerged (and hence untranslated) appdata file.
+    configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+                    ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml COPYONLY)
+else()
+    add_custom_command (
+        OUTPUT gnucash.appdata.xml
+        COMMAND ${CMAKE_COMMAND_TMP}
+            LC_ALL=C
+            ${GETTEXT_MSGFMT_EXECUTABLE}
+                --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
                 -d ${CMAKE_SOURCE_DIR}/po
                 -o gnucash.appdata.xml
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
-)
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+    )
+endif()
 
 ADD_CUSTOM_TARGET(gnucash-appdata ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml)
 
@@ -185,15 +194,23 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION  ${CMA
 
 configure_file(gnucash.desktop.in.in gnucash.desktop.in)
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT gnucash.desktop
-    COMMAND ${CMAKE_COMMAND_TMP}
-      LC_ALL=C
-      ${MSGFMT} --desktop --template gnucash.desktop.in
+if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19)
+    # Gettext is too old to be able to merge a desktop file.
+    # Fall back to providing an unmerged (and hence untranslated) desktop file.
+    configure_file (${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop.in
+                    ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop COPYONLY)
+else()
+    add_custom_command (
+        OUTPUT gnucash.desktop
+        COMMAND ${CMAKE_COMMAND_TMP}
+            LC_ALL=C
+            ${GETTEXT_MSGFMT_EXECUTABLE}
+                --desktop --template gnucash.desktop.in
                 -d ${CMAKE_SOURCE_DIR}/po
                 -o gnucash.desktop
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop.in
-)
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop.in
+    )
+endif()
 
 ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop)
 
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 3896060..2e83767 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -35,7 +35,9 @@ FOREACH(lingua ${ALL_LINGUAS})
   LIST(APPEND CATALOGS ${_OUTPUT_FILE})
   ADD_CUSTOM_COMMAND(
       OUTPUT ${_OUTPUT_FILE}
-      COMMAND ${CMAKE_COMMAND_TMP} ${MSGFMT} -o ${_OUTPUT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
+      COMMAND ${CMAKE_COMMAND_TMP}
+        ${GETTEXT_MSGFMT_EXECUTABLE}
+            -o ${_OUTPUT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
   )
   SET(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
   MAKE_DIRECTORY(${_BUILD_FILE_DIR})
diff --git a/util/ci/arch-testscript b/util/ci/arch-testscript
index 45f541a..bf59cb4 100644
--- a/util/ci/arch-testscript
+++ b/util/ci/arch-testscript
@@ -12,7 +12,9 @@
 mkdir ourpython_bin
 ln -s /usr/bin/python2 ourpython_bin/python
 export PATH=/ourpython_bin:"$PATH"
+export PLATFORM_CMAKE_OPTS=
 echo path is "$PATH"
 echo python version is "$(python --version)"
+echo PLATFORM_CMAKE_OPTS= "$PLATFORM_CMAKE_OPTS"
 
 ../commonbuild
diff --git a/util/ci/commonbuild b/util/ci/commonbuild
index 8fb3f00..9b1875d 100644
--- a/util/ci/commonbuild
+++ b/util/ci/commonbuild
@@ -7,11 +7,11 @@ cd build
 export TZ="America/Los_Angeles"
 
 if [[ "$BUILDTYPE" == "cmake-make" ]]; then
-    cmake ../gnucash
+    cmake ../gnucash $PLATFORM_CMAKE_OPTS
     make -j 4
     make check || ../afterfailure
 elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
-    cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja
+    cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja $PLATFORM_CMAKE_OPTS
     ninja
     ninja check || ../afterfailure;
 else
diff --git a/util/ci/ubuntu-14.04-testscript b/util/ci/ubuntu-14.04-testscript
index 1582688..a187801 100644
--- a/util/ci/ubuntu-14.04-testscript
+++ b/util/ci/ubuntu-14.04-testscript
@@ -4,5 +4,7 @@
 #  exit immediately.
 
 export GTEST_ROOT=/gtest/googletest GMOCK_ROOT=/gtest/googlemock
+export PLATFORM_CMAKE_OPTS="-DALLOW_OLD_GETTEXT=ON"
+echo PLATFORM_CMAKE_OPTS= "$PLATFORM_CMAKE_OPTS"
 
 ../commonbuild

commit ba799feb2a13341a14f96f1b491f27255cc94ed8
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Feb 27 15:45:38 2018 +0100

    Drop intltool in favour or using modern gettext
    
    This requires at least gettext 0.19.6, and will break our ubuntu 14.04LTS test instance on Travis.
    The next commit will work around this.

diff --git a/.gitignore b/.gitignore
index 7cb7509..478f7a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,7 @@ make-gnucash-potfiles
 missing
 mkinstalldirs
 po/.intltool-merge-cache
+po/LINGUAS
 po/Makefile.in.in
 po/POTFILES
 po/POTFILES.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2038ec3..295c40f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,8 +172,6 @@ IF (WIN32)
   SET(REGEX_LDFLAGS "-L${REGEX_LIB_PATH} -lregex")
   #SET(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include)
   #SET(LIBXSLT_XSLTPROC_EXECUTABLE ${CMAKE_PREFIX_PATH}/libxslt/bin/xsltproc)
-  # I have not yet debugged the intltool-merge file generation process on Windows.
-  SET(NO_INTLTOOL TRUE)
 #Prevent creating a console window on startup.
   SET(CMAKE_EXE_LINKER_FLAGS -mwindows)
 ENDIF(WIN32)
@@ -249,12 +247,8 @@ ENDIF()
 
 
 
-FIND_PROGRAM(INTLTOOL_MERGE NAMES intltool-merge HINTS ${CMAKE_PREFIX_PATH}/gnome/bin)
 FIND_PROGRAM(GLIB_COMPILE_SCHEMAS glib-compile-schemas HINTS ${CMAKE_PREFIX_PATH}/gnome/bin)
 FIND_PROGRAM(MSGFMT msgfmt)
-IF(NOT INTLTOOL_MERGE)
-  MESSAGE(SEND_ERROR "Can't find intltool-merge program. Please set INTLTOOL_MERGE.")
-ENDIF(NOT INTLTOOL_MERGE)
 
 IF (NOT GLIB_COMPILE_SCHEMAS)
   MESSAGE(SEND_ERROR "Can't find glib-compile-schemas program. Please set GLIB_COMPILE_SCHEMAS.")
diff --git a/common/cmake_modules/GncAddGSchemaTargets.cmake b/common/cmake_modules/GncAddGSchemaTargets.cmake
index 8c519f9..4c0a650 100644
--- a/common/cmake_modules/GncAddGSchemaTargets.cmake
+++ b/common/cmake_modules/GncAddGSchemaTargets.cmake
@@ -11,17 +11,9 @@ macro(add_gschema_targets _gschema_INPUTS)
     SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
   ENDIF()
   FOREACH(file ${_gschema_INPUTS})
-    configure_file(${file}.in.in ${file}.in @ONLY)
 
     set(_OUTPUT_FILE ${DATADIR_BUILD}/glib-2.0/schemas/${file})
-    ADD_CUSTOM_COMMAND(
-        OUTPUT ${_OUTPUT_FILE}
-        COMMAND ${CMAKE_COMMAND_TMP}
-          LC_ALL=C
-          ${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -x -u ${INITTOOL_OPTIONS} ${CMAKE_CURRENT_BINARY_DIR}/${file}.in ${_OUTPUT_FILE}
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${file}.in
-        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in.in
-    )
+    configure_file(${file}.in ${_OUTPUT_FILE} @ONLY)
     list(APPEND _gschema_OUTPUTS ${_OUTPUT_FILE})
 
     string(REPLACE ".xml" ".valid" file_no_xml ${file})
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 56296e8..a369e57 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -19,7 +19,7 @@ SET(doc_DATA
 
 SET(doc_noinst_DATA
         build-aix.txt build-solaris.txt CMakeLists.txt gnc-fq-dump.1 gnc-fq-helper.1 gnucash.1.in
-        misc-notes.txt README.HBCI README.OFX README.translator.txt tip_of_the_day.list.in
+        misc-notes.txt README.HBCI README.OFX README.translator.txt tip_of_the_day.list.c
         TRANSLATION_HOWTO)
 
 INSTALL(FILES ${doc_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
@@ -32,7 +32,7 @@ FILE(COPY ${doc_DATA} DESTINATION ${DATADIR_BUILD}/doc/gnucash)
 # Generate the tip of the day file.
 
 EXECUTE_PROCESS(
-    COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp ${CMAKE_CURRENT_SOURCE_DIR}/tip_of_the_day.list.in
+    COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp ${CMAKE_CURRENT_SOURCE_DIR}/tip_of_the_day.list.c
 )
 
 FILE(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp TIP_OF_THE_DAY_LINES)
diff --git a/doc/tip_of_the_day.list.in b/doc/tip_of_the_day.list.c
similarity index 100%
rename from doc/tip_of_the_day.list.in
rename to doc/tip_of_the_day.list.c
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 95b179c..065ec9d 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -10,21 +10,21 @@ gnc_add_swig_guile_command (swig-gnome-utils-c
     ${CMAKE_CURRENT_SOURCE_DIR}/gnome-utils.i
 )
 
-SET (WARNINGS_SCHEMA ../gschemas/org.gnucash.warnings.gschema.xml.in)
+SET (WARNINGS_SCHEMA ${DATADIR_BUILD}/glib-2.0/schemas/org.gnucash.warnings.gschema.xml)
 SET (GNC_WARNINGS_C ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.c)
 SET (GNC_WARNINGS_H ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.h)
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${GNC_WARNINGS_C}
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA} make-gnc-warnings-c.xsl
+  DEPENDS ${WARNINGS_SCHEMA} make-gnc-warnings-c.xsl
   COMMAND
-    ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_C} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-c.xsl ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA}
+    ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_C} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-c.xsl ${WARNINGS_SCHEMA}
 )
 ADD_CUSTOM_COMMAND(
   OUTPUT ${GNC_WARNINGS_H}
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA} make-gnc-warnings-h.xsl
+  DEPENDS ${WARNINGS_SCHEMA} make-gnc-warnings-h.xsl
   COMMAND
-    ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${CMAKE_CURRENT_BINARY_DIR}/${WARNINGS_SCHEMA}
+    ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${WARNINGS_SCHEMA}
 )
 
 #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 111fc49..be1ceb7 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -171,8 +171,9 @@ ADD_CUSTOM_COMMAND(
     OUTPUT gnucash.appdata.xml
     COMMAND ${CMAKE_COMMAND_TMP}
       LC_ALL=C
-      ${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -x -u -c ${CMAKE_SOURCE_DIR}/po/.intltool-merge-cache ${CMAKE_SOURCE_DIR}/po
-        ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in gnucash.appdata.xml
+      ${MSGFMT} --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+                -d ${CMAKE_SOURCE_DIR}/po
+                -o gnucash.appdata.xml
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
 )
 
@@ -188,8 +189,9 @@ ADD_CUSTOM_COMMAND(
     OUTPUT gnucash.desktop
     COMMAND ${CMAKE_COMMAND_TMP}
       LC_ALL=C
-      ${PERL_EXECUTABLE} ${INTLTOOL_MERGE} -d -u -c ${CMAKE_SOURCE_DIR}/po/.intltool-merge-cache ${CMAKE_SOURCE_DIR}/po
-        gnucash.desktop.in gnucash.desktop
+      ${MSGFMT} --desktop --template gnucash.desktop.in
+                -d ${CMAKE_SOURCE_DIR}/po
+                -o gnucash.desktop
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop.in
 )
 
diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in
index 72e53f8..4b9dbec 100644
--- a/gnucash/gnome/gnucash.appdata.xml.in
+++ b/gnucash/gnome/gnucash.appdata.xml.in
@@ -6,22 +6,22 @@
   <name>GnuCash</name>
   <summary>Manage your finances, accounts, and investments</summary>
   <description>
-    <_p>
+    <p>
       GnuCash is a program for personal and small-business financial-accounting.
-    </_p>
-    <_p>
+    </p>
+    <p>
       Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and intuitive to use as a checkbook register, it is based on professional accounting principles like double-entry
       accounting to ensure balanced books and accurate reports.
-    </_p>
-    <_p>With GnuCash you can (but are not limited to):</_p>
+    </p>
+    <p>With GnuCash you can (but are not limited to):</p>
     <ul>
-      <_li>Keep track of your day to day personal income and expenses</_li>
-      <_li>Manage your stock, bond and mutual fund accounts with ease</_li>
-      <_li>Keep your small business' accounting up to date</_li>
-      <_li>Create accurate reports and graphs from your financial data</_li>
-      <_li>Set up scheduled transactions to avoid repeated data entry</_li>
-      <_li>QIF/OFX/HBCI Import, Transaction Matching</_li>
-      <_li>Perform financial calculations, such as a loan repayment</_li>
+      <li>Keep track of your day to day personal income and expenses</li>
+      <li>Manage your stock, bond and mutual fund accounts with ease</li>
+      <li>Keep your small business' accounting up to date</li>
+      <li>Create accurate reports and graphs from your financial data</li>
+      <li>Set up scheduled transactions to avoid repeated data entry</li>
+      <li>QIF/OFX/HBCI Import, Transaction Matching</li>
+      <li>Perform financial calculations, such as a loan repayment</li>
     </ul>
   </description>
   <categories>
diff --git a/gnucash/gnome/gnucash.desktop.in.in b/gnucash/gnome/gnucash.desktop.in.in
index 6514737..ed28df3 100644
--- a/gnucash/gnome/gnucash.desktop.in.in
+++ b/gnucash/gnome/gnucash.desktop.in.in
@@ -2,9 +2,9 @@
 Type=Application
 MimeType=application/x-gnucash;
 Version=0.9.4
-_Name=GnuCash
-_GenericName=Finance Management
-_Comment=Manage your finances, accounts, and investments
+Name=GnuCash
+GenericName=Finance Management
+Comment=Manage your finances, accounts, and investments
 Exec=gnucash %f
 Icon=gnucash-icon
 StartupNotify=true
diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
index a4bcc97..9c7b1e0 100644
--- a/gnucash/gschemas/CMakeLists.txt
+++ b/gnucash/gschemas/CMakeLists.txt
@@ -38,6 +38,6 @@ install(CODE "execute_process(
 
 SET(gschemas_DIST_local "")
 FOREACH(file ${gschema_SOURCES})
-    LIST(APPEND gschemas_DIST_local ${file}.in.in)
+    LIST(APPEND gschemas_DIST_local ${file}.in)
 ENDFOREACH()
 SET_DIST_LIST(gschemas_DIST CMakeLists.txt ${gschemas_DIST_local})
diff --git a/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.history.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.history.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.history.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.history.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
diff --git a/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in b/gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
similarity index 100%
rename from gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in
rename to gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
diff --git a/gnucash/import-export/aqb/gschemas/CMakeLists.txt b/gnucash/import-export/aqb/gschemas/CMakeLists.txt
index e97fa4f..b22f8eb 100644
--- a/gnucash/import-export/aqb/gschemas/CMakeLists.txt
+++ b/gnucash/import-export/aqb/gschemas/CMakeLists.txt
@@ -5,4 +5,4 @@ IF (WITH_AQBANKING)
   add_gschema_targets("${aqb_GSCHEMA}")
 ENDIF(WITH_AQBANKING)
 
-SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in.in)
+SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in)
diff --git a/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in b/gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in
rename to gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
diff --git a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
index 04c045c..8f8abd1 100644
--- a/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
+++ b/gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
@@ -3,4 +3,4 @@ SET(csv_exp_GSCHEMA org.gnucash.dialogs.export.csv.gschema.xml)
 
 add_gschema_targets("${csv_exp_GSCHEMA}")
 
-SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in.in)
+SET_DIST_LIST(csv_exp_gschema_DIST CMakeLists.txt org.gnucash.dialogs.export.csv.gschema.xml.in)
diff --git a/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in b/gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in
rename to gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
diff --git a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
index 8dc5631..e108432 100644
--- a/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
+++ b/gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
@@ -2,4 +2,4 @@ SET(csv_imp_GSCHEMA org.gnucash.dialogs.import.csv.gschema.xml)
 
 add_gschema_targets("${csv_imp_GSCHEMA}")
 
-SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in.in)
+SET_DIST_LIST(csv_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.csv.gschema.xml.in)
diff --git a/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in b/gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in
rename to gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
diff --git a/gnucash/import-export/gschemas/CMakeLists.txt b/gnucash/import-export/gschemas/CMakeLists.txt
index 4f3f74d..e5290f1 100644
--- a/gnucash/import-export/gschemas/CMakeLists.txt
+++ b/gnucash/import-export/gschemas/CMakeLists.txt
@@ -3,4 +3,4 @@ SET(generic_import_GSCHEMA org.gnucash.dialogs.import.generic.gschema.xml)
 
 add_gschema_targets("${generic_import_GSCHEMA}")
 
-SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in.in)
+SET_DIST_LIST(generic_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.generic.gschema.xml.in)
diff --git a/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in b/gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
rename to gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
diff --git a/gnucash/import-export/ofx/gschemas/CMakeLists.txt b/gnucash/import-export/ofx/gschemas/CMakeLists.txt
index 7cb99c2..89bcea4 100644
--- a/gnucash/import-export/ofx/gschemas/CMakeLists.txt
+++ b/gnucash/import-export/ofx/gschemas/CMakeLists.txt
@@ -5,4 +5,4 @@ IF (WITH_OFX)
   add_gschema_targets("${ofx_GSCHEMA}")
 ENDIF (WITH_OFX)
 
-SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in.in)
+SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in)
diff --git a/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in b/gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
rename to gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
diff --git a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
index ddb41bf..fa15f03 100644
--- a/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
@@ -3,4 +3,4 @@ set(qif_imp_GSCHEMA org.gnucash.dialogs.import.qif.gschema.xml)
 
 add_gschema_targets("${qif_imp_GSCHEMA}")
 
-SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in.in)
+SET_DIST_LIST(qif_import_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.qif.gschema.xml.in)
diff --git a/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in b/gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
similarity index 100%
rename from gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in
rename to gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 0f7ed91..3896060 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -9,6 +9,8 @@ SET (NEW_LINGUAS as brx doi es_NI kok kok at latin ks mai mni mni at bengali)
 
 SET (ALL_LINGUAS ${TP_LINGUAS} ${GC_LINGUAS} ${NEW_LINGUAS})
 
+file (WRITE LINGUAS "${ALL_LINGUAS}")
+
 SET (CATALOGS "")
 SET (BUILD_CATALOGS "")
 
@@ -18,12 +20,14 @@ IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
 ENDIF()
 
 SET(po_SOURCES "")
+file (WRITE LINGUAS "")
 FOREACH(lingua ${ALL_LINGUAS})
   LIST(APPEND po_SOURCES ${lingua}.po)
+  file (APPEND LINGUAS "${lingua} ")
 ENDFOREACH()
 
 SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars
-  POTFILES.ignore POTFILES.in POTFILES.skip README check-po.cmake gnucash-pot.cmake)
+  POTFILES.ignore POTFILES.in POTFILES.skip README gnucash-pot.cmake)
 SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
 
 FOREACH(lingua ${ALL_LINGUAS})
@@ -71,7 +75,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
   # Create a list of candidate translation files
   FILE(GLOB_RECURSE FILES_IN RELATIVE ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in
-    ${CMAKE_SOURCE_DIR}/*.keys.in  ${CMAKE_SOURCE_DIR}/*.gschema.xml.in.in ${CMAKE_SOURCE_DIR}/*.scm)
+    ${CMAKE_SOURCE_DIR}/*.keys.in  ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.scm)
 
   # Only consider files in the common, libgnucash, and gnucash/ directories. Also check against list of ignore patterns
   SET(FILES "")
@@ -119,7 +123,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
     "gnucash/gnome/gnucash.appdata.xml.in"
     "gnucash/gnome/gnucash.desktop.in.in"
     "libgnucash/engine/qofbookslots.h"
-    "doc/tip_of_the_day.list.in")
+    "doc/tip_of_the_day.list.c")
 
   # Write out the final list.
   # intltool-update insists that this file be in the source directory. :-(
@@ -131,11 +135,6 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
   set(POTFILE_DEPS "")
   FOREACH(path ${POTFILES})
     list(APPEND POTFILE_DEPS ${CMAKE_SOURCE_DIR}/${path})
-    STRING(REGEX MATCH gschema.xml.in.in IS_GSCHEMA ${path})
-    IF(IS_GSCHEMA)
-      # Force parse type for gsettings files
-      SET(path "[type: gettext/gsettings]${path}")
-    ENDIF()
     FILE(APPEND ${POTFILES_IN_PATH} "${path}\n")
   ENDFOREACH()
 
@@ -144,36 +143,24 @@ FUNCTION(MAKE_GNUCASH_POTFILES)
   set(gnucash_pot_depends ${POTFILE_DEPS}  CACHE INTERNAL "List of files with translatable strings. If any of these change, gnucash.pot should be regenerated")
 ENDFUNCTION()
 
-find_program(INTLTOOL_UPDATE NAMES intltool-update)
-IF (${INTLTOOL_UPDATE} STREQUAL "INTLTOOL_UPDATE-NOTFOUND")
-  MESSAGE(FATAL_ERROR "Can't find the 'intltool-update' program.")
-ENDIF ()
-
 IF(BUILDING_FROM_VCS)
 
   MAKE_GNUCASH_POTFILES()
 
-  find_program(INTLTOOL_EXTRACT NAMES intltool-extract)
   find_program(XGETTEXT xgettext)
   configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Makevars
     ${CMAKE_CURRENT_BINARY_DIR}/Makevars COPYONLY)
 
-  IF (${INTLTOOL_EXTRACT} STREQUAL "INTLTOOL_EXTRACT-NOTFOUND")
-    MESSAGE(FATAL_ERROR "Can't find the 'intltool-extract' program.")
-  ENDIF ()
-
   IF (${XGETTEXT} STREQUAL "XGETTEXT-NOTFOUND")
     MESSAGE(FATAL_ERROR "Can't find the 'xgettext' program.")
   ENDIF ()
 
   add_custom_command(OUTPUT gnucash.pot
         COMMAND ${CMAKE_COMMAND}
-           -D INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT}
-           -D INTLTOOL_UPDATE=${INTLTOOL_UPDATE}
+           -D TOP_SRC_DIR=${CMAKE_SOURCE_DIR}
            -D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
            -D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
            -D PACKAGE=${PACKAGE}
-           -D PERL=${PERL_EXECUTABLE}
            -D XGETTEXT=${XGETTEXT}
            -P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake
         DEPENDS ${gnucash_pot_depends}
@@ -182,13 +169,3 @@ IF(BUILDING_FROM_VCS)
   add_custom_target (pot DEPENDS gnucash.pot)
 ENDIF()
 dist_add_generated (${BUILDING_FROM_VCS} gnucash.pot)
-
-ADD_CUSTOM_TARGET(check-po
-        COMMAND ${CMAKE_COMMAND}
-           -D INTLTOOL_UPDATE=${INTLTOOL_UPDATE}
-           -D PO_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-           -P check-po.cmake
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-add_dependencies(check check-po)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 24f70dd..aa029c3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -238,19 +238,19 @@ gnucash/gnome-utils/search-param.c
 gnucash/gnome-utils/tree-view-utils.c
 gnucash/gnome-utils/window-main-summarybar.c
 gnucash/gnucash-bin.c
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.history.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.warnings.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in.in
-[type: gettext/gsettings]gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in.in
+gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
+gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
+gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
+gnucash/gschemas/org.gnucash.gschema.xml.in
+gnucash/gschemas/org.gnucash.history.gschema.xml.in
+gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
+gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
+gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
 gnucash/html/gnc-html.c
 gnucash/html/gnc-html-factory.c
 gnucash/html/gnc-html-history.c
@@ -272,7 +272,7 @@ gnucash/import-export/aqb/gnc-file-aqb-import.c
 gnucash/import-export/aqb/gnc-gwen-gui.c
 gnucash/import-export/aqb/gncmod-aqbanking.c
 gnucash/import-export/aqb/gnc-plugin-aqbanking.c
-[type: gettext/gsettings]gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in.in
+gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
 gnucash/import-export/bi-import/dialog-bi-import.c
 gnucash/import-export/bi-import/dialog-bi-import-gui.c
 gnucash/import-export/bi-import/dialog-bi-import-helper.c
@@ -285,7 +285,7 @@ gnucash/import-export/csv-exp/csv-transactions-export.c
 gnucash/import-export/csv-exp/csv-tree-export.c
 gnucash/import-export/csv-exp/gncmod-csv-export.c
 gnucash/import-export/csv-exp/gnc-plugin-csv-export.c
-[type: gettext/gsettings]gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in
+gnucash/import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
 gnucash/import-export/csv-imp/assistant-csv-account-import.c
 gnucash/import-export/csv-imp/assistant-csv-account-import.glade
 gnucash/import-export/csv-imp/assistant-csv-price-import.cpp
@@ -308,7 +308,7 @@ gnucash/import-export/csv-imp/gnc-price-props.cpp
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp
 gnucash/import-export/csv-imp/gnc-trans-props.cpp
 gnucash/import-export/csv-imp/gnc-tx-import.cpp
-[type: gettext/gsettings]gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in
+gnucash/import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
 gnucash/import-export/customer-import/dialog-customer-import.c
 gnucash/import-export/customer-import/dialog-customer-import-gui.c
 gnucash/import-export/customer-import/gncmod-customer-import.c
@@ -316,7 +316,7 @@ gnucash/import-export/customer-import/gnc-plugin-customer-import.c
 gnucash/import-export/customer-import/gtkbuilder/dialog-customer-import-gui.glade
 gnucash/import-export/dialog-import.glade
 gnucash/import-export/gncmod-generic-import.c
-[type: gettext/gsettings]gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in
+gnucash/import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
 gnucash/import-export/import-account-matcher.c
 gnucash/import-export/import-backend.c
 gnucash/import-export/import-commodity-matcher.c
@@ -334,7 +334,7 @@ gnucash/import-export/ofx/gncmod-ofx-import.c
 gnucash/import-export/ofx/gnc-ofx-import.c
 gnucash/import-export/ofx/gnc-ofx-kvp.c
 gnucash/import-export/ofx/gnc-plugin-ofx.c
-[type: gettext/gsettings]gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in.in
+gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
 gnucash/import-export/qif/qif-context.c
 gnucash/import-export/qif/qif-file.c
 gnucash/import-export/qif/qif-objects.c
@@ -344,7 +344,7 @@ gnucash/import-export/qif-imp/dialog-account-picker.c
 gnucash/import-export/qif-imp/dialog-account-picker.glade
 gnucash/import-export/qif-imp/gncmod-qif-import.c
 gnucash/import-export/qif-imp/gnc-plugin-qif-import.c
-[type: gettext/gsettings]gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in
+gnucash/import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
 gnucash/import-export/qif-imp/qif-dialog-utils.scm
 gnucash/import-export/qif-imp/qif-file.scm
 gnucash/import-export/qif-imp/qif-guess-map.scm
@@ -707,4 +707,4 @@ libgnucash/tax/us/us.scm
 gnucash/gnome/gnucash.appdata.xml.in
 gnucash/gnome/gnucash.desktop.in.in
 libgnucash/engine/qofbookslots.h
-doc/tip_of_the_day.list.in
+doc/tip_of_the_day.list.c
diff --git a/po/check-po.cmake b/po/check-po.cmake
deleted file mode 100644
index 6a4dbd7..0000000
--- a/po/check-po.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Run intltool-update -m to check for missing files in POTFILES.in
-# We detect failure by looking for the presence of a 'missing' file.
-
-# Intltool returns a zero status whether or not the check failed.
-
-FILE(REMOVE ${PO_DIR}/missing)
-IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
-  EXECUTE_PROCESS(
-          COMMAND ${CMAKE_COMMAND} -E env ${INTLTOOL_UPDATE} -m
-          WORKING_DIRECTORY ${PO_DIR}
-  )
-ELSE()
-  EXECUTE_PROCESS(
-          COMMAND ${INTLTOOL_UPDATE} -m
-          WORKING_DIRECTORY ${PO_DIR}
-          RESULT_VARIABLE UPDATE_RESULT
-  )
-  MESSAGE("UPDATE_RESULT = ${UPDATE_RESULT}")
-ENDIF()
-IF (EXISTS ${PO_DIR}/missing)
-  MESSAGE(FATAL_ERROR "POTFILES.in is missing files. See 'missing' in ${PO_DIR}")
-ENDIF()
diff --git a/po/gnucash-pot.cmake b/po/gnucash-pot.cmake
index 8ac951e..c3db591 100644
--- a/po/gnucash-pot.cmake
+++ b/po/gnucash-pot.cmake
@@ -1,13 +1,32 @@
-# Note: the set commands below can be integrated in the execute process
-#       the day we require cmake > 3.1
-# The command would then become
-# COMMAND {CMAKE_COMMAND} -E env INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} .... ${PERL} ${INTLTOOL_UPDATE} ....
-
-set(ENV{INTLTOOL_EXTRACT} ${INTLTOOL_EXTRACT})
-set(ENV{XGETTEXT} ${XGETTEXT})
-set(ENV{srcdir} ${PO_SRC_DIR})
 execute_process(
-  COMMAND ${PERL} ${INTLTOOL_UPDATE} -x --gettext-package ${PACKAGE} --pot
+    COMMAND ${XGETTEXT} --add-comments
+                        --directory=${TOP_SRC_DIR}
+                        --default-domain=${PACKAGE}
+                        --output=${PACKAGE}.pot
+                        --files-from=${PO_SRC_DIR}/POTFILES.in
+                        --from-code=UTF-8
+                        --flag=g_strdup_printf:1:c-format
+                        --flag=g_string_printf:2:c-format
+                        --flag=g_string_append_printf:2:c-format
+                        --flag=g_error_new:3:c-format
+                        --flag=g_set_error:4:c-format
+                        --flag=g_markup_printf_escaped:1:c-format
+                        --flag=g_log:3:c-format
+                        --flag=g_print:1:c-format
+                        --flag=g_printerr:1:c-format
+                        --flag=g_printf:1:c-format
+                        --flag=g_fprintf:2:c-format
+                        --flag=g_sprintf:2:c-format
+                        --flag=g_snprintf:3:c-format
+                        --flag=g_scanner_error:2:c-format
+                        --flag=g_scanner_warn:2:c-format
+                        --keyword=_
+                        --keyword=N_
+                        --keyword=Q_
+                        --keyword=translate:1,1t
+                        --keyword=translate:1c,2,2t
+                        --keyword=translate:1,2,3t
+                        --keyword=translate:1c,2,3,4t
   WORKING_DIRECTORY ${PO_BIN_DIR}
   RESULT_VARIABLE GNUCASH_POT_RESULT
 )

commit 3462abe7adf8a35c30bc366da45056c8f07dba6a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Feb 26 19:00:07 2018 +0100

    Bug 793460 - gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp:1941 is impossible to translate

diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
index 2b8f55e..535f4ef 100644
--- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
+++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
@@ -38,6 +38,7 @@ extern "C"
 #include <glib/gi18n.h>
 #include <stdlib.h>
 
+#include "gnc-path.h"
 #include "gnc-ui.h"
 #include "gnc-uri-utils.h"
 #include "gnc-ui-util.h"
@@ -63,6 +64,11 @@ extern "C"
 #include "gnc-fw-tokenizer.hpp"
 #include "gnc-csv-tokenizer.hpp"
 
+#include <boost/locale.hpp>
+
+namespace bl = boost::locale;
+using namespace boost::locale;
+
 #define MIN_COL_WIDTH 70
 #define GNC_PREFS_GROUP "dialogs.import.csv"
 #define ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS "assistant-csv-trans-import"
@@ -1937,8 +1943,13 @@ CsvImpTransAssist::assist_summary_page_prepare ()
     gtk_assistant_remove_action_widget (csv_imp_asst, help_button);
     gtk_assistant_remove_action_widget (csv_imp_asst, cancel_button);
 
+    bl::generator gen;
+    gen.add_messages_path(gnc_path_get_datadir());
+    gen.add_messages_domain(PACKAGE);
+
     auto text = std::string("<span size=\"medium\"><b>");
-    text += _("The transactions were imported from the file '") + m_file_name + "'.";
+    // FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
+    text += (bl::format (translate ("The transactions were imported from the file '{1}'.")) % m_file_name).str(gen(""));
     text += "</b></span>";
     gtk_label_set_markup (GTK_LABEL(summary_label), text.c_str());
 }

commit 72a48c08842f730feeefe00a71521c6f7aecfd62
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Feb 26 18:16:58 2018 +0100

    Improve config and app data migration to handle renaming of config<version>.user to config-user.scm on all platforms

diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 1517b2b..248ffaa 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -384,8 +384,8 @@ load_system_config(void)
 static void
 load_user_config(void)
 {
-    /* Don't continue adding to this list. When 2.0 rolls around bump
-       the 1.4 (unnumbered) files off the list. */
+    /* Don't continue adding to this list. When 3.0 rolls around bump
+       the 2.4 files off the list. */
     static const gchar *saved_report_files[] =
     {
         SAVED_REPORTS_FILE, SAVED_REPORTS_FILE_OLD_REV, NULL
diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index 38fe1c9..d55b535 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -601,121 +601,137 @@ static std::string migrate_gnc_datahome()
     std::stringstream migration_msg;
     migration_msg.imbue(gen(""));
 
-    if (copy_recursive (old_dir,
-                        gnc_userdata_home))
+    /* Step 1: copy directory $HOME/.gnucash to $GNC_DATA_HOME */
+    auto full_copy = copy_recursive (old_dir, gnc_userdata_home);
+
+    /* Step 2: move user editable config files from GNC_DATA_HOME to GNC_CONFIG_HOME
+                These files are:
+                - log.conf
+                - the most recent of "config-2.0.user", "config-1.8.user", "config-1.6.user",
+                    "config.user"
+                Note: we'll also  rename config.user to config-user.scm to make it more clear
+                      this file is meant for custom scm code to load at run time */
+    auto failed = std::vector<std::string>{};
+    auto succeeded = std::vector<std::string>{};
+
+    /* Move log.conf
+     * Note on OS X/Quarz and Windows GNC_DATA_HOME and GNC_CONFIG_HOME are the same, so this will do nothing */
+    auto oldlogpath = gnc_userdata_home / "log.conf";
+    auto newlogpath = gnc_userconfig_home / "log.conf";
+    try
     {
-        /* Step 1: copy directory $HOME/.gnucash to $GNC_DATA_HOME */
-
-        /* Translators: the message below will be completed with two directory names. */
-        migration_msg
-            << translate ("Notice") << std::endl << std::endl
-            << translate ("Your gnucash metadata has been migrated.") << std::endl << std::endl
-            << translate ("Old location:") << " " << old_dir.string() << std::endl
-            << translate ("New location:") << " " << gnc_userdata_home.string() << std::endl << std::endl
-            // Translators {1} will be replaced with the package name (typically Gnucash) at runtime
-            << bl::format (translate ("If you no longer intend to run {1} 2.6.x or older on this system you can safely remove the old directory."))
-                % PACKAGE_NAME;
-
-        /* Step 2: move user editable config files from $GNC_DATA_HOME to GNC_CONFIG_HOME
-                   These files are:
-                   - log.conf
-                   - the most recent of "config-2.0.user", "config-1.8.user", "config-1.6.user",
-                     "config.user"
-                     Note: we'll also  rename config.user to config-user.scm to make it more clear what
-                     this file is expecting custom scm code to load at run time
-
-           This is only done if not Windows or OS X, because on those platforms
-           gnc_userconfig_home and gnc_userdata_home are the same.*/
-#if !defined G_OS_WIN32 && !defined MAC_INTEGRATION
-        auto failed = std::vector<std::string>{};
-        auto succeeded = std::vector<std::string>{};
-
-        auto oldlogpath = gnc_userdata_home / "log.conf";
-        auto newlogpath = gnc_userconfig_home / "log.conf";
-        try
+        if (bfs::exists (oldlogpath) && gnc_validate_directory (gnc_userconfig_home) &&
+            (oldlogpath != newlogpath))
         {
-            if (bfs::exists (oldlogpath) && gnc_validate_directory (gnc_userconfig_home))
-            {
-                bfs::rename (oldlogpath, newlogpath);
-                succeeded.emplace_back ("log.conf");
-            }
-        }
-        catch (const bfs::filesystem_error& ex)
-        {
-            failed.emplace_back ("log.conf");
+            bfs::rename (oldlogpath, newlogpath);
+            succeeded.emplace_back ("log.conf");
         }
+    }
+    catch (const bfs::filesystem_error& ex)
+    {
+        failed.emplace_back ("log.conf");
+    }
 
-        auto user_config_files = std::vector<std::string>
-        {
-            "config.user", "config-1.6.user",
-            "config-1.8.user", "config-2.0.user"
-        };
-        auto newconfpath = gnc_userconfig_home / "config-user.scm";
-        auto conf_exist_vec = std::vector<std::string> {};
-        auto final_rename = std::string();
-        for (auto conf_file : user_config_files)
+    /* Move/rename the most relevant config*.user file. The relevance comes from
+     * the order in which these files were searched for at gnucash startup.
+     * Make note of other config*.user files found to inform the user they are now ignored */
+    auto user_config_files = std::vector<std::string>
+    {
+        "config-2.0.user", "config-1.8.user",
+        "config-1.6.user", "config.user"
+    };
+    auto conf_exist_vec = std::vector<std::string> {};
+    auto renamed_config = std::string();
+    for (auto conf_file : user_config_files)
+    {
+        auto oldconfpath = gnc_userdata_home / conf_file;
+        try
         {
-            auto oldconfpath = gnc_userdata_home / conf_file;
-            try
+            if (bfs::exists (oldconfpath) && gnc_validate_directory (gnc_userconfig_home))
             {
-                if (bfs::exists (oldconfpath) && gnc_validate_directory (gnc_userconfig_home))
+                // Only migrate the most relevant of the config*.user files
+                if (renamed_config.empty())
                 {
-                    bfs::rename (oldconfpath, newconfpath);
                     /* Translators: this string refers to a file name that gets renamed */
-                    final_rename = conf_file + " (" + _("Renamed to:") + " config-user.scm)";
+                    renamed_config = conf_file + " (" + _("Renamed to:") + " config-user.scm)";
+                    auto newconfpath = gnc_userconfig_home / "config-user.scm";
+                    bfs::rename (oldconfpath, newconfpath);
+                }
+                else
+                {
+                    /* We want to report the obsolete file to the user */
                     conf_exist_vec.emplace_back (conf_file);
+                    if (full_copy)
+                        /* As we copied from .gnucash, just delete the obsolete file as well. It's still
+                         * present in .gnucash if the user wants to recover it */
+                        bfs::remove (oldconfpath);
                 }
             }
-            catch (const bfs::filesystem_error& ex)
-            {
-                failed.emplace_back (conf_file);
-            }
-        }
-        if (!final_rename.empty())
-            succeeded.emplace_back (final_rename);
-        /* The last element in conf_exist_vec would be the same as final_rename.
-         * This will be reported in the succeeded vector, so don't
-         * report it again as removed */
-        if (!conf_exist_vec.empty())
-            conf_exist_vec.pop_back();
-
-        /* Step 3: inform the user of additional changes */
-        if (!succeeded.empty() || !conf_exist_vec.empty() || !failed.empty())
-            migration_msg << std::endl << std::endl
-                          << translate ("In addition:");
-
-        if (!succeeded.empty())
-        {
-            migration_msg << std::endl << std::endl
-                          << bl::format (translate ("The following file has been moved to {1} instead:",
-                                                        "The following files have been moved to {1} instead:",
-                                                        succeeded.size())) % gnc_userconfig_home.string().c_str()
-                          << std::endl;
-            for (auto success_file : succeeded)
-                migration_msg << "- " << success_file << std::endl;
         }
-        if (!conf_exist_vec.empty())
-        {
-            migration_msg << std::endl << std::endl
-                          << translate ("The following file has been removed instead:",
-                                            "The following files have been removed instead:",
-                                            conf_exist_vec.size())
-                          << std::endl;
-            for (auto rem_file : conf_exist_vec)
-                migration_msg << "- " << rem_file << std::endl;
-        }
-        if (!failed.empty())
+        catch (const bfs::filesystem_error& ex)
         {
-            migration_msg << std::endl << std::endl
-                          << bl::format (translate ("The following file could not be moved to {1}:",
-                                                        "The following files could not be moved to {1}:",
-                                                        failed.size())) % gnc_userconfig_home.string().c_str()
-                          << std::endl;
-            for (auto failed_file : failed)
-                migration_msg << "- " << failed_file << std::endl;
+            failed.emplace_back (conf_file);
         }
-#endif
+    }
+    if (!renamed_config.empty())
+        succeeded.emplace_back (renamed_config);
 
+    /* Step 3: inform the user of additional changes */
+    if (full_copy || !succeeded.empty() || !conf_exist_vec.empty() || !failed.empty())
+        migration_msg << translate ("Notice") << std::endl << std::endl;
+
+    if (full_copy)
+    {
+        migration_msg
+        << translate ("Your gnucash metadata has been migrated.") << std::endl << std::endl
+        /* Translators: this refers to a directory name. */
+        << translate ("Old location:") << " " << old_dir.string() << std::endl
+        /* Translators: this refers to a directory name. */
+        << translate ("New location:") << " " << gnc_userdata_home.string() << std::endl << std::endl
+        // Translators {1} will be replaced with the package name (typically Gnucash) at runtime
+        << bl::format (translate ("If you no longer intend to run {1} 2.6.x or older on this system you can safely remove the old directory."))
+        % PACKAGE_NAME;
+    }
+
+    if (full_copy &&
+        (!succeeded.empty() || !conf_exist_vec.empty() || !failed.empty()))
+        migration_msg << std::endl << std::endl
+                        << translate ("In addition:");
+
+    if (!succeeded.empty())
+    {
+        migration_msg << std::endl << std::endl;
+        if (full_copy)
+            migration_msg << bl::format (translate ("The following file has been copied to {1} instead:",
+                                                    "The following files have been copied to {1} instead:",
+                                                    succeeded.size())) % gnc_userconfig_home.string().c_str();
+        else
+            migration_msg << bl::format (translate ("The following file in {1} has been renamed:"))
+                                         % gnc_userconfig_home.string().c_str();
+
+        migration_msg << std::endl;
+        for (auto success_file : succeeded)
+            migration_msg << "- " << success_file << std::endl;
+    }
+    if (!conf_exist_vec.empty())
+    {
+        migration_msg << std::endl << std::endl
+                      << translate ("The following file has become obsolete and will be ignored:",
+                                    "The following files have become obsolete and will be ignored:",
+                                    conf_exist_vec.size())
+                      << std::endl;
+        for (auto obs_file : conf_exist_vec)
+            migration_msg << "- " << obs_file << std::endl;
+    }
+    if (!failed.empty())
+    {
+        migration_msg << std::endl << std::endl
+                      << bl::format (translate ("The following file could not be moved to {1}:",
+                                                "The following files could not be moved to {1}:",
+                                                failed.size())) % gnc_userconfig_home.string().c_str()
+                      << std::endl;
+        for (auto failed_file : failed)
+            migration_msg << "- " << failed_file << std::endl;
     }
 
     return migration_msg.str ();

commit cd30578b2fb91e9feab29ac38fe461ae54e0f97b
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Fri Feb 23 10:42:47 2018 +0000

    Use the gnc_prefs_get_bool values to update cache values
    
    This way is a safer way to update the cache values in case the settings
    changed signal fails to trigger or there is a double trigger and the
    cached value gets out of sync with the preference value.

diff --git a/gnucash/register/ledger-core/split-register.c b/gnucash/register/ledger-core/split-register.c
index 69c1793..10d5999 100644
--- a/gnucash/register/ledger-core/split-register.c
+++ b/gnucash/register/ledger-core/split-register.c
@@ -2693,11 +2693,13 @@ split_register_pref_changed (gpointer prefs, gchar *pref, gpointer user_data)
     }
     else if (g_str_has_suffix(pref, GNC_PREF_SHOW_LEAF_ACCT_NAMES))
     {
-        reg->show_leaf_accounts = !reg->show_leaf_accounts;
+        reg->show_leaf_accounts = gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL_REGISTER,
+                                            GNC_PREF_SHOW_LEAF_ACCT_NAMES);
     }
     else if (g_str_has_suffix(pref, GNC_PREF_ALT_COLOR_BY_TRANS))
     {
-        reg->double_alt_color = !reg->double_alt_color;
+        reg->double_alt_color = gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL_REGISTER,
+                                            GNC_PREF_ALT_COLOR_BY_TRANS);
     }
     else
     {

commit f95ae1a96d5f4cc5d9238a0d373dde901384b2af
Author: John Erling Blad <jeblad at gmail.com>
Date:   Fri Feb 16 15:41:25 2018 +0100

    Partial update of Norwegian po file

diff --git a/po/glossary/nb.po b/po/glossary/nb.po
index 107049b..b980d7f 100644
--- a/po/glossary/nb.po
+++ b/po/glossary/nb.po
@@ -42,7 +42,7 @@ msgstr "kontonavn"
 
 #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"
 msgid "account type: Active"
-msgstr "kontotype: Aktiv"
+msgstr "kontotype: Aktiva"
 
 #. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead."
 msgid "account type: Asset"

commit 4a6f0223ef580631997ed22cf03a72c70b9bb01b
Author: John Erling Blad <jeblad at gmail.com>
Date:   Fri Feb 16 15:39:28 2018 +0100

    Changed last one to blame

diff --git a/po/glossary/nb.po b/po/glossary/nb.po
index d369799..107049b 100644
--- a/po/glossary/nb.po
+++ b/po/glossary/nb.po
@@ -3,6 +3,7 @@
 # Kjartan Maraas <kmaraas at gnome.org>, 2001.
 # Tor Harald Thorland <tortho at strigen.com>, 2005.
 # Kjartan Maraas <kmaraas at gnome.org>, 2005.
+# John Erling Blad <jeblad at gmail.com>, 2018
 #
 #
 msgid ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-20 19:04+0200\n"
 "PO-Revision-Date: 2018-02-16 15:32+0100\n"
-"Last-Translator: Tor Harald Thorland <tortho at strigen.com>\n"
+"Last-Translator: John Erling Blad <jeblad at gmail.com>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
diff --git a/po/nb.po b/po/nb.po
index a21e77a..821e5d5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,6 +3,7 @@
 # Kjartan Maraas <kmaraas at gnome.org>, 2000.
 # Tor Harald Thorland <linux at strigen.com>, 2005-2006.
 # Sigve Indregard <sigve.indregard at gmail.com>, 2006.
+# John Erling Blad <jeblad at gmail.com>, 2018
 #
 msgid ""
 msgstr ""
@@ -10,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-01-13 20:39+0100\n"
 "PO-Revision-Date: 2018-02-16 13:42+0100\n"
-"Last-Translator: sigvei <sigve.indregard at gmail.com>\n"
+"Last-Translator: John Erling Blad <jeblad at gmail.com>\n"
 "Language-Team: Norwegian <>\n"
 "Language: no\n"
 "MIME-Version: 1.0\n"

commit e8363e29b4a2f0ed6e1132fc2661141e6b980861
Author: John Erling Blad <jeblad at gmail.com>
Date:   Fri Feb 16 15:33:41 2018 +0100

    Partial update of Norwegian po file

diff --git a/po/glossary/nb.po b/po/glossary/nb.po
index c3aca89..d369799 100644
--- a/po/glossary/nb.po
+++ b/po/glossary/nb.po
@@ -10,13 +10,14 @@ msgstr ""
 "Project-Id-Version: gnucash-glossary 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-20 19:04+0200\n"
-"PO-Revision-Date: 2005-12-19 15:48+0800\n"
+"PO-Revision-Date: 2018-02-16 15:32+0100\n"
 "Last-Translator: Tor Harald Thorland <tortho at strigen.com>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb at lister.ping.uio.no>\n"
-"Language:  Norwegian/Bokmaal\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
 msgid "Term (Dear translator: This file will never be visible to the user!)"
@@ -39,93 +40,88 @@ msgid "account name"
 msgstr "kontonavn"
 
 #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"
-#, fuzzy
 msgid "account type: Active"
-msgstr "account type: Aktiva"
+msgstr "kontotype: Aktiv"
 
 #. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead."
 msgid "account type: Asset"
-msgstr "account type: Aktiva"
+msgstr "kontotype: Eiendel"
 
 #. "in fact: 'Active & Passive', group aka 'Balance Sheet accounts'; complement of 'Profit & Loss'"
-#, fuzzy
 msgid "account type: Assets & Liabilities"
-msgstr "account type: Gjeld"
+msgstr "kontotype: Eiendel & gjeld"
 
 #. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice"
 msgid "account type: checking"
-msgstr ""
+msgstr "kontotype: sjekk"
 
 #. "-"
 msgid "account type: currency"
-msgstr "Account type: valuta"
+msgstr "kontotype: valuta"
 
 #. "see: Equity, but see also 'account type: Passive'"
 msgid "account type: Equity"
-msgstr "account type: Egenkapital"
+msgstr "kontotype: Egenkapital"
 
 #. "-"
 msgid "account type: Expense"
-msgstr "account type: Utgift"
+msgstr "kontotype: Utgift"
 
 #. "-"
 msgid "account type: Income"
-msgstr "account type: Inntekt"
+msgstr "kontotype: Inntekt"
 
 #. "A debt, a financial obligation, but see also 'account type: Passive'"
 msgid "account type: Liability"
-msgstr "account type: Gjeld"
+msgstr "kontotype: Gjeld"
 
 #. "-"
 msgid "account type: money-market"
-msgstr "account type: pengemarked"
+msgstr "kontotype: pengemarked"
 
 #. "-"
 msgid "account type: Mutual fund"
-msgstr ""
+msgstr "kontotype: investeringsfond"
 
 #. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugzilla.gnome.org/show_bug.cgi?id=421766"
-#, fuzzy
 msgid "account type: Passive"
-msgstr "account type: Aktiva"
+msgstr "kontotype: Passiva"
 
 #. "Group of accounts tracking your success, complement of 'Assets & Liabilities'"
-#, fuzzy
 msgid "account type: Profit & Loss"
-msgstr "account type: Aktiva"
+msgstr "kontotype: Resultat & tap"
 
 #. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account"
 msgid "account type: saving"
-msgstr "account type: sparekonto"
+msgstr "kontotype: sparekonto"
 
 #. "-"
 msgid "account type: Stock"
-msgstr "account type: Aksjer"
+msgstr "kontotype: Aksjer"
 
 #. "This account type (new in gnucash-2.4.0) is used when exchanging or trading amounts from one currency into another"
-#, fuzzy
 msgid "account type: trading"
-msgstr "account type: sparekonto"
+msgstr "kontotype: handelskonto"
 
 #. "-"
 msgid "account: parent account"
-msgstr "account: overordnet konto"
+msgstr "konto: overordnet konto"
 
 #. "-"
 msgid "account: subaccount"
-msgstr "account: underkonto"
+msgstr "konto: underkonto"
 
 #. "-"
 msgid "account: top level account"
-msgstr "account: toppnivå konto"
+msgstr "konto: toppnivåkonto"
 
 #. "The process of doing something that caused a transaction to happen"
 msgid "Action (register)"
-msgstr ""
+msgstr "Handling (register)"
 
 #. "Automated teller machine"
 msgid "action: ATM"
-msgstr "action: Minibank"
+msgstr "handling: Minibank"
 
 #. "Transaction was an auto deposit"
 msgid "action: autoDep"
@@ -133,15 +129,15 @@ msgstr ""
 
 #. "-"
 msgid "action: buy"
-msgstr "action: kjøpe"
+msgstr "handling: kjøpe"
 
 #. "-"
 msgid "action: deposit"
-msgstr "action: bankinskudd"
+msgstr "handling: bankinskudd"
 
 #. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit."
 msgid "action: direct debit"
-msgstr "action: automatisk overførsel"
+msgstr "handling: automatisk overførsel"
 
 #. "transaction is a distribution (???)"
 msgid "action: dist"
@@ -153,7 +149,7 @@ msgstr ""
 
 #. "-"
 msgid "action: fee"
-msgstr "action: honorar"
+msgstr "handling: honorar"
 
 #. "transaction comes from interest"
 msgid "action: int"
@@ -161,11 +157,11 @@ msgstr ""
 
 #. "-"
 msgid "action: loan"
-msgstr ""
+msgstr "handling: lån"
 
 #. "see: payment 1."
 msgid "action: payment"
-msgstr "action: betaling"
+msgstr "handling: betaling"
 
 #. "Point of sale"
 msgid "action: POS"
@@ -173,19 +169,19 @@ msgstr ""
 
 #. "-"
 msgid "action: rebate"
-msgstr "action: rabatt"
+msgstr "handling: rabatt"
 
 #. "-"
 msgid "action: sell"
-msgstr ""
+msgstr "handling: selg"
 
 #. "-"
 msgid "action: Teller"
-msgstr ""
+msgstr "handling: kasserer"
 
 #. "see: transfer 2. (=credit transfer)"
 msgid "action: transfer"
-msgstr "action: overfør"
+msgstr "handling: overfør"
 
 #. "-"
 msgid "action: wire"
@@ -193,7 +189,7 @@ msgstr ""
 
 #. "-"
 msgid "action: withdraw"
-msgstr "action: bankuttak"
+msgstr "handling: bankuttak"
 
 #. "A sum of money"
 msgid "amount"
@@ -205,7 +201,7 @@ msgstr "gjennomsnitt"
 
 #. "The amount of money that is in one's account"
 msgid "balance (noun)"
-msgstr "saldo (noun)"
+msgstr "saldo (substantiv)"
 
 #. "A written record of money received and paid out, showing the difference between the two total amounts"
 msgid "balance sheet"
@@ -224,13 +220,12 @@ msgid "bill"
 msgstr "regning"
 
 #. "see invoice owner"
-#, fuzzy
 msgid "bill owner"
-msgstr "regnings betingelser"
+msgstr "regningseier"
 
 #. "Conditions on paying a bill. Both an invoice and a bill have billing terms. For example, you can have 'terms' of 'Net-30', where the bill is due in full in 30 days."
 msgid "billing terms"
-msgstr "regnings betingelser"
+msgstr "regningsbetingelser"
 
 #. "The dataset that encapsulates all the collections of entities (accounts etc.) in gnucash. The written records of the financial affairs of a business."
 msgid "Book"
@@ -238,7 +233,7 @@ msgstr ""
 
 #. "Completing the records of financial affairs for a specific time period, e.g. at the end of the year."
 msgid "book closing"
-msgstr ""
+msgstr "Ã¥rsavslutning"
 
 #. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
 msgid "Budget"
@@ -250,11 +245,11 @@ msgstr "næring (adjektiv)"
 
 #. "as Menu Item: Headline for features that are related to small business accounting"
 msgid "business (noun)"
-msgstr "Næring"
+msgstr "næring (substantiv)"
 
 #. "Profits made from the sale of investments or property"
 msgid "capital gains"
-msgstr ""
+msgstr "gevinst"
 
 #. "Distinguishing the uppercase and lowercase letters"
 msgid "case sensitive"
@@ -282,7 +277,7 @@ msgstr "vare"
 
 #. "e.g. NASDAQ"
 msgid "commodity listing"
-msgstr ""
+msgstr "varelisting"
 
 #. "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)"
 msgid "commodity option: fraction"
@@ -293,13 +288,12 @@ msgid "commodity option: Symbol"
 msgstr ""
 
 #. "interest which is earned on both the initial deposit and on any interest that has already been earned but left on deposit."
-#, fuzzy
 msgid "compound interests"
-msgstr "rente"
+msgstr "total avkastning"
 
 #. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account."
 msgid "Credit (column in register)"
-msgstr "Kredit (kolonne i registreringen)"
+msgstr "Kredit (kolonne i register)"
 
 #. "-"
 msgid "Credit Card"
@@ -310,9 +304,8 @@ msgid "credit transfer"
 msgstr "bankoverføring"
 
 #. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice"
-#, fuzzy
 msgid "credit note"
-msgstr "bankoverføring"
+msgstr "banknota"
 
 #. "The system of money used in a country"
 msgid "currency"
@@ -340,7 +333,7 @@ msgstr "dato område"
 
 #. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account."
 msgid "Debit (column in register)"
-msgstr "Debit (Kolonne i registreringen)"
+msgstr "Debet (kolonne i register)"
 
 #. "Each option has a default setting that it is shipped with, until the user changes the setting."
 msgid "default"
@@ -352,16 +345,15 @@ msgstr ""
 
 #. "The process of something becoming less valuable"
 msgid "depreciation"
-msgstr ""
+msgstr "avskrivninger"
 
 #. "1. One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars) 2. One textfield per account. It is intended to be a longer, 1-5 sentence description of what this account is all about."
 msgid "Description (column in register)"
-msgstr "Beskrivelse (kolonne i registreringen)"
+msgstr "Beskrivelse (kolonne i register)"
 
 #. "Reductions to a basic price of goods or services. Your language might distinguish between discounts dealing with payments (billing terms) and others (invoice)."
-#, fuzzy
 msgid "discount"
-msgstr "konto"
+msgstr "rabatt"
 
 #. "Important Buzzword :)"
 msgid "double entry"
@@ -377,15 +369,15 @@ msgstr "egenkapital"
 
 #. "Report that ... FIXME: Add description."
 msgid "equity statement"
-msgstr ""
+msgstr "egenkapitaloppstilling"
 
 #. "A trusted third party that holds a payment or deposit until a transaction is completed. In the US, many mortgage companies set up an escrow account when you get a mortgage.  You pay into the account every month and they disburse amounts out of the escrow to pay for hazard insurance and property taxes. So they are holding funds 'in escrow' to complete the transactions (paying insurance and taxes)."
 msgid "escrow (account)"
-msgstr ""
+msgstr "deponering (konto)"
 
 #. "The relation in value between the money used in different countries"
 msgid "exchange rate"
-msgstr "kurs"
+msgstr "vekslingskurs"
 
 #. "in the account creation dialog??"
 msgid "field"
@@ -401,11 +393,11 @@ msgstr "filtype"
 
 #. "-"
 msgid "financial calculator: interest rate"
-msgstr "financial calculator: rentesats"
+msgstr "finanskalkulator: rentesats"
 
 #. "see: payment"
 msgid "financial calculator: payments"
-msgstr ""
+msgstr "finanskalkulator: betalinger"
 
 #. "An increase in wealth; profit; advantage (See also: capital gains)"
 msgid "gain"
@@ -421,7 +413,7 @@ msgstr "import"
 
 #. "Report that ... FIXME: add description. This report used to be called the 'Profit & Loss', but it was renamed on 2004-07-13."
 msgid "income statement"
-msgstr ""
+msgstr "resultatoppstilling"
 
 #. "Money charged for borrowing money, or paid to somebody who invests money"
 msgid "interest"
@@ -465,12 +457,11 @@ msgstr "slå sammen, til"
 
 #. "The thing that the scatter plot uses to mark each data point"
 msgid "marker"
-msgstr "markør"
+msgstr "merker"
 
 #. "1. Some text annotation, but this meaning isn't used inside gnucash. 2. In the Customer summary report: The ratio of profit vs. sales, i.e. the profit amount divided by the sales amount, shown in percent."
-#, fuzzy
 msgid "markup"
-msgstr "markør"
+msgstr "markering"
 
 #. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
 msgid "MDI modus"
@@ -510,7 +501,7 @@ msgstr "notater (register)"
 
 #. "Abbreviation for: number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field."
 msgid "Num (column in register)"
-msgstr "No, (kolonne i registeret)="
+msgstr "Nr, (kolonne i registeret)"
 
 #. "to make accessible"
 msgid "open, to"
@@ -530,19 +521,19 @@ msgstr "ordre"
 
 #. "Name of an automatically created account that holds splits that have no account."
 msgid "orphan"
-msgstr ""
+msgstr "foreldreløs"
 
 #. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner."
 msgid "owner (of bill, invoice or expense voucher)"
-msgstr ""
+msgstr "eier (av regning, faktura, eller utgiftsbilag)"
 
 #. "A secret phrase that one needs to know in order to get access to a user account "
 msgid "passphrase"
-msgstr "passord frase"
+msgstr "passordfrase"
 
 #. "An amount that must be paid / An amount for which money has not yet been received"
 msgid "Payables/Receivables"
-msgstr ""
+msgstr "Gjeld/fordringer"
 
 #. "A person to whom sth is paid"
 msgid "payee"
@@ -565,18 +556,16 @@ msgid "portfolio"
 msgstr "portefølje"
 
 #. "Register invoice, voucher in account register"
-#, fuzzy
 msgid "post, to"
-msgstr "Ã¥pne, til"
+msgstr "poster, til"
 
 #. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. "
 msgid "preferences"
 msgstr "instillinger"
 
 #. "Loan repayment calculator: your payments are split in interests payment and principal payment"
-#, fuzzy
 msgid "principal payment"
-msgstr "action: betaling"
+msgstr "hovedstol"
 
 #. "An amount of money for which sth may be bought or sold"
 msgid "price (in a split)"
@@ -584,23 +573,23 @@ msgstr "beløp (i en splitt)"
 
 #. "An ask is an offer to sell, and the price you want to sell at."
 msgid "price type: ask"
-msgstr "price type: tilbud"
+msgstr "pristype: tilbud"
 
 #. "A bid is an offer to buy, and the price you want to buy at."
 msgid "price type: bid"
-msgstr "price type: bud"
+msgstr "pristype: bud"
 
 #. "online quotes (rather: quotation!?) A statement of the current price of stocks or commodities"
 msgid "price: quotes"
-msgstr "Noteringer"
+msgstr "pris: noteringer"
 
 #. "Money gained in business, esp. the difference between the amount earned (sales) and the amount spent (expenses/cost): Profit is sales minus expenses/cost."
 msgid "profit"
-msgstr "fortjeneste"
+msgstr "resultat"
 
 #. "OBSOLETE. This report was renamed to 'income statement' on 2004-07-13. Old definition: A list that shows the amount of money spent compared with the amount earned by a business in a particular period"
 msgid "Profit & Loss"
-msgstr "Profitt & Tap"
+msgstr "Resultat & Tap"
 
 #. "-"
 msgid "quick-fill"
@@ -608,7 +597,7 @@ msgstr ""
 
 #. "-"
 msgid "rebalance, to (a transaction)"
-msgstr ""
+msgstr "avbalansere, til (en transaksjon)"
 
 #. "reconcile an account, a reconciled split. To find a way to make the bank's account statement agree with the user's recorded transactions in an account."
 msgid "reconcile, to"
@@ -624,11 +613,11 @@ msgstr "registrer"
 
 #. "A transaction that is divided into two or more parts"
 msgid "register entry: split transaction"
-msgstr "register entry: splitt transaksjon"
+msgstr "registeroppføring: splitt transaksjon"
 
 #. "-"
 msgid "register entry: stock split"
-msgstr "register entry: aksje splitt"
+msgstr "registeroppføring: aksje splitt"
 
 #. "one form of register"
 msgid "register: auto-split ledger"
@@ -636,7 +625,7 @@ msgstr ""
 
 #. "another form of register"
 msgid "register: basic ledger"
-msgstr ""
+msgstr "register: grunnbok"
 
 #. "another form of register"
 msgid "register: general ledger"
@@ -644,7 +633,7 @@ msgstr "register: hovedbok"
 
 #. "another form of register"
 msgid "register: transaction journal"
-msgstr "register: transaksjons journal"
+msgstr "register: transaksjonsjournal"
 
 #. "reload the current document"
 msgid "reload, to"
@@ -660,15 +649,15 @@ msgstr ""
 
 #. "name of an equity account (?); to be distinguished from the opening balance."
 msgid "Retained Earnings"
-msgstr ""
+msgstr "Beholdt inntjening"
 
 #. "Create a new transaction that is the inverse of the old one.  When you add the two together they completely cancel out.  Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
 msgid "reverse transaction, to (Action in the register)"
-msgstr ""
+msgstr "omvendt transaksjon (handling i register)"
 
 #. "(In the customer summary report) The total amount of money received because something was sold."
 msgid "sales"
-msgstr ""
+msgstr "salg"
 
 #. "To write data (typically a file) to a storage medium, such as a disk or tape."
 msgid "save, to (to a file)"
@@ -684,11 +673,11 @@ msgstr ""
 
 #. "A document or certificate showing who owns shares"
 msgid "security"
-msgstr ""
+msgstr "depositum"
 
 #. "-"
 msgid "Share Balance (register)"
-msgstr ""
+msgstr "Andelsbalanse (register)"
 
 #. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits"
 msgid "shares"
@@ -711,13 +700,12 @@ msgid "subtotal"
 msgstr "delsum"
 
 #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation"
-#, fuzzy
 msgid "tax code"
-msgstr "MVA Informasjon"
+msgstr "MVA-kode"
 
 #. "field of an account"
 msgid "tax info"
-msgstr "MVA Informasjon"
+msgstr "MVA-informasjon"
 
 #. "if you create a new e.g. style sheet, you can start from a template"
 msgid "template"
@@ -741,19 +729,19 @@ msgstr "transaksjon"
 
 #. "A transaction whose amount has actually been moved. The word comes from checks: a check is issued, but several steps have to be done until the amount is actually retrieved from the bank account, which is the point in time where that transaction (check) gets cleared."
 msgid "transaction state: cleared"
-msgstr ""
+msgstr "transaksjonstilstand: klarert"
 
 #. "-"
 msgid "transaction state: frozen"
-msgstr "transaction state: sperret"
+msgstr "transaksjonstilstand: sperret"
 
 #. "A transaction that was reconciled with the bank's statement."
 msgid "transaction state: reconciled"
-msgstr "transaction state: avstemt"
+msgstr "transaksjonstilstand: avstemt"
 
 #. "A transaction that is void i.e. not valid (anymore)."
 msgid "transaction state: voided"
-msgstr "transaction state: annulert"
+msgstr "transaksjonstilstand: annulert"
 
 #. "1. The action of transferring sth. 2. see: credit transfer"
 msgid "transfer (noun)"
@@ -768,9 +756,8 @@ msgid "transfer, to (register toolbar)"
 msgstr "overfor, til (registrerings verktøylinje)"
 
 #. "The trial balance is a worksheet on which you list all your general ledger accounts and their debit or credit balance. It is a tool that is used to alert you to errors in your books. The total debits must equal the total credits. If they don't equal, you know you have an error that must be tracked down."
-#, fuzzy
 msgid "trial balance (report)"
-msgstr "saldo (noun)"
+msgstr "saldo (substantiv)"
 
 #. "A class or things that have characteristics in common; type of an account, of a commodity etc."
 msgid "type"
@@ -786,16 +773,15 @@ msgstr "URL"
 
 #. "The worth of sth in terms of money or other commodities for which it can be exchanged"
 msgid "value (in a split)"
-msgstr "beløp"
+msgstr "beløp (i en splitt)"
 
 #. "In small business accounting: A person or company that sells items and is supplying goods"
 msgid "vendor"
 msgstr "leverandør"
 
 #. "The terms 'Voucher' and 'Expense Voucher' are used interchangeably in gnucash. The 'Expense Voucher' is also a bit of a misnomer -- it's more like an 'Expense Report' in gnucash.  The phrase is meant to be a list of expenses incurred by an employee for which the company will reminburse them."
-#, fuzzy
 msgid "voucher"
-msgstr "kilde"
+msgstr "bilag"
 
 #. "see debit"
 msgid "withdraw (in the reconcile dialog)"

commit 839ba137b9df8bf4f289ada1b2aad36e9e455f19
Author: John Erling Blad <jeblad at gmail.com>
Date:   Fri Feb 16 13:57:09 2018 +0100

    Partial update of Norwegian po-file

diff --git a/po/nb.po b/po/nb.po
index d2cced1..a21e77a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1172,7 +1172,7 @@ msgstr "<Uten navn>"
 
 #: ../gnucash/gnome/dialog-customer.c:439
 msgid "Edit Customer"
-msgstr "Endre Kunde"
+msgstr "Rediger kunde"
 
 #: ../gnucash/gnome/dialog-customer.c:441
 #: ../gnucash/gnome/gtkbuilder/dialog-customer.glade.h:1
@@ -1271,7 +1271,7 @@ msgstr "Du må fylle inn en adresse."
 
 #: ../gnucash/gnome/dialog-employee.c:294
 msgid "Edit Employee"
-msgstr "Endre ansatt"
+msgstr "Rediger ansatt"
 
 #: ../gnucash/gnome/dialog-employee.c:296
 #: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:1
@@ -4196,7 +4196,7 @@ msgstr "Rediger valgt konto"
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:146
 #, fuzzy
 msgid "E_dit Customer"
-msgstr "Endre kunde"
+msgstr "Rediger kunde"
 
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:147
 #, fuzzy

commit ff0f4ac8d7c8934a7e76a4534372f4b5d44260c4
Author: John Erling Blad <jeblad at gmail.com>
Date:   Fri Feb 16 13:43:55 2018 +0100

    Partial update of Norwegian po-file

diff --git a/po/nb.po b/po/nb.po
index 6a753e5..d2cced1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: GnuCash 2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-01-13 20:39+0100\n"
-"PO-Revision-Date: 2007-08-12 21:11+0200\n"
+"PO-Revision-Date: 2018-02-16 13:42+0100\n"
 "Last-Translator: sigvei <sigve.indregard at gmail.com>\n"
 "Language-Team: Norwegian <>\n"
 "Language: no\n"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: ../borrowed/goffice/go-charmap-sel.c:70
 msgid "Arabic"
@@ -440,7 +441,7 @@ msgstr "Periodeboken ble lukket."
 #. * that will be created. This is a ngettext(3) message (but
 #. * only for the %d part).
 #: ../gnucash/gnome/assistant-acct-period.c:315
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The earliest transaction date found in this book is %s. Based on the "
 "selection made above, this book will be split into %d book."
@@ -449,15 +450,13 @@ msgid_plural ""
 "selection made above, this book will be split into %d books."
 msgstr[0] ""
 "Den tidligste transaksjonsdatoen som ble funnet i denne periodeboken er %s. "
-"Basert på valget over, vil dette regnskapet bli delt i %d periodebøker. Velg "
-"'Neste' for å starte avslutningen av den første boken."
+"Basert på valget over, vil dette regnskapet bli delt i %d periodebok."
 msgstr[1] ""
 "Den tidligste transaksjonsdatoen som ble funnet i denne periodeboken er %s. "
-"Basert på valget over, vil dette regnskapet bli delt i %d periodebøker. Velg "
-"'Neste' for å starte avslutningen av den første boken."
+"Basert på valget over, vil dette regnskapet bli delt i %d periodebøker."
 
 #: ../gnucash/gnome/assistant-acct-period.c:369
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You have asked for a book to be created. This book will contain all "
 "transactions up to midnight %s (for a total of %d transactions spread over "
@@ -467,9 +466,11 @@ msgid ""
 " Click on 'Back' to adjust the dates or 'Cancel'."
 msgstr ""
 "Du har bedt om å opprette en periodebok. Denne boken vil inneholde alle "
-"transaksjoner frem til midnatt %s (innholdet er totalt %d transaksjoner "
-"fordelt på %d kontoer). Trykk 'Neste' for å opprette denne boken. Trykk "
-"'Tilbake' for å endre datoene."
+"transaksjoner frem til midnatt %s (for totalt %d transaksjoner fordelt på %d "
+"kontoer).\n"
+"\n"
+"Legg til tittel ognotat, eller trykk «Neste» for å fortsette.\n"
+"Trykk «Tilbake» for å endre datoene eller «Avbryt»."
 
 #: ../gnucash/gnome/assistant-acct-period.c:386
 #, c-format
@@ -482,19 +483,22 @@ msgid ""
 "The book will be created with the title %s when you click on 'Apply'. Click "
 "on 'Back' to adjust, or 'Cancel' to not create any book."
 msgstr ""
+"Periodeboken vil bli opprettet med tittelen %s når du trykker på «Utfør». "
+"Trykk på «Tilbake» for å endre, eller «Avbryt» for å ikke opprette noen "
+"periodebok."
 
 #. Translation FIXME: Can this %s-containing message please be
 #. replaced by one single message? Either this closing went
 #. successfully ("success", "congratulations") or something else
 #. should be displayed anyway.
 #: ../gnucash/gnome/assistant-acct-period.c:526
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Congratulations! You are done closing books!\n"
 msgstr ""
 "%s\n"
-"Gratulerer! Du har fullført periode avsluttningen(e)!"
+"Gratulerer! Du har avsluttet bøkene!\n"
 
 #. Change the text so that its more mainingful for this assistant
 #: ../gnucash/gnome/assistant-acct-period.c:592
@@ -517,19 +521,17 @@ msgstr "Kontotyper"
 
 #. Translators: '%s' is the name of the selected account hierarchy template.
 #: ../gnucash/gnome/assistant-hierarchy.c:557
-#, fuzzy, c-format
+#, c-format
 msgid "Accounts in '%s'"
-msgstr "<b>Kontoer i '%s'</b>"
+msgstr "Kontoer i «%s»"
 
 #: ../gnucash/gnome/assistant-hierarchy.c:565
-#, fuzzy
 msgid "No description provided."
-msgstr "(ingen beskrivelse)"
+msgstr "Ingen beskrivelse gitt."
 
 #: ../gnucash/gnome/assistant-hierarchy.c:580
-#, fuzzy
 msgid "Accounts in Category"
-msgstr "<b>Kontoer i kategori</b>"
+msgstr "Kontoer i kategori"
 
 #: ../gnucash/gnome/assistant-hierarchy.c:792
 msgid "zero"
@@ -572,60 +574,54 @@ msgid ""
 "new accounts. Accounts in other currencies must be\n"
 "added manually."
 msgstr ""
+"Du valgte en valuta for periodeboken og den vil bli\n"
+"brukt for nye kontoer. Kontoer i andre valutaer må\n"
+"legges til manuelt."
 
 #: ../gnucash/gnome/assistant-hierarchy.c:1145
-#, fuzzy
 msgid "Please choose the currency to use for new accounts."
-msgstr "Vennligst velg valuta som skal brukes for nye kontoer."
+msgstr "Vennligst velg valuta som brukes for nye kontoer."
 
 #. The options dialog gets added to the notebook so it doesn't need a parent.
 #: ../gnucash/gnome/assistant-hierarchy.c:1190
 #: ../gnucash/gnome/assistant-hierarchy.c:1209
 #: ../gnucash/gnome-utils/dialog-utils.c:679
-#, fuzzy
 msgid "New Book Options"
-msgstr "Bokalternativer"
+msgstr "Alternativer for nye bøker"
 
 #. { name, default txn memo, throughEscrowP, specSrcAcctP }
 #: ../gnucash/gnome/assistant-loan.c:114
-#, fuzzy
 msgid "Taxes"
-msgstr "_Skatt"
+msgstr "Skatter"
 
 #: ../gnucash/gnome/assistant-loan.c:114
-#, fuzzy
 msgid "Tax Payment"
-msgstr "Innbetaling"
+msgstr "Innbetaling skatt"
 
 #: ../gnucash/gnome/assistant-loan.c:115
-#, fuzzy
 msgid "Insurance"
-msgstr "Grensesnitt"
+msgstr "Forsikring"
 
 #: ../gnucash/gnome/assistant-loan.c:115
-#, fuzzy
 msgid "Insurance Payment"
-msgstr "Rentebetaling"
+msgstr "Innbetaling forsikring"
 
 #. Translators: PMI stands for Private Mortgage Insurance.
 #: ../gnucash/gnome/assistant-loan.c:117
 msgid "PMI"
-msgstr ""
+msgstr "Privat låneforsikring"
 
 #: ../gnucash/gnome/assistant-loan.c:117
-#, fuzzy
 msgid "PMI Payment"
-msgstr "Innbetaling"
+msgstr "Innbetaling privat låneforsikring"
 
 #: ../gnucash/gnome/assistant-loan.c:118
-#, fuzzy
 msgid "Other Expense"
-msgstr "Kostnad"
+msgstr "Annen kostnad"
 
 #: ../gnucash/gnome/assistant-loan.c:118
-#, fuzzy
 msgid "Miscellaneous Payment"
-msgstr "Utfør betaling"
+msgstr "Diverse betaling"
 
 #. Add payment checkbox.
 #. Translators: %s is "Taxes",
@@ -637,7 +633,7 @@ msgstr "... betal \"%s\"?"
 
 #: ../gnucash/gnome/assistant-loan.c:765
 msgid "via Escrow account?"
-msgstr "via en deponeringskonto?"
+msgstr "via deponeringskonto?"
 
 #: ../gnucash/gnome/assistant-loan.c:916
 #: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2903
@@ -647,9 +643,9 @@ msgstr "LÃ¥n"
 
 #. Translators: %s is "Taxes", or "Insurance", or similar
 #: ../gnucash/gnome/assistant-loan.c:1447
-#, fuzzy, c-format
+#, c-format
 msgid "Loan Repayment Option: \"%s\""
-msgstr "Finanskalkulator"
+msgstr "Valg for tilbakebetaling av lån: \"%s\""
 
 #. Translators: The following symbols will build the *
 #. * header line of exported CSV files:
@@ -763,9 +759,8 @@ msgid "Interest"
 msgstr "Rente"
 
 #: ../gnucash/gnome/assistant-loan.c:2749
-#, fuzzy
 msgid "Escrow Payment"
-msgstr "Ekstra betalinger"
+msgstr "Deponert betaling"
 
 #. Set split-action with gnc_set_num_action which is the same as
 #. * xaccSplitSetAction with these arguments
@@ -773,9 +768,8 @@ msgstr "Ekstra betalinger"
 #: ../gnucash/gnome/assistant-stock-split.c:382
 #: ../gnucash/gnome-utils/gnc-tree-model-split-reg.c:2956
 #: ../gnucash/register/ledger-core/split-register.c:2583
-#, fuzzy
 msgid "Action Column|Split"
-msgstr "Automatisk splitt"
+msgstr "Handlingskolonne|Splitt"
 
 #: ../gnucash/gnome/assistant-stock-split.c:413
 msgid "Error adding price."
@@ -828,7 +822,7 @@ msgstr "Symbol"
 #: ../gnucash/report/standard-reports/transaction.scm:904
 #: ../gnucash/report/standard-reports/transaction.scm:1041
 msgid "Shares"
-msgstr "Aksjer"
+msgstr "Andeler"
 
 #: ../gnucash/gnome/assistant-stock-split.c:781
 msgid "You don't have any stock accounts with balances!"
@@ -869,7 +863,7 @@ msgstr "Regning"
 #: ../gnucash/gnome/dialog-invoice.c:2577
 #: ../gnucash/gnome/dialog-invoice.c:2578
 msgid "Voucher"
-msgstr "Kupong"
+msgstr "Bilag"
 
 #. page / name / orderkey / tooltip / default
 #: ../gnucash/gnome/business-gnome-utils.c:225
@@ -937,18 +931,18 @@ msgstr "Ugyldig URL: %s"
 #: ../gnucash/gnome/business-urls.c:82
 #, c-format
 msgid "No such entity: %s"
-msgstr "Ingen slik enhet: %s"
+msgstr "Ingen slik entitet: %s"
 
 #. =================================================================
 #: ../gnucash/gnome/business-urls.c:170
 #, c-format
 msgid "No such owner entity: %s"
-msgstr "Finner ikke eier: %s"
+msgstr "Finner ikke eier-entitet: %s"
 
 #: ../gnucash/gnome/business-urls.c:279
 #, c-format
 msgid "Entity type does not match %s: %s"
-msgstr "Enhetstype stemmer ikke overens med %s: %s"
+msgstr "Entitetsstype stemmer ikke med %s: %s"
 
 #: ../gnucash/gnome/business-urls.c:289
 #, c-format
@@ -958,11 +952,11 @@ msgstr "Ugyldig URL %s"
 #: ../gnucash/gnome/business-urls.c:302
 #, c-format
 msgid "No such Account entity: %s"
-msgstr "Ingen slik kontoenhet: %s"
+msgstr "Ingen slik kontoentitet: %s"
 
 #: ../gnucash/gnome/dialog-billterms.c:267
 msgid "Discount days cannot be more than due days."
-msgstr ""
+msgstr "Rabatt dager kan ikke være mer enn forfallsdagene."
 
 #: ../gnucash/gnome/dialog-billterms.c:326
 msgid "You must provide a name for this Billing Term."
@@ -1041,8 +1035,8 @@ msgid ""
 "This commodity has price quotes. Are you sure you want to delete the "
 "selected commodity and its price quotes?"
 msgstr ""
-"Denne varen har tilknyttede priser. Er du sikker på at du vil slette den "
-"valgte varen og dens priser?"
+"Denne varen har prisopplysninger. Er du sikker på at du vil slette den "
+"valgte varen og dens prisopplysninger?"
 
 #: ../gnucash/gnome/dialog-commodities.c:177
 msgid "Are you sure you want to delete the selected commodity?"
@@ -1146,7 +1140,6 @@ msgid "_Delete"
 msgstr "S_lett"
 
 #: ../gnucash/gnome/dialog-customer.c:329
-#, fuzzy
 msgid ""
 "You must enter a company name. If this customer is an individual (and not a "
 "company) you should enter the same value for:\n"
@@ -1154,7 +1147,9 @@ msgid ""
 "Payment Address - Name."
 msgstr ""
 "Du må fylle inn et firmanavn. Hvis kunden er en person (og ikke et firma) "
-"bør \"firmanavn\" og \"kontaktnavn\" være like."
+"bør du bruke samme verdi for:\n"
+"Identifisering – firmanavn, og\n"
+"Betalingsadresse – kontaktnavn."
 
 #: ../gnucash/gnome/dialog-customer.c:341
 msgid "You must enter a billing address."
@@ -1259,9 +1254,8 @@ msgid "No Account selected. Please try again."
 msgstr "Konto er ikke valgt. Vennligst forsøk igjen."
 
 #: ../gnucash/gnome/dialog-date-close.c:82
-#, fuzzy
 msgid "Placeholder account selected. Please try again."
-msgstr "Konto er ikke valgt. Vennligst forsøk igjen."
+msgstr "Plassholder-konto er valgt. Vennligst forsøk igjen."
 
 #: ../gnucash/gnome/dialog-employee.c:199
 msgid "You must enter a username."
@@ -1277,7 +1271,7 @@ msgstr "Du må fylle inn en adresse."
 
 #: ../gnucash/gnome/dialog-employee.c:294
 msgid "Edit Employee"
-msgstr "Rediger ansatt"
+msgstr "Endre ansatt"
 
 #: ../gnucash/gnome/dialog-employee.c:296
 #: ../gnucash/gnome/gtkbuilder/dialog-employee.glade.h:1
@@ -1343,12 +1337,12 @@ msgid ""
 "GnuCash cannot determine the value in one of the fields. You must enter a "
 "valid expression."
 msgstr ""
-"GnuCash kan ikke gjenkjenne verdien i et av feltene. Du må fylle inn en "
-"gyldig verdi."
+"GnuCash kan ikke gjenkjenne verdien i et av feltene. Du må fylle inn et "
+"gyldig uttrykk."
 
 #: ../gnucash/gnome/dialog-fincalc.c:353
 msgid "The interest rate cannot be zero."
-msgstr "Rentefoten kan ikke være null."
+msgstr "Rentesatsen kan ikke være null."
 
 #: ../gnucash/gnome/dialog-fincalc.c:372
 msgid "The number of payments cannot be zero."
@@ -1356,22 +1350,19 @@ msgstr "Antall betalinger kan ikke være null."
 
 #: ../gnucash/gnome/dialog-fincalc.c:377
 msgid "The number of payments cannot be negative."
-msgstr "Antall betalinger kan ikke være et negativt tall."
+msgstr "Antall betalinger kan ikke være negativt."
 
 #: ../gnucash/gnome/dialog-find-account.c:310
-#, fuzzy
 msgid "Place Holder"
 msgstr "Plassholder"
 
 #: ../gnucash/gnome/dialog-find-account.c:321
-#, fuzzy
 msgid "Hidden"
 msgstr "Sk_jult"
 
 #: ../gnucash/gnome/dialog-find-account.c:332
-#, fuzzy
 msgid "Not Used"
-msgstr "Ikke planlagt"
+msgstr "Ikke brukt"
 
 #: ../gnucash/gnome/dialog-find-account.c:343
 #, fuzzy
@@ -1379,9 +1370,8 @@ msgid "Balance Zero"
 msgstr "Saldo (periode)"
 
 #: ../gnucash/gnome/dialog-find-account.c:361
-#, fuzzy
 msgid "Search from "
-msgstr " Søk "
+msgstr "Søk fra"
 
 #: ../gnucash/gnome/dialog-find-transactions2.c:107
 #: ../gnucash/gnome/dialog-find-transactions.c:106
@@ -1455,9 +1445,8 @@ msgstr "Posteringsdato"
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:624
 #: ../gnucash/report/standard-reports/income-gst-statement.scm:847
 #: ../gnucash/report/standard-reports/transaction.scm:217
-#, fuzzy
 msgid "Number/Action"
-msgstr "Nummervalg"
+msgstr "Nummer/handling"
 
 #: ../gnucash/gnome/dialog-find-transactions2.c:133
 #: ../gnucash/gnome/dialog-find-transactions2.c:170
@@ -1495,9 +1484,8 @@ msgstr "Handling"
 #: ../gnucash/import-export/csv-exp/csv-transactions-export.c:621
 #: ../gnucash/report/standard-reports/income-gst-statement.scm:851
 #: ../gnucash/report/standard-reports/transaction.scm:229
-#, fuzzy
 msgid "Transaction Number"
-msgstr "Transaksjonsjournal"
+msgstr "Transaksjonsnummer"
 
 #: ../gnucash/gnome/dialog-find-transactions2.c:137
 #: ../gnucash/gnome/dialog-find-transactions2.c:172
@@ -1516,12 +1504,12 @@ msgstr "Transaksjonsjournal"
 #: ../gnucash/report/standard-reports/income-gst-statement.scm:898
 #: ../gnucash/report/standard-reports/transaction.scm:223
 msgid "Number"
-msgstr "Tall"
+msgstr "Nummer"
 
 #: ../gnucash/gnome/dialog-find-transactions2.c:149
 #: ../gnucash/gnome/dialog-find-transactions.c:148
 msgid "Description, Notes, or Memo"
-msgstr ""
+msgstr "Beskrivelser, merknader, eller notater"
 
 #: ../gnucash/gnome/dialog-find-transactions2.c:153
 #: ../gnucash/gnome/dialog-find-transactions.c:152
@@ -1642,42 +1630,36 @@ msgid "Find Transaction"
 msgstr "Finn transaksjoner"
 
 #: ../gnucash/gnome/dialog-imap-editor.c:119
-#, fuzzy
 msgid "Are you sure you want to delete the entries ?"
-msgstr "Er du sikker på at du ønsker å slette oppføringen?"
+msgstr "Er du sikker på at du ønsker å slette oppføringene?"
 
 #: ../gnucash/gnome/dialog-imap-editor.c:412
-#, fuzzy
 msgid "Map Account NOT found"
-msgstr "Kontokode"
+msgstr "Kontotilordning IKKE funnet"
 
 #: ../gnucash/gnome/dialog-imap-editor.c:503
 #: ../gnucash/gnome/gtkbuilder/dialog-imap-editor.glade.h:5
 msgid "Bayesian"
-msgstr ""
+msgstr "Bayesisk"
 
 #. Description
 #: ../gnucash/gnome/dialog-imap-editor.c:518
-#, fuzzy
 msgid "Description Field"
 msgstr "Beskrivelse"
 
 #. Memo
 #: ../gnucash/gnome/dialog-imap-editor.c:521
-#, fuzzy
 msgid "Memo Field"
-msgstr "Felt"
+msgstr "Notat"
 
 #. CSV Account Map
 #: ../gnucash/gnome/dialog-imap-editor.c:524
-#, fuzzy
 msgid "CSV Account Map"
-msgstr "Kontonavn"
+msgstr "CSV kontotilordning"
 
 #: ../gnucash/gnome/dialog-imap-editor.c:561
-#, fuzzy
 msgid "Online Id"
-msgstr "Online"
+msgstr "Online-ID"
 
 #. Translators: In this context,
 #. * 'Billing information' maps to the
@@ -1686,17 +1668,17 @@ msgstr "Online"
 #. * invoiced.
 #: ../gnucash/gnome/dialog-invoice.c:405 ../gnucash/gnome/dialog-order.c:182
 msgid "You need to supply Billing Information."
-msgstr "Du må fylle inn faktureringsinformasjon."
+msgstr "Du må fylle inn fakturainformasjon."
 
 #: ../gnucash/gnome/dialog-invoice.c:592
 msgid "Are you sure you want to delete the selected entry?"
-msgstr "Er du sikker på at du ønsker å slette valgte linje?"
+msgstr "Er du sikker på at du ønsker å slette den valgte oppføringen?"
 
 #: ../gnucash/gnome/dialog-invoice.c:594
 msgid ""
 "This entry is attached to an order and will be deleted from that as well!"
 msgstr ""
-"Fakturalinjen er koplet til en ordre, og vil bli slettet fra denne også!"
+"Fakturalinjen er koplet til en ordre, og vil også bli slettet fra denne!"
 
 #: ../gnucash/gnome/dialog-invoice.c:703 ../gnucash/gnome/dialog-invoice.c:3110
 #: ../gnucash/gnome/dialog-invoice.c:3144
@@ -1742,10 +1724,12 @@ msgid ""
 "One or more of the entries are for accounts different from the invoice/bill "
 "currency. You will be asked a conversion rate for each."
 msgstr ""
+"En eller flere av linjene er for kontoer forskjellig fra faktura-/"
+"regningsvalutaen. Du vil bli spurt om vekslingskurs for hver enkelt."
 
 #: ../gnucash/gnome/dialog-invoice.c:971
 msgid "The post action was canceled because not all exchange rates were given."
-msgstr ""
+msgstr "Posthandlingen ble kansellert fordi ikke alle valutakurser ble gitt."
 
 #: ../gnucash/gnome/dialog-invoice.c:1242
 #: ../gnucash/gnome/window-reconcile2.c:1149
@@ -1783,16 +1767,14 @@ msgstr "Sum fakturerbart:"
 #: ../gnucash/report/business-reports/invoice.scm:682
 #: ../gnucash/report/business-reports/invoice.scm:686
 #: ../libgnucash/engine/gncInvoice.c:996
-#, fuzzy
 msgid "Credit Note"
-msgstr "Kreditkonto"
+msgstr "Kreditnota"
 
 #: ../gnucash/gnome/dialog-invoice.c:1942
 #: ../gnucash/gnome/dialog-invoice.c:1961
 #: ../gnucash/gnome/dialog-invoice.c:1980
-#, fuzzy
 msgid "New Credit Note"
-msgstr "Kreditkonto"
+msgstr "Ny kreditnota"
 
 #: ../gnucash/gnome/dialog-invoice.c:1943
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:275
@@ -1804,9 +1786,8 @@ msgstr "Ny faktura"
 #: ../gnucash/gnome/dialog-invoice.c:1948
 #: ../gnucash/gnome/dialog-invoice.c:1967
 #: ../gnucash/gnome/dialog-invoice.c:1986
-#, fuzzy
 msgid "Edit Credit Note"
-msgstr "Rediger rapportoppsett"
+msgstr "Rediger kredittnota"
 
 #: ../gnucash/gnome/dialog-invoice.c:1949
 msgid "Edit Invoice"
@@ -1815,9 +1796,8 @@ msgstr "Rediger faktura"
 #: ../gnucash/gnome/dialog-invoice.c:1952
 #: ../gnucash/gnome/dialog-invoice.c:1971
 #: ../gnucash/gnome/dialog-invoice.c:1990
-#, fuzzy
 msgid "View Credit Note"
-msgstr "Vis/rediger jobb"
+msgstr "Vis kredittnota"
 
 #: ../gnucash/gnome/dialog-invoice.c:1953
 msgid "View Invoice"
@@ -1852,9 +1832,8 @@ msgstr "Vis utgiftsbilag"
 
 #: ../gnucash/gnome/dialog-invoice.c:2390
 #: ../gnucash/gnome/dialog-invoice.c:2569
-#, fuzzy
 msgid "Bill Information"
-msgstr "Fakturainformasjon"
+msgstr "Regningsinformasjon"
 
 #: ../gnucash/gnome/dialog-invoice.c:2392
 #: ../gnucash/gnome/dialog-invoice.c:2572
@@ -1864,9 +1843,8 @@ msgstr "Regnings-ID"
 
 #: ../gnucash/gnome/dialog-invoice.c:2395
 #: ../gnucash/gnome/dialog-invoice.c:2576
-#, fuzzy
 msgid "Voucher Information"
-msgstr "Fakturainformasjon"
+msgstr "Bilagsinformasjon"
 
 #: ../gnucash/gnome/dialog-invoice.c:2397
 #: ../gnucash/gnome/dialog-invoice.c:2579
@@ -1875,20 +1853,20 @@ msgid "Voucher ID"
 msgstr "Bilags-ID"
 
 #: ../gnucash/gnome/dialog-invoice.c:2918
-#, fuzzy
 msgid "Date of duplicated entries"
-msgstr "Finn duplikattransaksjoner"
+msgstr "Dato for duplikattransaksjoner"
 
 #: ../gnucash/gnome/dialog-invoice.c:2973
 msgid ""
 "One or more selected invoices have already been posted.\n"
 "Re-check your selection."
 msgstr ""
+"En eller flere av valgte fakturaene har allerede blitt postert.\n"
+"Kontroller ditt utvalg på nytt."
 
 #: ../gnucash/gnome/dialog-invoice.c:2977
-#, fuzzy
 msgid "Do you really want to post these invoices?"
-msgstr "Vil du virkelig postere fakturaen?"
+msgstr "Vil du virkelig postere disse fakturaene?"
 
 #: ../gnucash/gnome/dialog-invoice.c:3055
 #: ../gnucash/gnome/dialog-invoice.c:3337
@@ -1914,9 +1892,8 @@ msgstr "Poster"
 #: ../gnucash/gnome/dialog-invoice.c:3059
 #: ../gnucash/gnome/dialog-invoice.c:3068
 #: ../gnucash/gnome/dialog-invoice.c:3079
-#, fuzzy
 msgid "Printable Report"
-msgstr "Enkel rapport"
+msgstr "Utskrivbar rapport"
 
 #: ../gnucash/gnome/dialog-invoice.c:3064
 #: ../gnucash/gnome/dialog-invoice.c:3331
@@ -1927,7 +1904,7 @@ msgstr "Vis/rediger regning"
 #. interchangeably in gnucash and mean the same thing.
 #: ../gnucash/gnome/dialog-invoice.c:3075
 msgid "View/Edit Voucher"
-msgstr "Vis/rediger utgiftsbilag"
+msgstr "Vis/rediger bilag"
 
 #: ../gnucash/gnome/dialog-invoice.c:3089
 msgid "Invoice Owner"
@@ -2083,7 +2060,7 @@ msgstr "Finn faktura"
 #. the condition "Is this invoice a Credit Note?"
 #: ../gnucash/gnome/dialog-invoice.c:3347
 msgid "CN?"
-msgstr ""
+msgstr "KN?"
 
 #. note the "Amount" multichoice option here
 #: ../gnucash/gnome/dialog-invoice.c:3349
@@ -2120,29 +2097,28 @@ msgstr "Beløp"
 #. Translators: %d is the number of bills/credit notes due. This is a
 #. ngettext(3) message.
 #: ../gnucash/gnome/dialog-invoice.c:3435
-#, fuzzy, c-format
+#, c-format
 msgid "The following vendor document is due:"
 msgid_plural "The following %d vendor documents are due:"
-msgstr[0] "Følgende regning er forfalt"
-msgstr[1] "Følgende regning er forfalt"
+msgstr[0] "Følgende regning er forfalt:"
+msgstr[1] "Følgende %d regninger er forfalt:"
 
 #: ../gnucash/gnome/dialog-invoice.c:3439
 msgid "Due Bills Reminder"
-msgstr "PÃ¥minner for forfalte regninger"
+msgstr "PÃ¥minning for forfalte regninger"
 
 #. Translators: %d is the number of invoices/credit notes due. This is a
 #. ngettext(3) message.
 #: ../gnucash/gnome/dialog-invoice.c:3446
-#, fuzzy, c-format
+#, c-format
 msgid "The following customer document is due:"
 msgid_plural "The following %d customer documents are due:"
-msgstr[0] "Følgende regning er forfalt"
-msgstr[1] "Følgende regning er forfalt"
+msgstr[0] "Følgende kundefordring er forfalt:"
+msgstr[1] "Følgende %d kundefordringer er forfalt"
 
 #: ../gnucash/gnome/dialog-invoice.c:3450
-#, fuzzy
 msgid "Due Invoices Reminder"
-msgstr "PÃ¥minner for forfalte regninger"
+msgstr "PÃ¥minning for forfalte fakturaer"
 
 #: ../gnucash/gnome/dialog-job.c:139
 msgid "The Job must be given a name."
@@ -2237,6 +2213,7 @@ msgstr "Tittel"
 #: ../gnucash/report/standard-reports/account-summary.scm:460
 #: ../gnucash/report/standard-reports/register.scm:174
 #: ../gnucash/report/standard-reports/sx-summary.scm:465
+#, fuzzy
 msgid "Balance"
 msgstr "Saldo"
 
@@ -2313,9 +2290,8 @@ msgid "Find Order"
 msgstr "Finn ordre"
 
 #: ../gnucash/gnome/dialog-payment.c:228
-#, fuzzy
 msgid "You must enter a valid account name for posting."
-msgstr "Du må fylle inn et kontonavn for postering."
+msgstr "Du må fylle inn et gyldig kontonavn for postering."
 
 #: ../gnucash/gnome/dialog-payment.c:236
 msgid "You must select a company for payment processing."
@@ -2334,6 +2310,8 @@ msgid ""
 "The transfer and post accounts are associated with different currencies. "
 "Please specify the conversion rate."
 msgstr ""
+"Konto og motkonto er forbundet med forskjellige valutaer. Vennligst angi "
+"vekslingskurs."
 
 #. Translators: "Markup" is profit amount divided by sales amount
 #: ../gnucash/gnome/dialog-payment.c:1200
@@ -2388,7 +2366,7 @@ msgid ""
 "an Invoice or Bill first?"
 msgstr ""
 "Du har ingen gyldig \"postér til\"-konto. Vennligst lag en konto av typen "
-"\"%s\" før du fortsetter å behandle denne betalinger. Kanskje du vil "
+"\"%s\" før du fortsetter å behandle denne betalingen. Kanskje du vil "
 "opprettet en faktura eller regning først?"
 
 #: ../gnucash/gnome/dialog-payment.c:1500
@@ -2396,6 +2374,7 @@ msgid ""
 "The selected transaction doesn't have splits that can be assigned as a "
 "payment"
 msgstr ""
+"Den valgte overføringen har ikke splitter som kan tilordnes som en betaling"
 
 #: ../gnucash/gnome/dialog-payment.c:1514
 msgid ""
@@ -2404,17 +2383,19 @@ msgid ""
 "Please select one, the others will be ignored.\n"
 "\n"
 msgstr ""
+"Selv om denne overføringen har flere splitter som kan anses\n"
+"som «betalingssplitten», så vet gnucash kun hvordan én skal håndteres.\n"
+"Vennligst velg en, de andre vil bli ignorert.\n"
+"\n"
 
 #: ../gnucash/gnome/dialog-payment.c:1517
-#, fuzzy
 msgid "Warning"
-msgstr "Nullstill advarsler"
+msgstr "Advarsler"
 
 #: ../gnucash/gnome/dialog-payment.c:1520
 #: ../gnucash/gnome/dialog-payment.c:1638
-#, fuzzy
 msgid "Continue"
-msgstr "Kontinuerlig"
+msgstr "Fortsett"
 
 #: ../gnucash/gnome/dialog-payment.c:1521
 #: ../gnucash/gnome/gnc-plugin-page-invoice.c:260
@@ -2434,14 +2415,20 @@ msgid ""
 "%s\n"
 "Do you wish to continue and ignore these splits ?"
 msgstr ""
+"Overføringen har minst en splitt i en firmakonto som ikke er del av en "
+"forretningsoverføring.\n"
+"Hvis du fortsetter vil disse splittene bli ignorert:\n"
+"\n"
+"%s\n"
+"Vil du fortsette og ignorere disse splittene?"
 
 #. Translators: %d is the number of prices. This is a ngettext(3) message.
 #: ../gnucash/gnome/dialog-price-edit-db.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete the selected price?"
 msgid_plural "Are you sure you want to delete the %d selected prices?"
 msgstr[0] "Er du sikker på at du vil slette den valgte prisen?"
-msgstr[1] "Er du sikker på at du vil slette %d valgte priser?"
+msgstr[1] "Er du sikker på at du vil slette de %d valgte prisene?"
 
 #: ../gnucash/gnome/dialog-price-edit-db.c:197
 msgid "Delete prices?"
@@ -2456,17 +2443,14 @@ msgid "Entries"
 msgstr "Oppføringer"
 
 #: ../gnucash/gnome/dialog-price-edit-db.c:451
-#, fuzzy
 msgid "Are you sure you want to delete these prices ?"
-msgstr "Er du sikker på at du vil slette den valgte prisen?"
+msgstr "Er du sikker på at du vil slette disse valgte prisene?"
 
 #: ../gnucash/gnome/dialog-price-editor.c:213
-#, fuzzy
 msgid "You must select a Security."
-msgstr "Du må velge en valuta."
+msgstr "Du må velge et verdipapir."
 
 #: ../gnucash/gnome/dialog-price-editor.c:218
-#, fuzzy
 msgid "You must select a Currency."
 msgstr "Du må velge en valuta."
 
@@ -2478,11 +2462,12 @@ msgstr "Du må oppgi et gyldig beløp."
 #: ../gnucash/gnome/dialog-print-check.c:819
 #, fuzzy
 msgid "Cannot save check format file."
-msgstr "Du kan ikke lagre til den filen."
+msgstr "Du kan ikke lagre kontrollformatfil."
 
 #: ../gnucash/gnome/dialog-print-check.c:1507
+#, fuzzy
 msgid "There is a duplicate check format file."
-msgstr ""
+msgstr "Det finnes en duplisert kontrollformatfil."
 
 #. Translators: %1$s is the type of the first check
 #. * format (user defined or application defined); %2$s
@@ -2490,27 +2475,27 @@ msgstr ""
 #. * the other check format; and %4$s the filename of
 #. * that other format.
 #: ../gnucash/gnome/dialog-print-check.c:1515
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The GUIDs in the %s check format file '%s' and the %s check format file '%s' "
 "match."
 msgstr ""
+"GUID i %s kontrollformatfilen «%s» og %s kontrollformatfilen «%s» stemmer "
+"overens."
 
 #. Translators: This is a directory name. It may be presented to
 #. * the user to indicate that some data file was defined by the
 #. * gnucash application.
 #: ../gnucash/gnome/dialog-print-check.c:1556
-#, fuzzy
 msgid "application"
-msgstr "Avslutt programmet"
+msgstr "program"
 
 #. Translators: This is a directory name. It may be presented to
 #. * the user to indicate that some data file was defined by a
 #. * user herself.
 #: ../gnucash/gnome/dialog-print-check.c:1564
-#, fuzzy
 msgid "user"
-msgstr "Kunde"
+msgstr "bruker"
 
 #: ../gnucash/gnome/dialog-print-check.c:1588
 #: ../gnucash/gnome/dialog-print-check.c:2601
@@ -2531,9 +2516,8 @@ msgstr "Øverst"
 
 #: ../gnucash/gnome/dialog-progress.c:484
 #: ../gnucash/gnome/dialog-progress.c:533
-#, fuzzy
 msgid "(paused)"
-msgstr " (postert)"
+msgstr " (pauset)"
 
 #: ../gnucash/gnome/dialog-progress.c:768
 #: ../gnucash/gnome/dialog-progress.c:771
@@ -2576,11 +2560,10 @@ msgstr "Komm_andoer"
 
 #: ../gnucash/gnome/dialog-sx-editor2.c:199
 #: ../gnucash/gnome/dialog-sx-editor.c:201
-#, fuzzy
 msgid ""
 "This Scheduled Transaction has changed; are you sure you want to cancel?"
 msgstr ""
-"Denne planlagte kommandoen er endret; er du sikker på at du vil avbryte?"
+"Denne planlagte transaksjonen er endret; er du sikker på at du vil avbryte?"
 
 #: ../gnucash/gnome/dialog-sx-editor2.c:636
 #, c-format
@@ -2662,6 +2645,8 @@ msgid ""
 "Note: If you have already accepted changes to the Template, Cancel will not "
 "revoke them."
 msgstr ""
+"Merk: Hvis du allerede har akseptert endring av malen, så vil ikke «avbryt» "
+"endre disse."
 
 #: ../gnucash/gnome/dialog-sx-editor2.c:1346
 #: ../gnucash/gnome/dialog-sx-editor.c:1382
@@ -3148,7 +3133,7 @@ msgstr "_Verdipapir-redigering"
 
 #: ../gnucash/gnome/gnc-plugin-basic-commands.c:197
 msgid "View and edit the commodities for stocks and mutual funds"
-msgstr "Vis og endre varene for aksjer og fond"
+msgstr "Vis og rediger varene for aksjer og fond"
 
 #: ../gnucash/gnome/gnc-plugin-basic-commands.c:201
 #, fuzzy
@@ -3311,9 +3296,8 @@ msgid "_Customer"
 msgstr "_Kunde"
 
 #: ../gnucash/gnome/gnc-plugin-business.c:157
-#, fuzzy
 msgid "Customers Overview"
-msgstr "Kundens fakturaer"
+msgstr "Kundeoversikt"
 
 #: ../gnucash/gnome/gnc-plugin-business.c:158
 #, fuzzy
@@ -4212,7 +4196,7 @@ msgstr "Rediger valgt konto"
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:146
 #, fuzzy
 msgid "E_dit Customer"
-msgstr "Endre Kunde"
+msgstr "Endre kunde"
 
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:147
 #, fuzzy
@@ -4331,7 +4315,7 @@ msgstr "Ansattrapport"
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:276
 #, fuzzy
 msgid "New Voucher"
-msgstr "Kupong"
+msgstr "Nytt bilag"
 
 #: ../gnucash/gnome/gnc-plugin-page-owner-tree.c:477
 #, fuzzy
@@ -5032,7 +5016,7 @@ msgstr "Transaksjonsjournal"
 #, c-format
 msgid "This transaction is marked read-only with the comment: '%s'"
 msgstr ""
-"Denne transaksjonen er satt som skrivebeskyttet med følgende kommentar: '%s'"
+"Denne transaksjonen er satt som skrivebeskyttet med følgende kommentar: «%s»"
 
 #: ../gnucash/gnome/gnc-plugin-page-register.c:3149
 #: ../gnucash/gnome/gnc-split-reg.c:766
@@ -5297,7 +5281,7 @@ msgstr "Den gjeldende transaksjonen er ikke i balanse."
 #: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:963
 #, c-format
 msgid "Delete the split '%s' from the transaction '%s'?"
-msgstr "Slett splitt '%s' fra transaksjon '%s'?"
+msgstr "Slett splitt «%s» fra transaksjon «%s»?"
 
 #: ../gnucash/gnome/gnc-split-reg.c:1193
 #: ../gnucash/gnome-utils/gnc-tree-control-split-reg.c:964
@@ -5398,7 +5382,7 @@ msgid ""
 "If active, only the 'active' items in the current class will be searched. "
 "Otherwise all items in the current class will be searched."
 msgstr ""
-"Hvis aktiv søkes det bare etter 'aktive' oppføringer i gjeldende kategori. "
+"Hvis aktiv søkes det bare etter «aktive» oppføringer i gjeldende kategori. "
 "Ellers vil det søkes etter alle oppføringer."
 
 #: ../gnucash/gnome/gschemas/org.gnucash.dialogs.business.gschema.xml.in.in.h:5
@@ -5605,7 +5589,7 @@ msgid ""
 "any valid strftime string; for more information about this format, read the "
 "manual page of strftime by \"man 3 strftime\"."
 msgstr ""
-"Hvis 'date_format' settes til et egendefinert datoformat, vil denne verdien "
+"Hvis «date_format» settes til et egendefinert datoformat, vil denne verdien "
 "brukes som et argument til strftime for å omgjøre datoen til tekst. Dette "
 "kan være en hvilken som helst gyldig strftime-streng; for mer informasjon "
 "les manualen til strftime, tilgjengelig ved kommandoen \"man 3 strftime\"."
@@ -5830,7 +5814,7 @@ msgid ""
 "or only in 'active' items in the current class."
 msgstr ""
 "Denne innstillingen bestemmer om det skal søkes blant alle enheter i den "
-"gjeldende klassen, eller bare i enheter merket 'aktive' i den gjeldende "
+"gjeldende klassen, eller bare i enheter merket «aktive» i den gjeldende "
 "klassen."
 
 #: ../gnucash/gnome/gschemas/org.gnucash.dialogs.gschema.xml.in.in.h:6
@@ -6654,7 +6638,7 @@ msgid ""
 "transactions in expanded form."
 msgstr ""
 "Dette feltet spesifiserer forvalgt visningsstil når et nytt register åpnes. "
-"Mulige verdier er 'hovedbok', 'auto-hovedbok' og 'journal'. \"Hovedbok\" "
+"Mulige verdier er «hovedbok», «auto-hovedbok» og «journal». \"Hovedbok\" "
 "viser hver transaksjon på en eller to linjer. \"Auto-hovedbok\" gjør det "
 "samme, men utvider også gjeldende transaksjon for å vise alle splitter. "
 "\"Journal\"-innstillingen viser alle transaksjoner i utvidet form."
@@ -7099,7 +7083,7 @@ msgstr ""
 "aktiva (som f.eks. investeringer, sjekk eller sparekontoer), gjeld (som f."
 "eks lån) og andre typer inntekter og utgifter som du har.\n"
 "\n"
-"Trykk 'Avbryt' hvis du ikke vil opprette nye kontoer nå."
+"Trykk «Avbryt» hvis du ikke vil opprette nye kontoer nå."
 
 #: ../gnucash/gnome/gtkbuilder/assistant-hierarchy.glade.h:6
 msgid "New Account Hierarchy Setup"
@@ -7583,7 +7567,7 @@ msgid ""
 "the details of that payment here. Otherwise, just click `Forward'."
 msgstr ""
 "Hvis du mottok penger som en følge av aksjesplitten (Cash in lieu), skriv "
-"inn detaljene for den betalingen her. Hvis ikke, trykk 'Neste'."
+"inn detaljene for den betalingen her. Hvis ikke, trykk «Neste»."
 
 #: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:16
 msgid "_Amount:"
@@ -7618,8 +7602,8 @@ msgid ""
 "making any changes."
 msgstr ""
 "Hvis du er ferdig med opprettelsen av aksjesplitten eller -fusjonen, trykk "
-"'Bruk'. Du kan også velge 'Tilbake' for å se gjennom dine endringer, eller "
-"'Avbryt' for å avslutte uten å registrere endringene."
+"«Bruk». Du kan også velge «Tilbake» for å se gjennom dine endringer, eller "
+"«Avbryt» for å avslutte uten å registrere endringene."
 
 #: ../gnucash/gnome/gtkbuilder/assistant-stock-split.glade.h:23
 #, fuzzy
@@ -9253,7 +9237,7 @@ msgstr "_Auto-opprett nye transaksjoner"
 
 #: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:29
 msgid "Set the 'auto-create' flag on newly created scheduled transactions."
-msgstr "Aktiver 'auto-opprett' på nyopprettede planlagte transaksjoner."
+msgstr "Aktiver «auto-opprett» på nyopprettede planlagte transaksjoner."
 
 #: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:30
 #, fuzzy
@@ -9284,7 +9268,7 @@ msgstr "_Varsle før transaksjoner blir opprettet "
 
 #: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:36
 msgid "Set the 'notify' flag on newly created scheduled transactions."
-msgstr "Aktiver 'varsle' på nyopprettede planlagte transaksjoner."
+msgstr "Aktiver «varsle» på nyopprettede planlagte transaksjoner."
 
 #: ../gnucash/gnome/gtkbuilder/dialog-sx.glade.h:37
 msgid "Edit Scheduled Transaction"
@@ -9829,7 +9813,7 @@ msgstr "Sorteringsrekkefølge"
 #: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:52
 #, fuzzy
 msgid "Save the sort order for this register."
-msgstr "Rediger hovedkontoen for dette registeret"
+msgstr "Lagre sorteringsorden for dette registeret."
 
 #: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:53
 #, fuzzy
@@ -9839,7 +9823,7 @@ msgstr "Registerrekkefølge"
 #: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:54
 #, fuzzy
 msgid "Sort in descending order."
-msgstr "Sorter kolonnen stigende eller synkende"
+msgstr "Sorter kolonnen stigende eller synkende."
 
 #: ../gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade.h:60
 #, fuzzy
@@ -10457,7 +10441,7 @@ msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
-"Feil i regulært uttrykk '%s':\n"
+"Feil i regulært uttrykk «%s»:\n"
 "%s"
 
 #: ../gnucash/gnome-search/search-string.c:264
@@ -10513,11 +10497,11 @@ msgid ""
 "\n"
 "You can also go back and verify your selections by clicking on 'Back'."
 msgstr ""
-"Filen har blitt lastet. Hvis du trykker 'Bruk' vil den bli lagret og "
+"Filen har blitt lastet. Hvis du trykker «Bruk» vil den bli lagret og "
 "omlastet inn i hovedprogrammet. På den måten vil du ha en fungerende fil som "
 "sikkerhetskopi i samme katalog.\n"
 "\n"
-"Du kan også gå tilbake og se gjennom dine valg ved å trykke 'Tilbake'."
+"Du kan også gå tilbake og se gjennom dine valg ved å trykke «Tilbake»."
 
 #: ../gnucash/gnome-utils/assistant-xml-encoding.c:226
 msgid "European"
@@ -13507,7 +13491,7 @@ msgstr "Avslutt GnuCash XML-import"
 
 #: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:8
 msgid "Edit the list of encodings"
-msgstr "Vis og rediger listen over tegnkodinger"
+msgstr "Rediger listen over tegnkodinger"
 
 #: ../gnucash/gnome-utils/gtkbuilder/assistant-xml-encoding.glade.h:11
 msgid "<b>S_ystem input encodings</b>"
@@ -13839,7 +13823,7 @@ msgstr "_Saldo:"
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:62
 msgid "_Use equity 'Opening Balances' account"
-msgstr "Bruk egenkapitalskontoen 'Inngående balanse'"
+msgstr "Bruk egenkapitalskontoen «Inngående balanse»"
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-account.glade.h:63
 msgid "_Select transfer account"
@@ -14225,7 +14209,7 @@ msgstr "Bruk debet og kredit som merkelapper"
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:32
 #, fuzzy
 msgid "Use only 'debit' and 'credit' instead of informal synonyms."
-msgstr "Bruk bare 'debet' og 'kredit' i stedet for informative synonymer"
+msgstr "Bruk bare «debet» og «kredit» i stedet for informative synonymer"
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:33
 msgid "<b>Labels</b>"
@@ -14553,7 +14537,7 @@ msgstr "<b>Handlinger</b>"
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:129
 msgid "'_Enter' moves to blank transaction"
-msgstr "'Linj_eskift' flytter til ny transaksjon"
+msgstr "«Linj_eskift» flytter til ny transaksjon"
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:130
 #, fuzzy
@@ -14562,8 +14546,8 @@ msgid ""
 "transaction in the register. If clear, pressing the 'Enter' key will move "
 "down one row."
 msgstr ""
-"Hvis valgt vil 'linjeskift' flytte til en ny transaksjon i slutten av "
-"registeret. Hvis ikke vil 'linjeskift' flytte til neste transaksjon."
+"Hvis valgt vil «linjeskift» flytte til en ny transaksjon i slutten av "
+"registeret. Hvis ikke vil «linjeskift» flytte til neste transaksjon."
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:131
 msgid "_Auto-raise lists"
@@ -14627,7 +14611,7 @@ msgstr "<b>_Kontoer</b>"
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:145
 #, fuzzy
 msgid "_Future transactions after blank transaction"
-msgstr "'Linj_eskift' flytter til ny transaksjon"
+msgstr "«Linj_eskift» flytter til ny transaksjon"
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:146
 msgid ""
@@ -14855,7 +14839,7 @@ msgid ""
 "'Close' menu item."
 msgstr ""
 "Vis en lukk-knapp på hver notisblokk-fane. Denne funksjonen er identisk med "
-"menyalternativet 'Lukk'."
+"menyalternativet «Lukk»."
 
 #: ../gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade.h:221
 msgid "_Width:"
@@ -16346,8 +16330,8 @@ msgid ""
 "The internal check of the destination IBAN '%s' failed. This means the "
 "account number might contain an error."
 msgstr ""
-"Den interne kontrollen av målkontonummeret '%s' hos den valgte banken med "
-"bankkode '%s' mislyktes. Dette betyr at kontonummeret kan inneholde en feil. "
+"Den interne kontrollen av målkontonummeret «%s» hos den valgte banken med "
+"bankkode «%s» mislyktes. Dette betyr at kontonummeret kan inneholde en feil. "
 "Skal onlineoverføringen sendes med dette kontonummeret likevel?"
 
 #: ../gnucash/import-export/aqb/dialog-ab-trans.c:537
@@ -16357,8 +16341,8 @@ msgid ""
 "bank with bank code '%s' failed. This means the account number might contain "
 "an error."
 msgstr ""
-"Den interne kontrollen av målkontonummeret '%s' hos den valgte banken med "
-"bankkode '%s' mislyktes. Dette betyr at kontonummeret kan inneholde en feil. "
+"Den interne kontrollen av målkontonummeret «%s» hos den valgte banken med "
+"bankkode «%s» mislyktes. Dette betyr at kontonummeret kan inneholde en feil. "
 "Skal onlineoverføringen sendes med dette kontonummeret likevel?"
 
 #: ../gnucash/import-export/aqb/dialog-ab-trans.c:610
@@ -17075,7 +17059,7 @@ msgstr ""
 #, fuzzy
 msgid "Custom regular expression"
 msgstr ""
-"Feil i regulært uttrykk '%s':\n"
+"Feil i regulært uttrykk «%s»:\n"
 "%s"
 
 #: ../gnucash/import-export/bi-import/gtkbuilder/dialog-bi-import-gui.glade.h:16
@@ -17531,7 +17515,7 @@ msgstr "Startdato"
 #, fuzzy
 msgid "Custom regular Expression"
 msgstr ""
-"Feil i regulært uttrykk '%s':\n"
+"Feil i regulært uttrykk «%s»:\n"
 "%s"
 
 #: ../gnucash/import-export/csv-imp/assistant-csv-account-import.glade.h:20
@@ -19495,7 +19479,7 @@ msgstr ""
 "\n"
 "PÃ¥ den neste siden vil du se teksten i betalingsmottaker- og notatfeltene "
 "for transaksjoner uten QIF-konto eller -kategori. SSom standard vil disse "
-"transaksjonene legges inn i kontoen 'Uspesifisert' i GnuCash. Hvis du velger "
+"transaksjonene legges inn i kontoen «Uspesifisert» i GnuCash. Hvis du velger "
 "en annen konto, vil den huskes for fremtidige QIF-filer."
 
 #: ../gnucash/import-export/qif-imp/assistant-qif-import.glade.h:54
@@ -20568,12 +20552,12 @@ msgid ""
 "Cannot modify or delete this transaction. This transaction is marked read-"
 "only because:\n"
 "\n"
-"'%s'"
+"«%s»"
 msgstr ""
 "Kan ikke modifisere eller slette denne transaksjonen. Denne transaksjonen er "
 "skrivebeskyttet grunnet:\n"
 "\n"
-"'%s'"
+"«%s»"
 
 #: ../gnucash/register/ledger-core/split-register-model.c:2062
 #, fuzzy
@@ -24074,11 +24058,11 @@ msgstr "Kredittlinjer"
 
 #: ../gnucash/report/report-system/report-utilities.scm:690
 msgid "Building '%s' report ..."
-msgstr "Bygger '%s' rapport ..."
+msgstr "Bygger «%s» rapport ..."
 
 #: ../gnucash/report/report-system/report-utilities.scm:696
 msgid "Rendering '%s' report ..."
-msgstr "Gjengir '%s' rapport ..."
+msgstr "Gjengir «%s» rapport ..."
 
 #: ../gnucash/report/standard-reports/account-piecharts.scm:38
 msgid "Income Piechart"
@@ -29667,23 +29651,20 @@ msgid "Perform financial calculations, such as a loan repayment"
 msgstr ""
 
 #: ../gnucash/gnome/gnucash.desktop.in.in.h:1
-#, fuzzy
 msgid "GnuCash"
-msgstr "GnuCash %s"
+msgstr "GnuCash"
 
 #: ../gnucash/gnome/gnucash.desktop.in.in.h:2
-#, fuzzy
 msgid "Finance Management"
-msgstr "GnuCash finansforvaltning"
+msgstr "Finansforvaltning"
 
 #: ../gnucash/gnome/gnucash.desktop.in.in.h:3
 msgid "Manage your finances, accounts, and investments"
 msgstr "Forvalt dine finanser, kontoer og investeringer"
 
 #: ../libgnucash/engine/qofbookslots.h:66
-#, fuzzy
 msgid "Use Trading Accounts"
-msgstr "eksisterende konto"
+msgstr "Bruk handelskonto"
 
 #: ../libgnucash/engine/qofbookslots.h:67
 #, fuzzy
@@ -29710,12 +29691,11 @@ msgstr ""
 
 #: ../libgnucash/engine/qofbookslots.h:72
 msgid "Use Split Action Field for Number"
-msgstr ""
+msgstr "Bruk splitthandlingsfeltet for nummer"
 
 #: ../libgnucash/engine/qofbookslots.h:74
-#, fuzzy
 msgid "Budgeting"
-msgstr "Budsjett"
+msgstr "Budsjettering"
 
 #: ../libgnucash/engine/qofbookslots.h:75
 #, fuzzy
@@ -29737,15 +29717,12 @@ msgstr "_Slett budsjett"
 #. * OPTION-NAME-DEFAULT-BUDGET
 #.
 #: ../doc/tip_of_the_day.list.in:1
-#, fuzzy
 msgid ""
 "The GnuCash online manual has lots of helpful information. You can access "
 "the manual under the Help menu."
 msgstr ""
-"Onlineversjonen av GnuCash manualen har mye nyttig informasjon. Hvis du "
-"oppgraderer fra en tidligere versjon av GnuCash, er kapitlet \"Hva er nytt i "
-"GnuCash 2.0\" mest sannsynlig av interesse. Tilgang til manualen får du i "
-"Hjelp-menyen."
+"Onlineversjonen av GnuCash manualen har mye nyttig informasjon. Du kan nå "
+"manualen under Hjelp-menyen."
 
 #: ../doc/tip_of_the_day.list.in:4
 msgid ""
@@ -29756,8 +29733,8 @@ msgid ""
 msgstr ""
 "Du kan enkelt importere eksisterende data fra Quicken, MS Money eller andre "
 "programmer som kan eksportere QIF- eller OFX-filer. I Fil-menyen finner du "
-"undermenyen Importer, velg deretter QIF- eller OFX-fil. Følg instruksjonene "
-"for å importere."
+"undermenyen Importer, velg deretter QIF- eller OFX-fil. Følg deretter de "
+"angitte instruksjonene."
 
 #: ../doc/tip_of_the_day.list.in:9
 msgid ""
@@ -29817,7 +29794,7 @@ msgid ""
 msgstr ""
 "Ved inntasting av beløp under registreringen kan du bruke GnuCash-"
 "kalkulatoren til å addere, subtrahere, multiplisere og dividere. Dette "
-"gjøres ved å skrive inn første verdi, så bruk '+', '-', '*' eller '/', fyll "
+"gjøres ved å skrive inn første verdi, så bruk «+», «-», «*» eller «/», fyll "
 "så inn neste verdi, og trykk enter for å fylle inn kalkulert verdi."
 
 #: ../doc/tip_of_the_day.list.in:35
@@ -29844,7 +29821,7 @@ msgstr ""
 "Skriv inn de første bokstavene av et eksisterende kontonavn i kolonnen for "
 "Motkonto, og GnuCash vil fullføre navnet fra kontoplanen. For underkontoer, "
 "skriv inn de(n) første bokstaven(e) av den overordnede kontoen, deretter "
-"':', og til slutt de(n) første bokstaven(e) i underkontoen (f.eks. I:L for "
+"«:», og til slutt de(n) første bokstaven(e) i underkontoen (f.eks. I:L for "
 "Inntekter:Lønn)."
 
 #: ../doc/tip_of_the_day.list.in:46
@@ -29863,8 +29840,8 @@ msgid ""
 "selected date. You can use '+' and '-' to increment and decrement check "
 "numbers as well."
 msgstr ""
-"Ved inntasting av datoer kan du bruke '+' eller '-' før å gå frem eller "
-"tilbake en dag. Du kan bruke '+' og '-' til å endre kvitteringsnummer også."
+"Ved inntasting av datoer kan du bruke «+» eller «-» før å gå frem eller "
+"tilbake en dag. Du kan bruke «+» og «-» til å endre kvitteringsnummer også."
 
 #: ../doc/tip_of_the_day.list.in:54
 msgid ""
@@ -29951,7 +29928,6 @@ msgstr ""
 "irc.gnome.org"
 
 #: ../doc/tip_of_the_day.list.in:95
-#, fuzzy
 msgid ""
 "There is a theory that if ever anyone discovers what the Universe is for and "
 "why it is here, it will instantly disappear and be replaced with something "
@@ -29962,9 +29938,10 @@ msgid ""
 msgstr ""
 "Det finnes en teori som sier at dersom noen oppdager hva universet er til "
 "for og hvorfor det er her, vil det umiddelbart forsvinne og erstattes med "
-"noe enda mer bisart og uforståelig. Det finnes også en teori som sier at "
-"dette allerede har skjedd. Douglas Adams, \"Restauranten ved universets slutt"
-"\""
+"noe enda mer bisart og uforståelig.\n"
+"Det finnes også en teori som sier at dette allerede har skjedd.\n"
+"\n"
+"Douglas Adams, «Restauranten ved universets slutt»"
 
 #: ../doc/tip_of_the_day.list.in:102
 msgid ""
@@ -29974,8 +29951,12 @@ msgid ""
 msgstr ""
 
 #: ../doc/tip_of_the_day.list.in:106
+#, fuzzy
 msgid ""
 "To visually compare on screen the contents of 2 tabs, in one of the tabs, "
 "select Window -> New Window with Page from the menu to duplicate that tab in "
 "a new window."
 msgstr ""
+"For å visuelt sammenligne på skjermen innholdet i to arkfaner, i en av "
+"arkfanene velg Vindu -> Nytt vindu med side fra menyen for å duplisere den "
+"arkfanen i et nytt vindu."



Summary of changes:
 .gitignore                                         |     1 +
 CMakeLists.txt                                     |    42 +-
 HACKING                                            |     2 +-
 NEWS                                               |   124 +
 bindings/python/tests/CMakeLists.txt               |     7 +-
 common/cmake_modules/GncAddGSchemaTargets.cmake    |    15 +-
 common/cmake_modules/MakeDistCheck.cmake           |     2 +
 data/accounts/C/acctchrt_business.gnucash-xea      |    60 +-
 data/accounts/C/acctchrt_common.gnucash-xea        |    60 +-
 data/accounts/C/acctchrt_full.gnucash-xea          |    53 +-
 data/accounts/de_AT/acctchrt_auto.gnucash-xea      |    58 +-
 data/accounts/de_AT/acctchrt_brokerage.gnucash-xea |    58 +-
 .../accounts/de_AT/acctchrt_investment.gnucash-xea |    58 +-
 data/accounts/de_AT/acctchrt_kids.gnucash-xea      |    58 +-
 data/accounts/de_DE/acctchrt_autoloan.gnucash-xea  |    58 +-
 data/accounts/de_DE/acctchrt_common.gnucash-xea    |    60 +-
 data/accounts/de_DE/acctchrt_full.gnucash-xea      |    59 +-
 data/accounts/de_DE/acctchrt_houseown.gnucash-xea  |    58 +-
 .../accounts/de_DE/acctchrt_otherasset.gnucash-xea |    58 +-
 data/accounts/de_DE/acctchrt_otherloan.gnucash-xea |    58 +-
 data/accounts/de_DE/acctchrt_skr03.gnucash-xea     |     7 +-
 data/accounts/de_DE/acctchrt_skr04.gnucash-xea     |     7 +-
 data/accounts/de_DE/acctchrt_skr49.gnucash-xea     |     7 +-
 data/accounts/de_DE/acctchrt_studium.gnucash-xea   |    58 +-
 data/accounts/de_DE/acctchrt_wohnungsw.gnucash-xea |    19 +-
 data/accounts/en_GB/acctchrt_brokerage.gnucash-xea |    58 +-
 data/accounts/en_GB/acctchrt_carloan.gnucash-xea   |    59 +-
 .../accounts/en_GB/acctchrt_cdmoneymkt.gnucash-xea |    58 +-
 data/accounts/en_GB/acctchrt_checkbook.gnucash-xea |    59 +-
 data/accounts/en_GB/acctchrt_childcare.gnucash-xea |    58 +-
 data/accounts/en_GB/acctchrt_eduloan.gnucash-xea   |    58 +-
 .../en_GB/acctchrt_fixedassets.gnucash-xea         |    58 +-
 data/accounts/en_GB/acctchrt_homeloan.gnucash-xea  |    58 +-
 data/accounts/en_GB/acctchrt_homeown.gnucash-xea   |    58 +-
 data/accounts/en_GB/acctchrt_otherloan.gnucash-xea |    58 +-
 data/accounts/en_GB/acctchrt_renter.gnucash-xea    |    58 +-
 data/accounts/en_GB/acctchrt_retiremt.gnucash-xea  |    58 +-
 data/accounts/en_GB/acctchrt_spouseinc.gnucash-xea |    58 +-
 .../en_GB/acctchrt_spouseretire.gnucash-xea        |    58 +-
 data/accounts/ru/CMakeLists.txt                    |     4 +
 data/accounts/ru/acctchrt_auto.gnucash-xea         |   180 +
 data/accounts/ru/acctchrt_autoloan.gnucash-xea     |   142 +
 data/accounts/ru/acctchrt_common.gnucash-xea       |   548 +-
 data/accounts/ru/acctchrt_homeloan.gnucash-xea     |    92 +-
 data/accounts/ru/acctchrt_homeown.gnucash-xea      |   112 +-
 data/accounts/ru/acctchrt_kids.gnucash-xea         |   153 +
 data/accounts/ru/acctchrt_otherloan.gnucash-xea    |   142 +
 data/accounts/ru/acctchrt_renter.gnucash-xea       |    89 +-
 data/pixmaps/CMakeLists.txt                        |     4 +-
 doc/CMakeLists.txt                                 |     4 +-
 doc/gnc-fq-dump.1                                  |     4 +-
 ...ip_of_the_day.list.in => tip_of_the_day.list.c} |     0
 gnucash/CMakeLists.txt                             |     8 +-
 gnucash/gnome-search/CMakeLists.txt                |    12 +-
 gnucash/gnome-utils/CMakeLists.txt                 |    15 +-
 gnucash/gnome-utils/dialog-account.c               |    17 +-
 gnucash/gnome-utils/dialog-tax-table.c             |     8 +-
 gnucash/gnome-utils/dialog-tax-table.h             |     4 +-
 gnucash/gnome-utils/gnc-tree-view-commodity.c      |     2 +-
 gnucash/gnome-utils/gnc-tree-view-split-reg.c      |    12 +-
 gnucash/gnome-utils/gnome-utils.i                  |     2 +-
 gnucash/gnome-utils/gtkbuilder/CMakeLists.txt      |    26 -
 gnucash/gnome-utils/ui/CMakeLists.txt              |    17 -
 gnucash/gnome/CMakeLists.txt                       |    57 +-
 gnucash/gnome/assistant-hierarchy.c                |    37 +-
 gnucash/gnome/dialog-billterms.c                   |     8 +-
 gnucash/gnome/dialog-billterms.h                   |     2 +-
 gnucash/gnome/dialog-find-transactions.c           |     3 +-
 gnucash/gnome/dialog-find-transactions.h           |     2 +-
 gnucash/gnome/gnc-plugin-account-tree.c            |     1 +
 gnucash/gnome/gnc-plugin-basic-commands.c          |     2 +-
 gnucash/gnome/gnc-plugin-budget.c                  |     1 +
 gnucash/gnome/gnc-plugin-business.c                |     4 +-
 gnucash/gnome/gnc-plugin-page-account-tree.c       |     3 +
 gnucash/gnome/gnc-plugin-page-budget.c             |     3 +
 gnucash/gnome/gnc-plugin-page-invoice.c            |     6 +-
 gnucash/gnome/gnc-plugin-page-owner-tree.c         |     4 +
 gnucash/gnome/gnc-plugin-page-register.c           |    10 +-
 gnucash/gnome/gnc-plugin-page-sx-list.c            |     4 +
 gnucash/gnome/gnc-plugin-register.c                |     1 +
 gnucash/gnome/gnucash.appdata.xml.in               |    24 +-
 gnucash/gnome/gnucash.desktop.in.in                |     6 +-
 gnucash/gnome/gtkbuilder/CMakeLists.txt            |    41 -
 gnucash/gnome/reconcile-view.c                     |     3 +-
 gnucash/gnucash-bin.c                              |     4 +-
 gnucash/gschemas/CMakeLists.txt                    |    12 +-
 ...=> org.gnucash.dialogs.business.gschema.xml.in} |     0
 ...g.gnucash.dialogs.checkprinting.gschema.xml.in} |     0
 ...org.gnucash.dialogs.commodities.gschema.xml.in} |     0
 .../org.gnucash.dialogs.export.csv.gschema.xml.in} |     0
 ...ml.in.in => org.gnucash.dialogs.gschema.xml.in} |     0
 .../org.gnucash.dialogs.import.csv.gschema.xml.in} |     0
 ....gnucash.dialogs.import.generic.gschema.xml.in} |     0
 .../org.gnucash.dialogs.import.qif.gschema.xml.in} |     0
 ...> org.gnucash.dialogs.reconcile.gschema.xml.in} |     0
 ...n.in => org.gnucash.dialogs.sxs.gschema.xml.in} |     0
 ....in => org.gnucash.dialogs.totd.gschema.xml.in} |     0
 ...g.gnucash.general.finance-quote.gschema.xml.in} |     0
 ...schema.xml.in.in => org.gnucash.gschema.xml.in} |     0
 ...ml.in.in => org.gnucash.history.gschema.xml.in} |     0
 ...l.in.in => org.gnucash.warnings.gschema.xml.in} |     0
 ...ucash.window.pages.account.tree.gschema.xml.in} |     0
 ....in => org.gnucash.window.pages.gschema.xml.in} |     0
 gnucash/gtkbuilder/CMakeLists.txt                  |    71 +
 .../gtkbuilder/assistant-acct-period.glade         |     0
 .../assistant-csv-account-import.glade             |     0
 .../assistant-csv-export.glade                     |     0
 .../assistant-csv-price-import.glade               |    12 +-
 .../assistant-csv-trans-import.glade               |     6 +-
 .../gtkbuilder/assistant-hierarchy.glade           |     8 +
 .../{gnome => }/gtkbuilder/assistant-loan.glade    |     0
 .../assistant-qif-import.glade                     |     0
 .../gtkbuilder/assistant-stock-split.glade         |     0
 .../gtkbuilder/assistant-xml-encoding.glade        |     0
 .../gtkbuilder/business-options-gnome.glade        |     0
 .../{gnome => }/gtkbuilder/business-prefs.glade    |     0
 .../dialog-account-picker.glade                    |     0
 .../gtkbuilder/dialog-account.glade                |     0
 .../gtkbuilder/dialog-bi-import-gui.glade          |     1 -
 .../{gnome => }/gtkbuilder/dialog-billterms.glade  |     3 -
 .../gtkbuilder/dialog-book-close.glade             |     0
 .../gtkbuilder/dialog-choose-owner.glade           |     0
 .../gtkbuilder/dialog-commodities.glade            |     0
 .../gtkbuilder/dialog-commodity.glade              |     0
 .../dialog-custom-report.glade                     |     1 +
 .../gtkbuilder/dialog-customer-import-gui.glade    |     1 -
 .../{gnome => }/gtkbuilder/dialog-customer.glade   |     0
 .../{gnome => }/gtkbuilder/dialog-date-close.glade |     0
 .../{gnome => }/gtkbuilder/dialog-employee.glade   |     0
 .../gtkbuilder/dialog-file-access.glade            |     0
 .../{gnome => }/gtkbuilder/dialog-fincalc.glade    |     0
 .../gtkbuilder/dialog-find-account.glade           |     0
 .../gtkbuilder/dialog-imap-editor.glade            |     0
 .../dialog-import.glade                            |     2 -
 .../{gnome => }/gtkbuilder/dialog-invoice.glade    |     0
 gnucash/{gnome => }/gtkbuilder/dialog-job.glade    |     0
 .../{gnome => }/gtkbuilder/dialog-lot-viewer.glade |     0
 .../{gnome => }/gtkbuilder/dialog-new-user.glade   |     0
 .../gtkbuilder/dialog-object-references.glade      |     0
 .../gtkbuilder/dialog-options.glade                |     0
 gnucash/{gnome => }/gtkbuilder/dialog-order.glade  |     0
 .../{gnome => }/gtkbuilder/dialog-payment.glade    |     0
 .../gtkbuilder/dialog-preferences.glade            |     0
 gnucash/{gnome => }/gtkbuilder/dialog-price.glade  |     0
 .../gtkbuilder/dialog-print-check.glade            |     0
 .../{gnome => }/gtkbuilder/dialog-progress.glade   |     0
 .../gtkbuilder/dialog-query-view.glade             |     0
 .../dialog-report.glade                            |     3 -
 .../gtkbuilder/dialog-reset-warnings.glade         |     1 -
 .../dialog-search.glade                            |     0
 gnucash/{gnome => }/gtkbuilder/dialog-sx.glade     |     0
 .../{gnome => }/gtkbuilder/dialog-tax-info.glade   |     0
 .../gtkbuilder/dialog-tax-table.glade              |     1 -
 .../{gnome-utils => }/gtkbuilder/dialog-totd.glade |     0
 .../gtkbuilder/dialog-trans-assoc.glade            |     0
 .../gtkbuilder/dialog-transfer.glade               |     0
 .../gtkbuilder/dialog-userpass.glade               |     0
 gnucash/{gnome => }/gtkbuilder/dialog-vendor.glade |     0
 .../gtkbuilder/gnc-date-format.glade               |     0
 .../gtkbuilder/gnc-frequency.glade                 |     0
 .../gtkbuilder/gnc-plugin-page-budget.glade        |     0
 .../gtkbuilder/gnc-plugin-page-register.glade      |     4 -
 .../gtkbuilder/gnc-plugin-page-register2.glade     |     0
 .../gtkbuilder/gnc-recurrence.glade                |     0
 .../gtkbuilder/gnc-tree-view-owner.glade           |     0
 .../{gnome => }/gtkbuilder/window-autoclear.glade  |     0
 .../{gnome => }/gtkbuilder/window-reconcile.glade  |     0
 gnucash/import-export/CMakeLists.txt               |    12 +-
 gnucash/import-export/aqb/gschemas/CMakeLists.txt  |     2 +-
 ...org.gnucash.dialogs.import.hbci.gschema.xml.in} |     0
 gnucash/import-export/bi-import/CMakeLists.txt     |     7 +-
 .../import-export/bi-import/dialog-bi-import-gui.c |     2 +
 .../bi-import/gtkbuilder/CMakeLists.txt            |     7 -
 gnucash/import-export/bi-import/ui/CMakeLists.txt  |     7 -
 gnucash/import-export/csv-exp/CMakeLists.txt       |    22 +-
 .../import-export/csv-exp/gschemas/CMakeLists.txt  |     6 -
 gnucash/import-export/csv-imp/CMakeLists.txt       |    60 +-
 .../csv-imp/assistant-csv-price-import.cpp         |    54 +-
 .../csv-imp/assistant-csv-trans-import.cpp         |   155 +-
 .../import-export/csv-imp/gnc-csv-tokenizer.cpp    |    67 -
 ...gnc-price-props.cpp => gnc-imp-props-price.cpp} |     6 +-
 ...gnc-price-props.hpp => gnc-imp-props-price.hpp} |     6 +-
 .../{gnc-trans-props.cpp => gnc-imp-props-tx.cpp}  |     4 +-
 .../{gnc-trans-props.hpp => gnc-imp-props-tx.hpp}  |     4 +-
 ...settings.cpp => gnc-imp-settings-csv-price.cpp} |    30 +-
 ...settings.hpp => gnc-imp-settings-csv-price.hpp} |    11 +-
 ...rt-settings.cpp => gnc-imp-settings-csv-tx.cpp} |    30 +-
 ...rt-settings.hpp => gnc-imp-settings-csv-tx.hpp} |    11 +-
 ...mport-settings.cpp => gnc-imp-settings-csv.cpp} |    23 +-
 ...mport-settings.hpp => gnc-imp-settings-csv.hpp} |    16 +-
 .../{gnc-price-import.cpp => gnc-import-price.cpp} |    12 +-
 .../{gnc-price-import.hpp => gnc-import-price.hpp} |     8 +-
 .../{gnc-tx-import.cpp => gnc-import-tx.cpp}       |    22 +-
 .../{gnc-tx-import.hpp => gnc-import-tx.hpp}       |     8 +-
 .../import-export/csv-imp/gnc-tokenizer-csv.cpp    |    78 +
 ...gnc-csv-tokenizer.hpp => gnc-tokenizer-csv.hpp} |     4 +-
 ...dummy-tokenizer.cpp => gnc-tokenizer-dummy.cpp} |     2 +-
 ...dummy-tokenizer.hpp => gnc-tokenizer-dummy.hpp} |     7 +-
 .../{gnc-fw-tokenizer.cpp => gnc-tokenizer-fw.cpp} |     2 +-
 .../{gnc-fw-tokenizer.hpp => gnc-tokenizer-fw.hpp} |     4 +-
 gnucash/import-export/csv-imp/gnc-tokenizer.cpp    |     6 +-
 gnucash/import-export/csv-imp/gnc-tokenizer.hpp    |     2 +-
 .../import-export/csv-imp/gschemas/CMakeLists.txt  |     5 -
 .../import-export/csv-imp/test/test-tokenizer.cpp  |    34 +-
 .../import-export/csv-imp/test/test-tx-import.cpp  |     6 +-
 .../import-export/customer-import/CMakeLists.txt   |     6 +-
 .../customer-import/dialog-customer-import-gui.c   |     4 +-
 .../customer-import/dialog-customer-import-gui.h   |     2 +-
 .../customer-import/gnc-plugin-customer-import.c   |     2 +-
 .../customer-import/gtkbuilder/CMakeLists.txt      |     6 -
 .../customer-import/ui/CMakeLists.txt              |     6 -
 gnucash/import-export/gschemas/CMakeLists.txt      |     6 -
 gnucash/import-export/import-account-matcher.c     |     7 +-
 gnucash/import-export/import-main-matcher.c        |     5 +-
 gnucash/import-export/log-replay/CMakeLists.txt    |     9 +-
 gnucash/import-export/ofx/gnc-ofx-import.c         |     8 +-
 gnucash/import-export/ofx/gschemas/CMakeLists.txt  |     2 +-
 ... org.gnucash.dialogs.import.ofx.gschema.xml.in} |     0
 gnucash/import-export/qif-imp/CMakeLists.txt       |    18 +-
 .../import-export/qif-imp/gschemas/CMakeLists.txt  |     6 -
 .../register/ledger-core/gncEntryLedgerControl.c   |     2 +-
 gnucash/register/ledger-core/split-register.c      |     6 +-
 .../register/register-gnome/gnucash-item-edit.c    |     3 +-
 gnucash/report/business-reports/aging.scm          |    22 +-
 gnucash/report/business-reports/easy-invoice.scm   |     4 +-
 gnucash/report/business-reports/fancy-invoice.scm  |    30 +-
 gnucash/report/business-reports/invoice.scm        |     2 +-
 gnucash/report/business-reports/job-report.scm     |     6 +-
 gnucash/report/locale-specific/us/taxtxf.scm       |    42 +-
 gnucash/report/report-gnome/CMakeLists.txt         |    15 +-
 gnucash/report/report-gnome/dialog-custom-report.c |     2 +
 .../report-gnome/dialog-report-column-view.c       |     6 +-
 .../report-gnome/dialog-report-style-sheet.c       |     8 +-
 .../report-gnome/dialog-report-style-sheet.h       |     2 +-
 .../report/report-gnome/gnc-plugin-page-report.c   |     7 +
 gnucash/report/report-system/html-utilities.scm    |    20 +-
 gnucash/report/report-system/report.scm            |   102 +-
 gnucash/report/standard-reports/CMakeLists.txt     |     9 -
 .../report/standard-reports/average-balance.scm    |     8 +-
 .../report/standard-reports/budget-barchart.scm    |     4 +-
 .../report/standard-reports/cashflow-barchart.scm  |     6 +-
 gnucash/report/standard-reports/daily-reports.scm  |     1 -
 .../report/standard-reports/income-statement.scm   |     2 +-
 gnucash/report/standard-reports/net-barchart.scm   |     4 +-
 gnucash/report/standard-reports/net-linechart.scm  |     4 +-
 gnucash/report/standard-reports/sx-summary.scm     |     1 -
 .../report/standard-reports/test/CMakeLists.txt    |     1 +
 .../standard-reports/test/test-transaction.scm     |   877 +
 gnucash/report/standard-reports/transaction.scm    |   205 +-
 gnucash/report/stylesheets/CMakeLists.txt          |     9 +-
 .../report/stylesheets/gnc-plugin-stylesheets.c    |     2 +-
 gnucash/{gnome => }/ui/CMakeLists.txt              |    22 +-
 .../{gnome-utils => }/ui/gnc-main-window-ui.xml    |     0
 .../{gnome => }/ui/gnc-plugin-account-tree-ui.xml  |     0
 .../ui/gnc-plugin-basic-commands-ui.xml            |     0
 .../bi-import => }/ui/gnc-plugin-bi-import-ui.xml  |     0
 gnucash/{gnome => }/ui/gnc-plugin-budget-ui.xml    |     0
 gnucash/{gnome => }/ui/gnc-plugin-business-ui.xml  |     0
 .../csv-exp => ui}/gnc-plugin-csv-export-ui.xml    |     0
 .../csv-imp => ui}/gnc-plugin-csv-import-ui.xml    |     0
 .../ui/gnc-plugin-customer-import-ui.xml           |     0
 .../{gnome => }/ui/gnc-plugin-file-history-ui.xml  |     0
 .../log-replay => ui}/gnc-plugin-log-replay-ui.xml |     0
 .../ui/gnc-plugin-page-account-tree-ui.xml         |     0
 .../ui/gnc-plugin-page-account-tree2-ui.xml        |     0
 .../{gnome => }/ui/gnc-plugin-page-budget-ui.xml   |     0
 .../{gnome => }/ui/gnc-plugin-page-invoice-ui.xml  |     0
 .../ui/gnc-plugin-page-owner-tree-ui.xml           |     0
 .../{gnome => }/ui/gnc-plugin-page-register-ui.xml |     0
 .../ui/gnc-plugin-page-register2-ui.xml            |     0
 .../gnc-plugin-page-report-ui.xml                  |     0
 .../{gnome => }/ui/gnc-plugin-page-sx-list-ui.xml  |     0
 .../{gnome => }/ui/gnc-plugin-page-sx-list2-ui.xml |     0
 .../ui/gnc-plugin-page-sxregister-ui.xml           |     0
 .../qif-imp => ui}/gnc-plugin-qif-import-ui.xml    |     0
 gnucash/{gnome => }/ui/gnc-plugin-register-ui.xml  |     0
 gnucash/{gnome => }/ui/gnc-plugin-register2-ui.xml |     0
 .../{gnome => }/ui/gnc-plugin-register22-ui.xml    |     0
 .../gnc-plugin-stylesheets-ui.xml                  |     0
 gnucash/{gnome => }/ui/gnc-reconcile-window-ui.xml |     0
 .../ui/gnc-sxed-to-create-window-ui.xml            |     0
 gnucash/{gnome => }/ui/gnc-sxed-window-ui-full.xml |     0
 gnucash/{gnome => }/ui/gnc-sxed-window-ui.xml      |     0
 .../ui/gnc-windows-menu-ui-quartz.xml              |     0
 .../{gnome-utils => }/ui/gnc-windows-menu-ui.xml   |     0
 gnucash/{gnome-utils => }/ui/osx_accel_map         |     0
 libgnucash/app-utils/app-utils.scm                 |     3 +-
 libgnucash/app-utils/date-utilities.scm            |    14 +-
 libgnucash/app-utils/options.scm                   |     4 +-
 libgnucash/core-utils/gnc-filepath-utils.cpp       |   217 +-
 libgnucash/core-utils/gnc-path.c                   |    50 +-
 libgnucash/doc/design/top-level.texi               |     2 +-
 libgnucash/engine/Account.cpp                      |     2 +
 libgnucash/engine/gnc-commodity.c                  |    40 +-
 libgnucash/engine/gnc-numeric.cpp                  |    13 +
 libgnucash/engine/gnc-numeric.hpp                  |     8 +-
 libgnucash/engine/guid.cpp                         |     4 +-
 libgnucash/engine/guid.hpp                         |     1 +
 libgnucash/engine/test/gtest-gnc-numeric.cpp       |     9 +-
 libgnucash/engine/test/gtest-gnc-timezone.cpp      |    32 +-
 libgnucash/engine/test/test-extras.scm             |    74 +-
 po/CMakeLists.txt                                  |   105 +-
 po/POTFILES.ignore                                 |    10 -
 po/POTFILES.in                                     |   192 +-
 po/POTFILES.skip                                   |   103 +-
 po/check-po.cmake                                  |    23 -
 po/es.po                                           | 18967 +++++++++----------
 po/glossary/nb.po                                  |   193 +-
 po/gnucash-pot.cmake                               |    40 +-
 po/nb.po                                           |   402 +-
 util/ci/arch-testscript                            |     2 +
 util/ci/commonbuild                                |     4 +-
 util/ci/ubuntu-14.04-testscript                    |     2 +
 313 files changed, 14656 insertions(+), 11933 deletions(-)
 create mode 100644 data/accounts/ru/acctchrt_auto.gnucash-xea
 create mode 100644 data/accounts/ru/acctchrt_autoloan.gnucash-xea
 create mode 100644 data/accounts/ru/acctchrt_kids.gnucash-xea
 create mode 100644 data/accounts/ru/acctchrt_otherloan.gnucash-xea
 rename doc/{tip_of_the_day.list.in => tip_of_the_day.list.c} (100%)
 delete mode 100644 gnucash/gnome-utils/gtkbuilder/CMakeLists.txt
 delete mode 100644 gnucash/gnome-utils/ui/CMakeLists.txt
 delete mode 100644 gnucash/gnome/gtkbuilder/CMakeLists.txt
 rename gnucash/gschemas/{org.gnucash.dialogs.business.gschema.xml.in.in => org.gnucash.dialogs.business.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.dialogs.checkprinting.gschema.xml.in.in => org.gnucash.dialogs.checkprinting.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.dialogs.commodities.gschema.xml.in.in => org.gnucash.dialogs.commodities.gschema.xml.in} (100%)
 rename gnucash/{import-export/csv-exp/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in.in => gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.dialogs.gschema.xml.in.in => org.gnucash.dialogs.gschema.xml.in} (100%)
 rename gnucash/{import-export/csv-imp/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in.in => gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in} (100%)
 rename gnucash/{import-export/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in.in => gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in} (100%)
 rename gnucash/{import-export/qif-imp/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in.in => gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.dialogs.reconcile.gschema.xml.in.in => org.gnucash.dialogs.reconcile.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.dialogs.sxs.gschema.xml.in.in => org.gnucash.dialogs.sxs.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.dialogs.totd.gschema.xml.in.in => org.gnucash.dialogs.totd.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.general.finance-quote.gschema.xml.in.in => org.gnucash.general.finance-quote.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.gschema.xml.in.in => org.gnucash.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.history.gschema.xml.in.in => org.gnucash.history.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.warnings.gschema.xml.in.in => org.gnucash.warnings.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.window.pages.account.tree.gschema.xml.in.in => org.gnucash.window.pages.account.tree.gschema.xml.in} (100%)
 rename gnucash/gschemas/{org.gnucash.window.pages.gschema.xml.in.in => org.gnucash.window.pages.gschema.xml.in} (100%)
 create mode 100644 gnucash/gtkbuilder/CMakeLists.txt
 rename gnucash/{gnome => }/gtkbuilder/assistant-acct-period.glade (100%)
 rename gnucash/{import-export/csv-imp => gtkbuilder}/assistant-csv-account-import.glade (100%)
 rename gnucash/{import-export/csv-exp => gtkbuilder}/assistant-csv-export.glade (100%)
 rename gnucash/{import-export/csv-imp => gtkbuilder}/assistant-csv-price-import.glade (99%)
 rename gnucash/{import-export/csv-imp => gtkbuilder}/assistant-csv-trans-import.glade (99%)
 rename gnucash/{gnome => }/gtkbuilder/assistant-hierarchy.glade (97%)
 rename gnucash/{gnome => }/gtkbuilder/assistant-loan.glade (100%)
 rename gnucash/{import-export/qif-imp => gtkbuilder}/assistant-qif-import.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/assistant-stock-split.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/assistant-xml-encoding.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/business-options-gnome.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/business-prefs.glade (100%)
 rename gnucash/{import-export/qif-imp => gtkbuilder}/dialog-account-picker.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-account.glade (100%)
 rename gnucash/{import-export/bi-import => }/gtkbuilder/dialog-bi-import-gui.glade (99%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-billterms.glade (99%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-book-close.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-choose-owner.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-commodities.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-commodity.glade (100%)
 rename gnucash/{report/report-gnome => gtkbuilder}/dialog-custom-report.glade (99%)
 rename gnucash/{import-export/customer-import => }/gtkbuilder/dialog-customer-import-gui.glade (99%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-customer.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-date-close.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-employee.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-file-access.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-fincalc.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-find-account.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-imap-editor.glade (100%)
 rename gnucash/{import-export => gtkbuilder}/dialog-import.glade (99%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-invoice.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-job.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-lot-viewer.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-new-user.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-object-references.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-options.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-order.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-payment.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-preferences.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-price.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-print-check.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-progress.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-query-view.glade (100%)
 rename gnucash/{report/report-gnome => gtkbuilder}/dialog-report.glade (99%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-reset-warnings.glade (99%)
 rename gnucash/{gnome-search => gtkbuilder}/dialog-search.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-sx.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-tax-info.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-tax-table.glade (99%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-totd.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-trans-assoc.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-transfer.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/dialog-userpass.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/dialog-vendor.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-date-format.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-frequency.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/gnc-plugin-page-budget.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/gnc-plugin-page-register.glade (99%)
 rename gnucash/{gnome => }/gtkbuilder/gnc-plugin-page-register2.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-recurrence.glade (100%)
 rename gnucash/{gnome-utils => }/gtkbuilder/gnc-tree-view-owner.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/window-autoclear.glade (100%)
 rename gnucash/{gnome => }/gtkbuilder/window-reconcile.glade (100%)
 rename gnucash/import-export/aqb/gschemas/{org.gnucash.dialogs.import.hbci.gschema.xml.in.in => org.gnucash.dialogs.import.hbci.gschema.xml.in} (100%)
 delete mode 100644 gnucash/import-export/bi-import/gtkbuilder/CMakeLists.txt
 delete mode 100644 gnucash/import-export/bi-import/ui/CMakeLists.txt
 delete mode 100644 gnucash/import-export/csv-exp/gschemas/CMakeLists.txt
 delete mode 100644 gnucash/import-export/csv-imp/gnc-csv-tokenizer.cpp
 rename gnucash/import-export/csv-imp/{gnc-price-props.cpp => gnc-imp-props-price.cpp} (98%)
 rename gnucash/import-export/csv-imp/{gnc-price-props.hpp => gnc-imp-props-price.hpp} (95%)
 rename gnucash/import-export/csv-imp/{gnc-trans-props.cpp => gnc-imp-props-tx.cpp} (99%)
 rename gnucash/import-export/csv-imp/{gnc-trans-props.hpp => gnc-imp-props-tx.hpp} (98%)
 rename gnucash/import-export/csv-imp/{gnc-csv-price-import-settings.cpp => gnc-imp-settings-csv-price.cpp} (92%)
 rename gnucash/import-export/csv-imp/{gnc-csv-price-import-settings.hpp => gnc-imp-settings-csv-price.hpp} (92%)
 rename gnucash/import-export/csv-imp/{gnc-csv-trans-import-settings.cpp => gnc-imp-settings-csv-tx.cpp} (92%)
 rename gnucash/import-export/csv-imp/{gnc-csv-trans-import-settings.hpp => gnc-imp-settings-csv-tx.hpp} (92%)
 rename gnucash/import-export/csv-imp/{gnc-csv-import-settings.cpp => gnc-imp-settings-csv.cpp} (94%)
 rename gnucash/import-export/csv-imp/{gnc-csv-import-settings.hpp => gnc-imp-settings-csv.hpp} (93%)
 rename gnucash/import-export/csv-imp/{gnc-price-import.cpp => gnc-import-price.cpp} (99%)
 rename gnucash/import-export/csv-imp/{gnc-price-import.hpp => gnc-import-price.hpp} (97%)
 rename gnucash/import-export/csv-imp/{gnc-tx-import.cpp => gnc-import-tx.cpp} (98%)
 rename gnucash/import-export/csv-imp/{gnc-tx-import.hpp => gnc-import-tx.hpp} (97%)
 create mode 100644 gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
 rename gnucash/import-export/csv-imp/{gnc-csv-tokenizer.hpp => gnc-tokenizer-csv.hpp} (96%)
 rename gnucash/import-export/csv-imp/{gnc-dummy-tokenizer.cpp => gnc-tokenizer-dummy.cpp} (94%)
 rename gnucash/import-export/csv-imp/{gnc-dummy-tokenizer.hpp => gnc-tokenizer-dummy.hpp} (91%)
 rename gnucash/import-export/csv-imp/{gnc-fw-tokenizer.cpp => gnc-tokenizer-fw.cpp} (99%)
 rename gnucash/import-export/csv-imp/{gnc-fw-tokenizer.hpp => gnc-tokenizer-fw.hpp} (97%)
 delete mode 100644 gnucash/import-export/csv-imp/gschemas/CMakeLists.txt
 delete mode 100644 gnucash/import-export/customer-import/gtkbuilder/CMakeLists.txt
 delete mode 100644 gnucash/import-export/customer-import/ui/CMakeLists.txt
 delete mode 100644 gnucash/import-export/gschemas/CMakeLists.txt
 rename gnucash/import-export/ofx/gschemas/{org.gnucash.dialogs.import.ofx.gschema.xml.in.in => org.gnucash.dialogs.import.ofx.gschema.xml.in} (100%)
 delete mode 100644 gnucash/import-export/qif-imp/gschemas/CMakeLists.txt
 create mode 100644 gnucash/report/standard-reports/test/test-transaction.scm
 rename gnucash/{gnome => }/ui/CMakeLists.txt (55%)
 rename gnucash/{gnome-utils => }/ui/gnc-main-window-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-account-tree-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-basic-commands-ui.xml (100%)
 rename gnucash/{import-export/bi-import => }/ui/gnc-plugin-bi-import-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-budget-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-business-ui.xml (100%)
 rename gnucash/{import-export/csv-exp => ui}/gnc-plugin-csv-export-ui.xml (100%)
 rename gnucash/{import-export/csv-imp => ui}/gnc-plugin-csv-import-ui.xml (100%)
 rename gnucash/{import-export/customer-import => }/ui/gnc-plugin-customer-import-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-file-history-ui.xml (100%)
 rename gnucash/{import-export/log-replay => ui}/gnc-plugin-log-replay-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-account-tree-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-account-tree2-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-budget-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-invoice-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-owner-tree-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-register-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-register2-ui.xml (100%)
 rename gnucash/{report/report-gnome => ui}/gnc-plugin-page-report-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-sx-list-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-sx-list2-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-page-sxregister-ui.xml (100%)
 rename gnucash/{import-export/qif-imp => ui}/gnc-plugin-qif-import-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-register-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-register2-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-plugin-register22-ui.xml (100%)
 rename gnucash/{report/stylesheets => ui}/gnc-plugin-stylesheets-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-reconcile-window-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-sxed-to-create-window-ui.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-sxed-window-ui-full.xml (100%)
 rename gnucash/{gnome => }/ui/gnc-sxed-window-ui.xml (100%)
 rename gnucash/{gnome-utils => }/ui/gnc-windows-menu-ui-quartz.xml (100%)
 rename gnucash/{gnome-utils => }/ui/gnc-windows-menu-ui.xml (100%)
 rename gnucash/{gnome-utils => }/ui/osx_accel_map (100%)
 delete mode 100644 po/POTFILES.ignore
 delete mode 100644 po/check-po.cmake



More information about the gnucash-changes mailing list