gnucash-docs master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Sep 26 13:49:05 EDT 2021


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/474b93a2 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/34481d06 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c27e79bd (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fb5dab60 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7b21455a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fd79b6d9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b5ae2d61 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fdc8f223 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6c0e97b8 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5a143b62 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/0ecd867b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/40dab7df (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/48559056 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/228f5b4f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d0ecef96 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/014ce27e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/dd990803 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/2cdba471 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b172fd0e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ab60da39 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7c0642f0 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ee9fa864 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e7b49fce (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7e4e560f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4183b55e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6bdee39f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/93ec8aa4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d637ab7d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7593aee8 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b2130fda (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7971617f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/a53a0fd9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/57439a2b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/66874285 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/731dcdf4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b3072cb9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/8276f1a8 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3f4628ea (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/a9e32318 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ab6c9581 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/56c74d57 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/35c8e580 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/9f20dded (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/0777dffb (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1e176058 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b80e1d6d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/45ddec89 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/509b6f45 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f05cf389 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/05a7cf54 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/52706bef (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/bbcc94f2 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d0ac4737 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1e334a8a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e51efec7 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d4bce161 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c6e3f506 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/8ab1689c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5904fb00 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f8c4af01 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ffb82c08 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/0389e0aa (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e4f9068b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4998ad75 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/2a6f04b1 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4d8cdea7 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d33a0610 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6094099d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/43819db4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/913549d7 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d989dc0d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/389b357e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e02cf7fc (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3f49e6c1 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/8e69f7c8 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6dfa95a7 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/15219e34 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/ee5f0f05 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/311d4915 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5f43c783 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/9a69e106 (commit)



commit 474b93a26aee20440541ec36fa4e96fa2ba2645f
Merge: 9a69e106 34481d06
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Sep 26 10:47:41 2021 -0700

    Merge branch 'maint'


commit 34481d06c689d4d4814a92a8e1c91b38818380b6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Sep 25 14:56:07 2021 -0700

    Fix misaligned copy/paste

diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 0b3c62f6..f04c82ee 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -88,7 +88,7 @@
         </para>
       </revdescription>
       </revision>
-      <revision>       <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
+      <revision><revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
       <date>27 June 2021</date>
       <revdescription>
         <para role="author">Multiple authors
@@ -97,7 +97,7 @@
         <para role="publisher">&appname; Documentation Team
         </para>
       </revdescription>
-      </revision><revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
+      </revision><revision><revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
       <date>28 March 2021</date>
       <revdescription>
         <para role="author">Multiple authors

commit c27e79bd5b651254a2ec1107f4bd21e971bd5d8e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Sep 25 14:51:10 2021 -0700

    Release Documentation for GnuCash 4.7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe18f039..2ab69fea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.5)
 # We don't actually use C, but GNUInstallDirs doesn't work if we don't
 # specify a language.
 project (gnucash-docs
-    VERSION 4.6
+    VERSION 4.7
     LANGUAGES C)
 
 set (PACKAGE_NAME GnuCash Docs)
@@ -212,6 +212,7 @@ install(FILES COPYING COPYING-DOCS DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJEC
 add_to_dist(
     AUTHORS
     CMakeLists.txt
+    COPYING
     COPYING-DOCS
     ChangeLog
     HACKING
diff --git a/ChangeLog b/ChangeLog
index 536b0205..e8aa30b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,311 @@
+2021-09-25 Frank H. Ellenberger 
+
+	* Merge PR_#226 into maint (HEAD -> maint, origin/maint)
+
+2021-09-25 TANIGUCHI Yasuaki 
+
+	* Workaround patch for install gnc-locale-${lang}.dtd for CMake. This patch is for PR #207.
+
+2021-08-31 TANIGUCHI Yasuaki 
+
+	* Add WayBack Machine information for HTML Help Workshop download.
+
+2021-08-24 TANIGUCHI Yasuaki 
+
+	* Update README and other files.
+
+2021-09-24 Frank H. Ellenberger 
+
+	* Minor fix on PR #184
+
+2021-09-24 Frank H. Ellenberger 
+
+	* Merge PR_#184 into maint
+
+2021-06-25 Christian Wehling 
+
+	* L10N:de: Ãœbersetzung von Help_ch_Customize.xml
+
+2021-09-24 TANIGUCHI Yasuaki 
+
+	* Replace COPYING file from GPL 3 to GPL 2.
+
+2021-09-23 TANIGUCHI Yasuaki 
+
+	* Apply dtd-locale to help/de/Help_para-assist-intro.xml.
+
+2021-08-20 TANIGUCHI Yasuaki 
+
+	* Add ENTITY(s) prefix guisubmenu, guimenuitem, and guilabel as gsm, gmi, and gl, respectively.
+
+2021-08-22 TANIGUCHI Yasuaki 
+
+	* Move untranslated entity messages from gnc-docbookx.dtd to each locale file.
+
+2021-08-20 TANIGUCHI Yasuaki 
+
+	* Make DTD ENTITY(s) translatable. See docbook/README. Bug 798273 - Consider a entity import system like in docbook-xsl
+
+2021-08-04 Frank H. Ellenberger 
+
+	* Guide:C:Currency: update images Part 1
+
+2021-09-22 Geert Janssens 
+
+	* Fix license file
+
+2021-09-22 Frank H. Ellenberger 
+
+	* Merge branch 'PR_#198' into maint
+
+2021-09-22 Frank H. Ellenberger 
+
+	* Merge branch 'PR_#197' into maint
+
+2021-09-22 Geert Janssens 
+
+	* Add license file to git tracking
+
+2021-09-21 Geert Janssens 
+
+	* Install license files COPYING and COPYING-DOCS
+
+2021-09-19 Frank H. Ellenberger 
+
+	* Help/de: Crop Export screenshots
+
+2021-06-26 Christian Wehling 
+
+	* L10N:de: Beschreibung der Ex- und Import-Assistenten der Kontenstruktur
+
+2021-09-18 Frank H. Ellenberger 
+
+	* Merge branch 'PR_#192' into maint
+
+2021-09-11 Christian Wehling 
+
+	* Remove some unresolved ID reference from Help-Files
+
+2021-09-09 Frank H. Ellenberger 
+
+	* Drop travis-ci in favour of github worflows
+
+2021-09-09 Frank H. Ellenberger 
+
+	* Shrink .gitignore to autotools inserts
+
+2021-09-09 Frank H. Ellenberger 
+
+	* Merge branch 'PR_#213' into maint
+
+2021-09-09 Frank H. Ellenberger 
+
+	* Remove obsolete appendixesalso from italian guide
+
+2021-09-09 Frank H. Ellenberger 
+
+	* Merge branch 'PR_#210' into maint
+
+2021-09-05 Frank H. Ellenberger 
+
+	* Guide/C: Note on fieldnames in CSV import
+
+2021-08-24 TANIGUCHI Yasuaki 
+
+	* * {guide,help}/*/.gitignore were deleted completely.
+
+2021-08-22 TANIGUCHI Yasuaki 
+
+	* Remove obsolete appendix B about FAQ from guide.
+
+2021-08-22 TANIGUCHI Yasuaki 
+
+	* Remove obsolete appendix C about VAT from guide.
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Add a comment for translators.
+
+2021-07-20 TANIGUCHI Yasuaki 
+
+	* Unify words and account names. Fix minor typos and tags. Add commas to the numbers. Add some tags. Fix according to the review comments.
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Change the system order of procedure. &lin;, &mac;, &win;
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Fix comment below: https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680355097
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Fix comment below:  - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680359545
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Fix comments below:  - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680356731  - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680358015  - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680359138
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Fix comment below: https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680356197
+
+2021-08-04 TANIGUCHI Yasuaki 
+
+	* Fix comments bellow:  - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r682260218  - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680355097
+
+2021-07-20 TANIGUCHI Yasuaki 
+
+	* Change a paragraph to itemizedlist to make translation easier. Change a hardcoded numbered list to docbook numbered list. Replace starting balance with opening balance. Fix typos and minor mistakes. Fix RewordMiles account name. Change CoA to Chart of Accounts Unify currency expression like 12,345 USD for foreign currencies. Normailze account names. Change one of the note because English sentenses are too difficult. Change the date format like Jan. 2, 2020. Replace Price Editor with Price Database. Change +ve and -ve to positive and negative, respectively. Fix according to the pull request comment.
+
+2021-07-31 TANIGUCHI Yasuaki 
+
+	* Fix comment https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676279712
+
+2021-07-31 TANIGUCHI Yasuaki 
+
+	* Fix comment https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680092489  and https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676052158a
+
+2021-07-16 TANIGUCHI Yasuaki 
+
+	* Fix typos. Change some itemizelist to variablelist. Remove extra spaces within inline tags for translation. Modify tags to make translation easier. Replace Finance::Quote with &app-fq;. Fix according to the comment https://github.com/Gnucash/gnucash-docs/pull/192 Added a space between a word and a tag. Replace misused acronyms with guilabels. Add spaces between words and tags to avoid word concatenation. Change German word Strg to English word Ctrl. Add replaceable tag, see https://github.com/Gnucash/gnucash-docs/pull/190#discussion_r671407584
+
+2021-07-23 Frank H. Ellenberger 
+
+	* Improve last commit (Guide:txns): Change in GTK3
+
+2021-07-23 Frank H. Ellenberger 
+
+	* Merge branch 'PR_#196' into maint
+
+2021-07-20 Frank H. Ellenberger 
+
+	* Merge PR #195 into maint
+
+2021-07-20 Frank H. Ellenberger 
+
+	* Merge PR #194 into maint
+
+2021-07-20 Frank H. Ellenberger 
+
+	* Merge PR #193 into maint
+
+2021-07-18 TANIGUCHI Yasuaki 
+
+	* Minor fix.
+
+2021-07-17 TANIGUCHI Yasuaki 
+
+	* Add replaceable tag, see https://github.com/Gnucash/gnucash-docs/pull/190#discussion_r671407584
+
+2021-07-17 TANIGUCHI Yasuaki 
+
+	* More markups.
+
+2021-07-17 TANIGUCHI Yasuaki 
+
+	* Add markups.
+
+2021-07-17 TANIGUCHI Yasuaki 
+
+	* Fix typos.
+
+2021-07-17 TANIGUCHI Yasuaki 
+
+	* Fix typos.
+
+2021-07-16 TANIGUCHI Yasuaki 
+
+	* Add spaces between words and tags to avoid word concatenation. Change German word Strg to English word Ctrl.
+
+2021-07-16 TANIGUCHI Yasuaki 
+
+	* Add spaces between words and tags to avoid word concatenation. Change German word Strg to English word Ctrl.
+
+2021-07-15 TANIGUCHI Yasuaki 
+
+	* Replace misused acronyms with guilabels.
+
+2021-07-16 TANIGUCHI Yasuaki 
+
+	* Added a space between a word and a tag.
+
+2021-07-16 Frank H. Ellenberger 
+
+	* Merge PR #189 into maint
+
+2021-07-14 TANIGUCHI Yasuaki 
+
+	* Add entities for Apache OpenOffice, LibreOffice, and a GnuCash file fin.c. Replace hardcorded Office Suite and path of fin.c with the entities. Replace k(thousand) with 000. Add commas into the numbers over 1,000 except user's input. Change Terminology's list from itemizedlist to variablelist. Move Car loan section before personal loan section. Fix some typos.
+
+2021-07-16 Frank H. Ellenberger 
+
+	* Move Overview before Basics
+
+2021-07-16 Frank H. Ellenberger 
+
+	* Merge PR #186 into maint
+
+2021-07-15 TANIGUCHI Yasuaki 
+
+	* Change parts name (Bug 788912 - "Part III. Managing Business Finances" is misleading)
+
+2021-07-12 Frank H. Ellenberger 
+
+	* Python Bindings: link examples in API docs
+
+2021-07-14 Frank H. Ellenberger 
+
+	* Mark guides import chapter as outdated
+
+2021-07-14 TANIGUCHI Yasuaki 
+
+	* Replace hardcoded part names with xlinks.
+
+2021-07-14 TANIGUCHI Yasuaki 
+
+	* Replace starting balance with opening balance. Add comma to the numbers over 1000.
+
+2021-07-11 Frank H. Ellenberger 
+
+	* Bug 798236 - Remove comment about swapped A/P & A/R terminology
+
+2021-06-05 Frank H. Ellenberger 
+
+	* Minor improvements in C and de Help Tips on alphavantage
+
+2021-07-08 Frank H. Ellenberger 
+
+	* L10N:de:Help: Image optimization (again)
+
+2021-07-08 Frank H. Ellenberger 
+
+	* L10N:de:Help: Main-window-callouts.png Registerkarte -> Reiter
+
+2021-07-06 Frank H. Ellenberger 
+
+	* L10N:de:Help: Verbessere Titel von GUI-Menus
+
+2021-07-05 Frank H. Ellenberger 
+
+	* Bug 798226 postprocessing: xmlformat
+
+2021-07-05 TANIGUCHI Yasuaki 
+
+	* Bug 798226 - minor mistakes in Tutorial and Concepts guide 2
+
+2021-07-01 Christian Wehling 
+
+	* L10n:de: Optimize the pic
+
+2021-06-30 Frank H. Ellenberger 
+
+	* L10N:de: Tip des Tages: Gleiche Reihenfolge in Bild und Beschreibung
+
+2021-06-29 Christian Wehling 
+
+	* L10N:de: de/Help_ch_Customize.xml Bildschirmfotos...
+
 2021-06-26 Frank H. Ellenberger 
 
 	* Merge PR #179 into maint (HEAD -> maint, origin/maint)
diff --git a/NEWS b/NEWS
index d52825ab..12043c2a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,36 @@
 Version History
 ---------------
+ 4.7    - 26 September 2021
+        o Bug 798226 - minor mistakes in Tutorial and Concepts guide 2
+        o Bug 798226 - postprocessing: xmlformat
+        o Bug 798236 - Remove comment about swapped A/P & A/R terminology
+        o Replace COPYING file from GPL 3 to GPL 2.
+        o Substantial editing of the C documentation to make the meanings more
+          understandable to translators.
+        o Apply dtd-locale to help/de/Help_para-assist-intro.xml.
+        o Add ENTITY(s) prefix guisubmenu, guimenuitem, and guilabel as gsm,
+          gmi, and gl, respectively.
+        o Move untranslated entity messages from gnc-docbookx.dtd to each
+          locale file.
+        o Make DTD ENTITY(s) translatable. See docbook/README.
+          Bug 798273 - Consider a entity import system like in docbook-xsl
+        o Guide:C:Currency: update images Part 1
+        o Fix license file to use actual file instead of softlink.
+        o Unify words and account names. Fix minor typos and tags. Add commas
+          to the numbers. Add some tags. Fix according to the review comments.
+        o Add license file to git tracking
+          It is an autogenerated file from autotools but it was ignored by our
+          current git config. A previous commit chose to install the file, but
+          that's difficult if it's missing.
+        o Install license files COPYING and COPYING-DOCS
+        o Help/de: Crop Export screenshots
+        o Drop travis-ci in favour of github worflows
+        o Remove obsolete appendix B about FAQ from guide.
+        o Remove obsolete appendix C about VAT from guide.
+        o Guide/C: Note on fieldnames in CSV import
+        o Mark Guide's import chapter as outdated
+        o Minor improvements in C and de Help Tips on alphavantage
+
  4.6    - 27 June 2021
         o Bug 798178 - : Wrong Color in Scheduled Transactions Window text
         o Bug 798217 - minor mistakes in Tutorial and Concepts guide
diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 8b8c0104..6c1943ca 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -32,8 +32,8 @@ own entity definitions to use across all of our DocBook pages. -->
   
   1. a) Publication - should only be changed by the release manager!
 -->
-<!ENTITY manrevision "4.6">
-<!ENTITY date "27 June 2021">
+<!ENTITY manrevision "4.7">
+<!ENTITY date "26 September 2021">
 <!ENTITY vers-unstable "">
 <!ENTITY vers-stable "4.6">
 <!ENTITY series-unstable "master">
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index bb08a61f..0b3c62f6 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -78,8 +78,8 @@
     </authorgroup>
 
     <revhistory>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
-      <date>27 June 2021</date>
+      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
+      <date>26 September 2021</date>
       <revdescription>
         <para role="author">Multiple authors
         </para>
@@ -88,7 +88,16 @@
         </para>
       </revdescription>
       </revision>
-      <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
+      <revision>       <revision> <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
+      <date>27 June 2021</date>
+      <revdescription>
+        <para role="author">Multiple authors
+        </para>
+
+        <para role="publisher">&appname; Documentation Team
+        </para>
+      </revdescription>
+      </revision><revnumber>&appname; Tutorial and Concepts Guide 4.5</revnumber>
       <date>28 March 2021</date>
       <revdescription>
         <para role="author">Multiple authors
diff --git a/guide/CMakeLists.txt b/guide/CMakeLists.txt
index 0f1e8b8c..8049a946 100644
--- a/guide/CMakeLists.txt
+++ b/guide/CMakeLists.txt
@@ -38,7 +38,6 @@ add_subdirectory(de)
 add_subdirectory(it)
 add_subdirectory(ja)
 add_subdirectory(pt)
-add_subdirectory(ru)
 
 if(AUTOTOOLS_IN_DIST)
     set(autotoolsfiles Makefile.am)
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 4c31ae84..1b19b6cb 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -89,6 +89,17 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
         <date>27 June 2021</date>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 3b7366fb..ecaa002a 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -130,6 +130,17 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
         <date>27 June 2021</date>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index 7a566266..3d5cccc6 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -86,6 +86,17 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors
+          </para>
+
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.6</revnumber>
         <date>27 June 2021</date>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 6521f62d..020792ce 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -78,6 +78,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.7</revnumber>
+        <date>26 de septembro de 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.6</revnumber>
         <date>27 de junho de 2021</date>
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index 40dfc2bc..675c71b8 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -41,6 +41,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.6</revnumber>
         <date>27 June 2021</date>
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index a636a6bd..3d5957db 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -60,6 +60,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.6</revnumber>
         <date>27 June 2021</date>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 2a3d2b9a..62a28c68 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -209,6 +209,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.7</revnumber>
+        <date>26 September 2021</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.6</revnumber>
         <date>27 June 2021</date>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index 5bd3346c..b899eb49 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -46,6 +46,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.7</revnumber>
+        <date>26 de septembro de 2021</date>
+        <revdescription>
+          <para role="author">Múltiplos autores</para>
+          <para role="publisher">Equipa de documentação do &appname;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.6</revnumber>
         <date>27 de junho de 2021</date>

commit fb5dab60cb5b29b4442ddb1b5691dcc24653abc0
Merge: fd79b6d9 7b21455a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Sep 25 14:34:40 2021 +0200

    Merge PR_#226 into maint


commit 7b21455a053d62ce67321550e38337dc932579bb
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Sep 25 19:54:52 2021 +0900

    Workaround patch for install gnc-locale-${lang}.dtd for CMake.
    This patch is for PR #207.
    
    cmake -S gnucash-docs -B .
    cmake --build .
    cmake --install . --prefix ${prefix}
    
    Then ghelp will be installed under ${prefix}/share/gnome/help/.

diff --git a/cmake/AddGHelpTarget.cmake b/cmake/AddGHelpTarget.cmake
index a974d0da..c90538e4 100644
--- a/cmake/AddGHelpTarget.cmake
+++ b/cmake/AddGHelpTarget.cmake
@@ -18,7 +18,13 @@ function (add_ghelp_target docname lang entities figures)
     foreach(xml_file ${entities} ${docname}.xml)
         list(APPEND source_files "${CMAKE_CURRENT_SOURCE_DIR}/${xml_file}")
     endforeach()
-    list(APPEND source_files "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd")
+
+    set(dtd_files "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd"
+                  "${CMAKE_SOURCE_DIR}/docbook/gnc-locale-C.dtd"
+                  "${CMAKE_SOURCE_DIR}/docbook/gnc-locale-${lang}.dtd")
+    list(REMOVE_DUPLICATES dtd_files)
+    list(APPEND source_files ${dtd_files})
+
 
     set(dest_files "")
     foreach(xml_file ${entities} ${docname}.xml gnc-docbookx.dtd)
@@ -28,7 +34,7 @@ function (add_ghelp_target docname lang entities figures)
     add_custom_command(
         OUTPUT ${dest_files}
         COMMAND ${CMAKE_COMMAND} -E copy ${source_files} "${BUILD_DIR}"
-        DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd"
+        DEPENDS ${entities} "${docname}.xml" ${dtd_files}
         WORKING_DIRECTORY "${BUILD_DIR}")
 
     # Copy figures for this document
diff --git a/xmldocs.make b/xmldocs.make
index c630c5d3..64df52d2 100644
--- a/xmldocs.make
+++ b/xmldocs.make
@@ -48,7 +48,7 @@ otherdocdir = $(docdir)/$(lang)
 
 # ************** Rules to install xml files for gnome-help ***********************
 
-xml_files = $(entities) $(docname).xml $(top_srcdir)/docbook/gnc-docbookx.dtd
+xml_files = $(entities) $(docname).xml $(top_srcdir)/docbook/*.dtd
 gnomehelp_DATA =  $(xml_files)
 gnomehelpfiguresdir = $(gnomehelpdir)/$(figdir)
 gnomehelpfigures_DATA = $(shell ls ${srcdir}/${figdir}/*.png)

commit fd79b6d9be6b569a6240a2a4ed1495a8eb3b4d6e
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Tue Aug 31 13:29:11 2021 +0900

    Add WayBack Machine information for HTML Help Workshop download.

diff --git a/README b/README
index 46a1c839..e9904f76 100644
--- a/README
+++ b/README
@@ -45,9 +45,11 @@ Additional Requirements for Generating chm on Windows:
 ** cmake on MinGW32 or MinGW64 (not cmake for MSYS2)
 ** libxsl on MinGW32 or MinGW64 (not libxsl for MSYS2)
 ** docbook-xsl on MinGW32 or MinGW64 (not docbook-xsl for MSYS2)
-* Html Help Workshop (https://www.microsoft.com/en-us/download/details.aspx?id=21138 for Win XP - 8)
+* HTML Help Workshop (https://www.microsoft.com/en-us/download/details.aspx?id=21138 for Win XP - 8)
+Microsoft stopped providing HTML Help Workshop installer files. You can download from WayBack Machine instead.
+https://web.archive.org/web/20110712222004/http://msdn.microsoft.com:80/en-us/library/ms669985
 
-They are installed by windows bootstrap scripts for GnuCash. See
+They are installed by windows bootstrap scripts for GnuCash except HTML Help Workshop. See
   https://github.com/Gnucash/gnucash-on-windows/
 for details.
 

commit b5ae2d615ebfb6fdab6ddfc850e9b118eb4a6d5a
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Tue Aug 24 17:40:49 2021 +0900

    Update README and other files.
    
    README:
    * Garbage characters were removed.
    * Update to the more recent information.
    
    gnucash-docs.spec.in:
    * The License line was changed to FLD 1.1 or later.
    
    AUTHORS:
    * Move me to active users.

diff --git a/AUTHORS b/AUTHORS
index 899d454b..b777aaa1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ Dmitry Pavlov
 John Ralls
 Mechtilde Stehmann
 David T.
+TANIGUCHI Yasuaki
 
 Past -
 Mike Alexander
@@ -40,7 +41,7 @@ Patrick Schweiger
 Mark Simpson
 Niklas Spille
 Christian Stimming
-Yasuaki Taniguchi
+
 Bengt Thuree
 James A. Treacy
 Linas Vepstas
diff --git a/README b/README
index b80d5fda..46a1c839 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
               GnuCash Docs README file
 ------------------------------------------------------------
 
-This is the user documentation (docs) module for GnuCash. Written in DocBook
- they can be accessed under
+This is the user documentation (docs) module for GnuCash. Written in
+DocBook v4.5 (not 5.x series) they can be accessed under
 * directly without any conversion:
 ** Linux: from Yelp (the Gnome help browser)
 
@@ -28,6 +28,7 @@ or
 * libxslt [Debian packed the required xsltproc in a separate package, 
            which depends on libxslt]
 * docbook-xsl
+* docbook-dtds
 * yelp (for viewing)
 
 Optional:
@@ -37,25 +38,27 @@ Additional Requirements for Generating Mobipocket:
 
 * Calibre (https://www.calibre-ebook.com/)
 
-Additional Requirements for Generating chm:
+Additional Requirements for Generating chm on Windows:
 
-* Mingw (http://www.mingw.org)
+* MSYS2 (https://www.msys2.org/)
+** MinGW32 or MinGW64
+** cmake on MinGW32 or MinGW64 (not cmake for MSYS2)
+** libxsl on MinGW32 or MinGW64 (not libxsl for MSYS2)
+** docbook-xsl on MinGW32 or MinGW64 (not docbook-xsl for MSYS2)
 * Html Help Workshop (https://www.microsoft.com/en-us/download/details.aspx?id=21138 for Win XP - 8)
 
+They are installed by windows bootstrap scripts for GnuCash. See
+  https://github.com/Gnucash/gnucash-on-windows/
+for details.
+
 Additonal Requirements for Generating PDF:
 
 * Apache fop  >= 0.95
 
-For the Japanese PDF, Japanese fonts are included. If you want to use
-other Japanese fonts you can use the with-japanese-fonts-dir,
---with-japanese-mincho-ttf, and --with-japanese-gothic-ttf configure
-options to select them. fop's TTFReader can't, as of version 1.1
-anyway, handle OpenType fonts.
-
 ** FontBox
- from the Apache PDFBox [https://pdfbox.apache.org/download.cgi]
- can handle OpenType fonts, which are as default used for the russian PDF.
- Some distributions call it [lib]fontbox[-java].
+  from the Apache PDFBox [https://pdfbox.apache.org/download.cgi]
+  can handle OpenType fonts, which are as default used for the russian PDF.
+  Some distributions call it [lib]fontbox[-java].
 
 Notes
 #####
@@ -70,31 +73,23 @@ See also:
 * http://wiki.gnucash.org/wiki/Documentation_Update_Instructions
 * http://wiki.gnucash.org/wiki/Translation
 
-This release of the docs module only uses the docbook-xsl stylesheets
-to convert the docs to html. There are docbook stylesheets in
-gnucash-docs/xsl/1.79.2/epub, ../fo, ../html, ../xhtml, and ../xhtml-1_1.
-These docbook stylesheets are used and provided so that installing them
-separately isn't necessary. You still need, however, a working docbook-xsl
-setup to build and install these docs.
-
 Other Formats
 #############
 
 GnuCash-docs is written using docbook-xml. This allows it to be
 outputted to alternative formats using external tools.
 
-DocBook comes in two flavours - xml and sgml. GnuCash uses the xml flavour.
+The documentation source can be converted into HTML, PDF, EPUB, or MOBI
+format using such tools as xsltproc and fop.
 
-The documentation source comes with built-in commands to generate html, pdf
-or epub output. For other formats, you will need to use external tools.
 
 Note: if you use external tools to render HTML, remember to bring the images
-from figures/ along with the final HTML. The browser will expect to find
-the figures/ directory directly beneath the HTML directory:
-~/gnucash-docs/html/
-~/gnucash-docs/html/figures/
+from figures and icons along with the final HTML. The browser will expect to find
+the figures and images directory directly beneath the HTML directory as follows:
+/path_to/gnucash-docs/html/
+/path_to/gnucash-docs/html/figures/
+/path_to/gnucash-docs/html/images/
 
-* html, pdf, epub and mobi
 --------------------------
 
 You can generate the documentation in html, pdf, epub and mobi
@@ -104,9 +99,9 @@ For cmake the commands are
   cd gnucash-docs
   mkdir build && cd build
   # If you don't need mobi
-  cmake …
+  cmake [options…]
   # or, if you need mobi
-  cmake -DWITH_MOBI=ON …
+  cmake -DWITH_MOBI=ON [options…]
 
 For the deprecated autotools system the commands are:
   cd gnucash-docs
@@ -245,7 +240,7 @@ choose a component.
 - Feel free to append your fixes and improvements also there or open a pull
 request. Only docs about future features should go in branch master.
 So here is the link for branch stable:
-https://github.com/Gnucash/gnucash-docs/pull/new/maint.
+https://github.com/Gnucash/gnucash-docs/.
 
 - With any problems you have, you can contact us in the following ways:
 
@@ -275,4 +270,3 @@ your GnuCash Documentation Team
 Original Author: 
 Chris Lyttle
 <chris at wilddev.net>
-
diff --git a/gnucash-docs.spec.in b/gnucash-docs.spec.in
index 20affc60..2fd77923 100644
--- a/gnucash-docs.spec.in
+++ b/gnucash-docs.spec.in
@@ -4,7 +4,7 @@ Name:           gnucash-docs
 Summary:        This is the documentation module for GnuCash
 Version:        %{version}
 Release:        0
-License:        GNU Free Documentation License
+License:        GNU Free Documentation License 1.1 or later
 Group:          Office/Finance
 URL:            https://www.gnucash.org
 Source:         https://sourceforge.net/projects/gnucash/files/gnucash%20(stable)/%{version}/gnucash-docs-%{version}.tar.gz

commit fdc8f22316b00a59824687f8668da5a1b4f1e44b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Sep 24 23:58:56 2021 +0200

    Minor fix on PR #184

diff --git a/help/de/Help_ch_Customize.xml b/help/de/Help_ch_Customize.xml
index 86b3656b..d9eb8042 100644
--- a/help/de/Help_ch_Customize.xml
+++ b/help/de/Help_ch_Customize.xml
@@ -3852,8 +3852,10 @@ Scrolling to older transactions is not possible. If you want to see all entries
             Beispiel: Starten Sie &app; mit diesem Befehl
             <command>LANGUAGE=<replaceable>tr</replaceable>
             LANG=<replaceable>de_DE.utf8</replaceable> gnucash</command> so wird das Programm in
-            türkischer Sprache, Währung usw. arbeiten, Sie haben jedoch die Möglichkeit z.B. eine
+            türkischer Sprache arbeiten, Sie haben jedoch die Möglichkeit z.B. eine
             deutsche Steuererklärung vorzubereiten.
+            <!-- ToDo: in C entsprechend LANGUAGE=<replaceable>es</replaceable> und US-TXF
+            und Anregung für Übersetzter, die größe sprachliche Minorität zu wählen -->
           </para>
         </listitem>
       </varlistentry>

commit 6c0e97b8c681c4e847901f5fec6c708ccea71fa5
Merge: 0ecd867b 5a143b62
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Sep 24 21:02:21 2021 +0200

    Merge PR_#184 into maint


commit 5a143b62e63796cf874c3f9e7d5ea6c485a1993f
Author: Christian Wehling <christian.wehling at web.de>
Date:   Fri Jun 25 21:49:42 2021 +0200

    L10N:de: Ãœbersetzung von Help_ch_Customize.xml
    
    und das Auslagern des Abschnitts `Aktivierung der
    Online-Kursaktualisierung` von "Account-Actions" in ein neues Kapitel
    ist vorbereitet. (siehe PR #206)
    
    Die Beschreibung des Spaltenselektors wurde in "Customize" entfernt und
    in GUI-Menüs eingefügt.
    Beschreibung der Zusammenfassungszeile in der Kontenübersicht ergänzt.
    
    Weitere Bildschirmfotos mit übersetzen Texten hinzugefügt.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index cc403b44..8b8c0104 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -48,9 +48,11 @@ own entity definitions to use across all of our DocBook pages. -->
 -->
 <!ENTITY appname "GnuCash">  <!-- This should be used, where no further markup is desired, e.g. in GUI elements, URLs -->
 <!ENTITY app "<application>GnuCash</application>">  <!-- This should be used in normal text -->
-<!ENTITY app-fq "<application>Finance::Quote</application>">
+<!ENTITY app-aqb "<application>AqBanking</application>">
 <!ENTITY app-aoo "<application>Apache OpenOffice</application>">
+<!ENTITY app-fq "<application>Finance::Quote</application>">
 <!ENTITY app-lo "<application>LibreOffice</application>">
+<!ENTITY app-perl "<application>Perl</application>">
 <!ENTITY app-py "<application>Python</application>">
 <!ENTITY app-perl "<application>Perl</application>">
 <!ENTITY app-gfa "<application>Gnucash for Android</application>">
@@ -75,7 +77,11 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY file-finc "libgnucash/app-utils/calculation/fin.c">
 
 <!-- 
-  4. Some common URLs - should be changed on demand.
+  4. Other formatting instructions -->
+<!ENTITY img-w "850px">  <!-- The maximum width of the graphic elements. -->
+
+<!-- 
+  5. Some common URLs - should be changed on demand.
   
   Translators can add localized instances by adding -<lang>,
   An example is url-wiki-ml-de for the german wiki page about mailing lists.
diff --git a/help/de/CMakeLists.txt b/help/de/CMakeLists.txt
index 89f9429c..39626ea5 100644
--- a/help/de/CMakeLists.txt
+++ b/help/de/CMakeLists.txt
@@ -11,6 +11,7 @@ set (entities
         Help_ch_Customize.xml
         Help_fdl-appendix.xml
         Help_legal.xml
+        para-assist-buttons.xml
         Help_chartofaccts.xml
         Help_chtacctseg.xml
         Help_para-assist-intro.xml
diff --git a/help/de/Help_ch_Account-Actions.xml b/help/de/Help_ch_Account-Actions.xml
index 4a590e95..ddc43980 100644
--- a/help/de/Help_ch_Account-Actions.xml
+++ b/help/de/Help_ch_Account-Actions.xml
@@ -1220,6 +1220,10 @@
           </para>
         </note>
       </para>
+<!-- FIXME: this is to be inserted after the move to a new chapter
+      <sect3 id="accts-Online-price">
+        <title>Benutzen der Online-Kursaktualisierung</title>
+ -->
 
       <sect3 id="Online-price-setup">
         <title>Vorgehensweise zur Aktivierung der Online-Preisaktualisierung</title>
diff --git a/help/de/Help_ch_Customize.xml b/help/de/Help_ch_Customize.xml
index 4271829e..86b3656b 100644
--- a/help/de/Help_ch_Customize.xml
+++ b/help/de/Help_ch_Customize.xml
@@ -1,2474 +1,3409 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.1
-  Last modified: February 13th 2014
-       modified: January 16th 2013
-       modified: September 26th 2010
-       modified: December 7th 2009
-       modified: August 2nd 2008
-       modified: March 21th 2007
-       modified: August 2nd 2006
-       modified: July 9th 2006
-       modified: February 28th 2005
-  Maintainers:
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
-               Neil Williams <linux at codehelp.co.uk>
-  Author:
-               Chris Lyttle <chris at wilddev.net>
-  Translators:
-               (translators put your name and email here)
+<!-- (Do not remove this comment block.)
+Version: 4.6
+Last modified: September 2021
+     modified: February 13th 2014
+     modified: January 16th 2013
+     modified: September 26th 2010
+     modified: December 7th 2009
+     modified: August 2nd 2008
+     modified: March 21th 2007
+     modified: August 2nd 2006
+     modified: July 9th 2006
+     modified: February 28th 2005
+Maintainers:
+  Alex Aycinena <alex.aycinena at gmail.com>
+  Chris Lyttle <chris at wilddev.net>
+  Neil Williams <linux at codehelp.co.uk>
+Author:
+  Chris Lyttle <chris at wilddev.net>
+Translators:
+  Christian Wehling <christian.wehling at web.de>
 -->
 <chapter id="custom-gnucash"
          xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Customizing &app;</title>
-
-  <para>&untranslated-de;
-  </para>
-
+  <title>&app; anpassen</title>
+<!-- FIXME source: move to Help_ch_GUIMenus
   <sect1 id="account-options">
-    <title>Account Display Options</title>
-
-    <para>The
-      <menuchoice>
-        <guimenu>View</guimenu> <guimenuitem>Filter By ...</guimenuitem>
-      </menuchoice>
-      is used to set or modify the view of the account tree window. The
-      <guilabel>Accounts</guilabel> tab of this form allows the selection of the types of accounts
-      to display. These selections effect the view on each specific open window of the account tree.
-    </para>
-
-    <para>The <guilabel>Other</guilabel> tab allows enabling/disabling of the options; Show Hidden accounts,
-      Show zero total accounts.
-    </para>
-
-    <para>The account tree window, by default, only shows the quantity of each commodity that you own, under
-      the column heading <guilabel>Total</guilabel>. Often, however, you may want to display other
-      values. This is easily accomplished by clicking on the <guibutton>Options</guibutton> button
-      (the small down pointing arrow on the right side of the main account window
-      <emphasis>Titlebar</emphasis>), and selecting the option(s) to display. These selections set
-      the view on all open windows of the account tree.
-    </para>
+    <title>Anpassen der Anzeige für die Kontenübersicht</title>
   </sect1>
+ -->
+  <para>&app; kann in vielen Belangen an Ihre persönlichen Vorlieben angepasst werden. Es besteht zum einen
+    die Möglichkeit die <emphasis>Benutzer Einstellungen</emphasis> vorzunehmen, die von &app; in
+    den Einstellungen Ihres Betriebssystems gespeichert werden und ausschließlich für den
+    <emphasis>jeweiligen</emphasis> Benutzer gelten.
+  </para>
+
+  <para>Zum anderen können mit den <emphasis>Buch Einstellungen</emphasis> die Dateieigenschaften
+    beeinflusst werden. Diese gelten dann für <emphasis>alle</emphasis> Benutzer der Datendatei.
+  </para>
 
   <sect1 id="set-prefs">
-    <title>Setting Preferences</title>
+    <title>Benutzer Einstellungen</title>
 
-    <para>The <guilabel>&appname; Preferences</guilabel> window allows you to customize your &app; session by
-      setting several options. From the &app; menu select
+    <para>Im Fenster <guilabel>&appname;-Einstellungen</guilabel> können Sie das Verhalten Ihrer &app;
+      Sitzung anpassen, indem Sie verschiedene Optionen einstellen. Wählen Sie aus dem &app; Menü
       <menuchoice>
-        <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
+        <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
       </menuchoice>
       (
       <menuchoice>
-        <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
+        <guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem>
       </menuchoice>
-      on &mac;). The <guilabel>&appname; Preferences</guilabel> window will open. Using the tabs on
-      the left make your desired changes. The settings in this dialog are set per user and not
-      stored with the file. This is in contrast to the settings described in
-      <xref linkend="book-options"/>, which are kept with, and are part of, the file (or Book), and
-      as such are common to all users. So <guilabel>&appname; Preferences</guilabel> settings are
-      individual to each user who uses a given file and any changes made by one user will not affect
-      other users of that file. Also, a given user's preferences will be common to all files that
-      that user opens with &app;.
+      bei &mac;). Das Fenster <guilabel>&appname;-Einstellungen</guilabel> wird geöffnet. Wählen
+      Sie auf der linken Seite die gewünschte Kategorie und nehmen Sie rechts die gewünschten
+      Änderungen vor. Die Einstellungen in diesem Dialog werden pro Benutzer festgelegt und nicht
+      in der Datei gespeichert. Dies steht im Gegensatz zu den in <xref linkend="book-options"/>
+      beschriebenen Einstellungen, die mit der Datei (oder dem Buch) gespeichert werden und Teil
+      davon sind und als solche für alle Benutzer gemeinsam gelten. Die
+      <guilabel>&appname;-Einstellungen</guilabel> gelten somit für alle Dateien des Benutzers als
+      Vorgabe. Sie können aber teilweise durch individuelle
+      <link linkend="book-options">Buch-Optionen</link> für einzelne Dateien außer Kraft gesetzt
+      werden. Bedenken Sie das, wenn sie Dateien mit anderen Benutzern austauschen, diese
+      möglicherweise eine andere Einstellungen gewählt haben.
     </para>
 
     <tip>
-      <para>Pausing the cursor for a couple of seconds over options in these windows will display a tooltip with
-        in-depth information on the choice.
+      <para>Wenn Sie den Mauszeiger einige Sekunden lang über den Optionen in diesen Fenstern halten, wird eine
+        QuickInfo mit detaillierteren Informationen zu der Auswahl angezeigt.
       </para>
     </tip>
 
     <note>
-      <para>The changes you make will be applied at once.
+      <para>Die Änderungen, die Sie an jedem einzelnen Element vornehmen, werden sofort übernommen. Aus diesem
+        Grund enthält das Fenster weder eine <guibutton>Ok</guibutton> oder
+        <guibutton>Abbrechen</guibutton>- Schaltfläche. Stattdessen wird das Fenster
+        <guilabel>&appname;-Einstellungen</guilabel> mit drücken der Schaltfläche
+        <guibutton>Schließen</guibutton> verlassen.
       </para>
     </note>
 
-    <para>To close the <guilabel>&appname; Preferences</guilabel> window press the
-      <guibutton>Close</guibutton> button.
-    </para>
-
-    <para>Each tab in the <guilabel>&appname; Preferences</guilabel> window is discussed in its own section
-      below. For a listing of the tabs, see <xref linkend="custom-gnucash"/>.
+    <para>Jede Registerkarte im Fenster <guilabel>&appname;-Einstellungen</guilabel> wird in einem eigenen
+      Abschnitt weiter unten behandelt.
     </para>
 
     <note>
-      <para>The presentation of the sections that follows matches the order of the tabs, which are sorted
-        alphabetically by name, in English. The order of the tabs may be different in other
-        languages.
+      <para>Die Darstellung der folgenden Abschnitte entspricht in seiner Reihenfolge der alphabetischen
+        Sortierung der englischen Kategorien.
       </para>
     </note>
 
     <sect2 id="prefs-accounting-period">
-      <title>Accounting Period</title>
+      <title>Buchführungsperioden</title>
 
       <figure id="prefs-acct-period-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title><screenshot id="Prefer_Accounting-Period">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die
+          <guilabel>Buchführungsperioden</guilabel></title><screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
-                         srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" 
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
-
-            <textobject>
-              <phrase>The Accounting Period tab</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Start Date:</guilabel> This item sets the accounting period’s start date.
-          </para>
+      <simpara>Auf diesem Reiter können Sie angeben, wie in Ihrem Haushalt, Verein oder Unternehmen im Normalfall
+        das Geschäftsjahr definert ist. Zusätzlich bietet &app; Ihnen auch die Freiheit,
+        unterjährige Zeitbereiche einzustellen. Die Datumsangaben ermöglichen eine
+        periodenbasierte Finanzberechnungen in diversen Berichten sowie in der
+        <xref linkend ="Common-summary-bar" />.
+      </simpara>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Relative:</guilabel> Use the specified relative starting date for profit/loss
-                calculations. Also use this date for net assets calculations. Relative defines start
-                by today or start of current/previous year, quarter, month.
-              </para>
-            </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Anfangsdatum</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Absolute:</guilabel> Use the specified absolute starting date for profit/loss
-                calculations. Also use this date for net assets calculations.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+          <listitem>
+            <para>Dieser Eintrag legt das Startdatum der Abrechnungsperiode fest.
+            </para>
 
-        <listitem>
-          <para><guilabel>End Date:</guilabel> This item sets the accounting period’s end date.
-          </para>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Relativ</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Relative:</guilabel> Use the specified relative ending date for profit/loss calculations.
-                Also use this date for net assets calculations.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Hiermit wird der Beginn durch Heute oder den Anfang des aktuellen/vorherigen Jahres, Quartals,
+                    Monats bestimmt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Absolute:</guilabel> Use the specified absolute ending date for profit/loss calculations.
-                Also use this date for net assets calculations.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+              <varlistentry>
+                <term><guilabel>Absolut</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Summarybar content</guilabel>
-          </para>
+                <listitem>
+                  <para>Wählen Sie ein bestimmtes Datum aus dem Kalender aus.
+                    <footnote id="fn-cust-period-abs">
+                      <para><note>
+                          <para>Denken Sie daran, nach dem Geschäftsjahr das Datum neu zu definieren.
+                          </para>
+                        </note>
+                      </para>
+                    </footnote>
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Include grand total:</guilabel> If checked, show in the <emphasis>Summarybar</emphasis> a
-                grand total of all accounts converted to the default currency.
-              </para>
-            </listitem>
+        <varlistentry>
+          <term><guilabel>Enddatum</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Include non-currency totals:</guilabel> if this option is selected, &app; will include in
-                the <emphasis>Summarybar</emphasis> a total for non-currency items (for instance
-                number of shares).
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+          <listitem>
+            <para>Diese Position legt das Enddatum der Buchhaltungsperiode fest.
+            </para>
+
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Relativ</guilabel></term>
+
+                <listitem>
+                  <para>Hiermit wird das Enddatum durch Heute oder das Ende des aktuellen/vorherigen Jahres, Quartals,
+                    Monats bestimmt.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Absolut</guilabel></term>
+
+                <listitem>
+                  <para>Wählen Sie ein bestimmtes Datum aus dem Kalender aus. <footnoteref linkend="fn-cust-period-abs" />
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Inhalt Zusammenfassungsleiste</guilabel></term>
+
+          <listitem>
+            <variablelist spacing="compact">
+              <title></title>
+
+              <varlistentry>
+                <term><guilabel>Gesamtsumme anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn aktiviert, wird in der <guilabel>Zusammenfassungsleiste</guilabel> eine Gesamtsumme,
+                    umgerechnet in die für Berichte voreingestellte Währung, aller Konten
+                    angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Wertpapier-Gesamtsumme anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, enthält &app; in der <guilabel>Zusammenfassungsleiste</guilabel>
+                    eine Summe für Nicht-Währungselemente (z.B. Anzahl der Aktien). Ansonsten
+                    werden nur Währungen angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
     <sect2 id="prefs-accounts">
-      <title>Accounts</title>
+      <title>Konten</title>
 
       <figure id="prefs-acct-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Prefer_Accounts">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Konten</guilabel></title><screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
-                         srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Accnts.png" 
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Accnts.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Accounts tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Konten</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Separator Character:</guilabel> The account separator is the character that separates a
-            parent account from its sub-account, for example Utilities:Electric. The default is a
-            <keycap>:</keycap> (Colon), but you can also select <keycap>/</keycap> (Slash),
-            <keycap>\</keycap> (Backslash), <keycap>-</keycap> (Dash) or <keycap>.</keycap>
-            (Period), or any Unicode character that isn’t a letter or a number.
-          </para>
-        </listitem>
+      <simpara>Dieser Reiter bietet Ihnen zahlreiche Möglichkeiten, um die Darstellung ihrer Konten zu
+        beeinflussen.
+      </simpara>
 
-        <listitem>
-          <para><guilabel>Reverse Balanced accounts:</guilabel> This option lets you determine whether account
-            balances will display as positive or negative numbers:
-          </para>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Trennzeichen</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Income & Expense</guilabel> assigns a positive credit balance to income account
-                balances and a negative debit balance to expense account balances. See
-                <xref linkend="acct-types"></xref> for more information on these account types.
-              </para>
-            </listitem>
+          <listitem>
+            <para>Das Kontentrennzeichen ist das Zeichen, das ein übergeordnetes Konto von seinem Unterkonto trennt,
+              z.B. Versorgungsunternehmen:Strom. Die Vorgabe ist ein <keycap>:</keycap>
+              (Doppelpunkt). Sie können aber auch <keycap>/</keycap> (Schrägstrich),
+              <keycap>\</keycap> (Backslash), <keycap>-</keycap> (Gedankenstrich) oder
+              <keycap>.</keycap> (Punkt) wählen, oder ein beliebiges Unicode-Zeichen, das
+              <emphasis>kein</emphasis> Buchstabe oder eine Zahl ist.
+            </para>
+          </listitem>
+        </varlistentry>
 
-            <listitem>
-              <para><guilabel>Credit accounts</guilabel> (default) displays a positive balance for account types that
-                would normally carry a credit balance (income, credit, liability, equity). See
-                <xref linkend="acct-types"></xref> for more information on these account types.
-              </para>
-            </listitem>
+        <varlistentry>
+          <term><guilabel>Betrags-Vorzeichen umkehren für Kontentypen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>None</guilabel> shows all credit balances as negative and all debit balances as positive.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+          <listitem>
+            <para>Mit dieser Option können Sie festlegen, welche Kontosalden als positive oder negative Zahlen
+              angezeigt werden sollen. Siehe <xref linkend="acct-types"></xref> für weitere
+              Informationen zu diesen Kontotypen.
+            </para>
 
-        <listitem>
-          <para><guilabel>Labels:</guilabel> Select this option if you want column headings in the register to refer
-            to <guilabel>debits</guilabel> and <guilabel>credits</guilabel> instead of the default
-            informal headings such as <guilabel>withdrawal</guilabel> and
-            <guilabel>deposit</guilabel>.
-          </para>
-        </listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Keine</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Default Currency:</guilabel> This item determines which currency will be selected by
-            default when creating new accounts.
-          </para>
+                <listitem>
+                  <para>Entsprechend der
+                    <ulink url="&url-docs-build-C;guide/basics-accounting1.html#accounting_equation_dynamic"></ulink>
+                    werden Passiva und Erträge negativ dargestellt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Locale:</guilabel> Use the system locale currency for all newly created accounts.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Habenkonten</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Choose:</guilabel> specify the currency to use, independent of your system settings.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                <listitem>
+                  <para>(Standardvorgabe) zeigt einen positiven Saldo für Kontotypen an, die normalerweise einen Habensaldo
+                    aufweisen würden (Erträge, Guthaben, Verbindlichkeiten, Eigenkapital). Dies
+                    entspricht der umgeformten Bilanzgleichung unter
+                    <ulink url="&url-docs-build-C;guide/basics-accounting1.html#accounting_equation_rearranged"></ulink>.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <listitem>
-          <para><guilabel>Account Color:</guilabel> This option lets you manage the display of the account color set
-            in the <guilabel>Edit Account</guilabel> window:
-          </para>
+              <varlistentry>
+                <term><guilabel>Erträge & Aufwendungen</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Show the Account Colors as background:</guilabel> show the accounts color as account name
-                background in the Accounts Page.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Weist Ertragskonten einen positiven Habensaldo und Aufwandskonten einen negativen Sollsaldo zu.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-            <listitem>
-              <para><guilabel>Show the Account Colors on tabs:</guilabel> show the accounts color as background in the
-                account register tabs.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+        <varlistentry>
+          <term><guilabel>Beschriftungen</guilabel></term>
+
+          <listitem>
+            <para>Wählen Sie <guilabel>Buchungsüberschriften aus dem Rechnungswesen</guilabel>, wenn Sie
+              Spaltenüberschriften in der Kontenansicht als <guilabel>Soll</guilabel> und
+              <guilabel>Haben</guilabel> bevorzugen. Ansonsten wird die Vorgabe mit den informellen
+              Ãœberschriften wie z.B. <guilabel>Abhebung</guilabel> und
+              <guilabel>Einzahlung</guilabel>, abhängig von der gewählten Kontoart, verwendet.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Standardwährung</guilabel></term>
+
+          <listitem>
+            <para>Dieser Punkt legt fest, welche Währung standardmäßig beim Anlegen neuer Konten ausgewählt wird.
+            </para>
+
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Systemeinstellung</guilabel></term>
+
+                <listitem>
+                  <para>Verwenden Sie die Währung des Gebietsschemas Ihres Betriebssystems für alle neu erstellten Konten.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Auswahl</guilabel></term>
+
+                <listitem>
+                  <para>Geben Sie die zu verwendende Währung, abweichend von Ihren Systemeinstellungen, an.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Kontofarbe</guilabel></term>
+
+          <listitem>
+            <para>Mit dieser Option können Sie die Verwendung der Kontofarbe steuern, die unter
+              <menuchoice>
+                <shortcut>
+                <keycombo>
+                  <keycap>Strg</keycap><keycap>E</keycap>
+                </keycombo>
+                </shortcut><guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem>Konto
+                <accel>b</accel>earbeiten</guimenuitem>
+              </menuchoice>
+              eingestellt wird.
+            </para>
+
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Kontofarbe als Hintergrund anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Die Farbe der Konten als Hintergrundfarbe des Kontonamens in der Kontenübersicht anzeigen.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Kontofarbe auf Reiter anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Zeigt die Kontenfarbe als Hintergrund des Reiters für das Kontobuch an.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
     <sect2 id="prefs-biz">
-      <title>Business</title>
+      <title>Geschäft</title>
 
       <figure id="prefs-biz-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Prefer_Business">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Geschäft</guilabel></title><screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
-                         srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Business.png" 
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Business.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Business tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Geschäft</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>General</guilabel>
-          </para>
+      <simpara>Mit den Optionen auf diesem Reiter legen Sie Einstellung für den Umgang mit Rechnungen fest.
+      </simpara>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Enable extra buttons:</guilabel> If checked, extra toolbar buttons for common business
-                functions are shown.
-              </para>
-            </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Allgemein</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Open in new window:</guilabel> If checked, each invoice will be opened in its own top
-                level window. If clear, the invoice will be opened in the current window.
-              </para>
-            </listitem>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Zusätzliche Werkzeugleisten-Knöpfe</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Accumulate splits on post:</guilabel> Whether multiple entries in an invoice which
-                transfer to the same account should be accumulated into a single split by default.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                <listitem>
+                  <para>Wenn diese Option aktiviert ist, werden zusätzliche Schaltflächen in der Werkzeugleiste für
+                    häufig benutzte Geschäfts-Funktionen angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <listitem>
-          <para><guilabel>Invoices</guilabel>
-          </para>
+              <varlistentry>
+                <term><guilabel>In neuem Fenster öffnen</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Report for printing:</guilabel> Allows to select the invoice report to be used for
-                printing.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Mit dieser Option, wird jede Rechnung in einem eigenen Hauptfenster geöffnet. Ansonsten wird die
+                    Rechnung in einer Registerkarte des aktuellen Fensters angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Tax Included:</guilabel> Whether tax is included by default in entries on invoices. This
-                setting is inherited by new customers and vendors.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Buchungsteile beim Buchen kumulieren</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Auto pay on posting:</guilabel> If enabled, at post time automatically attempt to pay
-                customer documents with outstanding pre-payments and counter documents.
-              </para>
+                <listitem>
+                  <para>Ist diese Option markiert, dann wird in dem Dialog <guilabel>Buchen</guilabel> einer Rechnung das
+                    Kontrollkästchen <guilabel>Buchungen kumulieren?</guilabel> voreingestellt.
+                    <warning>
+                      <para>Dies fasst mehrere Einträge einer Rechnung, die zum gleichem Konto gebucht werden, zu einem
+                        einzigen Buchungsteil zusammen, was spätere Auswertungen erschwert.
+                      </para>
+                    </warning>
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-              <note>
-                <para>Counter documents are documents with opposite sign. For example for an invoice, customer credit
-                  notes and negative invoices are considered counter documents.
-                </para>
+        <varlistentry>
+          <term><guilabel>Rechnungsausgang</guilabel></term>
 
-                <para>The pre-payments and documents obviously have to be against the same customer.
-                </para>
-              </note>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+          <term><guilabel>Lieferantenrechnungen</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Bills</guilabel>
-          </para>
+          <listitem>
+            <para>Die folgenden Einstellungen gelten sowohl für den Rechnungsausgang (Kundenrechnung) als auch für
+              die Lieferantenrechnung (Rechnungseingang).
+            </para>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Notify when due:</guilabel> Lets you set whether you want to be notified at &app; startup
-                of when a bill is soon to be due.
-              </para>
-            </listitem>
+            <variablelist spacing="compact">
+<!--  FIXME source: new item -->
+              <varlistentry>
+                <term><guilabel>Bei Fälligkeit benachrichtigen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Days in advance:</guilabel> How many days before the due date to warn about bills coming
-                due.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Hier können Sie einstellen, ob Sie beim Start von &app; benachrichtigt werden möchten, wenn eine
+                    Rechnung fällig wird.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Tax Included:</guilabel> Whether tax is included by default in entries on bills. This
-                setting is inherited by new customers and vendors.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Tage im Voraus</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Process payments on posting:</guilabel> If enabled, at post time automatically attempt to
-                pay vendor documents with outstanding pre-payments and counter documents.
-              </para>
+                <listitem>
+                  <para>Geben Sie an, wie viele Tage Sie vor dem Fälligkeitsdatum der Rechnungen hingewiesen werden wollen.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-              <note>
-                <para>Counter documents are documents with opposite sign. For example for a bill, vendor credit notes and
-                  negative bills are considered counter documents.
-                </para>
+              <varlistentry>
+                <term><guilabel>Bericht zum Drucken</guilabel></term>
 
-                <para>The pre-payments and documents obviously have to be against the same vendor.
-                </para>
-              </note>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+                <listitem>
+                  <para>Nur für den Rechnungsausgang: Ermöglicht die Auswahl des zu verwendenden Rechnungsformulars für
+                    die Druckausgabe.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Inklusive Steuern</guilabel></term>
+
+                <listitem>
+                  <para>Mit dieser Einstellung können Sie festlegen, ob Sie bei Rechnungen
+                    (<guilabel>Rechnungsausgang</guilabel> oder
+                    <guilabel>Lieferantenrechnung</guilabel>) mit Brutto- oder Nettowerten arbeiten.
+                    Gibt an, ob die Steuer standardmäßig in den Einträgen auf Rechnungen
+                    enthalten ist. Diese Einstellung wird in den Dialogen
+                    <menuchoice>
+                      <guimenu><accel>G</accel>eschäft</guimenu><guisubmenu><accel>K</accel>unden</guisubmenu><guimenuitem>
+                      <accel>N</accel>euer Kunde…</guimenuitem>
+                    </menuchoice>
+                    bzw.
+                    <menuchoice>
+                      <guimenu><accel>G</accel>eschäft</guimenu><guisubmenu><accel>L</accel>ieferant</guisubmenu><guimenuitem>
+                      <accel>N</accel>euer Lieferant…</guimenuitem>
+                    </menuchoice>
+                    verwendet.
+                  </para>
+
+                  <note>
+                    <simpara>Im Endkunden-Geschäft in der EU sollten Sie den Standardwert verwenden, da es sonst zu
+                      unzulässigen Rundungsfehlern kommen kann.
+                    </simpara>
+                  </note>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Automatisch verrechnen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn aktiviert, wird zum Zeitpunkt der Buchung automatisch versucht, die Belege mit bereits
+                    geleisteten Vorauszahlungen und Gegenbelegen zu verrechnen.
+                    <footnote id="fn-prefs-counter-docs">
+                      <para><note>
+                          <para>Gegenbelege sind Belege mit umgekehrtem Vorzeichen. Zum Beispiel werden für eine Rechnung
+                            Gutschriften oder Stornierung als Gegenbelege betrachtet. Die
+                            Vorauszahlungen und Belege müssen natürlich an denselben
+                            <emphasis>Kunden</emphasis> respektive <emphasis>Lieferanten</emphasis>
+                            gerichtet sein.
+                          </para>
+                        </note>
+                      </para>
+                    </footnote>
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
     <sect2 id="prefs-date-time">
-      <title>Date/Time</title>
+      <title>Zahl, Datum, Zeit</title>
 
       <figure id="prefs-date-time-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Date/Time</guilabel> tab</title><screenshot id="Prefer_DateTime">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für <guilabel>Zahl, Datum, Zeit</guilabel></title><screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
-                         srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_DateTime.png" 
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_DateTime.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Date/Time tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Zahl, Datum, Zeit</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Time Format</guilabel>
-          </para>
+      <simpara>Auf diesem Reiter haben Sie die Möglichkeit, die Darstellung von Zahlen, Datum und Zeit
+        festzulegen.
+      </simpara>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Use 24-hour clock:</guilabel> Lets you specify if you want to use 24 or 12 hours time
-                format. That is if 11 o’clock at night should be represented as 11PM or 23:00.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Zahlen</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Date Format:</guilabel> This option controls the appearance of the date (you can see a
-            preview of the date beside each of the choices). The available choices are:
-          </para>
+          <listitem>
+            <variablelist spacing="compact">
+<!-- FIXME source: new item -->
+              <varlistentry>
+                <term><guilabel>Kurse immer als Dezimalzahlen anzeigen</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>US:</guilabel> Use the date format common in the United States.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Wenn aktiviert wird der Kurs von Wertpapieren als gerundete Dezimalzahl anstelle eines Bruchs
+                    angezeigt. Damit wird in Kauf genommen, dass Rundungsfehler entstehen können.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>UK:</guilabel> Use the date format common in the United Kingdom.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Negative Beträge in rot anzeigen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Europe:</guilabel> Use the date format common in continental Europe.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Wenn Sie diese Option deaktivieren, zeigt &app; negative Zahlen in schwarzer Schrift an.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>ISO:</guilabel> Use the date format specified by the ISO-8601 standard.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Automatische Dezimalstellen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Locale:</guilabel> Use the date format specified by the system locale.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                <listitem>
+                  <para>Diese Option fügt automatisch ein Dezimalkomma in Zahlen ein, die Sie eingeben. So wird zum
+                    Beispiel die Eingabe von <emphasis>2000</emphasis> in <emphasis>20,00</emphasis>
+                    umgewandelt. Die Position des Kommas hängt von der Angabe im Feld
+                    <guilabel>Kommastellen</guilabel> ab.
+                  </para>
+
+                  <note>
+                    <para>Wenn eine Berechnung in das Feld <guilabel>Betrag</guilabel> eingegeben wird, wird das
+                      Dezimalzeichen bei <emphasis>jedem</emphasis> Operanden eingefügt, der ein
+                      Dezimaltrennzeichen auslässt. Diese Option kann vormaligen Benutzern von
+                      Addiermaschinen den Umstieg zu Gnucash erleichtern.
+                    </para>
+                  </note>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Kommastellen</guilabel></term>
+
+                <listitem>
+                  <para>In diesem Feld können Sie die Anzahl der automatisch ergänzten Dezimalstellen einstellen.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Datumsformat</guilabel></term>
+
+          <listitem>
+            <para>Diese Option steuert das Erscheinungsbild des Datums (Sie sehen eine Vorschau des Datums neben jeder
+              der Auswahlmöglichkeiten). Die verfügbaren Auswahlmöglichkeiten sind:
+            </para>
+
+            <itemizedlist spacing="compact">
+              <listitem>
+                <para>USA
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>Großbritannien
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>Europäisch
+                </para>
+              </listitem>
 
-        <listitem>
-          <para><guilabel>Date completion:</guilabel> This option lets you manage the case when a date is entered
-            without a year:
-            <itemizedlist>
               <listitem>
-                <para><guilabel>In the current calendar year:</guilabel> Dates will be completed so that they are within
-                  the current calendar year.
+                <para>ISO-8601 Standard
                 </para>
               </listitem>
 
               <listitem>
-                <para><guilabel>In a sliding 12-month window starting a configurable number of months before the current
-                  month:</guilabel> (Default) Dates will be completed so that they are close to the
-                  current date. You can enter the maximum number of months to go backwards in time
-                  when completing dates in a range of 0…11 with 6 as default.
+                <para>Systemsprache, (Voreingestellt an Hand der Systemeinstellung)
                 </para>
               </listitem>
             </itemizedlist>
-          </para>
-        </listitem>
-      </itemizedlist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Datum vervollständigen</guilabel></term>
+
+          <listitem>
+            <para>Mit dieser Option können Sie den Umstand verwalten, dass ein Datum ohne Jahreszahl eingegeben wird.
+            </para>
+
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Im atuellen Kalenderjahr</guilabel></term>
+
+                <listitem>
+                  <para>Die Datumsangaben werden so ergänzt, dass sie innerhalb des aktuellen Kalenderjahres liegen.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>In einem 12-Monats-Zeitfenster, welches diese Anzahl Monate vor dem aktuellen Monat
+                  beginnt</guilabel></term>
+
+                <listitem>
+                  <para>Termine werden so ergänzt, dass sie nahe am aktuellen Datum liegen. Sie können die maximale Anzahl
+                    der Monate eingeben, die beim Vervollständigen des Datums rückwärts in einem
+                    Bereich von 0...11, mit 6 als Voreinstellung, verwendet werden.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Zeit</guilabel></term>
+
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>24-Stunden-Format</guilabel></term>
+
+                <listitem>
+                  <para>Hier können Sie angeben, ob Sie das Zeitformat 24 oder 12 Stunden verwenden möchten. Das heißt,
+                    ob 11 Uhr nachts als 11PM oder 23:00 Uhr dargestellt werden soll.
+                    <footnote>
+                      <para>Diese praktisch unbenutzte Option wird in Gnucah 5.0 entfernt, da sich das reguläre Zeitformat aus
+                        den Regionaleinstellungen ergibt. (Siehe
+                        <ulink url="https://bugs.gnucash.org/show_bug.cgi?id=798297"></ulink>)
+                      </para>
+                    </footnote>
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="prefs-general">
-      <title>General</title>
+    <sect2 id="prefs-general" xreflabel="Allgemeine Einstellungen">
+      <title>Allgemein</title>
 
       <figure id="prefs-general-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title><screenshot id="Prefer_General">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für alles <guilabel>Allgemein</guilabel>e</title><screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
-                         srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_General.png" 
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_General.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The General tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Allgemein</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>General</guilabel>
-          </para>
+      <simpara>Auf diesem Reiter können Sie Vorgaben machen, die unter anderem den Umgang mit der
+        &app;-Datendatei, Logdateien sowie verknüpften Dokumenten betreffen.
+      </simpara>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Display "Tip of the Day" dialog:</guilabel> This option displays or hides the
-                <guilabel>Tip of the Day</guilabel> screen when &app; is started.
-              </para>
-            </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Allgemein</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Show splash screen:</guilabel> With this option you can enable or disable the
-                visualization of the startup screen while &app; is starting up.
-              </para>
-            </listitem>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>"Tipp des Tages" anzeigen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Perform account list setup on new file:</guilabel> This option turns off the display of
-                the <guilabel>New Account Hierarchy Setup</guilabel> assistant when the entry
-                <menuchoice>
-                  <guimenu>File</guimenu> <guimenuitem>New File</guimenuitem>
-                </menuchoice>
-                is selected from the &app; menu.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Mit dieser Einstellung kann der <guilabel>Tipp des Tages</guilabel> beim Programmstart wieder
+                    angezeigt werden.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Set book option on new files to use split "action" field for "Num" field on
-                registers/reports:</guilabel> If selected, the displayed setting on the
-                <guilabel>New Book Options</guilabel> dialog for the <guilabel>Use Split Action
-                Field for Number</guilabel> setting will be selected and, if saved, the book option
-                for the new file will be set so that the "Num" field 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 displayed
-                setting on the dialog will not be selected and, if saved, the book option for the
-                new file will be set so that the "Num" field on registers shows/updates the
-                transaction-num field. See the discussion in
-                <xref
-              linkend="book-options"/> about how to set book options including
-                the option for <xref linkend="num-action-book-option"/>. Regardless of the setting
-                of this preference, the user can modify the initially displayed setting for this
-                option on the <guilabel>New Book Options</guilabel> dialog before saving the
-                options.
-              </para>
-            </listitem>
-          </itemizedlist>
-
-          <note>
-            <para>If the <guilabel>New Book Options</guilabel> dialog appears in situations where a new book is being
-              set up, the settings from this preference will determine the default setting for the
-              corresponding check box on the dialog. However, the <guibutton>OK</guibutton> button
-              on the <guilabel>New Book Options</guilabel> dialog must be pressed for the setting to
-              be made for the new book; otherwise it will default to <emphasis>not
-              selected</emphasis>.
-            </para>
-          </note>
-        </listitem>
+              <varlistentry>
+                <term><guilabel>Begrüßungsbild anzeigen</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Numbers</guilabel>
-          </para>
+                <listitem>
+                  <para>Mit dieser Option aktivieren oder deaktivieren Sie die Anzeige des Startbildschirms während des
+                    Startvorgangs von &app;. In der Anzeige des <quote>Splash-Screen</quote> wird
+                    Ihnen mit Texthinweisen der Fortschritt des Programmstarts angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Display negative amounts in red:</guilabel> If you turn off this option, &app; will
-                display negative numbers in black.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Bei neuer Datei erstellen: Konteneinrichtung starten</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Automatic Decimal Point:</guilabel> This option will automatically insert a decimal point
-                into numbers you type in.
-              </para>
+                <listitem>
+                  <para>Diese Option startet den Assistenten <guilabel>Neuen Kontenplan einrichten</guilabel>, wenn der
+                    Eintrag
+                    <menuchoice>
+                      <shortcut>
+                      <keycombo>
+                        <keycap>Strg</keycap><keycap>N</keycap>
+                      </keycombo>
+                      </shortcut> <guimenu><accel>D</accel>atei</guimenu>
+                      <guimenuitem><accel>N</accel>eue Datei</guimenuitem>
+                    </menuchoice>
+                    aus dem Menü ausgewählt wird.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-              <note>
-                <para>When a calculation is entered in the <guilabel>Amount</guilabel> field, the decimal sign is inserted
-                  into <emphasis>every</emphasis> operand that omits a decimal separator.
-                </para>
-              </note>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Bei neuer Datei: Voreinstellung, ob das Aktionsfeld des Buchungsteils für das Nummerfeld
+                  verwendet werden soll.</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Decimal Places:</guilabel> This field allows you to set the number of decimal places to be
-                used.
+                <listitem>
+                  <note>
+                    <para>Diese Einstellung ist hauptsächlich für ehemalige Anwender anderer Buchhaltungsprogramme
+                      interessant.
+                    </para>
+                  </note>
+
+                  <para>Wenn ausgewählt, wird bei der Erstellung einer neuen Datei im Assistenten <guilabel>Neuen
+                    Kontenplan einrichten</guilabel> auf dem zweiten Reiter <guilabel>Buch-Optionen
+                    für neues Buch</guilabel> das Kontrollkästchen <guilabel>Aktionsfeld des
+                    Buchungsteils für Nummer benutzen</guilabel> ebenfalls aktiviert. Beachten Sie
+                    hinsichtlich dieser Einstellung die ausführlichen Erläuterungen zu
+                    <xref linkend="num-action-book-option"/>.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+
+            <note>
+              <para>Wenn der Dialog <guilabel>Buch-Optionen für neues Buch</guilabel> in Situationen erscheint, in
+                denen ein neues Buch eingerichtet wird, bestimmen die Einstellungen aus dieser
+                Voreinstellung die Standardeinstellung für das entsprechende Kontrollkästchen im
+                Dialogfeld. Allerdings muss die Schaltfläche <guibutton>OK</guibutton> im Dialog
+                <guilabel>Buch-Optionen für neues Buch</guilabel> betätigt werden, damit die
+                Einstellung vorgenommen werden, ansonsten wird die Voreinstellung <emphasis>nicht
+                ausgewählt</emphasis> übernommen.
               </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+            </note>
+          </listitem>
+        </varlistentry>
+<!-- FIXME source: move number to Date/Time -->
+        <varlistentry>
+          <term><guilabel>Dateien</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Files</guilabel>
-          </para>
+          <listitem>
+            <note>
+              <para>Die folgenden Optionen sind nur für Dateien relevant, die im <acronym>XML</acronym>-Format
+                gespeichert sind.
+              </para>
+            </note>
 
-          <note>
-            <para>The following options are only relevant for files saved in <acronym>XML</acronym> format.
-            </para>
-          </note>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Datei komprimieren</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Compress files:</guilabel> This option determines whether the &app; data file will be
-                compressed or not.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Diese Option bestimmt, ob die &app; Datendatei komprimiert wird oder nicht. Die Komprimierung
+                    erfolgt hierbei mit <acronym>gzip</acronym>. Da viele Backup-Lösungen mit einer
+                    differentiellen Sicherung arbeiten, sind unkomprimierten Dateien hinsichtlich
+                    Datensicherung deutlich effizienter.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Show auto-save confirmation question:</guilabel> If this option is enabled, &app; will
-                show you a confirmation screen each time the auto-save process is started.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Erklärung für Automatisches Speichern anzeigen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Auto-save time interval:</guilabel> This field sets the number of minutes between each
-                automatic saving of the file. Set to 0 to disable the auto-save feature.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Wenn diese Option aktiviert ist, zeigt &app; jedes Mal einen Bestätigungsdialog an, bevor der
+                    automatische Speichervorgang gestartet wird.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Enable timout on "Save changes on closing" question:</guilabel> If enabled, the
-                <guilabel>Save changes on closing</guilabel> 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. You can set
-                the number of seconds in the <guilabel>Time to wait for answer</guilabel> field.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Zeitintervall Automatisches Speichern</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Retain log files:</guilabel> In this section you can set your preferences about the log
-                files using the provided radio buttons.
-              </para>
+                <listitem>
+                  <para>Dieses Feld legt die Anzahl der Minuten zwischen jedem automatischen Speichern der Datei fest.
+                    Setzen Sie es auf 0, um die automatische Speicherfunktion zu deaktivieren.
+                    <tip>
+                      <para>Möchten Sie bei komplexeren Vorgänge nicht durch das Speichern behindert werden, trotzdem auf die
+                        Funktion des automatischen Speicherns beim Beenden nicht verzichten, so
+                        können Sie z.B. den Wert 1440 eintragen. Das entspricht einer einmaligen,
+                        täglichen Sicherung und beim Beenden des Programms wird die Sitzung dann
+                        gespeichert.
+                      </para>
+                    </tip>
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Aktiviere Wartezeit bei "Geänderte Datei speichern"-Frage beim Schließen</guilabel></term>
 
-              <itemizedlist>
                 <listitem>
-                  <para><guilabel>Never:</guilabel> Disable the creation of log files.
+                  <para>Wenn aktiviert, wird der Dialog <guilabel>Änderungen beim Schließen speichern</guilabel> nur eine
+                    begrenzte Anzahl von Sekunden auf eine Antwort warten. Wenn der Benutzer
+                    innerhalb dieser Zeit nicht antwortet, werden die Änderungen automatisch
+                    gespeichert und das Fragefenster geschlossen. Sie können die Anzahl der
+                    Sekunden im Feld <guilabel>Wartezeit auf Antwort</guilabel> einstellen.
                   </para>
                 </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Log-/Sicherungsdateien aufbewahren</guilabel></term>
 
                 <listitem>
-                  <para><guilabel>For:</guilabel> Enter a specific number of days for which keep the files.
+                  <para>In diesem Abschnitt können Sie Ihre Präferenzen bezüglich der Log-Dateien mit Hilfe der
+                    bereitgestellten Optionsfelder einstellen.
                   </para>
+
+                  <tip>
+                    <para>Es empfiehlt sich, separate Ordner für jede Ihrer verwendeten Datendatei anzulegen, und diese dort
+                      zu organisieren, da &app; in dem selben Verzeichnis die Backup- und
+                      Log-Dateien schreibt, wenn Sie das aktiviert haben.
+                    </para>
+                  </tip>
+
+                  <variablelist spacing="compact">
+                    <varlistentry>
+                      <term><guilabel>Nie</guilabel></term>
+
+                      <listitem>
+                        <para>Deaktiviert die Erstellung von Protokolldateien.
+                        </para>
+                      </listitem>
+                    </varlistentry>
+
+                    <varlistentry>
+                      <term><guilabel>Für</guilabel></term>
+
+                      <listitem>
+                        <para>Geben Sie eine Anzahl von Tagen ein, für die die Dateien aufbewahrt und danach gelöscht werden
+                          sollen. Wenn Sie <keycap>0</keycap> einstellen, dann werden die Log- und
+                          Sicherungsdateien nicht automatisch gelöscht.Dies funktioniert nur, wenn
+                          Sie den Namen der &app;-Datendatei nicht ändern.
+                        </para>
+                      </listitem>
+                    </varlistentry>
+
+                    <varlistentry>
+                      <term><guilabel>Immer</guilabel></term>
+
+                      <listitem>
+                        <para>Wenn Sie <guilabel>Immer</guilabel> auswählen, dann werden die Log- und Sicherungsdateien behalten.
+                        </para>
+                      </listitem>
+                    </varlistentry>
+                  </variablelist>
                 </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+<!-- FIXME source: new item -->
+        <varlistentry>
+          <term><guilabel>Verknüpfte Dateien</guilabel></term>
+
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Anfang des Dateipfads für verknüpfte Dokumente (relativer Pfad)</guilabel></term>
 
                 <listitem>
-                  <para><guilabel>Forever:</guilabel> Disable the auto deletion of log files; retains the log files forever.
+                  <para>Wenn Sie Dateien, wie <acronym>z.B.</acronym> digitalisierte Belege, mit Buchungen verknüpfen
+                    möchten, so können Sie mit der Auswahlliste einen Speicherort festlegen.
                   </para>
+
+                  <note>
+                    <para>Haben Sie schon Dokumente verknüpft, wird in einem Dialog auf die Änderung des Dateipfades
+                      hingewiesen und Sie können angeben, wie Sie mit der Pfadänderung für die
+                      schon verknüpften Dokumente umgehen wollen. Die Schaltfläche
+                      <guilabel>Zurücksetzen</guilabel> macht die Änderung des Dateipfads
+                      rückgängig.
+                    </para>
+                  </note>
+
+                  <tip>
+                    <para>Es empfiehlt sich, separate Ordner je &app;-Datendatei für verknüpfte Dokumente anzulegen und
+                      diese dort zu organisieren.
+                    </para>
+                  </tip>
                 </listitem>
-              </itemizedlist>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><guilabel>Search Dialog</guilabel>
-          </para>
+        <varlistentry>
+          <term><guilabel>Such-Dialog</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>New search limit:</guilabel> Defaults to "new search" if fewer than this number of items
-                is returned.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
-    </sect2>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Ergebnisanzahl für Neue Suche</guilabel></term>
 
-    <sect2 id="prefs-online">
-      <title>Online Banking</title>
+                <listitem>
+                  <para>Standardmäßig wird eine <guilabel>Neue Suche</guilabel> verwendet, wenn weniger als diese Anzahl
+                    von Einträgen gefunden wird.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </sect2>
+<!-- FIXME source: New item -->
+    <sect2 id="prefs-import">
+      <title>Import</title>
 
-      <figure id="prefs-online-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Banking</guilabel> tab</title><screenshot id="Prefer_OnlineBanking">
+      <figure id="prefs-import-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für den <guilabel>Import</guilabel></title><screenshot id="Prefer_Import">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Import.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Import.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Online Banking tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Import</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>QIF Import</guilabel>
-          </para>
+      <simpara>Mit den Einstellungen auf diesem Reiter steuern Sie die Funktionsweise von &app; während des
+        Importvorgangs. Der Importvorgang von Buchungen wird in <xref linkend ="trans-import" />
+        beschrieben.
+      </simpara>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Show documentation:</guilabel> The first time you use the QIF importer you may notice that
-                the importer has detailed instructions on how to import a file. Once you have become
-                familiar with using the importer, you might want to turn off this option. Turning
-                off the option gives you less detail in the importer screens.
-              </para>
-            </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Allgemein</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Default transaction status (overridden by the status given by the QIF file):</guilabel> In
-                this section you can set the default status for imported transactions using the
-                provided self-explainingradio buttons:
-              </para>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>"Ãœberspringen"-Aktion aktivieren</guilabel></term>
 
-              <itemizedlist>
                 <listitem>
-                  <para><guilabel>Not cleared</guilabel> (Default)
+                  <para>Ist die <quote>Überspringen</quote>-Aktion aktiviert, so wird gemäß
+                    <xref linkend="trans-import-matcher" /> eine importierte Buchung übersprungen
+                    (nicht importiert), wenn die höchste Übereinstimmung mit einer vorhandenen
+                    Buchung lediglich im gelben Berich liegt. Das bedeutet, der Wert für eine
+                    Übereinstimmung liegt über der Entscheidungsschwelle für das automatische
+                    Hinzufügen, aber unterhalb der Schwelle für den automatischen Abgleich.
+                  </para>
+
+                  <para>Wenn Sie diese Option nicht markieren, dann wird diese importierte Buchung, trotz verhältnismäßig
+                    schlechter Ãœbereinstimmung, zum Abgleich mit einer vorhandenen Buchung
+                    verwendet.
                   </para>
                 </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>"Abgleichen und Datenübernahme"-Aktion aktivieren</guilabel></term>
 
                 <listitem>
-                  <para><guilabel>Cleared</guilabel>
+                  <para>Wenn diese Funktion aktiviert ist, wird eine importierte Buchung, deren Punktzahl für die beste
+                    Übereinstimmung über dem Schwellwert für den automatischen Abgleich liegt und
+                    die ein anderes Datum oder einen anderen Betrag als die entsprechende vorhandene
+                    Buchung hat, die Daten dieser Buchung aktualisieren und abgleichen.
+                  </para>
+
+                  <para>Ist die Option nicht markiert, so wird das Kontrollkästchen <guilabel>Abgleichen und
+                    Datenübernahme</guilabel> ausgeblendet und Sie die können die vorhandene
+                    Buchung nicht mit den importierten Daten aktualisieren.
                   </para>
                 </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Bayes-Algorithmus verwenden</guilabel></term>
 
                 <listitem>
-                  <para><guilabel>Reconciled</guilabel>
+                  <para>Verwenden Sie den Bayes'schen Algorithmus zum Abgleich neuer Buchungen mit bestehenden Konten.
+                    Weitere Informationen zu der Funktiosnweise können Sie unter
+                    <xref linkend="ImportMatchEditor" /> nachlesen.
                   </para>
                 </listitem>
-              </itemizedlist>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Generic Importer</guilabel>
-          </para>
+              </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Enable skip transaction action:</guilabel> Enable the SKIP action in the transaction
-                matcher. If enabled, a transaction whose best match’s score is in the yellow
-                zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be
-                skipped by default.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Entscheidungsschwelle für Anzeige in Zuordnung</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Enable update match action:</guilabel> Enable the UPDATE AND RECONCILE action in the
-                transaction matcher. If enabled, a transaction whose best match’s score is
-                above the Auto-CLEAR threshold and has a different date or amount than the matching
-                existing transaction will cause the existing transaction to be updated and cleared
-                by default.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Die Mindestpunktzahl, die eine potenzielle Ãœbereinstimmung haben muss, damit sie in der
+                    Ãœbereinstimmungsliste angezeigt wird.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Use Bayesian matching:</guilabel> Use Bayesian algorithms to match new transactions with
-                existing accounts.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Entscheidungsschwelle für automatisches Hinzufügen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Match display threshold:</guilabel> The minimal score a potential match must have to be
-                displayed in the match list.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Eine Buchung, deren beste Übereinstimmungspunktzahl im roten Bereich liegt (über dem
+                    Anzeigeschwellenwert, aber unter oder gleich dem Schwellenwert für das
+                    automatische Hinzufügen), wird standardmäßig hinzugefügt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Auto-add threshold:</guilabel> A transaction whose best match’s score is in the red
-                zone (above display threshold, but below or equal to Auto-add threshold) will be
-                added by default.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Entscheidungsschwelle für automatisches Abgleichen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Auto-clear threshold:</guilabel> A transaction whose best match’s score is in the
-                green zone (above or equal to Auto-clear threshold) will be cleared by default.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Eine Buchung, deren beste Übereinstimmungspunktzahl im grünen Bereich liegt (über oder gleich dem
+                    Schwellwert für den automatischen Abgleich), wird standardmäßig abgeglichen.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Commercial ATM fees threshold:</guilabel> In some places commercial ATMs (not belonging to
-                a financial institution) are installed in places like convenience stores. These ATMs
-                add their fee directly to the amount instead of showing up as a separate transaction
-                or in your monthly banking fees. For example, you withdraw $100, and you are charged
-                $101.50 plus Interac fees. If you manually entered that $100, the amounts
-                won’t match. You should set this to whatever is the maximum such fee in your
-                area (in units of your local currency), so the transaction will be recognized as a
-                match by &app;.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Entscheidungsschwelle für wahrscheinliche Datumsübereinstimmung</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Automatically create new commodities:</guilabel> Enables the automatic creation of new
-                commodities if any unknown commodity is encountered during import. If not enabled,
-                the user will be asked what to do with each unknown commodity.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                <listitem>
+                  <para>Liegt das Datum einer importierten Buchung innerhalb diesem Schwellwert so stimmt diese
+                    wahrscheinlich mit einer exisiterenden Buchung überein.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <listitem>
-          <para><guilabel>Online Banking</guilabel>
-          </para>
+              <varlistentry>
+                <term><guilabel>Entscheidungsschwelle für unwahrscheinliche Datumsübereinstimmung</guilabel></term>
 
-          <note>
-            <para>This section is shown only if &app; is compiled with Aqbanking and <acronym>HBCI</acronym> support.
-            </para>
-          </note>
+                <listitem>
+                  <para>Liegt das Datum einer importierten Buchung außerhalb diesem Schwellwert so ist eine
+                    Ãœbereinstimmung unwahrscheinlich.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Close log window when finished:</guilabel> Close the log window when the operation is
-                completed.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Auszahlungsgebühren</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Remember PIN:</guilabel> Enable this option if you want &app; to remember the PIN you
-                enter for online banking authentication.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Bei der Nutzung der Geldautomaten anderer Bank-Verbünde wird manchmal eine zusätzliche
+                    Auszahlungsgebür auf den ausgezahlten Betrag aufgeschlagen und nicht separat
+                    ausgewiesen. Damit die importierten Buchungen zu den existierenden Buchungen von
+                    &app; richtig zugeordnet werden können, haben Sie hier die Möglichkeit, einen
+                    solchen Aufschlag einzustellen.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Verbose debug messages:</guilabel> Enable this option if you want &app; to show more
-                information about the online banking operations.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+              <varlistentry>
+                <term><guilabel>Automatisch neue Wertpapiere/Währungen erstellen</guilabel></term>
+
+                <listitem>
+                  <para>Ermöglicht die automatische Erstellung neuer Wertpapiere/Währungen, wenn unbekannte
+                    Wertpapiere/Währungen während des Importvorgangs erkannt werden. Wenn diese
+                    Option nicht aktiviert ist, wird der Benutzer gefragt, wie &app; mit jedem
+                    unbekannten Wertpapier/Währung verfahren soll.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>QIF Import</guilabel></term>
+
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Erklärungsseiten anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn Sie den QIF-Importer zum ersten Mal verwenden, werden Sie feststellen, dass der
+                    Import-Assistent detaillierte Beschreibungen enthält die den Import einer Datei
+                    erläutert. Sobald Sie sich mit der Verwendung des Importvorgangs vertraut
+                    gemacht haben, können Sie diese Option deaktivieren und die Erklärungsseiten
+                    werden nicht mehr angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Voreingesteller Buchungsstatus (wird überschrieben vom Status aus der QIF
+                  Datei)</guilabel></term>
+
+                <listitem>
+                  <para>In diesem Abschnitt können Sie den Standardstatus für importierte Buchungen über die
+                    bereitgestellten Schaltflächen festlegen:
+                  </para>
+
+                  <itemizedlist spacing="compact">
+                    <listitem>
+                      <para><guilabel>Unbestätigt</guilabel> (Standardvorgabe)
+                      </para>
+                    </listitem>
+
+                    <listitem>
+                      <para><guilabel>Bestätigt</guilabel>
+                      </para>
+                    </listitem>
+
+                    <listitem>
+                      <para><guilabel>Abgeglichen</guilabel>
+                      </para>
+                    </listitem>
+                  </itemizedlist>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="prefs-online-quotes">
-      <title>Online Quotes</title>
+    <sect2 id="prefs-online">
+      <title>Onlinebanking</title>
 
-      <figure id="prefs-quotes-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Quotes</guilabel> tab</title><screenshot id="Prefer-online-quotes">
+      <figure id="prefs-online-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Onlinebanking</guilabel></title><screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Quotes.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Quotes.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_OnlineBanking.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Online Quotes tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Onlinebanking</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Online Quotes</guilabel> tab allows you to set options that affect the fetching of
-        online quotes with the <acronym>perl</acronym> module
-        &app-fq;.
-      </para>
+      <simpara>Auf diesem Reiter können Sie das Verhalten der Online-Banking Schnittstelle konfigurieren. Sollte
+        diese Seite nicht angezeigt werden, bitten Sie den Maintainer Ihrer &lin;-Distribution, das
+        Programmm neu zu bauen und die Option WITH_AQBANKING zu aktivieren.
+      </simpara>
+<!-- FIXME source: move QIF-Import to new Import-Section -->
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Onlinebanking</guilabel></term>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Alpha Vantage API key:</guilabel> To retrieve online quotes from Alphavantage, this key
-            needs to be set. A key can be retrieved from the <ulink url="&url-av;">Alpha Vantage
-            website</ulink>.
-          </para>
-        </listitem>
-      </itemizedlist>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Fenster nach Verbindungsende schließen</guilabel></term>
 
-      <itemizedlist>
-        <title>See also:</title>
+                <listitem>
+                  <para>Wenn aktiviert, wird das Verlaufsfenster geschlossen, sobald der &app-aqb;-Importvorgang beendet
+                    ist. Sollte das Online-Banking nicht wie erwartet funktionieren ist es
+                    hilfreich, diese Option zu deaktivieren.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <listitem>
-          <para><xref linkend="fq-sources"/>,
-          </para>
-        </listitem>
+              <varlistentry>
+                <term><guilabel>HBCI PIN im Speicher merken</guilabel></term>
 
-        <listitem>
-<!-- TODO: create link to id="currency_howto_Auto" -->
-          <para><quote>Automatic Updating Exchange Rates</quote> in the guide.
-          </para>
-        </listitem>
-      </itemizedlist>
+                <listitem>
+                  <para>Aktivieren Sie diese Option, wenn Sie möchten, dass &app; sich für die Dauer der Sitzung die PIN
+                    merkt, die Sie für die Authentifizierung beim Online-Banking eingeben.
+                    Ansonsten müssen Sie die PIN bei jeder Onlineaktion erneut eingeben.
+                    <note>
+                      <para>Die PIN wird nicht dauerhaft gespeichert sondern mit Beenden von &app; aus dem Speicher entfernt!
+                      </para>
+                    </note>
+                  </para>
+                </listitem>
+              </varlistentry>
+<!-- FIXME source: new item -->
+              <varlistentry>
+                <term><guilabel>Verwende Nicht-SWIFT Buchungstext</guilabel></term>
+
+                <listitem>
+                  <para>Einige Banken fügen, entgegen der SWIFT-Spezifikation, Teile der Buchungsbeschreibung als
+                    <quote>transaction text</quote> in MT940/MT942-Dateien ein, welche normalerweise
+                    von &app; ignoriert werden. Wenn Sie diese Einstellung aktivieren, dann wird der
+                    <quote>transaction text</quote> zur Buchungsbeschreibung hinzugefügt.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Ausführliche Fehlermeldungen</guilabel></term>
+
+                <listitem>
+                  <para>Aktivieren Sie diese Option, wenn &app; mehr Informationen über die Vorgänge während der
+                    Kommunikation mit dem Geldinstitut anzeigen soll. Falls Probleme im
+                    Online-Banking auftreten, sollten Sie diese Option vorübergehend aktivieren.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="prefs-printing">
-      <title>Printing</title>
+    <sect2 id="prefs-online-quotes">
+      <title>Online Kurse</title>
 
-      <figure id="prefs-printing-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Printing</guilabel> tab</title><screenshot id="Prefer_Printing">
+      <figure id="prefs-quotes-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> die <guilabel>Online Kurse</guilabel></title><screenshot id="Prefer-online-quotes">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Printing.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Quotes.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Printing.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Quotes.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Printing tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Online Kurse</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Printing</guilabel> tab allows you to set some options that affect the printing of
-        checks on paper.
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Print date format:</guilabel> Enable this option if you want to print on the check, below
-            the actual date, its format in 8 point type.
-          </para>
-        </listitem>
+      <simpara>Auf dem Reiter <guilabel>Online-Kurse</guilabel> können Sie Optionen festlegen, die das Abrufen von
+        Online-Kursen mit dem &app-perl;-Modul &app-fq; beeinflussen.
+      </simpara>
 
-        <listitem>
-          <para><guilabel>Print blocking chars:</guilabel> Enable this option to print a series of three asterisks
-            before and after each text field in the check.
-          </para>
-        </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Alpha Vantage API key</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Default font:</guilabel> Click the button on the left to open a <guilabel>Pick a
-            Font</guilabel> screen in which you can customize the font that will be used to print
-            checks.
-          </para>
-        </listitem>
-      </itemizedlist>
+          <listitem>
+            <para>Möchten Sie Online-Kurse mit &app-fq; über die Schnittstelle von Alphavantage abrufen, so muss
+              hier ein persönlicher Schlüssel eingetragen werden. Der Schlüssel kann auf der
+              <ulink url="&url-av;">Alpha Vantage Website</ulink> beantragt werden.
+              <tip>
+<!-- FIXME: When PR #206 has been merged this xref has to adjust to "online-quotes" -->
+                <para>Die Kursaktualisierung mit &app-fq; wird in <xref linkend="Online-price-setup" /> beschrieben.
+                </para>
+              </tip>
+              <tip>
+                <para>Im Anhang werden gängige <xref linkend="fq-sources"/> aufgelistet.
+                </para>
+              </tip>
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="prefs-reg">
-      <title>Register</title>
+    <sect2 id="prefs-printing">
+      <title>Drucken</title>
 
-      <figure id="prefs-reg-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register</guilabel> tab</title><screenshot id="Prefer_Register">
+      <figure id="prefs-printing-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Drucken</guilabel></title><screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Register.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Printing.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Register.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Printing.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Register tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Drucken</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Actions</guilabel>
-          </para>
-
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>'Enter' moves to blank transaction:</guilabel> If selected, move the cursor to the blank
-                transaction at the end of the register after the user presses the
-                <keycap function="enter">Enter</keycap> key. Otherwise the cursor will be moved down
-                one row.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para><guilabel>Auto-raise lists:</guilabel> If selected, all lists will automatically be expanded when
-                input focus is in the list field.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para><guilabel>Tab order includes Transfer on Memorized Transaction:</guilabel> If selected, when the
-                transaction is auto filled, pressing the <keycap>Tab</keycap> key in the register
-                the cursor’s jump will include the <guilabel>Transfer</guilabel> field.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Reconciling</guilabel>
-          </para>
-
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Check cleared transactions:</guilabel> If selected, automatically check off cleared
-                transactions when reconciling.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para><guilabel>Automatic interest transfer:</guilabel> If selected, 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.
-              </para>
-            </listitem>
+      <simpara>Dieser Bereich enthält die Optionen zur Anpassung für die Druckausgabe.
+      </simpara>
+<!-- FIXME: move appendixd.xml (Auxiliary File Formats) from Guide into Help, insert xref -->
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Scheckformulare drucken</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Automatic credit card payment:</guilabel> If selected, after reconciling a credit card
-                statement, prompt the user to enter a credit card payment.
-              </para>
-            </listitem>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Datumsformat zusätzlich drucken</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Always reconcile to today:</guilabel> If selected, always open the reconcile screen with
-                today’s date for statement date, regardless of previous reconciliation.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                <listitem>
+                  <para>Aktivieren Sie diese Option, wenn Sie auf dem Scheck unter dem eigentlichen Datum, zusätzlich
+                    dessen Format in 8-Punkt-Schrift drucken möchten.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <listitem>
-          <para><guilabel>Graphics</guilabel>
-          </para>
+              <varlistentry>
+                <term><guilabel>Abschlusszeichen drucken</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Use &appname; built-in color theme:</guilabel> If selected, the original &app; register
-                color theme will be used. Otherwise the system color theme will be applied to
-                register windows.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para><guilabel>Double mode colors alternate with transactions:</guilabel> If selected, configures the
-                register window to alternate between the primary and secondary colors with each
-                transaction, instead of each row.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Mit dieser Option wird vor und nach jedem Textfeld eine Folge von drei Sternchen <quote>***</quote>
+                    gedruckt, um die Verfälschung zu erschweren.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Draw horizontal lines between rows:</guilabel> If selected, &app; will draw a horizontal
-                line between each row.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Voreingestellt Schrift</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Draw vertical lines between columns:</guilabel> If selected, &app; will draw a vertical
-                line between the cells in each row.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+                <listitem>
+                  <para>Betätigen Sie die Schaltfläche, um den Auswahldialog <guilabel>Wählen Sie eine Schrift</guilabel>
+                    zu öffnen, in dem Sie die Schriftart für den Scheckdruck anpassen können.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="prefs-reg-def">
-      <title>Register Defaults</title>
+    <sect2 id="prefs-reg">
+      <title>Kontobuch</title>
 
-      <figure id="prefs-reg-def-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register Defaults</guilabel> tab</title><screenshot id="Prefer_RegisterDefaults">
+      <figure id="prefs-reg-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Kontobuch</guilabel></title><screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Register.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Register.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Register Defaults tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Kontobuch</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Register Defaults</guilabel> tab preferences affect the behavior of the transaction
-        register windows.
-      </para>
-
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Default Style</guilabel>
-          </para>
-
-          <para>Here you can choose from 3 different styles for register windows:
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Basic ledger:</guilabel> Show all transactions on one line. (Two in double line mode.)
-                </para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Auto-split ledger:</guilabel> Automatically expand the current transaction to show all
-                  splits. All other transactions are shown on one line. (Two in double line mode.)
-                </para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Transaction journal:</guilabel> All transactions are expanded to show all splits.
-                </para>
-              </listitem>
-            </itemizedlist>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Other Defaults</guilabel>
-          </para>
-
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Register opens in a new window:</guilabel> If selected, register will be in a separate
-                window instead of in a tab.
-              </para>
-            </listitem>
+      <simpara>In diesem Bereich wird die Arbeit mit Buchungen sowie deren Darstellung beeinflusst.
+      </simpara>
 
-            <listitem>
-              <para><guilabel>Double line mode:</guilabel> If selected, show two lines of information for each
-                transaction instead of one.
-              </para>
-            </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Aktionen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Only display leaf account names:</guilabel> If selected, only the name of the leaf
-                accounts will be displayed in the <guilabel>Account</guilabel> selection popup. The
-                default behavior is to display the full account name including the path in the
-                account tree.
-              </para>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Mit Eingabe gehen Sie zur leeren Buchung</guilabel></term>
 
-              <warning>
-                <para>Enabling this option implies that you use unique leaf account names.
-                </para>
-              </warning>
-            </listitem>
+                <listitem>
+                  <para>Wenn ausgewählt, wird der Cursor auf eine neue leere Buchung am Ende des Kontobuchs bewegt, nachdem
+                    der Benutzer die <keycap function="enter">Eingabetaste</keycap> drückt.
+                    Andernfalls wird der Cursor eine Zeile nach unten bewegt.
+                    <tip>
+                      <para>Es wird empfohlen, innerhalb des Buchungssatzes mit den Tasten
+                        <keycombo>
+                          <keycap function="shift"><optional>Umschalt</optional></keycap><keycap function="tab">Tab</keycap>
+                        </keycombo>
+                        die Eingabemarkierung vor- und zurückzubewegen.
+                      </para>
+                    </tip>
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Number of transactions:</guilabel> How many transactions to show in a register. Set to 0
-                to show all transactions.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
-    </sect2>
+              <varlistentry>
+                <term><guilabel>Listen automatisch aufklappen</guilabel></term>
 
-    <sect2 id="prefs-reports">
-      <title>Reports</title>
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, werden alle Listen (Konten- oder Auswahllisten) automatisch
+                    erweitert, wenn sich der Eingabefokus im Listenfeld befindet. Ist diese Option
+                    deaktiviert, dann öffnen sich die Listen nicht selbständig und Sie müssen
+                    diese bei Bedarf selber, durch betätigen der kleinen Schaltfläche, aufklappen.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-      <figure id="prefs-reports-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Reports</guilabel> tab</title><screenshot id="Prefer_Reports">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Reports.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
-            </imageobject>
+              <varlistentry>
+                <term><guilabel>Bei Auto-Vervollständigen zum Gegenkonto-Feld weitergehen</guilabel></term>
 
-            <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Reports.png" format="PNG"
-                         srccredit="Christian Wehling"></imagedata>
-            </imageobject>
+                <listitem>
+                  <note>
+                    <para>Diese Einstellung funktioniert nur, solange Sie die Buchungen <emphasis>nicht</emphasis>
+                      <guibutton>Vollständig</guibutton> anzeigen. (siehe
+                      <xref linkend="Trans-view-menu" />)
+                    </para>
+                  </note>
+
+                  <para>Wenn aktiviert, wird beim automatischen Ausfüllen der Buchung durch Drücken der
+                    <keycap function="tab">Tab</keycap>-Taste im Kontobuch der Cursor in das
+                    <guilabel>Buchen</guilabel> Feld springen. Ansonsten bewegt sich der
+                    Eingabefokus in das Feld <guilabel>Soll</guilabel>/
+                    <guilabel>Einzahlung</guilabel> oder <guilabel>Haben</guilabel>/
+                    <guilabel>Auszahlung</guilabel>.
+                  </para>
 
-            <textobject>
-              <phrase>The Reports tab</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
+                  <para>Ist die Ansicht auf <guibutton>Vollständig</guibutton> eingestellt, dann springt der Cursor, und
+                    abhängig von dieser Option, immer in das Eingabefeld
+                    <guilabel>Aktion</guilabel>.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-      <para>The <guilabel>Reports</guilabel> tab preferences affect the behavior of &app; reports.
-      </para>
+        <varlistentry>
+          <term><guilabel>Kontenabgleich</guilabel></term>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Default Report Currency:</guilabel> This item determines which currency will be used by
-            default when creating reports. You can choose:
-          </para>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Bestätigte Buchungen automatisch abgleichen</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Locale:</guilabel> Use the system locale currency for all newly created reports.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Ist diese Einstellung aktiviert, so versucht &app; die bestätigten Buchungen im Dialog
+                    <guilabel>Abgleichen</guilabel> als abgeglichen zu kennzeichnen. Wenn nicht,
+                    muss in dem Dialog jede einzelne Buchungsposition manuell als abgeglichen
+                    markiert werden.
+                  </para>
+                </listitem>
+              </varlistentry>
+<!-- FIXME source: remove this item -->
+<!--               <varlistentry>
+                <term><guilabel>Automatic interest transfer</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Choose:</guilabel> Use the specified currency for all newly created reports.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                <listitem>
+                  <para>If selected, 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.
+                  </para>
+                </listitem>
+              </varlistentry> -->
+              <varlistentry>
+                <term><guilabel>Automatische Kreditkartenbezahlung</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Location</guilabel>
-          </para>
+                <listitem>
+                  <para>Ist diese Option ausgewählt, erhält der Benutzer nach dem Abgleich einer Kreditkartenabrechnung
+                    die Möglichkeit, eine Überweisung zur Kreditkartenzahlung einzugeben.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Report opens in a new window:</guilabel> if you select this option, the reports will open
-                up in a new window, instead of in a tab.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
-    </sect2>
+              <varlistentry>
+                <term><guilabel>Immer zum heutigen Datum abgleichen</guilabel></term>
 
-    <sect2 id="prefs-sched">
-      <title>Scheduled Transactions</title>
+                <listitem>
+                  <para>Wenn aktiviert, wird im Abgleichen-Fenster, unabhängig eines vorherigen Abgleichs, immer mit dem
+                    heutigen Datum als Auszugsdatum geöffnet.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-      <figure id="prefs-sched-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Scheduled Transactions</guilabel> tab</title><screenshot id="Prefer_ScheduledTransactions">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Sched.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
-            </imageobject>
+        <varlistentry>
+          <term><guilabel>Grafik</guilabel></term>
 
-            <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Sched.png" format="PNG"
-                         srccredit="Christian Wehling"></imagedata>
-            </imageobject>
+          <listitem>
+            <para>Viele Einstellungen zur optischen Anpassung von &app; sind in
+              <ulink url="&url-wiki;GTK3#Register_Appearance" ></ulink> beschrieben.
+            </para>
 
-            <textobject>
-              <phrase>The Scheduled Transactions tab</phrase>
-            </textobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Benutze die &appname;-eigenen Farben</guilabel></term>
 
-      <para>The <guilabel>Scheduled Transactions</guilabel> tab preferences affect the behavior of &app; for
-        scheduling transactions. More information about scheduled transactions can be found in
-        <xref linkend="trans-sched"/>.
-      </para>
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, wird in der Kontenansicht das ursprüngliche &app; Farbschema
+                    (grün/gelb) verwendet. Andernfalls wird das Systemfarbschema angewendet.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Since Last Run Dialog</guilabel>
-          </para>
+              <varlistentry>
+                <term><guilabel>Zweizeilenstil: Farben abwechselnd pro Buchungssatz</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Run when data file opened:</guilabel> If selected, the <guilabel>Since Last Run</guilabel>
-                screen will appear when &app; opens the file.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Wenn markiert, wird die Kontenansicht so konfiguriert, dass bei jedem Buchungssatz zwischen der
+                    Primär- und der Sekundärfarbe abgewechselt wird und nicht bei jeder Zeile.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Show notification window:</guilabel> If selected, a list of scheduled and created
-                transactions will appear when &app; opens the file.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+              <varlistentry>
+                <term><guilabel>Horizontale Linien zwischen Zeilen zeichnen</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Transaction Editor Defaults</guilabel>
-          </para>
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, zeichnet &app; eine horizontale Linie zwischen den einzelnen
+                    Zeilen.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Auto-Create new transactions:</guilabel> If selected, new scheduled transactions will
-                automatically be entered into the register. If the auto-create option is enabled,
-                you can also check <guilabel>Notify before transactions are created</guilabel> so
-                that you will be able to confirm creating the transactions.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Vertikale Linien zwischen Spalten zeichnen</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Create in advance:</guilabel> The default number of days in advance to create the
-                registered scheduled transactions.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, zeichnet &app; eine vertikale Linie zwischen den Zellen in jeder
+                    Zeile.
+                  </para>
+                </listitem>
+              </varlistentry>
+<!-- FIXME source: new item -->
+              <varlistentry>
+                <term><guilabel>Layout</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Remind in advance:</guilabel> The default number of days in advance to remind about new
-                scheduled transactions.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-      </itemizedlist>
+                <listitem>
+                  <variablelist spacing="compact">
+                    <varlistentry>
+                      <term>Zukünftige Transaktionen nach leerer Buchung</term>
+
+                      <listitem>
+                        <para>Wenn diese Option ausgewählt ist, werden Buchungen mit einem Buchungsdatum in der Zukunft am Ende
+                          des Kontenbuches nach einer leeren Buchung angezeigt. Andernfalls ist die
+                          leere Buchung die letzte Buchung. Buchungen mit einem zukünftigem Datum
+                          werden mit einer blauen Linie abgegrenzt.
+                        </para>
+                      </listitem>
+                    </varlistentry>
+                  </variablelist>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="prefs-window">
-      <title>Windows</title>
+    <sect2 id="prefs-reg-def">
+      <title>Voreinstellungen Kontobuch</title>
 
-      <figure id="prefs-windows-fig">
-        <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Windows</guilabel> tab</title><screenshot id="Prefer_Windows">
+      <figure id="prefs-reg-def-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> der <guilabel>Voreinstellungen
+          Kontobuch</guilabel></title><screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Windows.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Windows.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" 
                          srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>The Windows tab</phrase>
-            </textobject>
+            <caption>
+              <para>Der Reiter <guilabel>Voreinstellungen Kontobuch</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Window Geometry</guilabel>
-          </para>
+      <para>Die Einstellungen auf der Registerkarte beeinflussen das Verhalten der Buchungsansicht. Geänderte
+        Einstellungen wirken sich erst bei dem <emphasis>Öffnen</emphasis> eines Kontobuchs aus.
+      </para>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Save window size and position:</guilabel> If selected, next time &app; starts it will
-                re-use the window size and position configured in the last run.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Voreinstellung Buchungsansicht</guilabel></term>
 
-        <listitem>
-          <para><guilabel>Tabs</guilabel>
-          </para>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Einzeilig</guilabel></term>
 
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Show close button on notebook tabs:</guilabel> Adds a small close icon on each tab, to
-                make it easier to close the various tabs.
-              </para>
-            </listitem>
+                <listitem>
+                  <para>Alle Buchungssätz einzeilig anzeigen. Im Zweizeilenmodus werden in der zweiten Zeile zusätzlich
+                    die Felder <guilabel>Aktion</guilabel>, <guilabel> Bemerkung </guilabel> und
+                    <guilabel>Verknüpfung</guilabel> angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-            <listitem>
-              <para><guilabel>Bring the most recent tab to the front:</guilabel> If selected, the newly created tab will
-                be shown over the other tabs.
-              </para>
-            </listitem>
+              <varlistentry>
+                <term><guilabel>Aktive vollständig</guilabel></term>
 
-            <listitem>
-              <para><guilabel>Width:</guilabel> The width of tab label expressed in characters.
-                <note>
-                  <para>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.
+                <listitem>
+                  <para>Erweitert automatisch die aktuelle Buchung, um alle Buchungsteile anzuzeigen. Alle anderen Buchungen
+                    werden einzeilig angezeigt bzw. im Zweizeilenmodus zweizeilig.
                   </para>
-                </note>
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+                </listitem>
+              </varlistentry>
 
-        <listitem>
-          <para><guilabel>Tab Position</guilabel>
-          </para>
+              <varlistentry>
+                <term><guilabel>Vollständig</guilabel></term>
 
-          <para>Position the tabs at the <guilabel>Top</guilabel> (default), <guilabel>Bottom</guilabel>,
-            <guilabel>Left</guilabel> or <guilabel>Right</guilabel>.
-          </para>
-        </listitem>
+                <listitem>
+                  <para>Alle Buchungen im Kontobuch werden erweitert, um alle Buchungsteile anzuzeigen.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><guilabel>Summary Bar Position</guilabel>
-          </para>
+        <varlistentry>
+          <term><guilabel>Andere Voreinstellungen</guilabel></term>
 
-          <para>Position the Summary Bar at the <guilabel>Top</guilabel> or at the <guilabel>Bottom</guilabel>
-            (default) of the &app; main window.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
-  </sect1>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Kontobuch in neuem Fenster öffnen</guilabel></term>
 
-  <sect1 id="book-options">
-    <title>Book Options</title>
+                <listitem>
+                  <para>Wenn Sie diese Option wählen, wird das Kontobuch in einem separaten Fenster geöffnet. Ansonsten
+                    wird es in einem neuen Reiter des aktuellen Fensters angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-    <para>The
-      <menuchoice>
-        <guimenu>File</guimenu> <guimenuitem>Properties</guimenuitem>
-      </menuchoice>
-      menu item is used to set or modify choices that affect how a specific &app; file (also
-      referred to as a Book) operates. Selecting this menu item brings up the <guilabel>Book Options</guilabel>
-      dialog. This dialog also appears in situations where you are importing
-      transactions into a new book, with the title <guilabel>New Book Options</guilabel>. It is
-      automatically raised in these 'new book' situations because these settings can affect how
-      imported data are converted to &app; transactions and so should be considered and set before
-      your first import (specifically, the <xref linkend="num-action-book-option"/> setting).
-    </para>
+              <varlistentry>
+                <term><guilabel>Bemerkung anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn diese Option aktiviert ist, werden für jede Buchung zwei Zeilen anstelle von einer Zeile
+                    angezeigt. (Zweizeilenmodus)
+                  </para>
+                </listitem>
+              </varlistentry>
 
-    <para>The settings in this dialog are kept with, and are part of, the file (or Book). This is in contrast
-      to the settings described in <xref linkend="set-prefs"/>, which are set per user and not
-      stored with the file. So <guilabel>Book Options</guilabel> settings are shared by all users
-      who use a given file and any changes made by one user will affect all users of that file.
-    </para>
+              <varlistentry>
+                <term><guilabel>Nur letzten Kontennamen anzeigen</guilabel></term>
 
-    <tip>
-      <para>Pausing the cursor for a couple of seconds over options in these tabs will display a tooltip with a
-        more detailed description of the choice.
-      </para>
-    </tip>
+                <listitem>
+                  <para>Wenn aktiviert, wird nur der Name des Kontos im Auswahl-Popup des Feldes <guilabel>Buchen</guilabel>
+                    angezeigt. Das Standardverhalten ist die Anzeige der vollständige Kontoname
+                    einschließlich des Pfads in der Kontenstruktur.
+                  </para>
 
-    <para>The <guilabel>Book Options</guilabel> dialog has five buttons that are common to all tabs. The
-      <guibutton>Reset defaults</guibutton> button takes all items on the visible tab and sets their
-      value to the default setting; it only affects the visible tab. The <guibutton>Help</guibutton>
-      button opens up a help window to this section. The <guibutton>Cancel</guibutton> button closes
-      the dialog, making no changes to the saved settings for <guilabel>Book Options</guilabel>. The
-      <guibutton>Apply</guibutton> button is initially insensitive but becomes sensitive when any
-      setting is set or changed. Selecting it saves the setting(s) for the book but keeps the
-      <guilabel>Book Options</guilabel> dialog open. Typically, the changes are reflected in the
-      affected areas of &app; as soon as the button is pressed, so it can be used to 'see' the
-      effect of a given option without having to re-open the dialog. The
-      <guibutton>Apply</guibutton> button is not sensitive on the dialog if it appears during
-      transaction import (that is, 'new book') situations. The <guibutton>OK</guibutton> button
-      behaves like the <guibutton>Apply</guibutton> button except that it immediately
-      <emphasis>closes</emphasis> the dialog, as well.
-    </para>
+                  <warning>
+                    <para>Das Aktivieren dieser Option setzt voraus, dass Sie eindeutige Namen für die letzte
+                      Kontobezeichnung verwenden.
+                    </para>
+                  </warning>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Anzahl Buchungen</guilabel></term>
+<!-- FIXME source: Improve toolzip
+Only the specified number of current transactions is displayed.
+Scrolling to older transactions is not possible. If you want to see all entries again, you must set the value to 0.
+ -->
+                <listitem>
+                  <para>Wie viele Buchungen in einem Kontofenster angezeigt werden sollen. Es werden, entsprechend Ihrer
+                    Vorgabe, die letzten Buchungen angezeigt. Setzen Sie den Wert auf 0, um alle
+                    Buchungen anzuzeigen.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </sect2>
 
-    <sect2 id="accounts-book-options">
-      <title>Accounts Book Options Tab</title>
+    <sect2 id="prefs-reports">
+      <title>Berichte</title>
 
-      <figure id="book-opt-acc-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Book_Options_Accounts">
+      <figure id="prefs-reports-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Berichte</guilabel></title><screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Reports.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
+
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         format="PNG" srccredit="Christian Wehling"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Reports.png" 
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
+
+            <caption>
+              <para>Der Reiter <guilabel>Berichte</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Accounts</guilabel> tab of this dialog allows the selection of options that affect how
-        accounting registers function.
+      <para>Die Einstellungen auf diesem Reiter beeinflussen das Verhalten von &app;- Berichten.
       </para>
 
-      <sect3 id="trading-accounts-book-option">
-        <title>Use Trading Accounts</title>
-
-        <para>Check the <guilabel>Use Trading Accounts</guilabel> checkbox to have trading accounts used for
-          transactions involving more than one currency or commodity.
-        </para>
-
-        <tip>
-          <para>To avoid several problems on multiple currency accounting read Peter Selinger's
-            <ulink url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;</ulink>.
-          </para>
-        </tip>
-      </sect3>
-
-      <sect3 id="read-only-days-option">
-        <title>Day Threshold for Read-Only Transactions</title>
-
-        <para>Use the <guilabel>Day Threshold for Read-Only Transactions</guilabel> spin-box to choose the number
-          of days before today, prior to which, transactions will be read-only and cannot be edited
-          anymore in the registers. This threshold is marked by a red line in the account register
-          windows. If zero, all transactions can be edited and none are read-only. This feature is
-          intended to be used to guard against accidental changes to non-current transactions.
-        </para>
-      </sect3>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Standardwährung für Berichte</guilabel></term>
 
-      <sect3 id="num-action-book-option">
-        <title>Use Split Action Field for Number</title>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Systemeinstellung</guilabel></term>
 
-        <note>
-          <para>This option is only available in &app; version 2.6 or later.
-          </para>
-        </note>
+                <listitem>
+                  <para>Verwendet, für alle neu erstellten Berichte, die systemweit voreingestellte Währung.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <para>Check the <guilabel>Use Split Action Field for Number</guilabel> checkbox to have the split action
-          field of the anchor split used for the 'Num' column in registers, reports and
-          import/export functions, where applicable, in place of the transaction number; the
-          transaction number is then shown as 'T-Num' on reports and on the second line of
-          registers. This choice has a corresponding effect on business features.
-        </para>
+              <varlistentry>
+                <term><guilabel>Auswahl</guilabel></term>
 
-        <para>The difference between the two is that with the checkbox not selected, the same 'Num' is displayed
-          for a given transaction regardless of what register it is viewed in and with the checkbox
-          selected, a different 'Num' can be entered/displayed for a given transaction in each
-          register it is viewed in. In both cases, the 'next number logic' of the 'Num' cell is
-          based on the account of the register the transaction is entered to or viewed from but in
-          one case it fills the transaction number, in the other, it fills the split action field of
-          the anchor split. In both cases, both fields are visible and can be viewed and used as
-          free-form text in double-line mode for any value the user wants.
-        </para>
+                <listitem>
+                  <para>Verwendet die angegebene Währung für alle neu erstellten Berichte.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
 
-        <warning>
-          <para>Initial setup of &app;: It is expected that, after careful consideration of the consequences, this
-            option will be set when a new &app; file is created and not changed thereafter (see next
-            warning). For this reason, a preference is provided (see
-            <link
-             linkend="prefs-general">Setting Preferences - General </link>) that
-            can establish an initial default setting for new files, so that if you will have more
-            than one file, it is easier to set them all up consistently. You may wish to set up a
-            test file and experiment with the two settings to understand the differences before
-            establishing your first real &app; file.
-          </para>
-        </warning>
+        <varlistentry>
+          <term><guilabel>Position</guilabel></term>
 
-        <tip>
-          <para>Moving from Quicken: For users that are switching from other personal accounting applications, such
-            as Quicken, selecting this option may be more consistent with the numbering approach
-            used there and can preserve the numbering of historical data brought over; this option
-            should be set before performing the initial import.
-          </para>
-        </tip>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Bericht in neuem Fenster öffnen</guilabel></term>
 
-        <warning>
-          <para>Changing this option for an existing &app; file: If you change this option for an existing file,
-            historical data will not be changed. This means that if you set the option one way,
-            enter (or import) transactions, then change the option and enter (or import) additional
-            transactions and switch back-and-forth, you will end up with a file that will appear to
-            have inconsistent treatment of numbers in registers, reports and exports. This is
-            because the setting of this option at the time of data entry/import determines where the
-            number data is stored and the setting at the time of data display/reporting/exporting
-            determines which field is displayed as number.
-          </para>
+                <listitem>
+                  <para>Wenn Sie diese Option auswählen, öffnen sich die Berichte in einem neuen Fenster, andernfalls wird
+                    er in einem neuen Reiter des aktuellen Fensters angezeigt.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+<!-- FIXME source: new item -->
+        <varlistentry>
+          <term><guilabel>Voreinstellung Vergrößerung</guilabel></term>
 
-          <para>There is no reason to avoid changing this option for an existing &app; file if you understand the
-            implications. If you elect to make this change, it should probably be done between
-            accounting periods with the understanding that number data prior to the date the option
-            is changed will be displayed/reported/exported differently from that after the date.
-          </para>
-        </warning>
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Voreingestellte Vergrößerung</guilabel></term>
 
-        <warning>
-          <para>If you change this option, and press <guibutton>Apply </guibutton> or <guibutton>OK</guibutton>,
-            open registers and labels on query and sorting dialogs will be refreshed to reflect the
-            new option immediately. But open reports need to be individually reloaded by the user to
-            have the change reflected on the report.
-          </para>
-        </warning>
-
-        <warning>
-          <para>This option is only available in &app; version 2.6 or later. If a &app; file from an earlier version
-            is opened in version 2.6 or later, and this feature is not used, this feature will not
-            prevent the file from being opened in the earlier version of &app;. However, if the
-            option is set, the file will not be able to be opened by the earlier version, even if
-            the option is set back to its original setting. A warning dialog will be displayed from
-            the earlier version. Do not set this option if you want to open the file with an earlier
-            version.
-          </para>
-        </warning>
-      </sect3>
+                <listitem>
+                  <para>Mit diesem Skalierungsfaktor haben Sie die Möglichkeit, die Lesbarkeit der Berichte auf
+                    hochauflösen Monitoren zu verbessern wobei z.B. der Faktor 2 die Darstellung
+                    des Berichts verdoppelt.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="budgeting-book-options">
-      <title>Budgeting Book Options Tab</title>
+    <sect2 id="prefs-sched">
+      <title>Terminierte Buchungen</title>
 
-      <figure id="book-opt-bud-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Budgeting</guilabel> tab</title><screenshot id="Book_Options_Budgeting">
+      <figure id="prefs-sched-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für <guilabel>Terminierte Buchungen</guilabel></title><screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Sched.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
+
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         format="PNG" srccredit="Christian Wehling"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Sched.png" 
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
+
+            <caption>
+              <para>Der Reiter <guilabel>Terminierte Buchungen</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Budgeting</guilabel> tab allows you to specify the budget to be used for reports when
-        none has otherwise been specified.
+      <para>Die Einstellungen auf der Registerkarte beeinflussen das Verhalten von &app; bezüglich der
+        Funktionsweise von terminierten Buchungen. Weitere Informationen über terminierte Buchungen
+        finden sich in <xref linkend="trans-sched"/>.
       </para>
+
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Seit-letztem-Aufruf Fenster</guilabel></term>
+
+          <listitem>
+            <variablelist spacing="compact">
+              <note>
+                <para>Weitere Information hinsichtlich des Dialog <guilabel>Seit letzem Aufruf</guilabel> finden Sie unter
+                  <xref linkend="trans-sched-slr" />
+                </para>
+              </note>
+
+              <varlistentry>
+                <term><guilabel>Ausführen, wenn eine Datei geöffnet wird</guilabel></term>
+
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, wird der Prozess <guilabel>Seit letztem Aufruf</guilabel>
+                    ausgeführt sobald eine Datei geöffnet wird.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Benachrichtungsfenster anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, wird eine Liste der terminierten und erstellten Buchungen
+                    angezeigt, sobald eine Datei geöffnet wird.
+                  </para>
+                </listitem>
+              </varlistentry>
+<!-- FIXME source: new item -->
+              <varlistentry>
+                <term><guilabel>Erzeugte Buchungen _durchsehen</guilabel></term>
+
+                <listitem>
+                  <para>Hiermit können Sie vorgeben, dass das Kontrollkästchen <guilabel>Erzeugte Buchungen
+                    durchsehen</guilabel> im Dialog <guilabel>Seit letztem Aufruf</guilabel>
+                    standardmäßig aktiviert ist. Dies bietet Ihnen die Möglichkeit, dass sie die
+                    Buchungen in dem sich öffnenden Kontenblatt <guilabel>Buchungen
+                    erstellt</guilabel> noch einmal anschauen und bearbeiten können.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Voreinstellungen Buchungseditor</guilabel></term>
+
+          <listitem>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Neue Buchungen automatisch erstellen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, werden neue terminierte Buchungen automatisch in das Kontobuch
+                    eingetragen. Zusätzlich können Sie mit der Auswahl <guilabel>Benachrichtigen,
+                    bevor Buchungen erstellt werden</guilabel> angeben, ob Sie die Erstellung der
+                    Buchungen bestätigen wollen.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Im Voraus erstellen</guilabel></term>
+
+                <listitem>
+                  <para>Die Standardanzahl von Tagen, um die die terminierten Buchungen vor dem eigentlichen Buchungsdatum
+                    erstellt werden.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Im Voraus erinnern</guilabel></term>
+
+                <listitem>
+                  <para>Die Standardanzahl von Tagen, um an neue terminierte Buchungen im Voraus zu erinnern. So haben Sie
+                    die Möglichkeit, die Buchungen an Ihre Liquidität anzupassen.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
-    <sect2 id="business-book-options">
-      <title>Business Book Options Tab</title>
+    <sect2 id="prefs-window">
+      <title>Fenster</title>
 
-      <figure id="book-opt-bus-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Book_Options_Business">
+      <figure id="prefs-windows-fig">
+        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Fenster</guilabel></title><screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Windows.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
+
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         format="PNG" srccredit="Christian Wehling"></imagedata>
+              <imagedata fileref="figures/Help_Pref_Windows.png" 
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
+
+            <caption>
+              <para>Der Reiter <guilabel>Fenster</guilabel>
+              </para>
+            </caption>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Business</guilabel> tab allows you to enter values that are in turn used by the
-        business features of &app;:
+      <para>Mit den Einstellungen in dem Bereich können Sie das Aussehen und Verhalten von &app;-Fenstern
+        konfigurieren.
       </para>
 
-      <variablelist>
+      <variablelist spacing="compact">
         <varlistentry>
-          <term>Company Name</term>
+          <term><guilabel>Fenster-Einstellungen</guilabel></term>
 
           <listitem>
-            <para>The name of the company is used in many reports.
-            </para>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Fenstergrößen und -positionen speichern</guilabel></term>
+
+                <listitem>
+                  <para>Wenn diese Option ausgewählt ist, wird beim nächsten Start von &app; die bei der letzten
+                    Ausführung verwendeten Fenstergröße und -position wieder genutzt. Dies
+                    erfolgt unter Nutzung der Möglichkeiten Ihres Betriebssystems.
+                    <footnote>
+                      <para>Weitere Details sind in den
+                        <ulink url="&url-wiki-de;Configuration_Locations#GSettings">Configuration
+                        Locations</ulink> (auf Englisch) beschrieben.
+                      </para>
+                    </footnote>
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term>Company Contact Person</term>
+          <term><guilabel>Karteikarten-Ansicht</guilabel></term>
 
           <listitem>
-            <para>The name of the contact person to print on invoices.
-            </para>
-          </listitem>
-        </varlistentry>
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Den Knopf "Schließen" bei Karteikarten-Ansicht anzeigen</guilabel></term>
 
-        <varlistentry>
-          <term>Company Phone, Fax, Email Address</term>
+                <listitem>
+                  <para>Fügt auf jedem Reiter ein kleines Symbol hinzu, um das Schließen der einzelnen Reiter zu
+                    erleichtern. Vielleicht reicht Ihnen aber auch der gemeinsame Schließen-Knopf
+                    auf der <guilabel>Werkzeugleiste</guilabel>? Sie müssen nur zuvor den
+                    gewünschten Reiter selektieren.
+                  </para>
+                </listitem>
+              </varlistentry>
+<!-- FIXME source: new item -->
+              <varlistentry>
+                <term><guilabel>Den neuen Reiter neben dem aktuellen Reiter öffnen</guilabel></term>
 
-          <listitem>
-            <para>The references of your business.
-            </para>
-          </listitem>
-        </varlistentry>
+                <listitem>
+                  <para>Wenn aktivert, werden neue Reiter neben dem aktuellen Reiter eingefügt, ansonsten werden die neuen
+                    Reiter <quote>wie früher</quote> am Ende angefügt.
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <varlistentry>
-          <term>Company Website URL</term>
+              <varlistentry>
+                <term><guilabel>Die zuletzt benutzte Karteikarte nach vorne bringen</guilabel></term>
 
-          <listitem>
-            <para>The internet address of the company’s website.
-            </para>
-          </listitem>
-        </varlistentry>
+                <listitem>
+                  <para>Wenn Sie diese Option auswählen, wird beim Schließen eines Reiters der zuletzt benutzte Reiter
+                    aktiviert. Ansonsten wird der Reiter daneben angewählt.
+                    <footnote>
+                      <para>Welcher Reiter tatsächlich aktiviert wird, hängt von dem gewählten Sprache und dem Gebietsschema
+                        ab.
+                      </para>
+                    </footnote>
+                  </para>
+                </listitem>
+              </varlistentry>
 
-        <varlistentry>
-          <term>Company ID</term>
+              <varlistentry>
+                <term><guilabel>Breite</guilabel></term>
 
-          <listitem>
-            <para>The tax ID of your company.
-            </para>
+                <listitem>
+                  <para>Die maximale Breite der Reiterbeschriftung, ausgedrückt in Zeichen.
+                    <note>
+                      <para>Wenn der Text auf dem Reiter länger als dieser Wert ist, dann wird die Reiterbeschriftung in der
+                        Textmitte beschnitten und durch eine Ellipse so ersetzt, dass diese maximale
+                        Breite erreicht wird. Dieses Verhalten läßt sich
+                        <emphasis>nicht</emphasis> mit 0 deaktivieren.
+                      </para>
+                    </note>
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term>Default Customer TaxTable</term>
+          <term><guilabel>Position Reiter der Karteikarten</guilabel></term>
 
           <listitem>
-            <para>The default taxtable applicable to your most common customers.
+            <para>Position der Reiter <guilabel>Oben</guilabel> (Standard), <guilabel>Unten</guilabel>,
+              <guilabel>Links</guilabel> oder <guilabel>Rechts</guilabel> am Rand des Fensters.
             </para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term>Default Vendor TaxTable</term>
+          <term><guilabel>Position Zusammenfassungsleiste</guilabel></term>
 
           <listitem>
-            <para>The default taxtable applicable to your most common vendors.
+            <para>Positioniert die Zusammenfassungsleiste <guilabel>Oben</guilabel> oder <guilabel>Unten</guilabel>
+              (Standard) in der jeweiligen Ansicht.
             </para>
           </listitem>
         </varlistentry>
+      </variablelist>
+    </sect2>
+  </sect1>
 
-        <varlistentry>
-          <term>Fancy Date Format</term>
+  <sect1 id="book-options">
+    <title>Buch Einstellungen</title>
 
-          <listitem>
-            <para>The default date format used for fancy printed dates (e.g. on invoices).
-            </para>
-          </listitem>
-        </varlistentry>
+    <para>Die
+      <menuchoice>
+        <shortcut>
+        <keycombo>
+          <keycap>Alt</keycap><keycap function="enter">Eingabe</keycap>
+        </keycombo>
+        </shortcut>
+        <guimenu><accel>D</accel>atei</guimenu><guimenuitem><accel>E</accel>igenschaften</guimenuitem>
+      </menuchoice>
+      können dazu genutzt werden, um Optionen festzulegen oder zu ändern, die sich auf die
+      Funktionsweise einer bestimmten &app; Datei (auch als Buch bezeichnet) beziehen. Wenn Sie
+      diesen Menüpunkt auswählen, wird der Dialog <guilabel>Buch-Optionen</guilabel> aufgerufen.
+      Dieser Dialog erscheint auch in der Situation, in der Sie Buchungen in ein neues Buch ohne
+      Kontenstruktur importieren, dann mit dem Dialogtitel <guilabel>Buch-Optionen für neues
+      Buch</guilabel>. Dies wird automatisch in dieser <emphasis>neuen Buch</emphasis>-Situation
+      ausgelöst, da diese Einstellungen für die Konvertierung der importierten Daten in &app;
+      Buchungen angewandt werden und daher vor dem ersten Import berücksichtigt und eingestellt
+      werden sollten (insbesondere die Einstellung <xref linkend="num-action-book-option"/>).
+    </para>
 
-        <varlistentry>
-          <term><guibutton>Reset Defaults</guibutton></term>
+    <para>Die Einstellungen in diesem Dialogfeld werden mit der Datei (oder dem Buch) gespeichert und sind
+      Teil davon. Dies steht im Gegensatz den in <xref linkend="set-prefs"/> beschriebenen
+      Einstellungen, die pro Benutzer festgelegt und nicht mit der Datei gespeichert werden. Die
+      Einstellungen der <guilabel>Buch-Optionen</guilabel> gelten also für alle Benutzer die die
+      Datei verwenden, und jede Änderung, die von einem Benutzer vorgenommen wird, wirkt sich auf
+      alle Benutzer dieser Datei aus.
+    </para>
 
-          <listitem>
-            <para>Press the button to reset all values to their defaults.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
+    <tip>
+      <para>Wenn Sie den Mauszeiger einige Sekunden lang über den Optionen auf diesen Registerkarten anhalten,
+        wird ein Tooltip mit einer ausführlicheren Beschreibung der Auswahl angezeigt.
+      </para>
+    </tip>
 
-      <note>
-        <para>None of the above values is required to use &app; but, if given, will be used throughout the
-          program. (f.e. in reports, invoices etc...)
-        </para>
-      </note>
-    </sect2>
+    <xi:include href="para-assist-buttons.xml"/>
 
-    <sect2 id="counters-book-options">
-      <title>Counters Book Options Tab</title>
+    <tip>
+      <para>Sobald Sie die <guibutton>Anwenden</guibutton> Schaltfläche betätigen, werden die Änderungen in
+        den betroffenen Bereichen von &app; widergespiegelt, so dass Sie die Auswirkung einer
+        bestimmten Einstellung sofort sehen können, ohne den Dialog erneut öffnen zu müssen.
+      </para>
+    </tip>
 
-      <figure id="book-opt-count-fig">
-        <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Counters</guilabel> tab</title><screenshot id="Book_Options_Counters">
+    <note>
+      <para>Die <guibutton>Anwenden</guibutton> Schaltfläche ist im Dialog nicht sensitiv, wenn er während
+        eines Buchungsimport in ein <emphasis>neues Buch</emphasis> angezeigt wird.
+      </para>
+    </note>
+
+    <sect2 id="accounts-book-options">
+      <title>Reiter Konten</title>
+
+      <figure id="book-opt-acc-fig">
+        <title>Der Reiter <quote>Konten</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Accounts">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
             </imageobject>
+
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         format="PNG" srccredit="Christian Wehling" ></imagedata>
+              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>The <guilabel>Counters</guilabel> tab allows you to set the 'previous' value for each number
-        indicated: Bill, Customer, Employee, etc. These counters are used by the
-        <xref linkend="chapter_busnss" /> of &app;.
+      <para>Der Reiter <guilabel>Konten</guilabel> ermöglicht die Angabe von Einstellungen, die die
+        Buchhaltungsfunktion des Kontobuchs beeinflussen.
       </para>
+<!-- FIXME source: change sect3 into variablelist -->
+      <variablelist spacing="compact" >
+        <varlistentry id="trading-accounts-book-option">
+          <term><guilabel>Devisenhandel-Konten benutzen</guilabel></term>
 
-      <para>The <guilabel>number</guilabel> entered here will be incremented when the various business features
-        calculate a value for a corresponding field on a dialog. For example, if you leave the
-        Customer Number field blank on the New Customer dialog, the customer will be assigned the
-        number in the counter field plus 1. The numbers displayed in the tab are incremented as
-        these business features are used. (But note that if you have the <guilabel>Book
-        Options</guilabel> dialog open, you need to close it and re-open it to see the changes; the
-        displayed field values are not automatically refreshed.)
-      </para>
+          <listitem>
+            <para>Wenn Sie dieses Kontrollkästchen aktivieren, werden Währungshandelskonten für Buchungen
+              verwendet, die mehr als eine Währung oder Wertpapiere beinhalten.
+            </para>
 
-      <para>The corresponding <guilabel>format</guilabel> fields are used to specify printf-style format strings
-        that are used to format the printing of the number. For example, to put the literal "C - "
-        in front of the customer number, you would put "C - %li" (without the quotes) in the
-        customer format string field. If the value in the customer number field was 5, the next
-        customer added would be assigned the number "C - 6". As another example, if you wanted the
-        number to be printed with leading zeros and 5 characters wide, you would enter "C - %05li"
-        and the next customer number would be assigned the number "C - 00006".
-      </para>
+            <tip>
+              <para>Um verschiedene Probleme bei der Buchführung in mehreren Währungen zu vermeiden, lesen Sie Peter
+                Selinger's
+                <ulink url="&url-selinger;accounting/tutorial.html">&tit-sel-tut;</ulink>.
+              </para>
+            </tip>
+          </listitem>
+        </varlistentry>
+<!-- FIXME source: change sect3 into variablelist -->
+        <varlistentry id="read-only-days-option">
+          <term><guilabel>Anzahl Tage, bis Buchungen schreibgeschützt werden (rote Linie)</guilabel></term>
 
-      <note>
-        <para>For historical reasons &app; accepts multiple format specifiers although they all yield the same end
-          result. You can choose "li", "lli" or I64i".
-        </para>
-      </note>
+          <listitem>
+            <para>In dem Feld können Sie die Anzahl Tage anngeben, nach dem Buchungen schreibgeschützt werden und
+              nicht mehr verändert werden können. Dieser Schwellenwert wird durch eine rote Linie
+              in dem Kontenblatt markiert. Ist der Wert Null, ist der Schreibschutz aufgehoben und
+              alle Buchungen können bearbeitet werden. Dieses Auswahlfeld soll vor versehentlichen
+              Änderungen an langfristigen Buchungen schützen.
+            </para>
+
+            <tip>
+<!-- Translators: Check your government's rules on electronic accounting and adjust the recommendation -->
+<!-- In some contries like DE ... -->
+              <para>Will man die <ulink url="https://wiki.gnucash.org/wiki/De/Projekte#GoBD"> Grund­sät­ze zur
+                ord­nungs­mä­ßi­gen Füh­rung und Auf­be­wah­rung von Bü­chern,
+                Auf­zeich­nun­gen und Un­ter­la­gen in elek­tro­ni­scher Form so­wie zum
+                Da­ten­zu­griff (GoDB)</ulink> ansatzweise erfüllen, sollte man 1 wählen.
+              </para>
+            </tip>
+          </listitem>
+        </varlistentry>
+<!-- FIXME source: change sect3 into variablelist -->
+        <varlistentry id="num-action-book-option">
+          <term><guilabel>Aktionsfeld des Buchungsteils für Nummer benutzen</guilabel></term>
+
+          <listitem>
+            <para>In der Voreinstellung ist diese Einstellung deaktiviert. Wenn Sie dieses Kontrollkästchen
+              aktvieren, dann wird das <guilabel>Aktion</guilabel>sfeld für die Nummerierung,
+              Spalte <guilabel>Num</guilabel>, im Bereich Geschäft, Berichten und
+              Import/Export-Funktionen anstelle der Buchungsnummer verwendet; die Buchungssnummer
+              wird dann als <guilabel>T-Num</guilabel> in Berichten und in der zweiten Zeile des
+              Kontenblatts angezeigt. Diese Wahl hat eine entsprechende Auswirkung auf die
+              Geschäftsfunktionen.
+            </para>
+
+            <para>Der Unterschied zwischen den beiden besteht darin, dass, wenn das Kontrollkästchen nicht aktiviert
+              ist, dieselbe <quote>Zahl</quote> für eine bestimmte Buchung angezeigt wird,
+              unabhängig davon, in welchem Kontobuch sie angezeigt wird. Wenn das Kontrollkästchen
+              aktiviert ist, kann für eine bestimmte Buchung in jedem Kontobuch, in dem sie
+              angezeigt wird, eine andere <quote>Nummer</quote> eingegeben/angezeigt werden. In
+              beiden Fällen basiert die <quote>Logik der nächsten Zahl</quote> der Zelle
+              <guilabel>Num</guilabel> auf dem Konto des Kontobuchs, in das die Buchung eingegeben
+              oder von dem aus sie angezeigt wird. Aber in einem Fall wird die Nummer der Buchung
+              ausgefüllt, im anderen Fall das <guilabel>Aktion</guilabel>sfeld des Buchungsteils.
+              In beiden Fällen sind beide Felder sichtbar und können als Freitext im
+              Zweizeilenmodus für jeden beliebigen Wert verwendet werden, den der Benutzer
+              wünscht.
+            </para>
+
+            <warning>
+              <variablelist spacing="compact">
+                <varlistentry>
+                  <term>Die Ersteinrichtung von &app;</term>
+
+                  <listitem>
+                    <para>Es wird erwartet, dass diese Option nach sorgfältiger Abwägung der Konsequenzen gesetzt wird, wenn
+                      eine neue &app; Datei erstellt wird und danach nicht mehr geändert wird
+                      (siehe nächste Warnung).
+                    </para>
+
+                    <para>Aus diesem Grund ist eine Einstellung vorgesehen (siehe
+                      <xref
+             linkend="prefs-general" />) die eine anfängliche
+                      Standardeinstellung für neue Dateien festlegen kann, so dass, wenn Sie mehr
+                      als eine Datei haben, es einfacher ist, sie alle einheitlich einzurichten. Sie
+                      sollten vielleicht eine Testdatei einrichten und mit den beiden Einstellungen
+                      experimentieren, um die Unterschiede zu verstehen, bevor Sie Ihre erste echte
+                      &app; Datei erstellen.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </warning>
+
+            <tip>
+              <variablelist spacing="compact">
+                <varlistentry>
+                  <term>Umstieg von Quicken</term>
+
+                  <listitem>
+                    <para>Für Benutzer, die von anderen Anwendungen für die persönliche Buchhaltung, wie Quicken wechseln,
+                      kann die Auswahl dieser Option eine bessere Ãœbereinstimmung mit der dort
+                      verwendeten Nummerierung bewirken, wodurch die Nummerierung der übernommenen
+                      historischen Daten beibehalten werden kann; diese Option sollte vor der
+                      Durchführung des ersten Imports eingestellt werden.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </tip>
+
+            <warning>
+              <variablelist spacing="compact">
+                <varlistentry>
+                  <term>Ändern dieser Option für eine vorhandene &app; Datei</term>
+
+                  <listitem>
+                    <para>Wenn Sie diese Option für eine bestehende Datei ändern, werden die bisherigen Daten nicht
+                      geändert. Das bedeutet wenn Sie die Option auf die eine Art einstellen,
+                      Buchungen eingeben (oder importieren), dann die Option ändern und
+                      zusätzliche Buchungen eingeben (oder importieren) und dazwischen hin- und
+                      herwechseln, erhalten Sie eine Datei, die scheinbar eine inkonsistente
+                      Behandlung von Zahlen in Kontobüchern, Berichten und Exporten aufweist. Der
+                      Grund dafür ist, dass die Einstellung dieser Option zum Zeitpunkt der
+                      Dateneingabe/des Datenimports bestimmt wo die Zahlendaten gespeichert werden,
+                      und die Einstellung zum Zeitpunkt der Daten Anzeige/Berichterstattung/Export
+                      bestimmt, welches Feld als Zahl angezeigt wird.
+                    </para>
+
+                    <para>Es gibt keinen Grund, diese Option für eine bestehende &app; Datei nicht zu ändern, wenn Sie sich
+                      der Konsequenzen bewusst sind. Wenn Sie sich für diese Änderung entscheiden,
+                      sollte sie möglichst zwischen den Abrechnungsperioden vorgenommen werden, mit
+                      dem Wissen, dass Zahlendaten vor dem Datum der Änderung der Option anders
+                      angezeigt/berichtet/exportiert werden als nach diesem Datum.
+                    </para>
+
+                    <warning>
+                      <para>Wenn Sie diese Option ändern und <guibutton>Anwenden</guibutton> oder <guibutton>OK</guibutton>
+                        drücken, werden die offenen Kontobücher und Beschriftungen der Abfrage-
+                        und Sortierdialoge aktualisiert, um sofort die neue Option widerzuspiegeln.
+                        Aber offene Berichte müssen vom Benutzer einzeln neu geladen werden, damit
+                        sich die Änderung im Bericht niederschlägt.
+                      </para>
+                    </warning>
+
+                    <warning>
+                      <para>Wenn eine &app; Datei aus einer früheren Version
+                        <footnote>
+                          <para>Die Option <emphasis>Aktionsfeld des Buchungsteils für Nummer benutzen</emphasis> ist seit &app;
+                            Version 2.6 verfügbar.
+                          </para>
+                        </footnote>
+                        geöffnet wird und diese Einstellung <emphasis>nicht</emphasis> verwendet
+                        wird, verhindert diese nicht, dass die Datei in der früheren Version von
+                        &app; geöffnet wird. Wenn jedoch die Option gesetzt ist, kann die Datei
+                        nicht mit der früheren Version geöffnet werden, auch wenn die Option
+                        wieder auf ihre ursprüngliche Einstellung zurückgesetzt wird. Es wird ein
+                        Warndialog der früheren Version angezeigt. Aktivieren Sie diese Option
+                        nicht, wenn Sie die Datei mit einer früheren Version öffnen wollen.
+                      </para>
+                    </warning>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </warning>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
-  </sect1>
 
-  <sect1 id="change-style">
-    <title>Changing Style Sheets</title>
+    <sect2 id="budgeting-book-options">
+      <title>Reiter Budgets</title>
 
-    <para>&app; has four default style sheets for web-page reports. These style sheets can be altered by using
-      the <acronym>HTML</acronym> Style Sheets editor. To access the editor go to
-      <menuchoice>
-        <guimenu>Edit</guimenu> <guimenuitem>Style Sheets...</guimenuitem>
-      </menuchoice>
-    </para>
+      <figure id="book-opt-bud-fig">
+        <title>Der Reiter <quote>Budgets</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Budgeting">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+            </imageobject>
 
-    <para>Using the Style Sheet Editor you may display/modify the setting of a Style Sheet.
-    </para>
+            <imageobject role="fo">
+              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+                         srccredit="Christian Wehling"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-    <note>
-      <para>Changing the Style Sheet will change the appearance of all reports that have selected that Style
-        Sheet. A <guibutton>Reload</guibutton> is required to view the changes, if the report(s) are
-        currently displayed.
+      <para>Der Reiter <guilabel>Budgets</guilabel> ermöglicht die Auswahl eines Budgets, welches für die
+        Berichte verwendet wird, wenn kein anderes angegeben wurde.
       </para>
-    </note>
-
-    <para>To add a new Style Sheet click the <guibutton>New...</guibutton> button in the Style Sheet pane. The
-      <guilabel>New Style Sheet</guilabel> dialog will appear. Fill in the <guilabel>name</guilabel>
-      field with the name of the new Style Sheet and choose a template. To remove a Style Sheet
-      select the Style Sheet from the list and click <guibutton>Delete</guibutton>.
-    </para>
+    </sect2>
 
-    <sect2 id="style-default">
-      <title>Default Style Sheet</title>
+    <sect2 id="business-book-options">
+      <title>Reiter Geschäft</title>
 
-      <para>The Default Style Sheet has four tabs to alter the appearance of reports utilizing it, Colors,
-        Fonts, General and Tables.
-      </para>
+      <figure id="book-opt-bus-fig">
+        <title>Der Reiter <quote>Geschäft</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Business">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Business.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+            </imageobject>
 
-      <sect3 id="style-def-color">
-        <title>Colors Tab</title>
+            <imageobject role="fo">
+              <imagedata fileref="figures/Help_Book_Options_Business.png"
+                         srccredit="Christian Wehling"></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a color that will
-              be applied to alternate table rows.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+      <para>Auf dem Reiter <guilabel>Geschäft</guilabel> können Sie Werte eingeben, die vornehmlich von den
+        Geschäftsfunktionen von &app; verwendet werden. Sinnvoll ist es in diesem Zusammenhang,
+        wenn Sie unter
+        <menuchoice>
+          <guimenu><accel>G</accel>eschäft</guimenu><guimenuitem>USt.-<accel>S</accel>teuertabelle…</guimenuitem>
+        </menuchoice>
+        die Tabelle ihrer Verkaufssteuern definieren. Aber auch in einigen privaten Berichten kann
+        es sich gut machen, z.B. als <quote>Firmenname</quote> seinen Namen einzusetzen:
+      </para>
 
-      <sect3 id="style-def-fonts">
-        <title>Fonts Tab</title>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Firmenname</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Title:</guilabel> Select the font and size for Titles.
-            </para>
-          </listitem>
+          <term><guilabel>Firmenadresse</guilabel></term>
 
           <listitem>
-            <para><guilabel>Account Link:</guilabel> Select the font and size for Account Links.
+            <para>Der Name und die Adresse Ihres Unternehmens wird in vielen Berichten verwendet.
             </para>
           </listitem>
+        </varlistentry>
 
-          <listitem>
-            <para><guilabel>Number Cell:</guilabel> Select the font and size for Number Cells.
-            </para>
-          </listitem>
+        <varlistentry>
+          <term><guilabel>Firmen Ansprechpartner</guilabel></term>
 
           <listitem>
-            <para><guilabel>Negative Values in Red:</guilabel> Select to have negative values displayed in red.
+            <para>Der Name Ihres Ansprechpartners, der auf die Rechnungen gedruckt werden soll.
             </para>
           </listitem>
+        </varlistentry>
 
-          <listitem>
-            <para><guilabel>Text Cell:</guilabel> Select the font and size for Text Cells.
-            </para>
-          </listitem>
+        <varlistentry>
+          <term><guilabel>Firmentelefonnummer</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Total Number Cell:</guilabel> Select the font and size for Total Number Cells.
-            </para>
-          </listitem>
+          <term><guilabel>Firmenfaxnummer</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Total Label Cell:</guilabel> Select the font and size for Total Label Cells.
-            </para>
-          </listitem>
+          <term><guilabel>Firmen-E-Mail-Adresse</guilabel></term>
 
           <listitem>
-            <para><guilabel>Centered Label Cell:</guilabel> Select the font and size for Centered Label Cells.
+            <para>Die Kontaktangaben Ihres Unternehmens.
             </para>
           </listitem>
-        </itemizedlist>
-      </sect3>
+        </varlistentry>
 
-      <sect3 id="style-def-general">
-        <title>General Tab</title>
+        <varlistentry>
+          <term><guilabel>Firmenwebseite URL</guilabel></term>
 
-        <itemizedlist>
           <listitem>
-            <para><guilabel>Background Color:</guilabel> Opens the color picker to choose a new background color.
+            <para>Die Internetadresse der Website Ihres Unternehmens.
             </para>
           </listitem>
+        </varlistentry>
 
-          <listitem>
-            <para><guilabel>Background Pixmap:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the background in reports.
-            </para>
-          </listitem>
+        <varlistentry>
+          <term><guilabel>Firmennummer</guilabel></term>
 
           <listitem>
-            <para><guilabel>Enable Links:</guilabel> Select this to enable blue hyperlinks in reports.
+            <para>Eine Identifikationsnummer Ihres Geschäfts, z.B. USt-IdNr.
+              <quote><replaceable>DE123…</replaceable></quote>.
+              <tip>
+                <para>Steht keine Identifikationsnummer auf der Rechnung, wird der Vorsteuerabzug vom Finanzamt nicht
+                  anerkannt.
+                </para>
+              </tip>
             </para>
           </listitem>
-        </itemizedlist>
-      </sect3>
+        </varlistentry>
 
-      <sect3 id="style-def-tables">
-        <title>Tables Tab</title>
+        <varlistentry>
+          <term><guilabel>Voreinstellung Kunde Steuertabelle</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Table cell spacing:</guilabel> Sets the space between table cells
-            </para>
-          </listitem>
+          <term><guilabel>Voreinstellung Lieferant Steuertabelle</guilabel></term>
 
           <listitem>
-            <para><guilabel>Table cell padding:</guilabel> Sets the space between table cell edges and contents
+            <para>In mehrwertsteuerplichtigen Unternehmen kann hier die Standard-Steuertabelle eingetragen werden.
+              <tip>
+                <para>Als EU-ansäßiges Unternehmen wählen Sie den vollen MwSt-Satz vor und geben bei ihren Schweizer
+                  Kunden explizit 0-Export an und umgekehrt.
+                </para>
+              </tip>
             </para>
           </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Ausführliches Datumsformat</guilabel></term>
 
           <listitem>
-            <para><guilabel>Table border width:</guilabel> Sets the width of the borders on tables.
+            <para>Das Standard-Datumsformat, das für die Druckdaten (z.B. auf Rechnungen) verwendet wird.
             </para>
           </listitem>
-        </itemizedlist>
-      </sect3>
+        </varlistentry>
+<!-- FIXME source: remove item 'Defaults' -->
+      </variablelist>
+
+      <note>
+        <para>Keiner der obigen Werte ist für die Benutzung von &app; erforderlich; wenn sie jedoch angegeben
+          werden, werden sie in allen Bereichen des Programms für dieses Buch, z.B. in Berichten,
+          Rechnungen usw., verwendet.
+        </para>
+      </note>
     </sect2>
 
-    <sect2 id="style-easy">
-      <title>Easy Style Sheet</title>
+    <sect2 id="counters-book-options">
+      <title>Reiter Nummern-Zähler</title>
+
+      <figure id="book-opt-count-fig">
+        <title>Der Reiter <quote>Nummern-Zähler</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Counters">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+                         srccredit="Christian Wehling" ></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-      <para>The Easy Style Sheet has five tabs to alter the appearance of reports: Colors, Fonts, General,
-        Images and Tables.
+      <para>Der Reiter <guilabel>Nummer-Zähler</guilabel> zeigt die <emphasis>zuletzt verwendeten</emphasis>
+        Nummern und gibt Ihnen die Möglichkeit, den <quote>vorherigen</quote> Wert für jede
+        Nummer, z.B. Rechnung, Kunde, Mitarbeiter, usw., hochzusetzen, wenn Sie z.B im laufenden
+        Geschäftsjahr zu &app; wechseln. Beachten Sie bitte, dass es sich nicht empfiehlt die
+        Nummer <emphasis>herunterzusetzen</emphasis>, da dann Dubletten entstehen können. Diese
+        Angaben werden vornehmlich von der Funktion <xref linkend="chapter_busnss" /> genutzt. Die
+        zuletzt genutzte Nummer kann auch in der Kontenübersicht in den
+        <glossterm linkend="gl-gui-acct-tree-col">Kontenspalten</glossterm> angezeigt werden.
       </para>
 
-      <sect3 id="style-easy-colors">
-        <title>Colors</title>
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Nummer</guilabel></term>
 
-        <itemizedlist>
           <listitem>
-            <para><guilabel>Background Color:</guilabel> Opens the color picker to choose a new background color.
+            <para>Der hier eingegebene Wert wird inkrementiert, wenn die verschiedenen Geschäftsfunktionen einen Wert
+              für ein entsprechendes Feld in einem Dialogfeld berechnen. Wenn Sie zum Beispiel
+              <emphasis>keine</emphasis> <guilabel>Lieferantennummer</guilabel> im Dialogfeld
+              <guilabel>Neuer Lieferant</guilabel> angeben, wird die Nummer im Zählerfeld um 1
+              erhöht. (Beachten Sie jedoch, dass Sie, wenn Sie den Dialog <guilabel>Buch-
+              Optionen</guilabel> geöffnet haben, diesen schließen und erneut öffnen müssen, um
+              die Änderungen zu sehen; die angezeigten Feldwerte werden nicht automatisch
+              aktualisiert.)
             </para>
           </listitem>
+        </varlistentry>
 
-          <listitem>
-            <para><guilabel>Text Color:</guilabel> Opens the color picker to choose a new text color.
+        <varlistentry>
+          <term><guilabel>Format der Nummer</guilabel></term>
+
+          <listitem>
+            <para>Die entsprechenden Felder werden verwendet, um Formatstrings im Stil von <quote>printf</quote>
+              anzugeben, die für die Formatierung des Ausdrucks der Zahl verwendet werden. Um zum
+              Beispiel das Literal <quote>K - </quote> vor die Kundennummer zu setzen, würden Sie
+              <quote>K - %li</quote> (ohne die Anführungszeichen) in das Feld <guilabel> Format
+              Kundennummer </guilabel> eintragen. Wenn der Wert im Feld für die Kundennummer 5
+              wäre, würde der nächste hinzugefügte Kunde die Nummer <guilabel>K - 6</guilabel>
+              erhalten. Ein weiteres Beispiel: Wenn Sie möchten, dass die Kundennummer mit
+              führenden Nullen und 5 Zeichen gedruckt werden soll, würden Sie <quote>K -
+              %05li</quote> eingeben, wodurch dem nächsten Kunden die Nummer <quote>K -
+              00006</quote> zugewiesen würde.
+              <tip>
+                <para>Man kann auch Nummern mit mehrere Nummernkreise emulieren, indem man z.B. die Jahreszahl im Format
+                  als Konstante eingibt und dahinter die laufende Nummer mit genügend vielen
+                  führenden Nullen formatiert. Beim Jahreswechsel erhöht man das Jahr im Format
+                  und setzt die laufende Nummer wieder auf Null.
+                </para>
+              </tip>
             </para>
           </listitem>
+        </varlistentry>
+      </variablelist>
 
-          <listitem>
-            <para><guilabel>Text Cell Color:</guilabel> Opens the color picker to choose a new text cell color.
-            </para>
-          </listitem>
+      <note>
+        <para>Aus historischen Gründen akzeptiert &app; mehrere Formatangaben, obwohl sie alle das gleiche
+          Endergebnis liefern. Sie können zwischen <quote>li</quote>, <quote>lli</quote> oder
+          <quote>I64i</quote> wählen.
+        </para>
+      </note>
+    </sect2>
+<!-- FIXME source: new item -->
+    <sect2 id="tax-book-options">
+      <title>Reiter Steuern</title>
 
-          <listitem>
-            <para><guilabel>Link Color:</guilabel> Opens the color picker to choose a new link color.
-            </para>
-          </listitem>
+      <figure id="book-opt-tax-fig">
+        <title>Der Reiter <quote>Steuern</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Tax">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Tax.png"
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+            </imageobject>
 
-          <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for
-              alternate table rows.
-            </para>
-          </listitem>
+            <imageobject role="fo">
+              <imagedata fileref="figures/Help_Book_Options_Tax.png"
+                         srccredit="Christian Wehling" ></imagedata>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-          <listitem>
-            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color
-              for subheading/subtotal table rows.
-            </para>
-          </listitem>
+      <para>Diese Seite speichert zusätzliche Stammdaten, die für eine elektronische Steuermeldung
+        erforderlich sind.
+      </para>
 
-          <listitem>
-            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color
-              for sub-subheading/total table rows.
-            </para>
-          </listitem>
+      <para>Geben Sie in das Feld die <acronym>ElStEr</acronym>-Steuernummer Ihres Geschäfts ein.
+      </para>
+    </sect2>
+  </sect1>
 
-          <listitem>
-            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand
-              total rows.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+  <sect1 id="change-style">
+    <title>Stilvorlagen organisieren</title>
 
-      <sect3 id="style-easy-fonts">
-        <title>Fonts</title>
+    <para>&app; verfügt über mehrere Standardformatvorlagen für Berichte. Diese Stilvorlagen können mit
+      dem <acronym>HTML</acronym>-Stilvorlagen Editor an Ihre Bedürfnisse angepasst oder um neue
+      Vorlagen ergänzt werden. Um den Editor aufzurufen, gehen Sie im Menü zu
+      <menuchoice>
+        <guimenu><accel>B</accel>earbeiten</guimenu>
+        <guimenuitem>Stil<accel>v</accel>orlagen</guimenuitem>
+      </menuchoice>
+      . Es stehen diese Vorlagen zur Verfügung:
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para><guilabel>Voreinstellung</guilabel>, als Standardvorgabe
+          </para>
+        </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Title:</guilabel> Select the font and size for Titles.
-            </para>
-          </listitem>
+        <listitem>
+          <para><guilabel>Einfach</guilabel>, ein schlichtes Layout
+          </para>
+        </listitem>
 
-          <listitem>
-            <para><guilabel>Account Link:</guilabel> Select the font and size for Account Links.
-            </para>
-          </listitem>
+        <listitem>
+          <para><guilabel>Bunt</guilabel>, eine farbig ansprechende Vorlage
+          </para>
+        </listitem>
 
-          <listitem>
-            <para><guilabel>Number Cell:</guilabel> Select the font and size for Number Cells.
-            </para>
-          </listitem>
+        <listitem>
+          <para><guilabel>CSS</guilabel>, bietet alle Möglichkeiten um sich ein eigenes Layout zu designen.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
 
-          <listitem>
-            <para><guilabel>Negative Values in Red:</guilabel> Select to have negative values displayed in red.
-            </para>
-          </listitem>
+    <sect2 id="style-choose">
+      <title>Stilvorlagen auswählen</title>
+<!-- FIXME source: new figure -->
+      <figure id="style-choose-fig">
+        <title>Die Auswahl von HTML-Stilvorlagen</title><screenshot id="Style_Choose">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Help_Style_Choose.png"
+                         srccredit="Christian Wehling" ></imagedata>
+            </imageobject>
 
-          <listitem>
-            <para><guilabel>Number Header:</guilabel> Select the font and size for Number Header table rows.
-            </para>
-          </listitem>
+            <caption>
+              <para>Mit dem Dialog <guilabel>HTML-Stilvorlagen auswählen</guilabel> können Sie Ihre Stilvorlage
+                organisieren.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-          <listitem>
-            <para><guilabel>Text Cell:</guilabel> Select the font and size for Text Cells.
-            </para>
-          </listitem>
+      <para>Der Dialog <guilabel>HTML-Stilvorlagen auswählen</guilabel> listet alle vorhandene Stilvorlagen auf
+        und bietet Ihnen die Möglichkeit, die Stilvorlage für Ihre Berichte zu bearbeiten.
+        <tip>
+          <para>Wollen Sie eine Stilvorlage für einen bestimmten Bericht anwenden, so können Sie in den Optionen
+            des Berichts die gewünschte Stilvorlage auswählen. Weitere Informationen finden Sie
+            unter <xref linkend="Reports" />.
+          </para>
+        </tip>
+      </para>
 
-          <listitem>
-            <para><guilabel>Total Number Cell:</guilabel> Select the font and size for Total Number Cells.
-            </para>
-          </listitem>
+      <variablelist spacing="compact">
+        <title>Dialogführung</title>
+
+        <varlistentry>
+          <term><guibutton><accel>B</accel>earbeiten</guibutton></term>
 
           <listitem>
-            <para><guilabel>Total Label Cell:</guilabel> Select the font and size for Total Label Cells.
+            <para>Öffnet den Dialog <guilabel>Eigenschaften HTML-Stilvorlagen Voreinstellungen</guilabel> in einem
+              <emphasis>Editor</emphasis>, mit dem Sie die ausgewählte Vorlage bearbeiten können.
             </para>
           </listitem>
+        </varlistentry>
 
-          <listitem>
-            <para><guilabel>Centered Label Cell:</guilabel> Select the font and size for Centered Label Cells.
+        <varlistentry>
+          <term><guibutton><accel>N</accel>eu</guibutton></term>
+
+          <listitem>
+            <para>Fügt eine neue Stilvorlage hinzu und der Dialog <guilabel>Neue Stilvorlage</guilabel> wird
+              angezeigt. Füllen Sie das Feld <guilabel>Name</guilabel> mit dem Namen der neuen
+              Stilvorlage aus und wählen Sie eine <guilabel>Vorlage</guilabel>, die als Basis für
+              Ihrer neuen Stilvorlage dient.
+<!-- FIXME source: new figure -->
+              <figure id="style-new-fig">
+                <title>Eine neue Stilvorlagen erstellen</title><screenshot>
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/Help_Style_New.png"
+                         srccredit="Christian Wehling" ></imagedata>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
             </para>
           </listitem>
-        </itemizedlist>
-      </sect3>
+        </varlistentry>
 
-      <sect3 id="style-easy-general">
-        <title>General</title>
+        <varlistentry>
+          <term><guibutton><accel>L</accel>öschen</guibutton></term>
 
-        <itemizedlist>
           <listitem>
-            <para><guilabel>Preparer:</guilabel> Name of the person preparing the report.
+            <para>Löscht die markierte Stilvorlage aus der Liste.
             </para>
           </listitem>
+        </varlistentry>
 
-          <listitem>
-            <para><guilabel>Prepared for:</guilabel> Name of Organization or Company the report is prepared for.
-            </para>
-          </listitem>
+        <varlistentry>
+          <term><guibutton>S<accel>c</accel>hließen</guibutton></term>
 
           <listitem>
-            <para><guilabel>Show preparer info:</guilabel> Show the Preparer information in the report.
+            <para>Beendet den Dialog.
             </para>
           </listitem>
+        </varlistentry>
+      </variablelist>
+    </sect2>
 
-          <listitem>
-            <para><guilabel>Enable Links:</guilabel> Select this to enable blue hyperlinks in reports.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+    <sect2 id="style-editor">
+      <title>Stilvorlagen bearbeiten</title>
 
-      <sect3 id="style-easy-images">
-        <title>Images</title>
+      <para>Mit dem Stilvorlagen-Editor können Sie die Einstellungen einer Stilvorlage anzeigen/ändern.
+      </para>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the background in reports. The <guibutton>Clear</guibutton> button
-              will clear the selection.
-            </para>
-          </listitem>
+      <note>
+        <para>Wenn Sie die Formatvorlage ändern, wirkt sich das auf alle Berichte, die auf dieser Formatvorlage
+          basieren, aus. Ein <guibutton>Erneut laden</guibutton> ist erforderlich, um die
+          Änderungen zu sehen, wenn der/die Bericht(e) aktuell angezeigt werden.
+        </para>
+      </note>
 
-          <listitem>
-            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the heading in reports. The <guibutton>Clear</guibutton> button will
-              clear the selection.
-            </para>
-          </listitem>
+      <xi:include href="para-assist-buttons.xml"/>
+    </sect2>
+<!-- FIXME source: new section "CSS Style" -->
+<!-- Wo werden die Style Sheets eigentlich gespeichert? -->
+    <sect2 id="style-customize">
+      <title>Stilvorlagen anpassen</title>
 
-          <listitem>
-            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify
-              the alignment of the banner at the top of report(s).
-            </para>
-          </listitem>
+      <sect3 id="style-css">
+        <title>CSS Stilvorlage</title>
 
-          <listitem>
-            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use
-              as the logo in reports. The <guibutton>Clear</guibutton> button will clear the
-              selection.
-            </para>
-          </listitem>
-        </itemizedlist>
+        <tip>
+<!-- Todo: im Englischen: https://www.w3schools.com/w3css/ -->
+          <para>Mit der Nutzung der CSS Stilvorlage haben Sie eine sehr flexible Möglichkeit an der Hand, sich
+            optisch ansprechende Berichte zu konfigurieren. Ein guter Einstieg in die Arbeit mit CSS
+            finden Sie z.B. unter <ulink url="https://wiki.selfhtml.org/wiki/CSS"></ulink>
+          </para>
+        </tip>
+
+        <para>Wenn Sie die CSS-Stilvorlage zur Bearbeitung öffnen, so sehen Sie eine einfachen Texteditor, in dem
+          Sie die CSS-Anweisungen direkt eingeben können.
+        </para>
       </sect3>
 
-      <sect3 id="style-easy-tables">
-        <title>Tables</title>
+      <sect3 id="style-default">
+        <title>Voreinstellung</title>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Table cell spacing:</guilabel> Sets the space between table cells
-            </para>
-          </listitem>
+        <para>Die Standardvorlage hat vier Registerkarten, mit denen Sie das Erscheinungsbild der Berichte ändern
+          können: <guilabel>Farben</guilabel>, <guilabel>Schriftarten</guilabel>,
+          <guilabel>Allgemein</guilabel> und <guilabel>Tabellen</guilabel>.
+        </para>
 
-          <listitem>
-            <para><guilabel>Table cell padding:</guilabel> Sets the space between table cell edges and contents
-            </para>
-          </listitem>
+        <variablelist spacing="compact">
+          <varlistentry>
+            <term>Der Reiter <guilabel>Farben</guilabel></term>
+
+            <listitem>
+              <variablelist spacing="compact" id="style-def-color" xreflabel="Der Reiter Farben">
+                <varlistentry>
+                  <term><guilabel>Zweite Farbe für Tabellenzeile</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Table border width:</guilabel> Sets the width of the borders on tables.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-    </sect2>
+                  <listitem>
+                    <para>Öffnet den Farbauswahldialog, um eine Farbe auszuwählen, die abwechselnd auf die Tabellenzeilen
+                      angewendet werden soll.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
 
-    <sect2 id="style-footer">
-      <title>Footer Style Sheet</title>
+          <varlistentry>
+            <term>Der Reiter <guilabel>Schriftarten</guilabel></term>
 
-      <para>The Footer Style Sheet has the same five tabs to alter the appearance of reports as the Easy Style
-        Sheets: Colors, Fonts, General, Images and Tables.
-      </para>
+            <listitem>
+              <variablelist spacing="compact" id="style-def-fonts" xreflabel="Der Reiter Schriftarten">
+                <varlistentry>
+                  <term><guilabel>Titel</guilabel></term>
 
-      <sect3 id="style-footer-colors">
-        <title>Colors</title>
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für den Berichtstitel.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Konto-Hyperlink</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für Kontonamen und Verknüpfungen.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Zahlenfeld</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für normale Zahlen aus.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Background Color:</guilabel> Opens the color picker to choose a new background color.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Negative Beträge in rot anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Text Color:</guilabel> Opens the color picker to choose a new text color.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Wählen Sie diese Option, um negative Werte in Rot anzuzeigen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Text Cell Color:</guilabel> Opens the color picker to choose a new text cell color.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Zahlenüberschrift</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für die Überschrift von Zahlenfeldern aus.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Textfeld</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für normale Textfelder aus.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Summenfeld</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für Zahlenfelder mit Summen aus.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Summenbeschriftung</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für Beschrifungsfelder von Summen aus.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Zentriertes Textfeld</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie die Schriftart und -größe für zentrierte Beschriftungsfelder aus.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Der Reiter <guilabel>Allgemein</guilabel></term>
+
+            <listitem>
+              <variablelist spacing="compact" id="style-def-general" xreflabel="Der Reiter Allgemein">
+                <varlistentry>
+                  <term><guilabel>Hintergrundfarbe</guilabel></term>
+
+                  <listitem>
+                    <para>Öffnet den Farbwähler zur Auswahl einer neuen Hintergrundfarbe des Berichts.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Hintergrundbild</guilabel></term>
+
+                  <listitem>
+                    <para>Verwenden Sie die Schaltfläche <guibutton>Durchsuchen</guibutton>, um eine Grafik, wie z.B. Ihr
+                      Logo oder Lieblingsbriefpapier, auszuwählen, das als Hintergrund in den
+                      Berichten verwendet wird. Mit der <guibutton>Zurücksetzen</guibutton>-
+                      Schaltfläche können Sie Ihre Auswahl wieder zurücknehmen.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Hyperlinks aktivieren</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie diese Option, um blaue Verknüpfungen in Berichten zu aktivieren.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Der Reiter <guilabel>Tabellen</guilabel></term>
+
+            <listitem>
+              <variablelist spacing="compact" id="style-def-tables" xreflabel="Der Reiter Tabellen">
+                <varlistentry>
+                  <term><guilabel>Zellen-Abstand</guilabel></term>
+
+                  <listitem>
+                    <para>Legt den Abstand zwischen den Tabellenzellen fest.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Zellen-Füllung</guilabel></term>
+
+                  <listitem>
+                    <para>Legt den Abstand zwischen den Rändern der Tabellenzellen und dem Inhalt fest.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Tabellen-Randbreite</guilabel></term>
+
+                  <listitem>
+                    <para>Legt die Breite der Ränder von Tabellen fest.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </sect3>
 
-          <listitem>
-            <para><guilabel>Link Color:</guilabel> Opens the color picker to choose a new link color.
-            </para>
-          </listitem>
+      <sect3 id="style-easy">
+        <title>Einfach</title>
 
-          <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for
-              alternate table rows.
-            </para>
-          </listitem>
+        <para>Die Stilvorlage <guilabel>Einfach</guilabel> hat fünf Reiter, mit denen Sie das Aussehen von
+          Berichten ändern können: <guilabel>Farben</guilabel>, <guilabel>Schriftarten</guilabel>,
+          <guilabel>Allgemein</guilabel>, <guilabel>Bilder</guilabel> und
+          <guilabel>Tabellen</guilabel>.
+        </para>
 
-          <listitem>
-            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color
-              for subheading/subtotal table rows.
-            </para>
-          </listitem>
+        <variablelist spacing="compact">
+          <varlistentry>
+            <term>Der Reiter <guilabel>Farben</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color
-              for sub-subheading/total table rows.
-            </para>
-          </listitem>
+            <listitem>
+              <variablelist spacing="compact" id="style-easy-colors" xreflabel="Der Reiter Farben">
+                <varlistentry>
+                  <term><guilabel>Hintergrund</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand
-              total rows.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+                  <listitem>
+                    <para>Öffnet den Farbwähler zur Auswahl einer neuen Hintergrundfarbe des Berichts.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-      <sect3 id="style-footer-fonts">
-        <title>Fonts</title>
+                <varlistentry>
+                  <term><guilabel>Textfarbe</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Title:</guilabel> Select the font and size for Titles.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Öffnet den Farbwähler zur Auswahl einer neuen Textfarbe.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Account Link:</guilabel> Select the font and size for Account Links.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Farbe für Tabellenzelle</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Number Cell:</guilabel> Select the font and size for Number Cells.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Öffnet den Farbwähler, um eine neue Hintergrundfarbe von Textzellen auszuwählen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Negative Values in Red:</guilabel> Select to have negative values displayed in red.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Hyperlink-Farbe</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Number Header:</guilabel> Select the font and size for Number Header table rows.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Öffnet den Farbwähler zur Auswahl einer neuen Farbe von Verknüpfungen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Text Cell:</guilabel> Select the font and size for Text Cells.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Zweite Farbe für Tabellenzelle</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Total Number Cell:</guilabel> Select the font and size for Total Number Cells.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Öffnet den Farbwähler, um eine neue Hintergrundfarbe für die abwechselnden Tabellenzeilen zu
+                      wählen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Total Label Cell:</guilabel> Select the font and size for Total Label Cells.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Farbe für Zwischenüberschrift/-summe</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Centered Label Cell:</guilabel> Select the font and size for Centered Label Cells.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+                  <listitem>
+                    <para>Öffnet den Farbwähler, um eine neue Farbe für die Tabellenzeilen mit
+                      Zwischenüberschriften/Zwischensummen auszuwählen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-      <sect3 id="style-footer-general">
-        <title>General</title>
+                <varlistentry>
+                  <term><guilabel>Farbe für Zwischen-Zwischenüberschriften/-summen</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Preparer:</guilabel> Name of the person preparing the report.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Öffnet den Farbwähler, um eine neue Farbe für die Zeilen mit Überschriften und Summen zweiter
+                      Ordnung in der Tabelle auszuwählen.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Zellfarbe für Gesamtsumme</guilabel></term>
+
+                  <listitem>
+                    <para>Öffnet den Farbwähler, um eine neue Farbe für die Gesamtsummenzeilen zu wählen.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry id="style-easy-fonts">
+            <term>Der Reiter <guilabel>Schriftarten</guilabel></term>
+
+            <listitem>
+              <para>Die Einstellungen für die Schriftarten wurden zuvor im Abschnitt <xref linkend="style-def-fonts" />
+                beschrieben.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Der Reiter <guilabel>Allgemein</guilabel></term>
+
+            <listitem>
+              <variablelist spacing="compact" id="style-easy-general" xreflabel="Der Reiter Allgmein">
+                <varlistentry>
+                  <term><guilabel>Sachbearbeiter</guilabel></term>
+
+                  <listitem>
+                    <para>Angabe des Namens der Person, die den Bericht erstellt hat.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Erstellt für</guilabel></term>
+
+                  <listitem>
+                    <para>Der Name der Organisation oder die Firma, für die der Bericht erstellt wird.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Berichterstatter-Information anzeigen</guilabel></term>
+
+                  <listitem>
+                    <para>Zeigt die Informationen zum Sachbearbeiter im Bericht an.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Prepared for:</guilabel> Name of Organization or Company the report is prepared for.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Hyperlinks aktivieren</guilabel></term>
+
+                  <listitem>
+                    <para>Wählen Sie diese Option, um blaue Verknüpfungen in Berichten zu aktivieren.
+                    </para>
+                  </listitem>
+                </varlistentry>
+<!-- FIXME source: new item -->
+                <varlistentry>
+                  <term><guilabel>Fußzeile</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Show preparer info:</guilabel> Show the Preparer information in the report.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Geben Sie hier den Text ein, der in der Fußzeile des Berichts angezeigt werden soll.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
 
-          <listitem>
-            <para><guilabel>Enable Links:</guilabel> Select this to enable blue hyperlinks in reports.
-            </para>
-          </listitem>
+          <varlistentry>
+            <term>Der Reiter <guilabel>Bilder</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Footer:</guilabel> Text to be included in report footer.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+            <listitem>
+              <variablelist spacing="compact" id="style-easy-images" xreflabel="Der Reiter Bilder">
+                <varlistentry>
+                  <term><guilabel>Hintergrundkachel</guilabel></term>
 
-      <sect3 id="style-footer-images">
-        <title>Images</title>
+                  <listitem>
+                    <para>Verwenden Sie die <guibutton>Durchsuchen</guibutton>-Schaltfläche, um ein Bild auszuwählen, das
+                      als Hintergrund in den Berichten verwendet werden soll. Mit der Schaltfläche
+                      <guibutton>Zurücksetzen</guibutton> können Sie die Auswahl wieder löschen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the background in reports. The <guibutton>Clear</guibutton> button
-              will clear the selection.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Titel</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the heading in reports. The <guibutton>Clear</guibutton> button will
-              clear the selection.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Verwenden Sie die Schaltfläche <guibutton>Durchsuchen</guibutton>, um ein Bild auszuwählen, das
+                      als Überschrift in Berichten verwendet werden soll. Mit der Schaltfläche
+                      <guibutton>Zurücksetzen</guibutton> können Sie die Auswahl löschen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify
-              the alignment of the banner at the top of report(s).
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Ausrichtung Ãœberschrift</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use
-              as the logo in reports. The <guibutton>Clear</guibutton> button will clear the
-              selection.
-            </para>
-          </listitem>
-        </itemizedlist>
+                  <listitem>
+                    <para>Wählen Sie aus der Pulldown-Liste: Links, Rechts, Zentriert, um die Ausrichtung der Titelzeile am
+                      oberen Rand des Berichts/der Berichte festzulegen.
+                    </para>
+                  </listitem>
+                </varlistentry>
+
+                <varlistentry>
+                  <term><guilabel>Logo</guilabel></term>
+
+                  <listitem>
+                    <para>Verwenden Sie die Schaltfläche <guibutton>Durchsuchen</guibutton>, um ein Bild auszuwählen, das
+                      als Logo in den Berichten verwendet werden soll. Die Schaltfläche
+                      <guibutton>Zurücksetzen</guibutton> wird die Auswahl gelöscht.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry id="style-easy-tables">
+            <term>Der Reiter <guilabel>Tabellen</guilabel></term>
+
+            <listitem>
+              <para>Die Einstellungen für die Tabellen wurden zuvor im Abschnitt <xref linkend="style-def-tables" />
+                beschrieben.
+              </para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
       </sect3>
+<!-- FIXME source: new Style-Sheet item -->
+      <sect3 id="style-head-trail">
+        <title>Vor- oder Nachspann</title>
+
+        <para>Die Stilvorlage für den <guilabel>Vor- oder Nachspann</guilabel> enthält ebenfalls fünf Reiter,
+          mit denen Sie das Aussehen von Berichten anpassen können: <guilabel>Farben</guilabel>,
+          <guilabel>Schriftarten</guilabel>, <guilabel>Allgemein</guilabel>,
+          <guilabel>Bilder</guilabel> und <guilabel>Tabellen</guilabel>.
+        </para>
 
-      <sect3 id="style-footer-tables">
-        <title>Tables</title>
+        <variablelist spacing="compact">
+          <varlistentry>
+            <term>Der Reiter <guilabel>Farben</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Table cell spacing:</guilabel> Sets the space between table cells
-            </para>
-          </listitem>
+            <listitem>
+              <para>Die Einstellungen für die Farben wurden zuvor im Abschnitt <xref linkend="style-easy-colors" />
+                beschrieben.
+              </para>
+            </listitem>
+          </varlistentry>
 
-          <listitem>
-            <para><guilabel>Table cell padding:</guilabel> Sets the space between table cell edges and contents
-            </para>
-          </listitem>
+          <varlistentry>
+            <term>Der Reiter <guilabel>Schriftarten</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Table border width:</guilabel> Sets the width of the borders on tables.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
-    </sect2>
+            <listitem>
+              <para>Die Einstellungen für die Schriftarten wurden zuvor im Abschnitt <xref linkend="style-def-fonts" />
+                beschrieben.
+              </para>
+            </listitem>
+          </varlistentry>
 
-    <sect2 id="style-technicolor">
-      <title>Technicolor Style Sheet</title>
+          <varlistentry>
+            <term>Der Reiter <guilabel>Allgemein</guilabel></term>
 
-      <para>The Technicolor Style Sheet has has five tabs to alter the appearance of reports: Colors, Fonts,
-        General, Images and Tables.
-      </para>
+            <listitem>
+              <variablelist spacing="compact" id="style-head-trail-general" xreflabel="Der Reiter Allgmein">
+                <varlistentry>
+                  <term><guilabel>Sachbearbeiter</guilabel></term>
 
-      <sect3 id="style-tech-colors">
-        <title>Colors</title>
+                  <listitem>
+                    <para>Angabe des Namens der Person, die den Bericht erstellt hat.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Background Color:</guilabel> Opens the color picker to choose a new background color.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Erstellt für</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Text Color:</guilabel> Opens the color picker to choose a new text color.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Der Name der Organisation oder die Firma, für die der Bericht erstellt wird.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Text Cell Color:</guilabel> Opens the color picker to choose a new text cell color.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Berichterstatter-Information</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Link Color:</guilabel> Opens the color picker to choose a new link color.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Zeigt die Informationen zum Sachbearbeiter im Bericht an.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Alternate Table Cell Color:</guilabel> Opens the color picker to choose a new color for
-              alternate table rows.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Empfänger Information anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Subheading/Subtotal Cell Color:</guilabel> Opens the color picker to choose a new color
-              for subheading/subtotal table rows.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Fügt den Namen der Organisation oder der Firma in den Bericht ein.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Sub-subheading/total Cell Color:</guilabel> Opens the color picker to choose a new color
-              for sub-subheading/total table rows.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Datum anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Grand Total Cell Color:</guilabel> Opens the color picker to choose a new color for grand
-              total rows.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+                  <listitem>
+                    <para>Schreibt das Tagesdatum in den Bericht.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-      <sect3 id="style-tech-fonts">
-        <title>Fonts</title>
+                <varlistentry>
+                  <term><guilabel>Zusätzlich zum Datum auch die Zeit anzeigen</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Title:</guilabel> Select the font and size for Titles.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Das Datum in dem Bericht kann mit der Angaben zur Uhrzeit ergänzt werden.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Account Link:</guilabel> Select the font and size for Account Links.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>&app;-Version anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Number Cell:</guilabel> Select the font and size for Number Cells.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Fügt die &app;-Versionsnummer, mit der der Bericht erstellt wurde, ein.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Negative Values in Red:</guilabel> Select to have negative values displayed in red.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Hyperlinks aktivieren</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Number Header:</guilabel> Select the font and size for Number Header table rows.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Wählen Sie diese Option, um blaue Verknüpfungen in Berichten zu aktivieren.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Text Cell:</guilabel> Select the font and size for Text Cells.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Zusätzliche Kommentare</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Total Number Cell:</guilabel> Select the font and size for Total Number Cells.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>In diesem Textfeld können Sie weiter Informationen zur Anzeige im Bericht eintragen.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Total Label Cell:</guilabel> Select the font and size for Total Label Cells.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Angaben zum Berichterstatter am Ende anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Centered Label Cell:</guilabel> Select the font and size for Centered Label Cells.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+                  <listitem>
+                    <para>Zeigt die Informationen zum Sachbearbeiter hinter den Berichtsdaten an.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-      <sect3 id="style-tech-general">
-        <title>General</title>
+                <varlistentry>
+                  <term><guilabel>Empfängerdaten am Ende anzeigen</guilabel></term>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Preparer:</guilabel> Name of the person preparing the report.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Fügt den Namen der Organisation oder der Firma hinter den Berichtsdaten ein.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Prepared for:</guilabel> Name of Organization or Company the report is prepared for.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>Datum und Uhrzeit am Ende anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Show preparer info:</guilabel> Show the Preparer information in the report.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Schreibt Datum und Uhrzeit an den Ende des Berichts.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-          <listitem>
-            <para><guilabel>Enable Links:</guilabel> Select this to enable blue hyperlinks in reports.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </sect3>
+                <varlistentry>
+                  <term><guilabel>Kommentare am Ende anzeigen</guilabel></term>
 
-      <sect3 id="style-tech-images">
-        <title>Images</title>
+                  <listitem>
+                    <para>Fügt den zusätzlichen Kommentar hinter den Berichtsdaten ein.
+                    </para>
+                  </listitem>
+                </varlistentry>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Background Tile:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the background in reports. The <guibutton>Clear</guibutton> button
-              will clear the selection.
-            </para>
-          </listitem>
+                <varlistentry>
+                  <term><guilabel>&app;-Version am Ende anzeigen</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Heading Banner:</guilabel> Use the <guibutton>Browse</guibutton> button to select a
-              picture to use as the heading in reports. The <guibutton>Clear</guibutton> button will
-              clear the selection.
-            </para>
-          </listitem>
+                  <listitem>
+                    <para>Fügt die &app;-Versionsnummer, mit der der Bericht erstellt wurde, am Ende des Berichts ein.
+                    </para>
+                  </listitem>
+                </varlistentry>
+              </variablelist>
+            </listitem>
+          </varlistentry>
 
-          <listitem>
-            <para><guilabel>Heading Alignment:</guilabel> Select from pull-down list; Left, Right, Center, to specify
-              the alignment of the banner at the top of report(s).
-            </para>
-          </listitem>
+          <varlistentry>
+            <term>Der Reiter <guilabel>Bilder</guilabel></term>
 
-          <listitem>
-            <para><guilabel>Logo:</guilabel> Use the <guibutton>Browse</guibutton> button to select a picture to use
-              as the logo in reports. The <guibutton>Clear</guibutton> button will clear the
-              selection.
-            </para>
-          </listitem>
-        </itemizedlist>
+            <listitem>
+              <para>Die Einstellungen für die Bilder wurden zuvor im Abschnitt <xref linkend="style-easy-images" />
+                beschrieben.
+              </para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
+            <term>Der Reiter <guilabel>Tabellen</guilabel></term>
+
+            <listitem>
+              <para>Die Einstellungen für die Tabellen wurden zuvor im Abschnitt <xref linkend="style-def-tables" />
+                beschrieben.
+              </para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
       </sect3>
 
-      <sect3 id="style-tech-tables">
-        <title>Tables</title>
+      <sect3 id="style-footer">
+        <title>Fußzeile</title>
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Table cell spacing:</guilabel> Sets the space between table cells
-            </para>
-          </listitem>
+        <para>Die Stilvorlage <guilabel>Fußzeile</guilabel> hat dieselben fünf Reiter, mit denen Sie das
+          Aussehen von Berichten anpassen können, wie die Stilvorlage
+          <xref linkend="style-easy" />: <guilabel>Farben</guilabel>,
+          <guilabel>Schriftarten</guilabel>, <guilabel>Allgemein</guilabel>,
+          <guilabel>Bilder</guilabel> und <guilabel>Tabellen</guilabel>.
+        </para>
+      </sect3>
 
-          <listitem>
-            <para><guilabel>Table cell padding:</guilabel> Sets the space between table cell edges and cell contents
-            </para>
-          </listitem>
+      <sect3 id="style-technicolor">
+        <title>Bunt</title>
 
-          <listitem>
-            <para><guilabel>Table border width:</guilabel> Sets the width of the borders on tables.
-            </para>
-          </listitem>
-        </itemizedlist>
+        <para>Die Stilvorlage <guilabel>Bunt</guilabel> hat dieselben fünf Reiter, mit denen Sie das Aussehen von
+          Berichten anpassen können, wie die Stilvorlage <xref linkend="style-easy" />:
+          <guilabel>Farben</guilabel>, <guilabel>Schriftarten</guilabel>,
+          <guilabel>Allgemein</guilabel>, <guilabel>Bilder</guilabel> und
+          <guilabel>Tabellen</guilabel>.
+        </para>
       </sect3>
     </sect2>
   </sect1>
@@ -2476,6 +3411,9 @@
   <sect1 id="set-tax-options">
     <title>Setting Tax Report Options</title>
 
+    <para>&untranslated-de;
+    </para>
+
     <abstract>
       <para>The tax report can be used to prepare online tax reports for specific countries, see
         <xref linkend="report-regional"/>. Currently US and partial DE are supported.
@@ -2814,50 +3752,109 @@
   </sect1>
 
   <sect1  id="reset-warning">
-    <title>Reset Warnings...</title>
-
-    <para>&app; gives warnings when certain operations are attempted, such as removing a transaction or
-      removing the splits of a transaction. The warning message gives you the option to not give you
-      these warnings when attempting the operation. Check-boxes labeled <guilabel>Remember and
-      don’t ask me again</guilabel> and <guilabel>Remember and don’t ask me again this
-      session</guilabel> allow disabling the warnings. This option permits reseting the warnings to
-      the default, IE make the warning happen. Warnings may be selectivly enabled.
+    <title>Warnungen zurücksetzen…</title>
+
+    <para>&app; gibt Warnungen aus, wenn Sie bestimmte Handlungen durchführen, z.B. das Löschen einer
+      Buchung oder das Entfernen eines einzelnen Buchungsteils. Da einige Benutzer zu häufige
+      Warnungen ablenkend fanden, wurde die Möglichkeit geschaffen, diese abzuschalten Die
+      Kontrollkästchen mit den Bezeichnungen <guilabel>Antwort speichern und nicht wieder
+      anzeigen</guilabel> und <guilabel>Antwort speichern und in dieser Sitzung nicht wieder
+      anzeigen </guilabel> erlauben das Deaktivieren der Warnungen. Mit dem Menüeintrag
+      <menuchoice>
+        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>W</accel>arnungen
+        zurücksetzen…</guimenuitem>
+      </menuchoice>
+      öffnet sich ein Dialog, der die von Ihnen deaktivierten Warnung auflistet.
+    </para>
+
+    <figure id="reset-warning-fig">
+      <title>Das <guilabel>Warnungen zurücksetzen</guilabel> Fenster</title><screenshot>
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_Reset_Warnings.png" 
+                         srccredit="Christian Wehling"></imagedata>
+          </imageobject>
+
+          <imageobject role="fo">
+            <imagedata fileref="figures/Help_Reset_Warnings.png" 
+                         srccredit="Christian Wehling"></imagedata>
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
+
+    <para>Warnungen können selektiv aktiviert werden, wobei der Dialog in zwei Rubriken aufgeteilt ist.
+    </para>
+
+    <para><variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>Dauerhafte Warnung</guilabel></term>
+
+          <listitem>
+            <para>Hier werden die Warnungen aufgelistet, die Sie dauerhaft nicht wieder sehen wollten.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Zeitweise Warnung</term>
+
+          <listitem>
+            <para>Unter den zweitweisen Warnung fallen die Hinweise, die Sie lediglich für die aktuelle Sitzung nicht
+              mehr sehen wollten.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </para>
   </sect1>
 
   <sect1  id="chang-lang">
-    <title>Changing the Language or Region</title>
+    <title>Ändern der Sprache und des Gebietsschemas</title>
 
-    <para>The language of the &app; user interface is not modifiable directly from the program’s
-      preferences.
+    <para>Die Sprache der &app; Benutzeroberfläche kann nicht direkt über die Programmeinstellungen
+      geändert werden. Schauen Sie erst einmal in die <guilabel>Einstellungen</guilabel> Ihres
+      Betriebssystems, um diese Einstellungen anzupassen, weil diese auch für &app; erst einmal
+      maßgeblich sind.
     </para>
 
-    <para>The way you can change the language depends on the operating system you are running &app; on.
-    </para>
+    <tip>
+      <para>Weitere und aktuelle Informationen zu diesem Thema finden Sie auf der Seite
+        <ulink url="&url-wiki-de;Konfiguration#Lokalisierung_.28Einstellung_der_Sprache.2C_W.C3.A4hrung.2C_Formate_....29">Lokalisierung</ulink>
+        im &app; Wiki und auch auf der <ulink url="&url-wiki-locale;">Locale Settings page</ulink>
+        (auf Englisch).
+      </para>
+    </tip>
 
-    <variablelist>
+    <variablelist spacing="compact">
       <varlistentry>
         <term>&lin;</term>
 
         <listitem>
-          <para>In general you should set the <envar>LANGUAGE</envar> and <envar>LANG</envar> environment variables
-            before starting &app;. To do this you need to open a terminal and run the following
-            command:
+          <para>Nutzer der Kommandozeile sollten die Umgebungsvariablen <envar>LANGUAGE</envar> und
+            <envar>LANG</envar>
+            <footnote>
+              <para><envar>LANGUAGE</envar> ist wie im Browser eine Preferenzliste nur von Sprachen, während
+                <envar>LANG</envar> die Vorgabe für die Formate, wie z.B. Währung, Datum, Zeit,
+                Zahl usw., aber auch für die Sortierung ist.
+              </para>
+            </footnote>
+            setzen, bevor Sie &app; starten. Dazu geben Sie in einem Terminal den folgenden Befehl
+            ein:
           </para>
 
           <para><command>LANGUAGE=<replaceable>ll_LL</replaceable> LANG=<replaceable>ll_LL</replaceable>
             gnucash</command>
           </para>
 
-          <para><replaceable>ll_LL</replaceable> is the locale you want to run &app; with
-            (<emphasis>de_DE</emphasis> for Deutsch, <emphasis>it_IT</emphasis> for Italian etc.)
+          <para>Mit dem Kürzel <replaceable>ll_LL</replaceable> ist das Gebietsschema, in dem Sie &app; ausführen
+            möchten, gemeint. Um die Zusammenhänge etwas zu veranschaulichen, hilft dieses
+            Beispiel: Starten Sie &app; mit diesem Befehl
+            <command>LANGUAGE=<replaceable>tr</replaceable>
+            LANG=<replaceable>de_DE.utf8</replaceable> gnucash</command> so wird das Programm in
+            türkischer Sprache, Währung usw. arbeiten, Sie haben jedoch die Möglichkeit z.B. eine
+            deutsche Steuererklärung vorzubereiten.
           </para>
-
-          <note>
-            <para>On some systems (e.g. Ubuntu) the encoding could be part of the locales name, like
-              <replaceable>ll_LL.UTF-8</replaceable>. You can use these names as well.
-            </para>
-          </note>
         </listitem>
       </varlistentry>
 
@@ -2865,24 +3862,12 @@
         <term>&mac;</term>
 
         <listitem>
-          <para>If you want to use a different translation from the one that is automatically selected, you can run
-            the following in <application>Terminal.app</application>:
-          </para>
-
-          <para><command>defaults write $(mdls -name kMDItemCFBundleIdentifier -raw /Applications/GnuCash.app)
-            AppleLanguages "(<replaceable>de</replaceable>,
-            <replaceable>en</replaceable>)"</command>
-          </para>
-
-          <para>Use whatever language codes you want, replacing Deutsch and English. It won’t work if there
-            isn’t a translation file for the language you want.
-          </para>
-
-          <para>If you want to unset it (that is, return to using the system settings), run this:
-          </para>
-
-          <para><command>defaults delete $(mdls -name kMDItemCFBundleIdentifier -raw
-            /Applications/GnuCash.app)</command>
+          <para>Wenn Sie eine andere als die automatisch gewählte Übersetzung verwenden möchten, können Sie
+            unter
+            <menuchoice>
+              <guimenu>System Settings</guimenu><guimenuitem>Language and Region</guimenuitem>
+            </menuchoice>
+            eine andere Sprache einstellen.
           </para>
         </listitem>
       </varlistentry>
@@ -2891,30 +3876,14 @@
         <term>&win;</term>
 
         <listitem>
-          <para>If you are running &app; 2.4.0 (or newer) on &win;, you can set the interface language by editing
-            the file <filename>environment</filename> with a text editor (e.g.
-            <application>Notepad</application>). By default this file is installed in
-            <filename role="directory">c:\Program Files\gnucash\etc\gnucash</filename>. Change this
-            file such that the last few lines are:
-          </para>
-
-          <para><programlisting linenumbering="unnumbered"># If you wish GnuCash to use a different language, uncomment the two parameters
-# below and set LANG to your preferred locale
-LANG=ll_LL
-LANGUAGE={LANG}</programlisting>
-          </para>
-
-          <para><replaceable>ll_LL</replaceable> is the locale you want to run &app; with
-            (<emphasis>de_DE</emphasis> for Deutsch, <emphasis>it_IT</emphasis> for Italian etc.)
+          <para><menuchoice>
+              <guimenu>Start</guimenu><guisubmenu>Einstellungen</guisubmenu><guisubmenu>Zeit &
+              Sprache</guisubmenu><guimenuitem>Region</guimenuitem>
+            </menuchoice>
+            und stellen dann das Gebietsschema ein.
           </para>
         </listitem>
       </varlistentry>
     </variablelist>
-
-    <tip>
-      <para>More and updated information about this topic can be found on the
-        <ulink url="&url-wiki-locale;">Locale Settings page</ulink> of the &app; wiki.
-      </para>
-    </tip>
   </sect1>
 </chapter>
diff --git a/help/de/Help_ch_GUIMenus.xml b/help/de/Help_ch_GUIMenus.xml
index 3813485f..28956727 100644
--- a/help/de/Help_ch_GUIMenus.xml
+++ b/help/de/Help_ch_GUIMenus.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
-<!-- (Do not remove this comm Version: 3.11)
-  Last modified: March 29th 2018
+<!-- (Do not remove this comment block.)
+  Version: 4.6
+  Last modified: September 2021
+       modified: March 29th 2018
        modified: November 18th 2010
        modified: December 7th 2009
        modified: April 23th 2007
@@ -27,12 +29,12 @@
     <figure id="Help_Main_WindowCallouts">
       <title>Die Bereiche des &app;-Hauptfensters</title><mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/Main-window-callouts.png" format="PNG"
-                       srccredit="Frank H. Ellenberger" width="510" />
+          <imagedata fileref="figures/Main-window-callouts.png"
+                       srccredit="Frank H. Ellenberger" width="&img-w;" />
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/Main-window-callouts.png" format="PNG"
+          <imagedata fileref="figures/Main-window-callouts.png" 
                        srccredit="Frank H. Ellenberger" />
         </imageobject>
 
@@ -182,12 +184,12 @@
       <title>Die Anzeige der <emphasis>Kontenübersicht</emphasis></title><screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG"
-                       srccredit="Christian Wehling" width="510" />
+            <imagedata fileref="figures/Help_AccountTree_Screen.png"
+                       srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_AccountTree_Screen.png"
                        srccredit="Christian Wehling" />
           </imageobject>
 
@@ -202,64 +204,371 @@
     <sect2 id="AccTree-main-bar">
       <title>Anzeigebereich der Kontenübersicht</title>
 
-      <para>Die Kontenübersicht zeigt eine Liste Ihrer Konten in einer Baumstruktur an. Dies ermöglicht, dass
-        Sie Ihre Konten nach Kontenarten organisieren können.
+      <para>Die Kontenübersicht zeigt Ihren gegenwärtigen Kontenplan in einer Baumstruktur an. Dies
+        ermöglicht, dass Sie Ihre Konten nach Kontenarten organisieren können. Dies eröffnet
+        Ihnen diese Möglichkeiten:
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>Ãœberblick bedeutet Vergleich von Basiskennzahlen wie etwa aktueller Saldo ohne Berichte starten zu
+              müssen.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Verwalten von Konten wie z.B. Einfügen, ändern, neu ordnen.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Navigation, also das schnelle Springen in ein Konto.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Ein-/Ausblenden von Spalten mit unterschiedlichen Informationen zu den Konten.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Ein/Ausblenden von Zeilen, also Konten, um die Kontenliste übersichtlich zu gestalten.
+            </para>
+          </listitem>
+        </itemizedlist>
       </para>
 
       <tip>
-        <para>Die Dreiecksform (oder das Pluszeichen) neben dem Kontonamen dient zum Öffnen und Schließen der
-          Kontenstruktur. Wenn Sie auf das Dreieck (Pluszeichen) klicken, ändert es sich von einem
-          nach rechts zeigenden in ein nach unten zeigendes Zeichen (Minuszeichen), um anzuzeigen,
-          dass der Baum geöffnet ist. Sie sehen dann versetzt unterhalb des Kontonamens entweder
-          eine Liste der Unterkonten oder ein weiteres Dreieck (Pluszeichen) links neben einem
-          Konto. Dieses zeigt eine weitere untere Ebene der Kontenübersicht an.
+        <para>Die Dreiecksform (oder das Pluszeichen) vor jedem Kontonamen , der kein Blatt bezeichnet, also
+          Unterkonten hat, dient zum Anzeigen oder Ausblenden (des Teilbaums) der Unterkonten. Wenn
+          Sie auf das Dreieck (Pluszeichen) klicken, ändert es sich von einem nach rechts zeigenden
+          in ein nach unten zeigendes Zeichen (Minuszeichen), um anzuzeigen, dass der Baum geöffnet
+          ist. Sie sehen dann versetzt unterhalb des Kontonamens entweder eine Liste der Unterkonten
+          oder ein weiteres Dreieck (Pluszeichen) links neben einem Konto. Dieses zeigt eine weitere
+          untere Ebene der Kontenübersicht an.
         </para>
       </tip>
 
       <para>Im Hauptfenster werden außerdem standardmäßig vier Spalten angezeigt:
         <guilabel>Kontobezeichnung</guilabel>, <guilabel>Kontoart</guilabel>,
         <guilabel>Beschreibung</guilabel> und <guilabel>Gesamt</guilabel>. Für jedes Konto werden
-        diese Informationen, sofern vorhanden, in der gleichen Zeile des Kontos angezeigt.
+        diese Informationen, sofern vorhanden, in der gleichen Zeile des Kontos angezeigt. Wenn die
+        Gesamtbreite der Spalten die Breite des Anzeigebereichs überschreitet, erscheint,
+        normalerweise am unteren Rand, ein Rollbalken um die Ansicht horizontal zu verschieben.
+      </para>
+
+      <para>Die Spalten, die für jedes Konto in der Kontenübersicht angezeigt werden, sowie die zeilenweise
+        Darstellung der Konten, können an Ihre Bedürfnisse angepasst werden. Siehe hierzu
+        <xref linkend ="Account-View-Options" />
       </para>
 
-      <para>Die Spalten, die für jedes Konto in der Kontenübersicht angezeigt werden, können an Ihre
-        Bedürfnisse angepasst werden.
+      <para>Die angezeigten Spalten in der Kontenübersicht lassen sich mit Betätigen des
+        <guibutton>Spaltenselektors</guibutton> in der <guilabel>Kontenübersicht</guilabel>, ganz
+        rechts in der Reihe der Spaltenüberschriften, direkt neben dem
+        <guilabel>Rollbalken</guilabel>, auswählen.
       </para>
 
       <figure pgwide="1">
         <title>Der Spaltenselektor</title><screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/column-selector-0.png" format="PNG"
+              <imagedata fileref="figures/column-selector-0.png"
                    srccredit="Frank H. Ellenberger" />
             </imageobject>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>Klicken Sie auf den Spaltenselektor, das Pfeilsymbol ganz rechts im Tabellenkopf der
-        Kontenübersicht direkt am Scrollbalken, damit die Dropdown-Liste mit Spaltennamen angezeigt
-        wird.
+      <para>In der sich öffnenden Dropdown-Liste werden Ihnen eine Vielzahl an Spaltennamen angezeigt, die zur
+        Anzeige in der Kontenübersicht zur Verfügung stehen.
       </para>
 
       <figure pgwide="1">
         <title>Die Spaltenauswahl im Spaltenselektor</title><screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/column-selector-1.png" format="PNG"
+              <imagedata fileref="figures/column-selector-1.png"
                    srccredit="Frank H. Ellenberger" />
             </imageobject>
           </mediaobject>
         </screenshot>
       </figure>
 
-      <para>Die Spalte <guilabel>Kontobezeichnung</guilabel> ist immer ausgewählt und kann nicht deaktiviert
-        werden. Die momentan in der <guilabel>Kontenübersicht</guilabel> aktive Spalten werden in
-        der Liste markiert angezeigt. Ein Großteil der Spalten die zur Auswahl stehen wird in
-        <xref linkend="acct-create" /> beschrieben. Klicken Sie auf einen Eintrag, um die Spalte in
-        die <guilabel>Kontenübersicht</guilabel> hinzuzufügen. Klicken Sie erneut auf die
-        Spaltenbeschreibung, um sie auszublenden.
+      <para>Die Spalte <guilabel>Kontobezeichnung</guilabel> kann nicht deaktiviert werden. Die momentan in der
+        <guilabel>Kontenübersicht</guilabel> aktiven Spalten werden in der Liste markiert
+        angezeigt. Einige Spalten die zur Auswahl stehen, zeigen die statischen Eigenschaften der
+        Konten an und sind in <xref linkend="acct-create" /> beschrieben. Daneben stehen weitere
+        Spalten zur Anzeige von dynamischen Inhalten zur Verfügung. Diese gibt es in zwei
+        unterschiedliche Ausprägungen.
+        <orderedlist spacing="compact">
+          <listitem>
+            <para>Kontowährung —ohne Klammern– als nominelle Darstellung.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Buchwährung —in Klammern dahinter— um verschiedene Konten miteinander leichter vergleichen zu
+              können. Die Standardwährung wird in den &app;-Einstellungen unter
+              <xref linkend="prefs-accounts" /> angegeben.
+            </para>
+          </listitem>
+        </orderedlist>
       </para>
+<!-- Alle Beschreibungen kritisch prüfen! -->
+      <glosslist id="gl-gui-acct-tree-col">
+        <title>Kontenübersichtsspalten</title>
+
+        <glossentry>
+          <glossterm>Letzte Nummer</glossterm>
+          <glossdef>
+            <para>Die letzte vergebene Transaktionsnummer.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Aktuell (<replaceable>CUR</replaceable>)</guilabel></glossterm>
+          <glossdef>
+            <para>Der letzte bekannte Kontostand, die übergeordneten Konten zeigen die Summe ihrer Unterkonten an.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Saldo (<replaceable>CUR</replaceable>)</guilabel></glossterm>
+          <glossdef>
+            <para>Der Saldo der einzelnen Konten.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Bilanz (periodenbezogen)</guilabel></glossterm>
+          <glossdef>
+            <para>Die Summe der <emphasis>neuen</emphasis> Buchungen der einzelnen Konten.
+              <footnote id="fn_gui_prefs_acc_per">
+                <para>In den &app;-Einstellung kann die ausgewählte (Buchführungs-)Periode unter
+                  <xref linkend ="prefs-accounting-period" /> angepasst werden.
+                </para>
+              </footnote>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Bestätigt (<replaceable>CUR</replaceable>)</guilabel></glossterm>
+          <glossdef>
+            <para>Die Summe der bestätigten Buchungen.<footnoteref linkend="fn_gui_acct_reconcile"/>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Abgeglichen (<replaceable>CUR</replaceable>)</guilabel></glossterm>
+          <glossdef>
+            <para>Die Summe der abgeglichenen Buchungen.
+              <footnote id="fn_gui_acct_reconcile">
+                <para>Das Vorgehen beim Abgleichen von Buchungen ist in <xref linkend="acct-reconcile"/> beschrieben.
+                </para>
+              </footnote>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Letztes Abgleich-Datum</guilabel></glossterm>
+          <glossdef>
+            <para>Datum des letzten Abgleichs des Kontos mit einem
+              Kontoauszug.<footnoteref linkend="fn_gui_acct_reconcile"/>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Zukünftiges Minimum
+          (<replaceable>CUR</replaceable>)</guilabel></glossterm>
+          <glossdef>
+            <para>Der Kontostand inklusive zukünfitger Buchungen.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Summe</guilabel></glossterm>
+          <glossdef>
+            <para>Auf dem übergeordneten Konto wird die Summe der Unterkonten angezeigt.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Gesamt (<replaceable>CUR</replaceable>)</guilabel></glossterm>
+          <glossdef>
+            <para>Auf dem übergeordneten Konto wird die Summe der Unterkonten angezeigt.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm><guilabel>Saldo (periodenbezogen)</guilabel></glossterm>
+          <glossdef>
+            <para>Enthält die Summe aller <emphasis>neuen</emphasis> Buchungen in dem
+              Geschäftsjahr.<footnoteref linkend="fn_gui_prefs_acc_per"/>
+            </para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
+
+      <para>Klicken Sie auf einen Eintrag, um die Spalte in die <guilabel>Kontenübersicht</guilabel>
+        hinzuzufügen. Klicken Sie erneut auf die Spaltenbeschreibung, um sie auszublenden.
+      </para>
+<!-- FIXME source: moved from ch_Customize -->
+      <para>Der Dialog <guilabel>Konten filtern nach…</guilabel> wird mit dem Menüpunkt
+        <menuchoice>
+          <guimenu><accel>A</accel>nsicht</guimenu> <guimenuitem><accel>F</accel>ilter
+          nach…</guimenuitem>
+        </menuchoice>
+        geöffnet und beeinflusst die Darstellung in den einzelnen geöffneten Fenstern der
+        Kontenübersicht in der Art, dass die Auswahl der darzustellenden
+        <emphasis>Zeilen</emphasis> Ihren Anforderungen angepasst wird.
+      </para>
+<!-- FIXME source: insert pictures -->
+      <table id="Account-View-Options">
+        <title>Dialog zur Anpassung der <guilabel>Kontenübersicht</guilabel></title>
+
+        <tgroup align="left" cols="2">
+          <tbody>
+            <row>
+              <entry>
+                <para><figure id="acct-opt-fig0">
+                    <title>Der Reiter <quote>Kontoart</quote></title><screenshot id="Account-View-Options-0">
+                      <mediaobject>
+                        <imageobject role="html">
+                          <imagedata fileref="figures/AcctViewOptions-0.png" 
+                         srccredit="Christian Wehling"></imagedata>
+                        </imageobject>
+
+                        <imageobject role="fo">
+                          <imagedata fileref="figures/AcctViewOptions-0.png" 
+                         srccredit="Christian Wehling" width="100%"></imagedata>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
+                </para>
+              </entry>
+
+              <entry>
+                <para><figure id="acct-opt-fig1">
+                    <title>Der Reiter <quote>Weitere</quote></title><screenshot id="Account-View-Options-1">
+                      <mediaobject>
+                        <imageobject role="html">
+                          <imagedata fileref="figures/AcctViewOptions-1.png" 
+                         srccredit="Christian Wehling"></imagedata>
+                        </imageobject>
+
+                        <imageobject role="fo">
+                          <imagedata fileref="figures/AcctViewOptions-1.png" 
+                         srccredit="Christian Wehling" width="100%"></imagedata>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
+                </para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <para>Die Abbildungen zeigen die Grundeinstellung zur Filterung der Kontoarten
+      </para>
+
+      <variablelist spacing="compact" id="gl-gui-acct-filter">
+        <varlistentry>
+          <term><guilabel>Kontoart</guilabel></term>
+
+          <listitem>
+            <para>Auf diesem Reiter wird Ihnen die Auswahl der Kontoarten, die angezeigt werden sollen, ermöglicht.
+              Sie besteht aus 2 Spalten: Links befinden sich die Kontoarten wie in
+              <xref linkend="TypeAccounts" /> beschrieben, rechts Knöpfe zur Vorauswahl:
+            </para>
+
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Alle auswählen</guilabel></term>
+
+                <listitem>
+                  <para>Aktiviert die Kontrollkästchen für alle Kontoarten.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Keine auswählen</guilabel></term>
+
+                <listitem>
+                  <para>Entfernt für alle Kontoarten die Markierung.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Voreinstellung</guilabel></term>
+
+                <listitem>
+                  <para>Setzt die Auswahl wieder auf die Voreinstellungen zurück was auch <guilabel>Alle
+                    auswählen</guilabel> entspricht.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>Weitere</guilabel></term>
+
+          <listitem>
+            <para>Der Reiter <guilabel>Weitere</guilabel> bietet Ihnen die Möglichkeit, einige spezielle Optionen
+              auszuwählen.
+            </para>
+
+            <variablelist spacing="compact">
+              <varlistentry>
+                <term><guilabel>Versteckte Konten anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Haben Sie einige Konten als <guilabel>versteckt</guilabel> gekennzeichnet, so können Sie mit diesem
+                    Kontrollkästchen diese Konten in der Kontenübersicht aus- und einblenden, um
+                    dann diese wieder sichtbar zu machen.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Konten mit Saldo Null anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn dieses Kontrollkästchen ausgewählt ist, werden auch die Konten angezeigt, deren Kontostand
+                    gleich Null ist. Das Ausblenden kann bei der Fehlersuche eine kompaktere
+                    Ãœbersicht verschaffen.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guilabel>Unbenutzte Konten anzeigen</guilabel></term>
+
+                <listitem>
+                  <para>Wenn Sie in Ihrer Kontenübersicht auch Konten ohne Buchungen sehen wollen, so nutzen Sie diesen
+                    Eintrag. Das Ausblenden kann bei der Fehlersuche eine kompaktere Ãœbersicht
+                    verschaffen.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
 
       <para>Die Standardanzeige für die Kontenübersicht ist der Karteikartenmodus. Dies erkennen Sie an dem
         Reiter auf der linken Seite des Hauptfensters. Wenn Sie Berichte oder weitere
@@ -3238,16 +3547,47 @@
     <sect2 id="Common-summary-bar">
       <title>Zusammenfassungsleiste</title>
 
-      <para>Die <firstterm>Zusammenfassungsleiste</firstterm> zeigt auf einen Blick das aktuelle Nettovermögen
-        und den aktuellen Gewinn an. Normalerweise zeigen Konten den heutigen Saldo, einen Saldo zu
-        einem beliebigen zukünftigen Datum, einen Saldo für ausgeglichene Posten und einen
-        abgestimmten Saldo an. Aktienkonten hingegen zeigen Aktiensummen und deren Wert. Die
-        <emphasis>Zusammenfassungsleiste</emphasis> kann im Menü
+      <para>Die <firstterm>Zusammenfassungsleiste</firstterm> der <guilabel>Kontenübersicht</guilabel> zeigt
+        auf einen Blick das Eigenkapital und den Gewinn an. Wertpapierkonten hingegen zeigen
+        Stückzahl und Devisenkonten deren Wert an. Die <emphasis>Zusammenfassungsleiste</emphasis>
+        kann im Menü
         <menuchoice>
           <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>Z</accel>usammenfassungsleiste</guimenuitem>
         </menuchoice>
         ein- und ausgeblendet werden.
       </para>
+
+      <para>Möchten Sie die angezeigte Auswahl der <guilabel>Zusammenfassungsleiste</guilabel> umstellen, so
+        klicken Sie einfach in die <guilabel>Zusammenfassungsleiste</guilabel> und es öffnet sich
+        eine Auswahlliste mit unterschiedlichen Inhalten. Dies Auswahl ist nur für die aktuell
+        geöffenten Ansicht der Kontenstruktur gültig.
+      </para>
+
+      <figure pgwide="1">
+        <title>Die Zusammenfassungsleiste der Kontenübersicht</title><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/summarybar-selector-1.png"
+                   srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/summarybar-selector-2.png"
+                   srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
+      <tip>
+        <para>Die angezeigten Werte in der Liste werden von den in <xref linkend="prefs-accounting-period"/>
+          eingestellten Periode beeinflusst. Zeilen mit der Ergänzung <quote>Gesamt</quote> geben
+          die Werte inklusive zukünftiger Buchungen an, die anderen Einträge entsprechend der
+          Buchhaltungsperiode.
+        </para>
+      </tip>
     </sect2>
 
     <sect2 id="Common-status-bar">
@@ -3267,15 +3607,15 @@
 <!-- Fixme: 1. Journal noch nicht eingeführt,
             2. wäre nicht Kontenblatt angemessener als Kontobuch? -->
     <figure>
-      <title>Das <emphasis>Kontobuch</emphasis> Fenster.</title><screenshot id="AccountReg_Screen">
+      <title>Die Ansicht des <emphasis>Kontobuch</emphasis>s</title><screenshot id="AccountReg_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG"
-                       srccredit="Christian Wehling" width="510" />
+            <imagedata fileref="figures/Help_AccountReg_Screen.png"
+                       srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_AccountReg_Screen.png"
                        srccredit="Christian Wehling" />
           </imageobject>
 
@@ -4384,12 +4724,12 @@ url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Das <emphasis>Berichtsfenster</emphasis></title><screenshot id="Report_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Report_Screen.png" format="PNG"
-                       srccredit="Christian Wehling" width="510" />
+            <imagedata fileref="figures/Help_Report_Screen.png"
+                       srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Report_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_Report_Screen.png"
                        srccredit="Christian Wehling" />
           </imageobject>
 
@@ -4960,11 +5300,11 @@ url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Der Assistent zum Abgleichen von Buchungen</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Reconcile_Screen.png" format="PNG" srccredit="Christian Wehling" width="510" />
+            <imagedata fileref="figures/Help_Reconcile_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Reconcile_Screen.png" format="PNG" srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Help_Reconcile_Screen.png" srccredit="Christian Wehling" />
           </imageobject>
 
           <caption>
@@ -5588,11 +5928,11 @@ url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Arbeiten mit terminierten Buchungen</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Scheduled_Transactions.png" format="PNG" srccredit="Christian Wehling" width="510" />
+            <imagedata fileref="figures/Help_Scheduled_Transactions.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Scheduled_Transactions.png" format="PNG" srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Help_Scheduled_Transactions.png" srccredit="Christian Wehling" />
           </imageobject>
 
           <caption>
@@ -5914,11 +6254,11 @@ url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Die Budgetansicht</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Budget_Screen.png" format="PNG" srccredit="Christian Wehling" width="510" />
+            <imagedata fileref="figures/Help_Budget_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Budget_Screen.png" format="PNG" srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Help_Budget_Screen.png" srccredit="Christian Wehling" />
           </imageobject>
 
           <caption>
diff --git a/help/de/Makefile.am b/help/de/Makefile.am
index 71afe76d..ccb0dfc3 100644
--- a/help/de/Makefile.am
+++ b/help/de/Makefile.am
@@ -15,6 +15,7 @@ entities = \
 	Help_ch_Customize.xml \
 	Help_fdl-appendix.xml \
 	Help_legal.xml \
+    para-assist-buttons.xml \
 	Help_chartofaccts.xml \
 	Help_chtacctseg.xml \
 	Help_para-assist-intro.xml \
diff --git a/help/de/figures/AcctViewOptions-0.png b/help/de/figures/AcctViewOptions-0.png
new file mode 100644
index 00000000..d5c76f17
Binary files /dev/null and b/help/de/figures/AcctViewOptions-0.png differ
diff --git a/help/de/figures/AcctViewOptions-1.png b/help/de/figures/AcctViewOptions-1.png
new file mode 100644
index 00000000..d2561664
Binary files /dev/null and b/help/de/figures/AcctViewOptions-1.png differ
diff --git a/help/de/figures/Help_Pref_Import.png b/help/de/figures/Help_Pref_Import.png
index 17c5eeb9..e6e8b362 100644
Binary files a/help/de/figures/Help_Pref_Import.png and b/help/de/figures/Help_Pref_Import.png differ
diff --git a/help/de/figures/Help_Pref_Sched.png b/help/de/figures/Help_Pref_Sched.png
index f97809a9..4c4f0ed8 100644
Binary files a/help/de/figures/Help_Pref_Sched.png and b/help/de/figures/Help_Pref_Sched.png differ
diff --git a/help/de/figures/Help_Pref_Windows.png b/help/de/figures/Help_Pref_Windows.png
index f5cd63b6..d7dbad19 100644
Binary files a/help/de/figures/Help_Pref_Windows.png and b/help/de/figures/Help_Pref_Windows.png differ
diff --git a/help/de/figures/Help_Reset_Warnings.png b/help/de/figures/Help_Reset_Warnings.png
new file mode 100644
index 00000000..93f770d5
Binary files /dev/null and b/help/de/figures/Help_Reset_Warnings.png differ
diff --git a/help/de/figures/Help_Style_Choose.png b/help/de/figures/Help_Style_Choose.png
new file mode 100644
index 00000000..90bd9e5b
Binary files /dev/null and b/help/de/figures/Help_Style_Choose.png differ
diff --git a/help/de/figures/Help_Style_New.png b/help/de/figures/Help_Style_New.png
new file mode 100644
index 00000000..498cbf31
Binary files /dev/null and b/help/de/figures/Help_Style_New.png differ
diff --git a/help/de/figures/summarybar-selector-1.png b/help/de/figures/summarybar-selector-1.png
new file mode 100644
index 00000000..22b93eb9
Binary files /dev/null and b/help/de/figures/summarybar-selector-1.png differ
diff --git a/help/de/figures/summarybar-selector-2.png b/help/de/figures/summarybar-selector-2.png
new file mode 100644
index 00000000..3c2fc69f
Binary files /dev/null and b/help/de/figures/summarybar-selector-2.png differ
diff --git a/help/de/figures/summarybar-selector.png b/help/de/figures/summarybar-selector.png
new file mode 100644
index 00000000..9a331c39
Binary files /dev/null and b/help/de/figures/summarybar-selector.png differ
diff --git a/help/de/para-assist-buttons.xml b/help/de/para-assist-buttons.xml
new file mode 100644
index 00000000..07273beb
--- /dev/null
+++ b/help/de/para-assist-buttons.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE para SYSTEM "gnc-locale-de.dtd">
+<para>Die Schaltflächen eines Dialogs oder Assistenten sind im sogenannten Aktionsbereich platziert. Er
+  befindet sich üblicherweise am untern Rand des Dialogs. Einige Fenstermanager stellen die
+  Schaltflächen stattdessen in der Titelleiste dar.
+  <glosslist>
+    <title>Schaltflächen des Assistenten</title>
+
+    <glossentry>
+      <glossterm><guibutton>Voreinstellungen</guibutton></glossterm>
+      <glossdef>
+        <para>Die Schaltfläche setzt für alle Elemente auf der aktiven Registerkarte die Wert auf die
+          Standardeinstellung zurück; sie wirkt sich nur auf die sichtbare Registerkarte aus.
+        </para>
+      </glossdef>
+    </glossentry>
+
+    <glossentry>
+      <glossterm><guibutton><accel>H</accel>ilfe</guibutton></glossterm>
+      <glossdef>
+        <para>Öffnet ein Hilfefenster zu diesem Abschnitt.
+        </para>
+      </glossdef>
+    </glossentry>
+
+    <glossentry>
+      <glossterm><guibutton><accel>A</accel>bbrechen</guibutton></glossterm>
+      <glossdef>
+        <para>Schließt den Dialog, ohne die veränderten Einstellungen zu übernehmen.
+        </para>
+      </glossdef>
+    </glossentry>
+<!-- FIXME: "Anwenden" und "OK" in eine <glossdef> zusammenfassen und per <glosssee> verweisen -->
+    <glossentry>
+      <glossterm><guibutton><accel>A</accel>nwenden</guibutton></glossterm>
+      <glossdef>
+        <para>Die Schaltfläche ist zunächst deaktiviert, wird aber aktiv, sobald Sie eine Einstellung geändert
+          haben. Mit Betätigten der Schaltflächen werden die Einstellungen gespeichert; bei
+          <guibutton><accel>A</accel>nwenden</guibutton> bleibt der Dialog für weitere
+          Einstellungen <emphasis>geöffnet</emphasis>.
+<!-- , wohingegen er mit <guibutton><accel>O</accel>K</guibutton> auch geschlossen wird. -->
+        </para>
+      </glossdef>
+    </glossentry>
+<!-- FIXME: "Anwenden" und "OK" in einer <glossdef> zusammenfassen und per <glosssee> verweisen -->
+    <glossentry>
+      <glossterm><guibutton><accel>O</accel>K</guibutton></glossterm>
+      <glossdef>
+        <para>Die Schaltfläche ist zunächst deaktiviert, wird aber aktiv, sobald Sie eine Einstellung geändert
+          haben. Mit Betätigten der Schaltflächen werden die Einstellungen gespeichert und der
+          Dialog beendet.
+        </para>
+      </glossdef>
+    </glossentry>
+  </glosslist>
+</para>

commit 0ecd867b45584a31b4ecffa9bc04e9fc34e5f8b6
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Sep 24 12:41:41 2021 +0900

    Replace COPYING file from GPL 3 to GPL 2.

diff --git a/COPYING b/COPYING
index f288702d..d159169d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,622 +1,281 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2, June 1991
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
 this License.
 
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
 
                      END OF TERMS AND CONDITIONS
 
@@ -628,15 +287,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
+convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software: you can redistribute it and/or modify
+    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 3 of the License, or
+    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,
@@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

commit 40dab7df62b44da7b1d1e2e1ba14f8f590eb7b52
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Thu Sep 23 09:43:30 2021 +0900

    Apply dtd-locale to help/de/Help_para-assist-intro.xml.

diff --git a/help/de/Help_para-assist-intro.xml b/help/de/Help_para-assist-intro.xml
index 32988498..8219fa7b 100644
--- a/help/de/Help_para-assist-intro.xml
+++ b/help/de/Help_para-assist-intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE variablelist SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <variablelist spacing="compact">
   <title>Dialogführung</title>
 

commit 4855905668ae7038b63c35a8358ffb89926ccf98
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Aug 20 17:32:27 2021 +0900

    Add ENTITY(s) prefix guisubmenu, guimenuitem, and guilabel as gsm, gmi, and gl, respectively.

diff --git a/docbook/gnc-locale-C.dtd b/docbook/gnc-locale-C.dtd
index 254a6689..b2fd3ed0 100644
--- a/docbook/gnc-locale-C.dtd
+++ b/docbook/gnc-locale-C.dtd
@@ -37,22 +37,22 @@
 <!ENTITY kc.tab "%kc.tab;">
 
 
-<!-- guimenus -->
-<!ENTITY % gm.file "<guimenu>File</guimenu>">
+<!-- guimenu/guisubmenu/guimenuitem to be used as names in text -->
+<!ENTITY % gm.file "<guimenu><accel>F</accel>ile</guimenu>">
 <!ENTITY gm.file "%gm.file;">
 
+<!ENTITY % gm.rep "<guimenu><accel>R</accel>eports</guimenu>">
+<!ENTITY % gsm.budget "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
+<!ENTITY % gmi.budget-rep "<guimenuitem>Budge<accel>t</accel> Report</guimenuitem>">
 
-<!-- guimenus with accel-->
-<!ENTITY % gma.file "<guimenu><accel>F</accel>ile</guimenu>">
-<!ENTITY gma.file "%gma.file;">
 
-<!ENTITY % gma.rep "<guimenu><accel>R</accel>eports</guimenu>">
-<!ENTITY % gma.budget "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
-<!ENTITY % gma.budget-rep "<guimenuitem>Budge<accel>t</accel> Report</guimenuitem>">
+<!-- menuchoice -->
+<!ENTITY mc.rep.budget.budget-rep "<menuchoice>%gm.rep;%gsm.budget;%gmi.budget-rep;</menuchoice>">
 
 
-<!-- menuchoice -->
-<!ENTITY mc.rep.budget.budget-rep "<menuchoice>%gma.rep;%gma.budget;%gma.budget-rep;</menuchoice>">
+<!-- guilabel -->
+<!ENTITY % gl.new-acct-hi-setup "<guilabel>New Account Hierarchy Setup</guilabel>">
+<!ENTITY gl.new-acct-hi-setup "%gl.new-acct-hi-setup;">
 
 
 
diff --git a/docbook/gnc-locale-de.dtd b/docbook/gnc-locale-de.dtd
index 548fe421..e378d349 100644
--- a/docbook/gnc-locale-de.dtd
+++ b/docbook/gnc-locale-de.dtd
@@ -11,18 +11,15 @@
 
 
 
-<!-- guimenus -->
-<!ENTITY % gm.file "<guimenu>Datei</guimenu>">
+<!-- guimenu/guisubmenu/guimenuitem to be used as names in text -->
+<!ENTITY % gm.report "<guimenu>Be<accel>r</accel>ichte</guimenu>">
+<!ENTITY % gsm.budget "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
+<!ENTITY % gmi.budget-rep "<guimenuitem>Budget-Bericht</guimenuitem>">
 
-<!-- guimenus with accel-->
+<!ENTITY % gm.file "<guimenu><accel>D</accel>atei</guimenu>">
 
-<!ENTITY % gma.report "<guimenu>Be<accel>r</accel>ichte</guimenu>">
-<!ENTITY % gma.budget "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
-<!ENTITY % gma.budget-report "<guimenuitem>Budget-Bericht</guimenuitem>">
-
-
-
-<!ENTITY % gma.file "<guimenu><accel>D</accel>atei</guimenu>">
+<!-- guilabel -->
+<!ENTITY % gl.new-acct-hi-setup "<guilabel>Neuen Kontenplan erstellen</guilabel>">
 
 <!-- untranslated message -->
 <!ENTITY % untranslated 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
diff --git a/docbook/gnc-locale-ja.dtd b/docbook/gnc-locale-ja.dtd
index de65c63b..37bf95bd 100644
--- a/docbook/gnc-locale-ja.dtd
+++ b/docbook/gnc-locale-ja.dtd
@@ -1,17 +1,13 @@
-<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd. 
+<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd.
      Only parameter entities (% entities) should be translated.
      See htps://www.w3.org/TR/REC-xml/#sec-physical-struct. -->
 
-<!ENTITY % gma.report "<guimenu>帳票(<accel>R</accel>)</guimenu>">
-<!ENTITY % gma.budget "<guisubmenu>予算(<accel>U</accel>)</guisubmenu>">
-<!ENTITY % gma.budget-report "<guimenuitem>予算帳票</guimenuitem>">
-
-
-<!ENTITY % gm.file "<guimenu>ファイル</guimenu>">
-<!ENTITY % gma.file "<guimenu>ファイル(<accel>F</accel>)</guimenu>">
-
+<!ENTITY % gm.report "<guimenu>帳票(<accel>R</accel>)</guimenu>">
+<!ENTITY % gsm.budget "<guisubmenu>予算(<accel>U</accel>)</guisubmenu>">
+<!ENTITY % gmi.budget-rep "<guimenuitem>予算帳票</guimenuitem>">
 
 
+<!ENTITY % gm.file "<guimenu>ファイル(<accel>F</accel>)</guimenu>">
 
 <!-- Include "gnc-locale-C.dtd" -->
 <!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">

commit 228f5b4f4a69007465b3a46917fe31749170915c
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sun Aug 22 15:26:02 2021 +0900

    Move untranslated entity messages from gnc-docbookx.dtd to each locale file.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index b5cdb036..cc403b44 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -162,37 +162,3 @@ own entity definitions to use across all of our DocBook pages. -->
 <!-- 
   5. Other formatting instructions -->
 <!ENTITY img-w "850px">  <!-- The maximum width of the graphic elements. -->
-
-<!--
-  Translators:
-    If you can only offer a partial translation, that is fine.
-    Just inform the reader and potential successors about the state by inserting
-    the (localized) "&untranslated-<lang>;" entity and commenting off the still untranslated part.
-    You should localize the &untranslated-<lang>; text, e.g. name the user group of your language.
-    <lang> should be replaced by your language.
-    The &untranslated; entity below serves as a sample text in English.
--->
-<!ENTITY untranslated 'Dear Reader, we are really sorry, but nobody offered a translation
-  for the following parts. If you would like to help us, follow the instructions at <ulink
-    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
-  Questions can be discussed at the gnucash-XX at gnucash.org mailing list.'>
-
-<!ENTITY untranslated-de 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
-  der folgenden Teile erstellt. Falls Sie uns dabei helfen möchten, folgen Sie
-  bitte der Anleitung in <ulink
-    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-    <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
-  Fragen können auf der deutschsprachigen Mailingliste gnucash-de at gnucash.org diskutiert werden.'>
-
-<!ENTITY untranslated-pt 'Caro leitor, lamentamos, ainda ninguém ofereceu uma tradução
-  para as secções seguintes. Se quiser ajudar, siga as instruções na <ulink
-  url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-  <citetitle>Wiki do Gnucash: como traduzir o guia e/ou os ficheiros de ajuda do GnuCash</citetitle></ulink>.
-  Questões podem ser discutidas na lista gnucash-user at gnucash.org o gnucash-br at gnucash.org.'>
-
-<!ENTITY untranslated-ru 'Дорогой пользователь, нам очень жаль, но никто не перевел до сих пор
-  следующие части документации. Если вы хотите помочь нам, следуйте инструкциям на
-  <ulink url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
-  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
-  Свои вопросы вы можете задать в списке рассылки gnucash-user at gnucash.org.'>
diff --git a/docbook/gnc-locale-C.dtd b/docbook/gnc-locale-C.dtd
index e60b3b0a..254a6689 100644
--- a/docbook/gnc-locale-C.dtd
+++ b/docbook/gnc-locale-C.dtd
@@ -56,6 +56,21 @@
 
 
 
+<!-- untranslated message -->
+<!--
+  Translators:
+    If you can only offer a partial translation, that is fine.
+    Just inform the reader and potential successors about the state by inserting
+    the "&untranslated;" entity and commenting off the still untranslated part.
+-->
+
+<!ENTITY % untranslated 'Dear Reader, we are really sorry, but nobody offered a translation
+  for the following parts. If you would like to help us, follow the instructions at <ulink
+    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+  Questions can be discussed at the gnucash-XX at gnucash.org mailing list.'>
+
+<!ENTITY untranslated "%untranslated;">
 
 
 <!-- Include "gnc-docbookx.dtd" -->
diff --git a/docbook/gnc-locale-de.dtd b/docbook/gnc-locale-de.dtd
index 230b1f22..548fe421 100644
--- a/docbook/gnc-locale-de.dtd
+++ b/docbook/gnc-locale-de.dtd
@@ -24,6 +24,16 @@
 
 <!ENTITY % gma.file "<guimenu><accel>D</accel>atei</guimenu>">
 
+<!-- untranslated message -->
+<!ENTITY % untranslated 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
+  der folgenden Teile erstellt. Falls Sie uns dabei helfen möchten, folgen Sie
+  bitte der Anleitung in <ulink
+    url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+    <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+  Fragen können auf der deutschsprachigen Mailingliste gnucash-de at gnucash.org diskutiert werden.'>
+
+<!ENTITY untranslated-de "%untranslated;"> <!-- For backward compatibility. Remove if unnecessary. -->
+
 
 <!-- Include "gnc-locale-C.dtd" -->
 <!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
diff --git a/docbook/gnc-locale-pt.dtd b/docbook/gnc-locale-pt.dtd
index 40bdba1e..4ca87eed 100644
--- a/docbook/gnc-locale-pt.dtd
+++ b/docbook/gnc-locale-pt.dtd
@@ -4,6 +4,14 @@
 
 
 
+<!-- untranslated message -->
+<!ENTITY % untranslated 'Caro leitor, lamentamos, ainda ninguém ofereceu uma tradução
+  para as secções seguintes. Se quiser ajudar, siga as instruções na <ulink
+  url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <citetitle>Wiki do Gnucash: como traduzir o guia e/ou os ficheiros de ajuda do GnuCash</citetitle></ulink>.
+  Questões podem ser discutidas na lista gnucash-user at gnucash.org o gnucash-br at gnucash.org.'>
+
+<!ENTITY untranslated-pt "%untranslated;"> <!-- For backward compatibility. Remove if unnecessary. -->
 
 <!-- Include "gnc-locale-C.dtd" -->
 <!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
diff --git a/docbook/gnc-locale-ru.dtd b/docbook/gnc-locale-ru.dtd
index 40bdba1e..5ebe1383 100644
--- a/docbook/gnc-locale-ru.dtd
+++ b/docbook/gnc-locale-ru.dtd
@@ -5,6 +5,16 @@
 
 
 
+
+<!-- untranslated message -->
+<!ENTITY % untranslated 'Дорогой пользователь, нам очень жаль, но никто не перевел до сих пор
+  следующие части документации. Если вы хотите помочь нам, следуйте инструкциям на
+  <ulink url="https://wiki.gnucash.org/wiki/Translation#Translating_the_GnuCash_Guide_and_Help">
+  <citetitle>Gnucash wiki: How to translate the GnuCash guide and/or help files</citetitle></ulink>.
+  Свои вопросы вы можете задать в списке рассылки gnucash-user at gnucash.org.'>
+
+<!ENTITY untranslated-ru "%untranslated;"> <!-- For backward compatibility. Remove if unnecessary. -->
+
 <!-- Include "gnc-locale-C.dtd" -->
 <!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
 %gnc-locale-C;

commit d0ecef9695caf5d03b67d4c01423ce0f71bf4b89
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Aug 20 17:32:27 2021 +0900

    Make DTD ENTITY(s) translatable. See docbook/README.
    Bug 798273 - Consider a entity import system like in docbook-xsl

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70102d72..fe18f039 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ endif()
 
 file(GLOB_RECURSE extrafiles
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    cmake/* fonts/* stylesheet/* xsl/*)
+    cmake/* fonts/* stylesheet/* xsl/* docbook/*)
 add_to_dist(${extrafiles})
 
 configure_file(COPYING ${DATADIR_BUILD}/${PROJECT_NAME}/COPYING COPYONLY)
@@ -217,7 +217,6 @@ add_to_dist(
     HACKING
     NEWS
     README
-    docbook/gnc-docbookx.dtd
     fop.xconf.in)
 
 ############################ BEGIN MAKE DIST #################
diff --git a/docbook/README b/docbook/README
new file mode 100644
index 00000000..ef24c7c5
--- /dev/null
+++ b/docbook/README
@@ -0,0 +1,43 @@
+This directory contains GnuCash specific DTD files.
+
+1. Files
+(1) gnc-docbookx.dtd
+ GnuCash common language neutral DTD file. Version information, URLs, application names, and so on.
+ 
+(2) gnc-locale-C.dtd
+The original English entities are defined in this file. For example,
+<!ENTITY % gm.file "<guimenu>File</guimenu>">
+<!ENTITY gm.file "%gm.file">
+.
+
+The differences among general entities, parameter entities (%), and 
+external entities are described in 
+https://www.w3.org/TR/REC-xml/#sec-physical-struct.
+
+(3) gnc-locale-${LANG}.dtd
+The translated entities should be defined in UTF-8 in this file. For German example,
+filename is gnc-locale-de.dtd. A translated entity for %gm.file; is:
+<!ENTITY % gm.file "<guimenu>Datei</guimenu>">
+.
+
+You must only translate parameter entities. They are with % in ENTITY definitions.
+If you don't translate some parameter entities, English entities are used instead.
+
+2. Usage
+Specify gnc-locale-${LANG}.dtd file in DOCTYPE declarations for each docbook xml file.
+For Japanese example, you have to use
+<!DOCTYPE book SYSTEM "gnc-locale-ja.dtd">
+.
+
+The Import order is as follows:
+gnc-locale-${LANG}.dtd --> gnc-locale-C.dtd --> gnc-docbookx.dtd --> PUBLIC docbook 4.5 docbookx.dtd
+
+Extensible Markup Language (XML) 1.0 (Fifth Edition)
+   4.2 Entity Declarations
+   https://www.w3.org/TR/REC-xml/#sec-entity-decl
+says
+'''
+    The Name identifies the entity in an entity reference or, in the case of an unparsed entity, in the value of 
+    an ENTITY or ENTITIES attribute. If the same entity is declared more than once, the first declaration encountered 
+    is binding; at user option, an XML processor may issue a warning if entities are declared multiple times.
+"""
diff --git a/docbook/gnc-locale-C.dtd b/docbook/gnc-locale-C.dtd
new file mode 100644
index 00000000..e60b3b0a
--- /dev/null
+++ b/docbook/gnc-locale-C.dtd
@@ -0,0 +1,65 @@
+<!-- Add master English entities that should be translated below.
+     Only parameter entities (% entities) should be translated.
+     See htps://www.w3.org/TR/REC-xml/#sec-physical-struct. -->
+
+
+
+<!-- keycaps for keycombos and shortcuts -->
+
+<!ENTITY % kc.alt '<keycap function="alt">Alt</keycap>'>
+<!ENTITY kc.alt "%kc.alt;">
+
+<!ENTITY % kc.cmd '<keycap function="command">Command</keycap>'>
+<!ENTITY kc.cmd "%kc.cmd;">
+
+<!ENTITY % kc.ctrl '<keycap function="control">Ctrl</keycap>'>
+<!ENTITY kc.ctrl "%kc.ctrl;">
+
+<!ENTITY % kc.end '<keycap function="end">End</keycap>'>
+<!ENTITY kc.end "%kc.end;">
+
+<!ENTITY % kc.enter '<keycap function="enter">Enter</keycap>'>
+<!ENTITY kc.enter "%kc.enter;">
+
+<!ENTITY % kc.esc '<keycap function="escape">Esc</keycap>'>
+<!ENTITY kc.esc "%kc.esc;">
+
+<!ENTITY % kc.home '<keycap function="home">Home</keycap>'>
+<!ENTITY kc.home "%kc.home;">
+
+<!ENTITY % kc.shift '<keycap function="shift">Shift</keycap>'>
+<!ENTITY kc.shift "%kc.shift;">
+
+<!ENTITY % kc.space '<keycap function="space">Space</keycap>'>
+<!ENTITY kc.space "%kc.space;">
+
+<!ENTITY % kc.tab '<keycap function="tab">Tab</keycap>'>
+<!ENTITY kc.tab "%kc.tab;">
+
+
+<!-- guimenus -->
+<!ENTITY % gm.file "<guimenu>File</guimenu>">
+<!ENTITY gm.file "%gm.file;">
+
+
+<!-- guimenus with accel-->
+<!ENTITY % gma.file "<guimenu><accel>F</accel>ile</guimenu>">
+<!ENTITY gma.file "%gma.file;">
+
+<!ENTITY % gma.rep "<guimenu><accel>R</accel>eports</guimenu>">
+<!ENTITY % gma.budget "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
+<!ENTITY % gma.budget-rep "<guimenuitem>Budge<accel>t</accel> Report</guimenuitem>">
+
+
+<!-- menuchoice -->
+<!ENTITY mc.rep.budget.budget-rep "<menuchoice>%gma.rep;%gma.budget;%gma.budget-rep;</menuchoice>">
+
+
+
+
+
+<!-- Include "gnc-docbookx.dtd" -->
+<!ENTITY % gnc-docbookx SYSTEM "gnc-docbookx.dtd">
+%gnc-docbookx;
+
+<!-- Don't add any declarations below. -->
diff --git a/docbook/gnc-locale-de.dtd b/docbook/gnc-locale-de.dtd
new file mode 100644
index 00000000..230b1f22
--- /dev/null
+++ b/docbook/gnc-locale-de.dtd
@@ -0,0 +1,32 @@
+<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd.
+     Only parameter entities (% entities) should be translated.
+     See htps://www.w3.org/TR/REC-xml/#sec-physical-struct. -->
+
+<!-- keycaps for keycombos and shortcuts -->
+<!ENTITY % kc.alt '<keycap function="alt">Alt</keycap>'>
+<!ENTITY % kc.cmd '<keycap function="command">Command</keycap>'>
+<!ENTITY % kc.ctrl '<keycap function="control">Strg</keycap>'>
+<!ENTITY % kc.end '<keycap function="end">Ende</keycap>'>
+<!ENTITY % kc.home '<keycap function="home">Pos1</keycap>'>
+
+
+
+<!-- guimenus -->
+<!ENTITY % gm.file "<guimenu>Datei</guimenu>">
+
+<!-- guimenus with accel-->
+
+<!ENTITY % gma.report "<guimenu>Be<accel>r</accel>ichte</guimenu>">
+<!ENTITY % gma.budget "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
+<!ENTITY % gma.budget-report "<guimenuitem>Budget-Bericht</guimenuitem>">
+
+
+
+<!ENTITY % gma.file "<guimenu><accel>D</accel>atei</guimenu>">
+
+
+<!-- Include "gnc-locale-C.dtd" -->
+<!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
+%gnc-locale-C;
+
+<!-- Don't add any declarations below. -->
diff --git a/docbook/gnc-locale-it.dtd b/docbook/gnc-locale-it.dtd
new file mode 100644
index 00000000..ddbd07f5
--- /dev/null
+++ b/docbook/gnc-locale-it.dtd
@@ -0,0 +1,11 @@
+<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd. -->
+
+
+
+
+
+<!-- Include "gnc-locale-C.dtd" -->
+<!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
+%gnc-locale-C;
+
+<!-- Don't add any declarations below. -->
diff --git a/docbook/gnc-locale-ja.dtd b/docbook/gnc-locale-ja.dtd
new file mode 100644
index 00000000..de65c63b
--- /dev/null
+++ b/docbook/gnc-locale-ja.dtd
@@ -0,0 +1,20 @@
+<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd. 
+     Only parameter entities (% entities) should be translated.
+     See htps://www.w3.org/TR/REC-xml/#sec-physical-struct. -->
+
+<!ENTITY % gma.report "<guimenu>帳票(<accel>R</accel>)</guimenu>">
+<!ENTITY % gma.budget "<guisubmenu>予算(<accel>U</accel>)</guisubmenu>">
+<!ENTITY % gma.budget-report "<guimenuitem>予算帳票</guimenuitem>">
+
+
+<!ENTITY % gm.file "<guimenu>ファイル</guimenu>">
+<!ENTITY % gma.file "<guimenu>ファイル(<accel>F</accel>)</guimenu>">
+
+
+
+
+<!-- Include "gnc-locale-C.dtd" -->
+<!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
+%gnc-locale-C;
+
+<!-- Don't add any declarations below. -->
diff --git a/docbook/gnc-locale-pt.dtd b/docbook/gnc-locale-pt.dtd
new file mode 100644
index 00000000..40bdba1e
--- /dev/null
+++ b/docbook/gnc-locale-pt.dtd
@@ -0,0 +1,12 @@
+<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd. 
+     Only parameter entities (% entities) should be translated.
+     See htps://www.w3.org/TR/REC-xml/#sec-physical-struct. -->
+
+
+
+
+<!-- Include "gnc-locale-C.dtd" -->
+<!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
+%gnc-locale-C;
+
+<!-- Don't add any declarations below. -->
diff --git a/docbook/gnc-locale-ru.dtd b/docbook/gnc-locale-ru.dtd
new file mode 100644
index 00000000..40bdba1e
--- /dev/null
+++ b/docbook/gnc-locale-ru.dtd
@@ -0,0 +1,12 @@
+<!-- Add translated entities below. The master entities are in gnc-locale-C.dtd. 
+     Only parameter entities (% entities) should be translated.
+     See htps://www.w3.org/TR/REC-xml/#sec-physical-struct. -->
+
+
+
+
+<!-- Include "gnc-locale-C.dtd" -->
+<!ENTITY % gnc-locale-C SYSTEM "gnc-locale-C.dtd">
+%gnc-locale-C;
+
+<!-- Don't add any declarations below. -->
diff --git a/guide/C/appendixa.xml b/guide/C/appendixa.xml
index 22b2250b..5792cf38 100644
--- a/guide/C/appendixa.xml
+++ b/guide/C/appendixa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/C/appendixd.xml b/guide/C/appendixd.xml
index 889b990a..07ca44d9 100644
--- a/guide/C/appendixd.xml
+++ b/guide/C/appendixd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index df8ee3db..f63e497a 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.1
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 1e367797..20be4dac 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
 (Do not remove this comment block.)
 Version: 2.0.0
diff --git a/guide/C/ch_budgets.xml b/guide/C/ch_budgets.xml
index 13169a4b..5215f649 100644
--- a/guide/C/ch_budgets.xml
+++ b/guide/C/ch_budgets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index bc50f880..b6398b6c 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index b8b0c79d..24224e99 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/C/ch_cbook.xml b/guide/C/ch_cbook.xml
index 15234c0a..78d8c4d9 100644
--- a/guide/C/ch_cbook.xml
+++ b/guide/C/ch_cbook.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index b9a66453..ee0bc4de 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/C/ch_configuring.xml b/guide/C/ch_configuring.xml
index e57bcc6a..554c580b 100644
--- a/guide/C/ch_configuring.xml
+++ b/guide/C/ch_configuring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index b1c44844..f50aea2e 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.6.15
   Last modified: December 6, 2016
diff --git a/guide/C/ch_dep.xml b/guide/C/ch_dep.xml
index 8140f0d3..2b9fbe96 100644
--- a/guide/C/ch_dep.xml
+++ b/guide/C/ch_dep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/C/ch_expenses.xml b/guide/C/ch_expenses.xml
index c4593d48..fd39ac24 100644
--- a/guide/C/ch_expenses.xml
+++ b/guide/C/ch_expenses.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.0
diff --git a/guide/C/ch_import_business_data.xml b/guide/C/ch_import_business_data.xml
index f3a07409..3ca61a82 100644
--- a/guide/C/ch_import_business_data.xml
+++ b/guide/C/ch_import_business_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
 
 Version: 3.4.0
diff --git a/guide/C/ch_importing.xml b/guide/C/ch_importing.xml
index d94b0386..0c896c4a 100644
--- a/guide/C/ch_importing.xml
+++ b/guide/C/ch_importing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 74b9f39a..7d0edf2f 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index e7ca124a..42a9a075 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/C/ch_oth_assets.xml b/guide/C/ch_oth_assets.xml
index 85188874..cf46c5ef 100644
--- a/guide/C/ch_oth_assets.xml
+++ b/guide/C/ch_oth_assets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.9
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index e2660010..aef4b239 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.0
diff --git a/guide/C/ch_python_bindings.xml b/guide/C/ch_python_bindings.xml
index 34d8ddfe..678ed27a 100644
--- a/guide/C/ch_python_bindings.xml
+++ b/guide/C/ch_python_bindings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
 Version: 2.4.0
 Last modified: 2011-01-01
diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 7d667adb..9fe483f0 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.15
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index c36d3ebb..ca31ced0 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/C/fdl-appendix.xml b/guide/C/fdl-appendix.xml
index ea478c9d..7544ca46 100644
--- a/guide/C/fdl-appendix.xml
+++ b/guide/C/fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-C.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/guide/C/gnc-glossary.xml b/guide/C/gnc-glossary.xml
index 3bf8d850..9ade10c1 100644
--- a/guide/C/gnc-glossary.xml
+++ b/guide/C/gnc-glossary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glossary SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE glossary SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.15
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 2ce2eb17..bb08a61f 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/guide/C/legal.xml b/guide/C/legal.xml
index e29d59eb..7a07cdc1 100644
--- a/guide/C/legal.xml
+++ b/guide/C/legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE legalnotice SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE legalnotice SYSTEM "gnc-locale-C.dtd">
 <legalnotice id="legalnotice">
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU
     Free Documentation License (GFDL), Version 1.1 or any later version published by the Free
diff --git a/guide/de/appendixa.xml b/guide/de/appendixa.xml
index 7bd186f2..44ca332e 100644
--- a/guide/de/appendixa.xml
+++ b/guide/de/appendixa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/de/appendixd.xml b/guide/de/appendixd.xml
index 364170e4..e1acef65 100644
--- a/guide/de/appendixd.xml
+++ b/guide/de/appendixd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
diff --git a/guide/de/appendixe.xml b/guide/de/appendixe.xml
index 93dbb522..b3d1fa66 100644
--- a/guide/de/appendixe.xml
+++ b/guide/de/appendixe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-de.dtd">
 <appendix>
   <title>Anhang E</title>
 
diff --git a/guide/de/ch_accts.xml b/guide/de/ch_accts.xml
index aff1ec2b..74a3ecbb 100644
--- a/guide/de/ch_accts.xml
+++ b/guide/de/ch_accts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
   (Do not remove this comment block.)
   Version: 2.2.1 (2.6 trunk)
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index 763f1f13..a20c3a93 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.3 2.6 maint
diff --git a/guide/de/ch_budgets.xml b/guide/de/ch_budgets.xml
index 413e4cf9..bde760fa 100644
--- a/guide/de/ch_budgets.xml
+++ b/guide/de/ch_budgets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/de/ch_bus_ap.xml b/guide/de/ch_bus_ap.xml
index 217cbc95..f9b63d65 100644
--- a/guide/de/ch_bus_ap.xml
+++ b/guide/de/ch_bus_ap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Originally designed by Carol Champagne.
   Version: 2.0.0
diff --git a/guide/de/ch_bus_ar.xml b/guide/de/ch_bus_ar.xml
index c0a20f57..36ff672d 100644
--- a/guide/de/ch_bus_ar.xml
+++ b/guide/de/ch_bus_ar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006 (English 20.09.2015)
diff --git a/guide/de/ch_bus_intro.xml b/guide/de/ch_bus_intro.xml
index fc6fc2d4..6bc970b5 100644
--- a/guide/de/ch_bus_intro.xml
+++ b/guide/de/ch_bus_intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 1.0.0
diff --git a/guide/de/ch_bus_pay.xml b/guide/de/ch_bus_pay.xml
index 26dee1db..93426ddd 100644
--- a/guide/de/ch_bus_pay.xml
+++ b/guide/de/ch_bus_pay.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/de/ch_bus_setup.xml b/guide/de/ch_bus_setup.xml
index 32c15a3a..ac77cc3f 100644
--- a/guide/de/ch_bus_setup.xml
+++ b/guide/de/ch_bus_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015 (Englisch 20.09.1015)
diff --git a/guide/de/ch_capgain.xml b/guide/de/ch_capgain.xml
index 126d6282..1107810f 100644
--- a/guide/de/ch_capgain.xml
+++ b/guide/de/ch_capgain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0 /2.6.9 
   Last modified: July 9th 2006
diff --git a/guide/de/ch_cbook.xml b/guide/de/ch_cbook.xml
index b91da414..9b19dc5c 100644
--- a/guide/de/ch_cbook.xml
+++ b/guide/de/ch_cbook.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0 (2.6 maint)
diff --git a/guide/de/ch_cc.xml b/guide/de/ch_cc.xml
index e7253a3a..187361ce 100644
--- a/guide/de/ch_cc.xml
+++ b/guide/de/ch_cc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0 /2.6 maint
   Last modified: July 9th 2006 (Englisch 2015-08-27)
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index 714c21fe..bdc70313 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.4.0 /2.6.9
   Last modified: March 16th 2010 (Englisch 10.12.2016)
diff --git a/guide/de/ch_dep.xml b/guide/de/ch_dep.xml
index 4eab572f..f97ffceb 100644
--- a/guide/de/ch_dep.xml
+++ b/guide/de/ch_dep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/de/ch_expenses.xml b/guide/de/ch_expenses.xml
index ff5810f9..73cd43f8 100644
--- a/guide/de/ch_expenses.xml
+++ b/guide/de/ch_expenses.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.0
diff --git a/guide/de/ch_import_business_data.xml b/guide/de/ch_import_business_data.xml
index 6a92fbd8..af912732 100644
--- a/guide/de/ch_import_business_data.xml
+++ b/guide/de/ch_import_business_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
 
 Version: 3.4.0
diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index e9ef1c39..0c22d5ea 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009 (Englisch 2016-10-27)
diff --git a/guide/de/ch_loans.xml b/guide/de/ch_loans.xml
index d984bcf5..7d8d639b 100644
--- a/guide/de/ch_loans.xml
+++ b/guide/de/ch_loans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0 / 2.6 maint
   Last modified: July 9th 2006 (Englisch 2015-09-08)
diff --git a/guide/de/ch_oth_assets.xml b/guide/de/ch_oth_assets.xml
index 13804389..04ce7a86 100644
--- a/guide/de/ch_oth_assets.xml
+++ b/guide/de/ch_oth_assets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.9
diff --git a/guide/de/ch_oview.xml b/guide/de/ch_oview.xml
index f6dbf6aa..e12b1e45 100644
--- a/guide/de/ch_oview.xml
+++ b/guide/de/ch_oview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
    (Do not remove this comment block.)  
    Version: 2.3.15 /2.6 maint
diff --git a/guide/de/ch_python_bindings.xml b/guide/de/ch_python_bindings.xml
index eb2417ab..1c185c21 100644
--- a/guide/de/ch_python_bindings.xml
+++ b/guide/de/ch_python_bindings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
 Version: 2.4.0
 Last modified: 2011-01-01
diff --git a/guide/de/ch_reports.xml b/guide/de/ch_reports.xml
index 1311ce54..1a58b223 100644
--- a/guide/de/ch_reports.xml
+++ b/guide/de/ch_reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.15
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index f8893bd6..5232eb67 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0 (2.6 maint)
diff --git a/guide/de/fdl-appendix.xml b/guide/de/fdl-appendix.xml
index ea478c9d..e1adde99 100644
--- a/guide/de/fdl-appendix.xml
+++ b/guide/de/fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-de.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/guide/de/glossary.xml b/guide/de/glossary.xml
index 9bc8829f..c7246498 100644
--- a/guide/de/glossary.xml
+++ b/guide/de/glossary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glossary SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE glossary SYSTEM "gnc-locale-de.dtd">
 <!--
    (Do not remove this comment block.)
    Version: 2.3.15
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 47e260be..4c31ae84 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 76f08e0e..3b7366fb 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-it.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/guide/ja/appendixa.xml b/guide/ja/appendixa.xml
index b8f08746..18a919ad 100644
--- a/guide/ja/appendixa.xml
+++ b/guide/ja/appendixa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/appendixd.xml b/guide/ja/appendixd.xml
index 1bc05788..3e95d328 100644
--- a/guide/ja/appendixd.xml
+++ b/guide/ja/appendixd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
diff --git a/guide/ja/ch_accts.xml b/guide/ja/ch_accts.xml
index 09feff5a..e5b4a113 100644
--- a/guide/ja/ch_accts.xml
+++ b/guide/ja/ch_accts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.1
diff --git a/guide/ja/ch_basics.xml b/guide/ja/ch_basics.xml
index 83f8ecfe..5d397b97 100644
--- a/guide/ja/ch_basics.xml
+++ b/guide/ja/ch_basics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ja/ch_budgets.xml b/guide/ja/ch_budgets.xml
index 2e426b1d..de594d55 100644
--- a/guide/ja/ch_budgets.xml
+++ b/guide/ja/ch_budgets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ja/ch_bus_ap.xml b/guide/ja/ch_bus_ap.xml
index 7290b13d..7c10a2b4 100644
--- a/guide/ja/ch_bus_ap.xml
+++ b/guide/ja/ch_bus_ap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Originally designed by Carol Champagne.
diff --git a/guide/ja/ch_bus_ar.xml b/guide/ja/ch_bus_ar.xml
index d412b55a..c19a4031 100644
--- a/guide/ja/ch_bus_ar.xml
+++ b/guide/ja/ch_bus_ar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/ch_bus_pay.xml b/guide/ja/ch_bus_pay.xml
index 6c6c7936..53d04495 100644
--- a/guide/ja/ch_bus_pay.xml
+++ b/guide/ja/ch_bus_pay.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/ch_capgain.xml b/guide/ja/ch_capgain.xml
index c6faea05..9503c779 100644
--- a/guide/ja/ch_capgain.xml
+++ b/guide/ja/ch_capgain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/ch_cbook.xml b/guide/ja/ch_cbook.xml
index 443126d2..d1921f4f 100644
--- a/guide/ja/ch_cbook.xml
+++ b/guide/ja/ch_cbook.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ja/ch_cc.xml b/guide/ja/ch_cc.xml
index 783b5b63..7a070fc0 100644
--- a/guide/ja/ch_cc.xml
+++ b/guide/ja/ch_cc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/ch_currency.xml b/guide/ja/ch_currency.xml
index 7b78f9d1..c2b4c373 100644
--- a/guide/ja/ch_currency.xml
+++ b/guide/ja/ch_currency.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.4.0
   Last modified: March 16th 2010
diff --git a/guide/ja/ch_dep.xml b/guide/ja/ch_dep.xml
index 6b7e39c4..7beb33db 100644
--- a/guide/ja/ch_dep.xml
+++ b/guide/ja/ch_dep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/ch_invest.xml b/guide/ja/ch_invest.xml
index 763d12e6..55b7223f 100644
--- a/guide/ja/ch_invest.xml
+++ b/guide/ja/ch_invest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
diff --git a/guide/ja/ch_loans.xml b/guide/ja/ch_loans.xml
index 7b296f4b..9242a43c 100644
--- a/guide/ja/ch_loans.xml
+++ b/guide/ja/ch_loans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ja/ch_oth_assets.xml b/guide/ja/ch_oth_assets.xml
index 6a7a63c9..8617e690 100644
--- a/guide/ja/ch_oth_assets.xml
+++ b/guide/ja/ch_oth_assets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.9
diff --git a/guide/ja/ch_oview.xml b/guide/ja/ch_oview.xml
index 4d35df4d..cdeb252a 100644
--- a/guide/ja/ch_oview.xml
+++ b/guide/ja/ch_oview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.0
diff --git a/guide/ja/ch_python_bindings.xml b/guide/ja/ch_python_bindings.xml
index 3a2c8358..cf6a1f31 100644
--- a/guide/ja/ch_python_bindings.xml
+++ b/guide/ja/ch_python_bindings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!-- (Do not remove this comment block.)
 Version: 2.4.0
 Last modified: 2011-01-01
diff --git a/guide/ja/ch_reports.xml b/guide/ja/ch_reports.xml
index 9ad5ad09..a3cf6cf3 100644
--- a/guide/ja/ch_reports.xml
+++ b/guide/ja/ch_reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ja/ch_txns.xml b/guide/ja/ch_txns.xml
index ac7cac14..e045fbfe 100644
--- a/guide/ja/ch_txns.xml
+++ b/guide/ja/ch_txns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ja/fdl-appendix.xml b/guide/ja/fdl-appendix.xml
index ea478c9d..ec60f9a5 100644
--- a/guide/ja/fdl-appendix.xml
+++ b/guide/ja/fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-ja.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/guide/ja/gnucash-guide.sgml b/guide/ja/gnucash-guide.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index b69d8962..7a566266 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-ja.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/guide/ja/legal.xml b/guide/ja/legal.xml
index 478883cc..68af66d2 100644
--- a/guide/ja/legal.xml
+++ b/guide/ja/legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ja.dtd">
 <legalnotice id="legalnotice">
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU
     Free Documentation License (GFDL), Version 1.1 or any later version published by the Free
diff --git a/guide/pt/appendixa.xml b/guide/pt/appendixa.xml
index f9b05e56..1a77433a 100644
--- a/guide/pt/appendixa.xml
+++ b/guide/pt/appendixa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/pt/appendixd.xml b/guide/pt/appendixd.xml
index 844acebe..1c6a181d 100644
--- a/guide/pt/appendixd.xml
+++ b/guide/pt/appendixd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
diff --git a/guide/pt/ch_accts.xml b/guide/pt/ch_accts.xml
index e801da73..58243287 100644
--- a/guide/pt/ch_accts.xml
+++ b/guide/pt/ch_accts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.1
diff --git a/guide/pt/ch_basics.xml b/guide/pt/ch_basics.xml
index 09b633c3..57d60173 100644
--- a/guide/pt/ch_basics.xml
+++ b/guide/pt/ch_basics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/pt/ch_budgets.xml b/guide/pt/ch_budgets.xml
index 827e5f85..923adad6 100644
--- a/guide/pt/ch_budgets.xml
+++ b/guide/pt/ch_budgets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/pt/ch_bus_ap.xml b/guide/pt/ch_bus_ap.xml
index 93ea3067..ff6ac6b4 100644
--- a/guide/pt/ch_bus_ap.xml
+++ b/guide/pt/ch_bus_ap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Originally designed by Carol Champagne.
diff --git a/guide/pt/ch_bus_ar.xml b/guide/pt/ch_bus_ar.xml
index a4c0cefe..3a2dd762 100644
--- a/guide/pt/ch_bus_ar.xml
+++ b/guide/pt/ch_bus_ar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/pt/ch_bus_intro.xml b/guide/pt/ch_bus_intro.xml
index 3e356e6a..bfee23a2 100644
--- a/guide/pt/ch_bus_intro.xml
+++ b/guide/pt/ch_bus_intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 1.0.0
diff --git a/guide/pt/ch_bus_pay.xml b/guide/pt/ch_bus_pay.xml
index e08d3e05..9579b095 100644
--- a/guide/pt/ch_bus_pay.xml
+++ b/guide/pt/ch_bus_pay.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/pt/ch_bus_setup.xml b/guide/pt/ch_bus_setup.xml
index 9f1d4a67..89b781d8 100644
--- a/guide/pt/ch_bus_setup.xml
+++ b/guide/pt/ch_bus_setup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
diff --git a/guide/pt/ch_capgain.xml b/guide/pt/ch_capgain.xml
index f5c4055f..88c34d65 100644
--- a/guide/pt/ch_capgain.xml
+++ b/guide/pt/ch_capgain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/pt/ch_cbook.xml b/guide/pt/ch_cbook.xml
index eae5d7c9..22df6c2e 100644
--- a/guide/pt/ch_cbook.xml
+++ b/guide/pt/ch_cbook.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/pt/ch_cc.xml b/guide/pt/ch_cc.xml
index b1779e2e..68372754 100644
--- a/guide/pt/ch_cc.xml
+++ b/guide/pt/ch_cc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: de julho de 9th 2006
diff --git a/guide/pt/ch_currency.xml b/guide/pt/ch_currency.xml
index 54273f29..9e57c3df 100644
--- a/guide/pt/ch_currency.xml
+++ b/guide/pt/ch_currency.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.4.0
   Last modified: March 16th 2010
diff --git a/guide/pt/ch_dep.xml b/guide/pt/ch_dep.xml
index 8140f0d3..08ad2259 100644
--- a/guide/pt/ch_dep.xml
+++ b/guide/pt/ch_dep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/pt/ch_import_business_data.xml b/guide/pt/ch_import_business_data.xml
index 8ee7e59b..aabae8bc 100644
--- a/guide/pt/ch_import_business_data.xml
+++ b/guide/pt/ch_import_business_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
 
 Version: 2.4.0
diff --git a/guide/pt/ch_invest.xml b/guide/pt/ch_invest.xml
index 4a381544..b234ab85 100644
--- a/guide/pt/ch_invest.xml
+++ b/guide/pt/ch_invest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
diff --git a/guide/pt/ch_loans.xml b/guide/pt/ch_loans.xml
index b5b9c7ce..62d4eceb 100644
--- a/guide/pt/ch_loans.xml
+++ b/guide/pt/ch_loans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/pt/ch_oth_assets.xml b/guide/pt/ch_oth_assets.xml
index 85188874..c191f8c0 100644
--- a/guide/pt/ch_oth_assets.xml
+++ b/guide/pt/ch_oth_assets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.9
diff --git a/guide/pt/ch_oview.xml b/guide/pt/ch_oview.xml
index da0409d4..7b6081ad 100644
--- a/guide/pt/ch_oview.xml
+++ b/guide/pt/ch_oview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.0
diff --git a/guide/pt/ch_python_bindings.xml b/guide/pt/ch_python_bindings.xml
index 2c0f2836..2e488fac 100644
--- a/guide/pt/ch_python_bindings.xml
+++ b/guide/pt/ch_python_bindings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
 Version: 2.4.0
 Last modified: 2011-01-01
diff --git a/guide/pt/ch_reports.xml b/guide/pt/ch_reports.xml
index 08b3460f..6a781f22 100644
--- a/guide/pt/ch_reports.xml
+++ b/guide/pt/ch_reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/pt/ch_txns.xml b/guide/pt/ch_txns.xml
index af557c6e..158729ad 100644
--- a/guide/pt/ch_txns.xml
+++ b/guide/pt/ch_txns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/pt/fdl-appendix.xml b/guide/pt/fdl-appendix.xml
index d6ea13dd..0cb07ebc 100644
--- a/guide/pt/fdl-appendix.xml
+++ b/guide/pt/fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-pt.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index e4534192..6521f62d 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/guide/pt/legal.xml b/guide/pt/legal.xml
index e29d59eb..e692e906 100644
--- a/guide/pt/legal.xml
+++ b/guide/pt/legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE legalnotice SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE legalnotice SYSTEM "gnc-locale-pt.dtd">
 <legalnotice id="legalnotice">
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU
     Free Documentation License (GFDL), Version 1.1 or any later version published by the Free
diff --git a/guide/ru/appendixa.xml b/guide/ru/appendixa.xml
index 50b49ba5..0fe1199f 100644
--- a/guide/ru/appendixa.xml
+++ b/guide/ru/appendixa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ru/appendixd.xml b/guide/ru/appendixd.xml
index 889b990a..e1d7f681 100644
--- a/guide/ru/appendixd.xml
+++ b/guide/ru/appendixd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: March 18th, 2007
diff --git a/guide/ru/ch_accts.xml b/guide/ru/ch_accts.xml
index c8dbf097..77c225d8 100644
--- a/guide/ru/ch_accts.xml
+++ b/guide/ru/ch_accts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
   (Do not remove this comment block.)
   Version: 2.2.1
diff --git a/guide/ru/ch_basics.xml b/guide/ru/ch_basics.xml
index bb2a47c3..76df3a73 100644
--- a/guide/ru/ch_basics.xml
+++ b/guide/ru/ch_basics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
   (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ru/ch_budgets.xml b/guide/ru/ch_budgets.xml
index 13169a4b..7d0d70e1 100644
--- a/guide/ru/ch_budgets.xml
+++ b/guide/ru/ch_budgets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ru/ch_bus_features.xml b/guide/ru/ch_bus_features.xml
index 8dd6442a..16c2b0b6 100644
--- a/guide/ru/ch_bus_features.xml
+++ b/guide/ru/ch_bus_features.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 1.0.0
   Last modified: Sep 19th 2015
diff --git a/guide/ru/ch_capgain.xml b/guide/ru/ch_capgain.xml
index bd7c60f4..1e4811a9 100644
--- a/guide/ru/ch_capgain.xml
+++ b/guide/ru/ch_capgain.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ru/ch_cbook.xml b/guide/ru/ch_cbook.xml
index 75bc76a9..7cca5235 100644
--- a/guide/ru/ch_cbook.xml
+++ b/guide/ru/ch_cbook.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ru/ch_cc.xml b/guide/ru/ch_cc.xml
index 315f46a4..7ecfabaa 100644
--- a/guide/ru/ch_cc.xml
+++ b/guide/ru/ch_cc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ru/ch_currency.xml b/guide/ru/ch_currency.xml
index eb038a86..8570de1f 100644
--- a/guide/ru/ch_currency.xml
+++ b/guide/ru/ch_currency.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.6.15
   Last modified: December 6, 2016
diff --git a/guide/ru/ch_dep.xml b/guide/ru/ch_dep.xml
index 8140f0d3..8ea5c9f6 100644
--- a/guide/ru/ch_dep.xml
+++ b/guide/ru/ch_dep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--  (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ru/ch_expenses.xml b/guide/ru/ch_expenses.xml
index d60bc4b2..5680ee2e 100644
--- a/guide/ru/ch_expenses.xml
+++ b/guide/ru/ch_expenses.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.0
diff --git a/guide/ru/ch_import_business_data.xml b/guide/ru/ch_import_business_data.xml
index 30dadd2a..1928fb81 100644
--- a/guide/ru/ch_import_business_data.xml
+++ b/guide/ru/ch_import_business_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
 
 Version: 3.4.0
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index 47483af0..d341afeb 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: December 7th 2009
diff --git a/guide/ru/ch_loans.xml b/guide/ru/ch_loans.xml
index d63f1c00..776c5019 100644
--- a/guide/ru/ch_loans.xml
+++ b/guide/ru/ch_loans.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/guide/ru/ch_oth_assets.xml b/guide/ru/ch_oth_assets.xml
index 85188874..27b84475 100644
--- a/guide/ru/ch_oth_assets.xml
+++ b/guide/ru/ch_oth_assets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.2.9
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index 435efce5..cf3ebd29 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
   (Do not remove this comment block.)
   Version: 2.2.0 / 2.6 maint
diff --git a/guide/ru/ch_python_bindings.xml b/guide/ru/ch_python_bindings.xml
index 34d8ddfe..bd7e20e9 100644
--- a/guide/ru/ch_python_bindings.xml
+++ b/guide/ru/ch_python_bindings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!-- (Do not remove this comment block.)
 Version: 2.4.0
 Last modified: 2011-01-01
diff --git a/guide/ru/ch_reports.xml b/guide/ru/ch_reports.xml
index ecd984ac..e02aaef1 100644
--- a/guide/ru/ch_reports.xml
+++ b/guide/ru/ch_reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.15
diff --git a/guide/ru/ch_txns.xml b/guide/ru/ch_txns.xml
index 95de899c..d0f5d2c4 100644
--- a/guide/ru/ch_txns.xml
+++ b/guide/ru/ch_txns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/guide/ru/fdl-appendix.xml b/guide/ru/fdl-appendix.xml
index ea478c9d..4e3ad5fe 100644
--- a/guide/ru/fdl-appendix.xml
+++ b/guide/ru/fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-ru.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/guide/ru/gnc-glossary.xml b/guide/ru/gnc-glossary.xml
index 3bf8d850..94911f1d 100644
--- a/guide/ru/gnc-glossary.xml
+++ b/guide/ru/gnc-glossary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glossary SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE glossary SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.15
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index e7395626..7add2c2d 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-ru.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/guide/ru/legal.xml b/guide/ru/legal.xml
index e29d59eb..e56d4482 100644
--- a/guide/ru/legal.xml
+++ b/guide/ru/legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE legalnotice SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE legalnotice SYSTEM "gnc-locale-ru.dtd">
 <legalnotice id="legalnotice">
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU
     Free Documentation License (GFDL), Version 1.1 or any later version published by the Free
diff --git a/help/C/Help_ch_Account-Actions.xml b/help/C/Help_ch_Account-Actions.xml
index 857fd7e6..91e136d4 100644
--- a/help/C/Help_ch_Account-Actions.xml
+++ b/help/C/Help_ch_Account-Actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.x
   Last modified: December 7th 2009
diff --git a/help/C/Help_ch_Business.xml b/help/C/Help_ch_Business.xml
index 85504f82..b15c6761 100644
--- a/help/C/Help_ch_Business.xml
+++ b/help/C/Help_ch_Business.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/help/C/Help_ch_Customize.xml b/help/C/Help_ch_Customize.xml
index ff252f27..467d1cf2 100644
--- a/help/C/Help_ch_Customize.xml
+++ b/help/C/Help_ch_Customize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
 (Do not remove this comment block.)
 Version: 2.0.1
diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index 3cda5e2d..9adc5fe5 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 3.11
diff --git a/help/C/Help_ch_GettingHelp.xml b/help/C/Help_ch_GettingHelp.xml
index d35ae394..e86a85d3 100644
--- a/help/C/Help_ch_GettingHelp.xml
+++ b/help/C/Help_ch_GettingHelp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/C/Help_ch_GettingStarted.xml b/help/C/Help_ch_GettingStarted.xml
index 890a841d..f762a6c9 100644
--- a/help/C/Help_ch_GettingStarted.xml
+++ b/help/C/Help_ch_GettingStarted.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
 (Do not remove this comment block.)
 Version: 2.0.2
diff --git a/help/C/Help_ch_Intro.xml b/help/C/Help_ch_Intro.xml
index e95b50de..f1908c8f 100644
--- a/help/C/Help_ch_Intro.xml
+++ b/help/C/Help_ch_Intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.2
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 5aad3535..ad6272c2 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/C/Help_ch_Tools_Assistants.xml b/help/C/Help_ch_Tools_Assistants.xml
index 3682ed05..323dbd1a 100644
--- a/help/C/Help_ch_Tools_Assistants.xml
+++ b/help/C/Help_ch_Tools_Assistants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index 94d706f9..29622957 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-C.dtd">
 <!-- (Do not remove this comment block.)
 Version: 3.5
 Last modified: March 30th 2019
diff --git a/help/C/Help_chartofaccts.xml b/help/C/Help_chartofaccts.xml
index aa348ab4..dce45446 100644
--- a/help/C/Help_chartofaccts.xml
+++ b/help/C/Help_chartofaccts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE itemizedlist SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE itemizedlist SYSTEM "gnc-locale-C.dtd">
 <itemizedlist>
   <listitem>
     <para>Assets
diff --git a/help/C/Help_chtacctseg.xml b/help/C/Help_chtacctseg.xml
index d3bb4de3..304a4e34 100644
--- a/help/C/Help_chtacctseg.xml
+++ b/help/C/Help_chtacctseg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE screen SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE screen SYSTEM "gnc-locale-C.dtd">
 <screen>300             Expenses
  |
  +--310         Living Expenses
diff --git a/help/C/Help_fdl-appendix.xml b/help/C/Help_fdl-appendix.xml
index 304ad231..9f6316a7 100644
--- a/help/C/Help_fdl-appendix.xml
+++ b/help/C/Help_fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-C.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/help/C/Help_legal.xml b/help/C/Help_legal.xml
index 09ef4321..da641f74 100644
--- a/help/C/Help_legal.xml
+++ b/help/C/Help_legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE legalnotice SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE legalnotice SYSTEM "gnc-locale-C.dtd">
 <legalnotice id="legalnotice">
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU
     Free Documentation License (GFDL), Version 1.1 or any later version published by the Free
diff --git a/help/C/Help_tips-appendix.xml b/help/C/Help_tips-appendix.xml
index 0bb0ab55..896b5935 100644
--- a/help/C/Help_tips-appendix.xml
+++ b/help/C/Help_tips-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.6.20
diff --git a/help/C/Help_txf-categories.xml b/help/C/Help_txf-categories.xml
index 45183bfd..22d99465 100644
--- a/help/C/Help_txf-categories.xml
+++ b/help/C/Help_txf-categories.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE para SYSTEM "gnc-locale-C.dtd">
 <para><!-- Translators: You will probably have your own codes.
      Look for similar files as the source at the end of this file,
      but in the directory with your country code.
diff --git a/help/C/gnucash-help.xml b/help/C/gnucash-help.xml
index b0b1206a..40dfc2bc 100644
--- a/help/C/gnucash-help.xml
+++ b/help/C/gnucash-help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-C.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 4.0
diff --git a/help/de/Help_ch_Account-Actions.xml b/help/de/Help_ch_Account-Actions.xml
index ec3efbeb..4a590e95 100644
--- a/help/de/Help_ch_Account-Actions.xml
+++ b/help/de/Help_ch_Account-Actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 4.6
   Last modified: September 2021
diff --git a/help/de/Help_ch_Business.xml b/help/de/Help_ch_Business.xml
index 5a2c0654..7004f768 100644
--- a/help/de/Help_ch_Business.xml
+++ b/help/de/Help_ch_Business.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0
diff --git a/help/de/Help_ch_Customize.xml b/help/de/Help_ch_Customize.xml
index 9ef4ce0c..4271829e 100644
--- a/help/de/Help_ch_Customize.xml
+++ b/help/de/Help_ch_Customize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.1
diff --git a/help/de/Help_ch_GUIMenus.xml b/help/de/Help_ch_GUIMenus.xml
index 60e40904..3813485f 100644
--- a/help/de/Help_ch_GUIMenus.xml
+++ b/help/de/Help_ch_GUIMenus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comm Version: 3.11)
   Last modified: March 29th 2018
        modified: November 18th 2010
diff --git a/help/de/Help_ch_GettingHelp.xml b/help/de/Help_ch_GettingHelp.xml
index e09990d2..4017ccf0 100644
--- a/help/de/Help_ch_GettingHelp.xml
+++ b/help/de/Help_ch_GettingHelp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/de/Help_ch_GettingStarted.xml b/help/de/Help_ch_GettingStarted.xml
index 5d888414..ee336bcf 100644
--- a/help/de/Help_ch_GettingStarted.xml
+++ b/help/de/Help_ch_GettingStarted.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
 Version: 2.0.2
 Last modified: January 2011
diff --git a/help/de/Help_ch_Intro.xml b/help/de/Help_ch_Intro.xml
index 64919901..bea1ecc4 100644
--- a/help/de/Help_ch_Intro.xml
+++ b/help/de/Help_ch_Intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.2
diff --git a/help/de/Help_ch_Reports.xml b/help/de/Help_ch_Reports.xml
index e7981465..c1d20d79 100644
--- a/help/de/Help_ch_Reports.xml
+++ b/help/de/Help_ch_Reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/de/Help_ch_Tools_Assistants.xml b/help/de/Help_ch_Tools_Assistants.xml
index 44554a54..49361167 100644
--- a/help/de/Help_ch_Tools_Assistants.xml
+++ b/help/de/Help_ch_Tools_Assistants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/de/Help_ch_Transactions.xml b/help/de/Help_ch_Transactions.xml
index 4f99bbda..6fca1d3b 100644
--- a/help/de/Help_ch_Transactions.xml
+++ b/help/de/Help_ch_Transactions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
 Version: 3.5
 Last modified: March 30th 2019
diff --git a/help/de/Help_chartofaccts.xml b/help/de/Help_chartofaccts.xml
index 6398ffe7..e0fed790 100644
--- a/help/de/Help_chartofaccts.xml
+++ b/help/de/Help_chartofaccts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE itemizelist SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE itemizelist SYSTEM "gnc-locale-de.dtd">
 <itemizedlist>
   <listitem>
     <para>Aktiva
diff --git a/help/de/Help_chtacctseg.xml b/help/de/Help_chtacctseg.xml
index bd119162..3ee356b7 100644
--- a/help/de/Help_chtacctseg.xml
+++ b/help/de/Help_chtacctseg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE screen SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE screen SYSTEM "gnc-locale-de.dtd">
 <screen>300             Aufwendungen
  |
  +--310         Lebenshaltungskosten
diff --git a/help/de/Help_fdl-appendix.xml b/help/de/Help_fdl-appendix.xml
index 304ad231..c0368109 100644
--- a/help/de/Help_fdl-appendix.xml
+++ b/help/de/Help_fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-de.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/help/de/Help_legal.xml b/help/de/Help_legal.xml
index 73eaf6ed..c6d6164c 100644
--- a/help/de/Help_legal.xml
+++ b/help/de/Help_legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE legalnotice SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE legalnotice SYSTEM "gnc-locale-de.dtd">
 <legalnotice id="legalnotice">
   <para>Das vorliegende Dokument kann gemäß den Bedingungen der GNU Free Documentation License (GFDL),
     Version 1.1 oder jeder späteren, von der Free Software Foundation veröffentlichten Version
diff --git a/help/de/Help_tips-appendix.xml b/help/de/Help_tips-appendix.xml
index 358a934a..bbf36f0a 100644
--- a/help/de/Help_tips-appendix.xml
+++ b/help/de/Help_tips-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-de.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.6.20
    Last modified: see <releaseinfo>
diff --git a/help/de/Help_txf-categories.xml b/help/de/Help_txf-categories.xml
index 898d43a3..d2a9f607 100644
--- a/help/de/Help_txf-categories.xml
+++ b/help/de/Help_txf-categories.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE para SYSTEM "gnc-locale-de.dtd">
 <para><table>
     <title>Detailed TXF Category Descriptions</title>
 
diff --git a/help/de/gnucash-help.xml b/help/de/gnucash-help.xml
index f39a60fc..a636a6bd 100644
--- a/help/de/gnucash-help.xml
+++ b/help/de/gnucash-help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-de.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 4.0
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 6492ec0e..2a3d2b9a 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-it.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:
diff --git a/help/pt/Help_ch_Account-Actions.xml b/help/pt/Help_ch_Account-Actions.xml
index e24647e8..ae91ba78 100644
--- a/help/pt/Help_ch_Account-Actions.xml
+++ b/help/pt/Help_ch_Account-Actions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.x
   Last modified: December 7th 2009
diff --git a/help/pt/Help_ch_Business.xml b/help/pt/Help_ch_Business.xml
index 0be7aa41..59f764f1 100644
--- a/help/pt/Help_ch_Business.xml
+++ b/help/pt/Help_ch_Business.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!-- (Do not remove this comment block.)
   Version: 2.0.0
   Last modified: July 9th 2006
diff --git a/help/pt/Help_ch_Customize.xml b/help/pt/Help_ch_Customize.xml
index bc68ad3a..6ec199a0 100644
--- a/help/pt/Help_ch_Customize.xml
+++ b/help/pt/Help_ch_Customize.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.1
diff --git a/help/pt/Help_ch_GUIMenus.xml b/help/pt/Help_ch_GUIMenus.xml
index e1074cbf..4ad4c3ba 100644
--- a/help/pt/Help_ch_GUIMenus.xml
+++ b/help/pt/Help_ch_GUIMenus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/pt/Help_ch_GettingHelp.xml b/help/pt/Help_ch_GettingHelp.xml
index f02f045e..f0d88572 100644
--- a/help/pt/Help_ch_GettingHelp.xml
+++ b/help/pt/Help_ch_GettingHelp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/pt/Help_ch_GettingStarted.xml b/help/pt/Help_ch_GettingStarted.xml
index 16da7171..14df3072 100644
--- a/help/pt/Help_ch_GettingStarted.xml
+++ b/help/pt/Help_ch_GettingStarted.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
 
       (Do not remove this comment block.)
diff --git a/help/pt/Help_ch_Intro.xml b/help/pt/Help_ch_Intro.xml
index cf3ca48e..1254368f 100644
--- a/help/pt/Help_ch_Intro.xml
+++ b/help/pt/Help_ch_Intro.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.2
diff --git a/help/pt/Help_ch_Reports.xml b/help/pt/Help_ch_Reports.xml
index bde0b475..427fd9f1 100644
--- a/help/pt/Help_ch_Reports.xml
+++ b/help/pt/Help_ch_Reports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/pt/Help_ch_Tools_Assistants.xml b/help/pt/Help_ch_Tools_Assistants.xml
index d6a24e9b..e48365e3 100644
--- a/help/pt/Help_ch_Tools_Assistants.xml
+++ b/help/pt/Help_ch_Tools_Assistants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.0.x
diff --git a/help/pt/Help_ch_Transactions.xml b/help/pt/Help_ch_Transactions.xml
index 61655300..57e057f3 100644
--- a/help/pt/Help_ch_Transactions.xml
+++ b/help/pt/Help_ch_Transactions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-locale-pt.dtd">
 <!--
     (Do not remove this comment block.)
     Version: 2.0.x
diff --git a/help/pt/Help_chartofaccts.xml b/help/pt/Help_chartofaccts.xml
index d036ade6..affe77b3 100644
--- a/help/pt/Help_chartofaccts.xml
+++ b/help/pt/Help_chartofaccts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE itemizedlist SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE itemizedlist SYSTEM "gnc-locale-pt.dtd">
 <itemizedlist>
   <listitem>
     <para>Activos
diff --git a/help/pt/Help_chtacctseg.xml b/help/pt/Help_chtacctseg.xml
index bc7cc33a..323c4a25 100644
--- a/help/pt/Help_chtacctseg.xml
+++ b/help/pt/Help_chtacctseg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE screen SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE screen SYSTEM "gnc-locale-pt.dtd">
 <screen>300             Despesas
  |
  +--310         Despesas pessoais
diff --git a/help/pt/Help_fdl-appendix.xml b/help/pt/Help_fdl-appendix.xml
index fdfefa3e..fd9c56e9 100644
--- a/help/pt/Help_fdl-appendix.xml
+++ b/help/pt/Help_fdl-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-pt.dtd">
 <!--
      The GNU Free Documentation License 1.1 in DocBook
      Markup by Eric Baudais <baudais at okstate.edu>
diff --git a/help/pt/Help_legal.xml b/help/pt/Help_legal.xml
index 09ef4321..2c2e669b 100644
--- a/help/pt/Help_legal.xml
+++ b/help/pt/Help_legal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE legalnotice SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE legalnotice SYSTEM "gnc-locale-pt.dtd">
 <legalnotice id="legalnotice">
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU
     Free Documentation License (GFDL), Version 1.1 or any later version published by the Free
diff --git a/help/pt/Help_tips-appendix.xml b/help/pt/Help_tips-appendix.xml
index ca758353..b26450b5 100644
--- a/help/pt/Help_tips-appendix.xml
+++ b/help/pt/Help_tips-appendix.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE appendix SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Version: 2.4.12
diff --git a/help/pt/Help_txf-categories.xml b/help/pt/Help_txf-categories.xml
index 51d518a6..a7941f02 100644
--- a/help/pt/Help_txf-categories.xml
+++ b/help/pt/Help_txf-categories.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE para SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE para SYSTEM "gnc-locale-pt.dtd">
 
 <para>&untranslated;
 </para>
diff --git a/help/pt/gnucash-help.xml b/help/pt/gnucash-help.xml
index 9fd2d000..5bd3346c 100644
--- a/help/pt/gnucash-help.xml
+++ b/help/pt/gnucash-help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE book SYSTEM "gnc-locale-pt.dtd">
 <!--
       (Do not remove this comment block.)
   Template Maintained by the GNOME Documentation Project:

commit 014ce27e1969762190653b530e5d40451e59f873
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Aug 4 16:55:54 2021 +0200

    Guide:C:Currency: update images Part 1

diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index ced84014..b1c44844 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -131,8 +131,8 @@ TODO -->
       <screenshot id="currency_main1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main1.png" format="PNG"
-                       srccredit="Geert Janssens" />
+            <imagedata fileref="figures/currency_main1.png"
+                       srccredit="Frank H. Ellenberger" />
           </imageobject>
 
           <textobject>
@@ -223,8 +223,8 @@ TODO -->
       <screenshot id="currency_main1a">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main1.png" format="PNG"
-                       srccredit="Geert Janssens" />
+            <imagedata fileref="figures/currency_main1.png"
+                       srccredit="Frank H. Ellenberger" />
           </imageobject>
 
           <textobject>
@@ -255,15 +255,11 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_peditor.png"
-                         format="PNG" srccredit="Geert Janssens" />
+                         srccredit="Frank H. Ellenberger" />
             </imageobject>
 
-            <textobject>
-              <phrase>Price Database window</phrase>
-            </textobject>
-
             <caption>
-              <para>Price Database Window.
+              <para>Price Database Window—still empty
               </para>
             </caption>
           </mediaobject>
@@ -276,8 +272,8 @@ TODO -->
         <screenshot id="currency_addcurr">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_addcurr.png" format="PNG"
-                         srccredit="Geert Janssens" />
+              <imagedata fileref="figures/currency_addcurr.png"
+                         srccredit="Frank H. Ellenberger" />
             </imageobject>
 
             <textobject>
@@ -301,14 +297,10 @@ TODO -->
         <screenshot id="currency_manualpriceadded">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
-                         srccredit="Geert Janssens" />
+              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                         srccredit="Frank H. Ellenberger" />
             </imageobject>
 
-            <textobject>
-              <phrase>Price Database Window</phrase>
-            </textobject>
-
             <caption>
               <para>The Price Database window after setting the exchange rate between Euros and US Dollars
               </para>
@@ -319,16 +311,12 @@ TODO -->
         <screenshot id="currency_main2">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_main2.png" format="PNG"
-                         srccredit="Geert Janssens" />
+              <imagedata fileref="figures/currency_main2.png"
+                         srccredit="Frank H. Ellenberger" />
             </imageobject>
 
-            <textobject>
-              <phrase>Chart of Accounts</phrase>
-            </textobject>
-
             <caption>
-              <para>Chart of Accounts after setting the exchange rate between Euros and US Dollars.
+              <para>Chart of Accounts after setting the exchange rate between Euro and US Dollar
               </para>
             </caption>
           </mediaobject>
@@ -355,16 +343,12 @@ TODO -->
         <screenshot id="currency_BeforeGetOnline">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
-                         srccredit="Geert Janssens" />
+              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                         srccredit="Frank H. Ellenberger" />
             </imageobject>
 
-            <textobject>
-              <phrase>Price Database window</phrase>
-            </textobject>
-
             <caption>
-              <para>Price Database Window before you obtain online quotes.
+              <para>Price Database Window before you obtain online quotes
               </para>
             </caption>
           </mediaobject>
@@ -386,15 +370,11 @@ TODO -->
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
-                           format="PNG" srccredit="Geert Janssens" />
+                           srccredit="Frank H. Ellenberger" />
               </imageobject>
 
-              <textobject>
-                <phrase>Price Database window</phrase>
-              </textobject>
-
               <caption>
-                <para>Price Database Window after we obtained online quotes.
+                <para>Price Database Window after we obtained online quotes
                 </para>
               </caption>
             </mediaobject>
@@ -415,16 +395,12 @@ TODO -->
         <screenshot id="currency_main3.png">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_main3.png" format="PNG"
-                         srccredit="Geert Janssens" />
+              <imagedata fileref="figures/currency_main3.png"
+                         srccredit="Frank H. Ellenberger" />
             </imageobject>
 
-            <textobject>
-              <phrase>Price Database window</phrase>
-            </textobject>
-
             <caption>
-              <para>Chart of Accounts after we obtain online quotes.
+              <para>Chart of Accounts after we obtain online quotes
               </para>
             </caption>
           </mediaobject>
@@ -517,7 +493,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -539,7 +515,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -562,7 +538,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -586,7 +562,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -644,7 +620,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -668,7 +644,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_Commodities.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -763,7 +739,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_ToAmount.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -785,7 +761,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -1131,12 +1107,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_acct_setup.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_acct_setup.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1162,12 +1138,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1189,12 +1165,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_acct_setup_2.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_acct_setup_2.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1225,12 +1201,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_transfer_funds.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_transfer_funds.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1261,12 +1237,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_transfer_trans1.png"
-                format="PNG" srccredit="David Cousens"  width="510"/>
+                srccredit="David Cousens"  width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_transfer_trans1.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1289,12 +1265,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_transfer_trans2.png"
-                format="PNG" srccredit="David Cousens"  width="510"/>
+                srccredit="David Cousens"  width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_transfer_trans2.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1316,12 +1292,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1363,13 +1339,13 @@ Trading
         <screenshot id="currency_trading_tfr_back">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_trf_back.png" format="PNG"
+              <imagedata fileref="figures/currency_trading_trf_back.png"
                          srccredit="David Cousens"  width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_trf_back.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1391,12 +1367,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1417,12 +1393,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
@@ -1455,12 +1431,12 @@ Trading
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/currency_trading_balance_sheet.png"
-                format="PNG" srccredit="David Cousens" width="510"/>
+                srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/currency_trading_balance_sheet.png"
-                format="PNG" srccredit="David Cousens"/>
+                srccredit="David Cousens"/>
             </imageobject>
 
             <textobject>
diff --git a/guide/C/figures/currency_AfterGetOnlineQuotes.png b/guide/C/figures/currency_AfterGetOnlineQuotes.png
index dd1c068e..9aae9de4 100644
Binary files a/guide/C/figures/currency_AfterGetOnlineQuotes.png and b/guide/C/figures/currency_AfterGetOnlineQuotes.png differ
diff --git a/guide/C/figures/currency_BeforeGetOnlineQuotes.png b/guide/C/figures/currency_BeforeGetOnlineQuotes.png
index e5450a90..93dc270e 100644
Binary files a/guide/C/figures/currency_BeforeGetOnlineQuotes.png and b/guide/C/figures/currency_BeforeGetOnlineQuotes.png differ
diff --git a/guide/C/figures/currency_addcurr.png b/guide/C/figures/currency_addcurr.png
index 93e489e5..0bcecc4e 100644
Binary files a/guide/C/figures/currency_addcurr.png and b/guide/C/figures/currency_addcurr.png differ
diff --git a/guide/C/figures/currency_main1.png b/guide/C/figures/currency_main1.png
index 7f98d1e9..074d9c3b 100644
Binary files a/guide/C/figures/currency_main1.png and b/guide/C/figures/currency_main1.png differ
diff --git a/guide/C/figures/currency_main2.png b/guide/C/figures/currency_main2.png
index ce8dc310..493ac390 100644
Binary files a/guide/C/figures/currency_main2.png and b/guide/C/figures/currency_main2.png differ
diff --git a/guide/C/figures/currency_main3.png b/guide/C/figures/currency_main3.png
index a0817c17..c80fc313 100644
Binary files a/guide/C/figures/currency_main3.png and b/guide/C/figures/currency_main3.png differ
diff --git a/guide/C/figures/currency_peditor.png b/guide/C/figures/currency_peditor.png
index d3df465f..c7d86349 100644
Binary files a/guide/C/figures/currency_peditor.png and b/guide/C/figures/currency_peditor.png differ

commit dd990803695a0925b6263cb00620df93b92694ae
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 22 20:53:04 2021 +0200

    Fix license file
    
    Use actual file instead of softlink.

diff --git a/COPYING b/COPYING
deleted file mode 120000
index 28ecdc8a..00000000
--- a/COPYING
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/automake-1.16/COPYING
\ No newline at end of file
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 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, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

commit 2cdba471b413c33e6d5e2cca8f47e05fa01b29ed
Merge: b172fd0e 731dcdf4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Sep 22 18:10:56 2021 +0200

    Merge branch 'PR_#198' into maint


commit b172fd0ec15e3836671e277dbb4d4384f6ab1685
Merge: ab60da39 b3072cb9
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Sep 22 18:03:44 2021 +0200

    Merge branch 'PR_#197' into maint


commit ab60da39de71b488bd533cae20b06dfe0b2ee3d0
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Sep 22 16:19:42 2021 +0200

    Add license file to git tracking
    
    It is an autogenerated file from autotools but it was
    ignored by our current git config. A previous commit
    chose to install the file, but that's difficult if it's
    missing.

diff --git a/.gitignore b/.gitignore
index 30cfa985..19050bdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 # For other purposes adjust "$XDG_CONFIG_HOME/git/ignore!
 
 #absolute:
-/COPYING
 /INSTALL
 /aclocal.m4
 /autom4te.cache/
@@ -15,4 +14,4 @@
 /missing
 
 #relative:
-Makefile.in
\ No newline at end of file
+Makefile.in
diff --git a/COPYING b/COPYING
new file mode 120000
index 00000000..28ecdc8a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+/usr/share/automake-1.16/COPYING
\ No newline at end of file

commit 7c0642f0748ba06f73baaaf396c369e08cc392b9
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Sep 21 16:28:25 2021 +0200

    Install license files COPYING and COPYING-DOCS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec19d5fb..70102d72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,10 @@ file(GLOB_RECURSE extrafiles
     cmake/* fonts/* stylesheet/* xsl/*)
 add_to_dist(${extrafiles})
 
+configure_file(COPYING ${DATADIR_BUILD}/${PROJECT_NAME}/COPYING COPYONLY)
+configure_file(COPYING-DOCS ${DATADIR_BUILD}/${PROJECT_NAME}/COPYING-DOCS COPYONLY)
+install(FILES COPYING COPYING-DOCS DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
+
 add_to_dist(
     AUTHORS
     CMakeLists.txt

commit ee9fa864241ebb77fb514ff8f224e5660b1130ff
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Sep 19 18:24:32 2021 +0200

    Help/de: Crop Export screenshots

diff --git a/help/de/figures/AccountTree_Export_dbms.png b/help/de/figures/AccountTree_Export_dbms.png
index a5bbf529..67d5f9c7 100644
Binary files a/help/de/figures/AccountTree_Export_dbms.png and b/help/de/figures/AccountTree_Export_dbms.png differ
diff --git a/help/de/figures/AccountTree_Export_file.png b/help/de/figures/AccountTree_Export_file.png
index 8e785e1f..30e7739b 100644
Binary files a/help/de/figures/AccountTree_Export_file.png and b/help/de/figures/AccountTree_Export_file.png differ

commit e7b49fcea7bf0311eb6f4e3c4833ca984099f92d
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Jun 26 17:07:13 2021 +0200

    L10N:de: Beschreibung der Ex- und Import-Assistenten der Kontenstruktur
    
    ... und Bildschirmfotos ergänzt.
    * Die Breite der Bilder mit Entity &img-w; flexibel gestaltet.
    
    * Beschreibung der allgemeinen Steuerelemente der Assistenten in die
    neue Datei Help_para-assist-intro.xml ausgelagert.
    
    * Link für F::Q auf das neue Kapitel in ch_Online-Quotes.xml
    gesetzt.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 36cc64a5..b5cdb036 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -52,6 +52,8 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY app-aoo "<application>Apache OpenOffice</application>">
 <!ENTITY app-lo "<application>LibreOffice</application>">
 <!ENTITY app-py "<application>Python</application>">
+<!ENTITY app-perl "<application>Perl</application>">
+<!ENTITY app-gfa "<application>Gnucash for Android</application>">
 
   <!-- Operating Systems (3 letters), Bundles: -->
 <!ENTITY lin "<systemitem class='osname'>Linux</systemitem>">
@@ -157,6 +159,10 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY tit-sel-tut "Tutorial on multiple currency accounting">
 <!ENTITY tit-sel-gnc "Multiple currency accounting in GnuCash">
 
+<!-- 
+  5. Other formatting instructions -->
+<!ENTITY img-w "850px">  <!-- The maximum width of the graphic elements. -->
+
 <!--
   Translators:
     If you can only offer a partial translation, that is fine.
diff --git a/help/de/CMakeLists.txt b/help/de/CMakeLists.txt
index a41f3139..89f9429c 100644
--- a/help/de/CMakeLists.txt
+++ b/help/de/CMakeLists.txt
@@ -13,6 +13,7 @@ set (entities
         Help_legal.xml
         Help_chartofaccts.xml
         Help_chtacctseg.xml
+        Help_para-assist-intro.xml
         Help_txf-categories.xml
         Help_tips-appendix.xml)
 
diff --git a/help/de/Help_ch_Account-Actions.xml b/help/de/Help_ch_Account-Actions.xml
index c9165458..ec3efbeb 100644
--- a/help/de/Help_ch_Account-Actions.xml
+++ b/help/de/Help_ch_Account-Actions.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comm  Version: 2.0.x
-  Last modified: December 7th 2009
+<!-- (Do not remove this comment block.)
+  Version: 4.6
+  Last modified: September 2021
+       modified: December 7th 2009
        modified: March 28th 2007
        modified: August 12th 2006
-	   modified: February 28th 2005
+       modified: February 28th 2005
   Maintainers:
     Alex Aycinena <alex.aycinena at gmail.com>
     Chris Lyttle <chris at wilddev.net>
@@ -601,12 +603,11 @@
       <title>Der Assistent <quote>Neuen Kontoplan erstellen</quote></title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountTreeCreate.png" format="PNG"
-                   srccredit="Christian Wehling" width="510px" />
+            <imagedata fileref="figures/AccountTreeCreate.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
+
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTreeCreate.png" format="PNG"
-                   srccredit="Christian Wehling" />
+            <imagedata fileref="figures/AccountTreeCreate.png" srccredit="Christian Wehling" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -620,7 +621,7 @@
       </para>
 
       <varlistentry>
-        <term><guibutton>Abbrechen</guibutton></term>
+        <term><guibutton><accel>A</accel>bbrechen</guibutton></term>
 
         <listitem>
           <para>Beendet den Vorgang und bricht die Erstellung einer neuen Kontenstruktur ab.
@@ -635,7 +636,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><guibutton>Zurück</guibutton></term>
+        <term><guibutton><accel>Z</accel>urück</guibutton></term>
 
         <listitem>
           <para>Bringt Sie zur vorherigen Anzeige zurück, so das Sie Ihre Eingaben noch einmal ändern können.
@@ -644,7 +645,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><guibutton>Weiter</guibutton></term>
+        <term><guibutton><accel>W</accel>eiter</guibutton></term>
 
         <listitem>
           <para>Mit der Taste bestätigen Sie Ihre Eingaben und gehen weiter zum nächsten Bildschirm.
@@ -653,7 +654,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><guibutton>Fertigstellen</guibutton></term>
+        <term><guibutton><accel>F</accel>ertigstellen</guibutton></term>
 
         <listitem>
           <para>Überspringt den nächsten Schritt <guilabel>Ausgewählte Konten feinabstimmen</guilabel> und bringt
@@ -663,7 +664,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><guibutton>Anwenden</guibutton></term>
+        <term><guibutton>An<accel>w</accel>enden</guibutton></term>
 
         <listitem>
           <para>Hiermit beenden Sie Ihre Eingaben und die neuen Kontostruktur wird in der &app;-Datei angelegt.
@@ -676,117 +677,129 @@
       <title>Beschreibung der Arbeitsschritte in dem Assistenten</title>
 
       <step>
-        <variablelist spacing="compact">
-          <varlistentry>
-            <term><guilabel>Neuen Kontenplan erstellen</guilabel></term>
+        <title><guilabel>Neuen Kontenplan erstellen</guilabel></title>
 
-            <listitem>
-              <para>Der Assistent öffnet sich mit einer Übersicht, in der kurz beschrieben wird, bei welchen Aufgaben
-                Sie hier untersützt werden.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
+        <para>Der Assistent startet mit einer kurzen Einführungsseite.
+        </para>
       </step>
 
       <step>
-        <para>Im nächsten Bildschirm können Sie die <guilabel>Währung wählen</guilabel>, die Sie als Standard
-          für Ihre Konten verwenden wollen.
+        <title><guilabel>Buch-Optionen für neues Buch</guilabel></title>
+
+        <para><note>
+            <para>Dieser Dialogschritt wird <emphasis>nicht</emphasis> angezeigt, wenn Sie den Assistenten in der
+              Kontenansicht einer bestehen &app;-Datei mit dem Menüpunkt
+              <menuchoice>
+                <guimenu><accel>A</accel>ktionen</guimenu><guimenuitem>Konten<accel>h</accel>ierachie
+                hinzufügen</guimenuitem>
+              </menuchoice>
+              starten.
+            </para>
+          </note>
+          In diesem Schritt können Sie generelle Einstellungen für die &app;-Datei vornehmen, die
+          in der Datei gespeichert werden und somit für alle Benutzer gelten. Der Dialog wird
+          ausführlich in <xref linkend="book-options" /> beschrieben.
         </para>
+      </step>
 
-        <variablelist spacing="compact">
-          <varlistentry>
-            <term><guilabel>Währung</guilabel></term>
+      <step>
+        <title><guilabel>Währung wählen</guilabel></title>
 
-            <listitem>
-              <para>Die Dropdown-Liste ist standardmäßig auf die Währung eingestellt, die in der Registerkarte
-                <xref linkend="prefs-accounts"/> in den <guilabel>&appname; Einstellungen</guilabel>
-                eingestellt ist. Sie erreichen diesen Dialog im Menü
-                <menuchoice>
-                  <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
-                </menuchoice>
-                . Wenn Sie stattdessen für Ihre Konten eine andere Standardwährung verwenden
-                wollen, wählen Sie diese aus der Liste aus.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
+        <para>Im nächsten Bildschirm können Sie die Währung auswählen, die Sie als Vorgabe für die
+          buchspezifische Basiswährung verwenden wollen.
+        </para>
+
+        <para>Die Dropdown-Liste ist standardmäßig auf die Währung eingestellt, die in der Registerkarte
+          <xref linkend="prefs-accounts"/> in den <guilabel>&appname; Einstellungen</guilabel>
+          eingestellt ist. Sie erreichen diesen Dialog im Menü
+          <menuchoice>
+            <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
+          </menuchoice>
+          . Wenn Sie stattdessen für Ihre Konten eine andere Standardwährung verwenden wollen,
+          wählen Sie diese aus der Liste aus.
+        </para>
       </step>
 
       <step>
-        <para>Der nächste Schritt wird dafür verwendet, um die <guilabel>zu erstellenden Konten
-          auszuwählen</guilabel>. Sie sehen einen Bildschirm, der in drei Teile unterteilt ist.
+        <title><guilabel>zu erstellende Konten auszuwählen</guilabel></title>
+
+        <para>Dieser Schritt wird dafür verwendet, um die Kontenstruktur zu erstellen. Sie sehen einen
+          Bildschirm, der in drei Teile unterteilt ist.
         </para>
 
-        <variablelist spacing="compact">
-          <varlistentry>
-            <term><guilabel>Kategorien</guilabel></term>
+        <substeps>
+          <step>
+            <title><guilabel>Kategorien</guilabel></title>
 
-            <listitem>
-              <para>Im linken oberen Teil befinden sich zwei Dropdownfelder, mit denen Sie die sprach- und
-                regionsspezifischen Kategorien filtern können. Wählen Sie aus dem Listenfeld
-                unterhalb der Auswahlfelder die Arten von Konten aus, die Sie für Ihre Arbeit in
-                &app; verwenden möchten. Sie können so viele der Kategorien für Ihre Konten
-                auswählen, wie Sie möchten.
-              </para>
-            </listitem>
-          </varlistentry>
+            <para>Im linken oberen Teil befinden sich zwei Dropdownfelder, mit denen Sie die sprach- und
+              regionsspezifischen Kategorien filtern können. Wählen Sie aus dem Listenfeld
+              unterhalb der Auswahlfelder die Arten von Konten aus, die Sie für Ihre Arbeit in
+              &app; verwenden möchten. So können Sie viele der Kategorien aus einem Gebietsschema
+              für Ihre Konten auswählen. Wollen Sie Konten aus verschiedenen Gebietsschemen
+              mischen, müssen Sie den Assistenten für jedes Schema einmal durchlaufen.
+            </para>
+          </step>
 
-          <varlistentry>
-            <term><guibutton>Alle auswählen</guibutton></term>
+          <step>
+            <title><guibutton>Alle auswählen</guibutton></title>
 
-            <listitem>
-              <para>Mit der Schaltfläche können Sie alle Kontokategorien auswählen.
-              </para>
-            </listitem>
-          </varlistentry>
+            <para>Mit der Schaltfläche können Sie alle Kontokategorien auswählen.
+            </para>
+          </step>
 
-          <varlistentry>
-            <term><guibutton>Keine auswählen</guibutton></term>
+          <step>
+            <title><guibutton>Keine auswählen</guibutton></title>
 
-            <listitem>
-              <para>Mit dieser Schaltfläche können Sie die Auswahl aller ausgewählten Kategorien aufheben.
-              </para>
-            </listitem>
-          </varlistentry>
+            <para>Mit dieser Schaltfläche können Sie die Auswahl aller ausgewählten Kategorien aufheben.
+            </para>
+          </step>
 
-          <varlistentry>
-            <term><guilabel>Kategorie-Beschreibung</guilabel></term>
+          <step>
+            <title><guilabel>Kategorie-Beschreibung</guilabel></title>
 
-            <listitem>
-              <para>Im linken unteren Bereich befindet sich ein Feld, in dem eine detaillierte Beschreibung der aktuell
-                markierten Kategorie angezeigt wird.
-              </para>
-            </listitem>
-          </varlistentry>
+            <para>Im linken unteren Bereich befindet sich ein Feld, in dem eine detaillierte Beschreibung der aktuell
+              markierten Kategorie angezeigt wird. Hier haben die Ersteller der regionsspezifischen
+              Module z.T. ausführliche Hinweise zu den einzelnen Modulen geben.
+            </para>
+          </step>
 
-          <varlistentry>
-            <term><guilabel>Konten in …</guilabel></term>
+          <step>
+            <title><guilabel>Konten in …</guilabel></title>
 
-            <listitem>
-              <para>Auf der rechten Seite befindet sich eine Liste der Konten, die der links ausgewählten Kategorie
-                entsprechen.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
+            <para>Auf der rechten Seite befindet sich eine Vorschau der Konten, die der links hervorgehobenen
+              Kategorie entsprechen.
+            </para>
+          </step>
+        </substeps>
+
+        <tip>
+          <para>In diesem Arbeitsschritt bietet der Assistent Ihnen eine Abkürzung an. Die Schaltfläche
+            <guibutton><accel>F</accel>ertigstellen</guibutton> bringt Sie direkt zum letzten
+            Schritt.
+          </para>
+        </tip>
       </step>
 
       <step>
-        <para>Weiter geht es mit dem Schritt <guilabel>Ausgewählte Konten feinabstimmen</guilabel>, bei dem Sie
-          für die einzelnen Konten den Kontonamen anpassen können, einen Anfangsbestand eingeben
-          oder definieren, ob ein Konto als ein Platzhalter fungieren soll.
+        <title><guilabel>Ausgewählte Konten feinabstimmen</guilabel></title>
+
+        <para>Weiter geht es mit dem Schritt, bei dem Sie für jedes einzelne Konto bei Bedarf den Kontonamen
+          anpassen können, einen Anfangsbestand eingeben oder definieren, ob ein Konto als ein
+          Platzhalter fungieren soll.
         </para>
 
-        <note>
-          <para>Eigenkapitalkonten können keinen Anfangsbestand haben, daher wird die Eingabe für diese Art von
-            Konten unterbunden und von &app; auf <guilabel>Null</guilabel> gesetzt.
+        <note id="placeholder-acct">
+          <para><emphasis>Platzhalterkonten</emphasis> bilden eine Art Gruppenüberschrift und werden verwendet, um
+            eine Hierarchie von Konten zu erstellen. Das Kontobuch der so markierte Konten ist
+            schreibgeschützt.
           </para>
         </note>
 
-        <note id="placeholder-acct">
-          <para><emphasis>Platzhalterkonten</emphasis> werden verwendet, um eine Hierarchie von Konten zu erstellen
-            und haben normalerweise keine Buchungen oder Anfangsbestände.
+        <note>
+          <para>Da das Anfangsbestandkonto ein Eigenkapital-Konto ist, wird die Eingabe für diese Art von Konten
+            unterbunden und von &app; auf <guilabel>Null</guilabel> gesetzt. Der Anfangsbestand wird
+            als eine normale Buchung in das Kontobuch eingetragen und kann von Ihnen später
+            ergänzt, korrigiert oder gelöscht werden.
           </para>
         </note>
 
@@ -797,22 +810,8 @@
         <variablelist spacing="compact">
           <title>Die Spaltenüberschriften der Tabelle</title>
 
-          <para>Sie können einige Einträge für die Konten ändern, indem Sie mit
-            <keycombo action="click">
-              <mousebutton>Button1</mousebutton>
-            </keycombo>
-            die entsprechende Eintrag in der Spalte auswählen und anschließend mit
-            <keycombo action="click">
-              <mousebutton>Button1</mousebutton>
-            </keycombo>
-            in die Zelle klicken die Sie bearbeiten wollen.
-            <footnote>
-              <para>Die Maustasten werden neutral mit <emphasis>Button1</emphasis> und <emphasis>Button2</emphasis>
-                bezeichnet. Bei vielen Benutzern entspricht <emphasis>Button1</emphasis> der linken
-                und <emphasis>Button2</emphasis> der rechten Maustaste. Dies kann durch den Anwender
-                in den Einstellungen des Betriebssystems den Bedürfnissen angepasst werden.
-              </para>
-            </footnote>
+          <para>Sie können einige Einträge für die Konten ändern, indem Sie den entsprechenden Eintrag in der
+            Spalte auswählen und anschließend in die Zelle klicken die Sie bearbeiten wollen.
           </para>
 
           <varlistentry>
@@ -829,7 +828,7 @@
             <term><guilabel>Kontoart</guilabel></term>
 
             <listitem>
-              <para>Dies Einträge in dieser Spalte dienen Ihrer Information und können nicht geändert werden.
+              <para>Die Einträge in dieser Spalte dienen Ihrer Information und können nicht geändert werden.
               </para>
             </listitem>
           </varlistentry>
@@ -1228,142 +1227,18 @@
         <orderedlist spacing="compact">
           <listitem>
             <para>&app; bedient sich eines externen Tools zum Abrufen von Online-Kursen. Dieses Tool ist ein
-              Perl-Modul namens &app-fq; und muss unabhängig von &app; auf Ihrem Computer
+              &app-perl;-Modul namens &app-fq; und muss zusätzlich zu &app; auf Ihrem Computer
               installiert werden.
             </para>
-<!-- FIXME source: replace the link to the new place, show below -->
+
             <tip>
-              <para>Die Installation wird in den
-                <ulink url="&url-docs-build-de;guide/invest-stockprice1.html#invest-stockprice-auto2">&app;
-                Tutorial und Konzepte</ulink> beschrieben.
+              <para>Die Installation wird in
+<!-- <xref linkend="suggest-online-price" /> -->
+                detailiert beschrieben.
               </para>
             </tip>
-<!-- FIXME source: Find a proper place, e.g. "Customizing GnuCash". The installation of F::Q is also described in the guide. -->
-<!-- 
-            <para>&app; bedient sich eines externen Tools zum Abrufen von Online-Kursen. Dieses Tool ist ein
-              Perl-Modul namens &app-fq; und muss unabhängig von &app; auf Ihrem Computer
-              installiert werden.
-              Als erster Schritt zur Benutzung der Online-
-              Preisaktualisierung sollte daher sein, sicherzustellen, dass sowohl <application>Perl</application> als auch
-              &app-fq; korrekt installiert sind. 
-            </para>
-            <para> Um zu prüfen ob die technischen Vorraussetzungen zur Verwendung
-              von &app-fq; gegeben sind, öffnen Sie hierzu bitte ein Terminalfenster und geben den
-              Befehl <prompt>></prompt> <userinput>perl - -version</userinput> ein. Im Ausgabefenster
-              sollte jetzt ein Hinweis auf die installierte <application>Perl</application>- Version
-              erscheinen. Ist dies erfolgreich verlaufen sollten Sie herausfinden, ob das Perl-Modul &app-fq; bereits auf Ihrem
-              System installiert ist, geben Sie <command>perldoc Finance::Quote</command> in ein
-              Terminalfenster ein, um zu prüfen, ob eine Dokumentation vorhanden ist. Wenn die
-              Dokumentation angezeigt wird, dann ist das Modul installiert, ansonsten nicht.
-              
-            </para>
-
-            <para>Die Installation von &app-fq; unterscheidet sich von einem
-              Betriebssystem zum anderen. Für die verschiedenen unterstützten Systeme, können Sie
-              die folgenden Anweisungen befolgen:
-            </para>
-            <variablelist spacing="compact">
-              <varlistentry>
-                <term>&lin;</term>
-
-                <listitem>
-                  <para>Die meisten &lin;-Distributionen (wie Fedora, openSuse, Mandriva, Ubuntu, und so weiter) haben in
-                    ihren Software-Repositorien ein Paket für das Perl-Modul
-                    &app-fq;. Die Aktualität ihrer Distribution können Sie unter <ulink url="https://repology.org/project/perl:finance-quote/versions"><citetitle>&app-fq;- Versionen</citetitle></ulink> nachlesen. In den meisten Fällen können Sie
-                    also einfach Ihren bevorzugten Paketmanager verwenden, um das Modul zu
-                    installieren. Der Name des Pakets kann von einer Distribution zur anderen
-                    variieren. Es heißt oft in etwa wie <command>perl-Finance-Quote</command>.
-                  </para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term>&win;</term>
-
-                <listitem>
-                  <para>&app-fq; unter &win; erfordert, dass Perl bereits installiert
-                    ist. Wenn das nicht bereits erfolgt ist, können Sie z.B. Strawberry Perl
-                    installieren.
-                    <footnote>
-                      <para>Bis &app; Version 2.4 wurde stattdessen ActivePerl verwendet. Falls dies noch bei Ihnen installiert
-                        ist, sollten sie es ersetzen.
-                      </para>
-                    </footnote>
-                  </para>
-
-                  <para>Das &win;-Installationsprogramm von der <ulink url="&url-www;download.phtm">&app; Homepage</ulink>
-                    wird mit einem kleinen Hilfsprogramm geliefert, das
-                    &app-fq; für Sie installiert. Sie finden es im
-                    Startmenü in der &app; Gruppe und heißt <quote>Online-Preisabfrage
-                    installieren</quote>.
-                  </para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term>&mac;</term>
-
-                <listitem>
-                  <para>Wenn Sie &app; mit Hilfe des Installationsprogramms auf der &app; Homepage installiert haben, ist
-                    &app-fq; bereits installiert.
-                  </para>
-                </listitem>
-              </varlistentry>
-
-              <varlistentry>
-                <term></term>
-
-                <listitem>
-                  <para>Trifft keine der obigen Anleitungen auf Ihre Umgebung zu, so können Sie die folgende alternative,
-                    allgemeinere Anweisungen probiern:
-                  </para>
-
-                  <orderedlist spacing="compact">
-                    <listitem>
-                      <para>Schließen Sie alle &app;-Anwendungen, die Sie gerade ausführen.
-                      </para>
-                    </listitem>
-
-                    <listitem>
-                      <para>Lokalisieren Sie den Ordner, in dem &app; installiert ist, indem Sie nach
-                        <command>gnc-fq-update</command> suchen.
-                      </para>
-                    </listitem>
-
-                    <listitem>
-                      <para>Wechseln Sie in dieses Verzeichnis, öffnen Sie eine Root-Shell und führen Sie den Befehl
-                        <command>gnc-fq-update</command> aus. Dadurch wird eine Perl
-                        CPAN-Update-Sitzung gestartet, die ins Internet geht und das Modul
-                        &app-fq; und seine Abhängigkeiten auf
-                        Ihrem System installiert. Das Programm
-                        <command>gnc-fq-update</command> ist interaktiv, bei den meisten
-                        Systemen sollten Sie jedoch die erste Frage mit <userinput>Ja</userinput>
-                        beantworten können: <quote>Möchten Sie so viel wie möglich automatisch konfigurieren? [ja]</quote> und die Aktualisierung wird von diesem Punkt an
-                        selbstständig ablaufen.
-                      </para>
-                    </listitem>
-                  </orderedlist>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-
-            <para>Nachdem die Installation abgeschlossen ist, sollten Sie das Testprogramm
-              <command>gnc-fq-check</command>, das mit &app; verteilt wird, im gleichen Verzeichnis
-              ausführen, um zu testen, ob &app-fq; installiert ist
-              und richtig funktioniert.
-            </para>
-
-            <note>
-              <para>Wenn Sie sich bei der Durchführung eines dieser Schritte nicht sicher fühlen, senden Sie bitte
-                ihre Frage entweder per E-Mail an die deutschsprachige &app;-user Mailingliste
-                (<email>gnucash-de at gnucash.org</email>) oder besuchen Sie den &app; IRC-Kanal auf
-                irc.gnome.org. Weitere Informationen finden Sie z.B. in den &app; Wiki FAQ
-                <ulink url="&url-wiki-faq-quot;" />. Sie können diesen Schritt auch weglassen und
-                Ihre Aktienkurse manuell aktualisieren.
-              </para>
-            </note> -->
           </listitem>
-
+<!-- FIXME source: Delete some sections referring to F::Q -->
           <listitem>
             <para>Legen Sie das Konto für den Investmentfonds bzw. die Aktie an und stellen Sie sicher, dass das
               gewünschte Papier im Feld <guilabel>Wertpapier/Währung</guilabel>, wie oben
@@ -1528,47 +1403,7 @@ and update the appendix. -->
             </para>
           </listitem>
         </orderedlist>
-<!-- FIXME source: Move to the new place, e.g. "Customizing GnuCash". -->
-<!--           <para>Wenn Sie die Kurse per Kommandozeile abrufen wollen, können Sie dazu den Befehl
-          <command>gnucash-cli - -quotes get
-          <replaceable><optional>/pfad/zur/</optional>gnucash-datei</replaceable></command> benutzen
-          und die Kurs werden direkt in ihre &app;-Datendatei geschreiben.
-          <footnote>
-            <para>In &app; Versionen vor 4.0 wurde für die Aktualisierung der Wertpapiere das Kommando
-              <command>gnucash - -add-price-quotes
-              <replaceable><optional>/pfad/zur/</optional>gnucash-datei</replaceable></command>
-              verwendet.
-            </para>
-          </footnote>
-        </para>
-
-        <para>Die Dateibezeichnung <command><replaceable>gnucash-datei</replaceable></command> ist abhängig von
-          dem Namen und dem Speicherort Ihrer Datendatei. Dies lässt sich anhand des Namens
-          feststellen, der im oberen Rahmen des &app; Fensters vor dem <quote>-</quote> angezeigt
-          wird. Der Dateiname ist auch unter <guimenu>Datei</guimenu> in der Liste der zuletzt
-          geöffneten Dateien zu finden; der erste Eintrag mit der Nummer 1 ist der Name der aktuell
-          verwendeten Datei.
-        </para>
-
-        <para>Der Kursabruf kann in &mac; automatisiert werden, indem ein crontab-Eintrag erstellt wird. Um Ihre
-          Datei zum Beispiel jeden Freitag Abend (18:00 Uhr) nach Börsenschluss zu aktualisieren
-          (passen Sie die Zeit entsprechend Ihrer Zeitzone an), könnten Sie Folgendes zu Ihrer
-          persönlichen crontab hinzufügen:
-        </para>
-
-        <para><code language="cron">0 18 * * 5 <optional>/pfad/zu/</optional>gnucash-cli - -quotes get
-          <optional>/pfad/zur/</optional>gnucash-datei > /dev/null 2>&1</code>
-        </para>
-
-        <para>Damit der Kursabruf unter &lin; auch ohne Desktop-Manager, z.B. bei einem Fernzugriff per ssh,
-          funktioniert, muss sichergestellt sein, dass dbus gestartet ist. Das Gleiche trifft auf
-          den per Cron gesteuerten Kursabruf zu. Der Eintrag in der crontab laut dann:
-        </para>
-
-        <para><code language="cron">0 18 * * 5 env `dbus-launch` sh -c 'trap "kill $DBUS_SESSION_BUS_PID" EXIT;
-          <optional>/pfad/zu/</optional>gnucash-cli - -quotes get
-          <optional>/pfad/zur/</optional>gnucash-datei > /dev/null 2>&1'</code>
-        </para> -->
+<!-- FIXME source: Delete some sections referring to F::Q -->
         <para>Denken Sie daran, dass die <quote>Kurse</quote> von Investmentfonds in Wirklichkeit der
           <quote>Nettoanteilswert</quote> ist. und erst mehrere Stunden nach Börsenschluss
           verfügbar sind. Wenn die <quote>Kurse</quote> aktualisiert werden, bevor die
@@ -2157,7 +1992,7 @@ and update the appendix. -->
       verschiedene &app; Funktionen, die die Eingabe und Aktualisierung von Kontoinformationen
       während des Abgleichs erleichtern.
     </para>
-<!-- FIXME source: new description -->
+<!-- FIXME source: (Bug 797950) new description -->
     <note>
       <para>Wenn Sie ein Konto vom Typ <guilabel>Kreditkarte</guilabel> anhand einer Kreditkartenabrechnung
         abgleichen, haben Sie die Möglichkeit, mit Hilfe des sich automatisch öffnenden
@@ -2469,4 +2304,555 @@ and update the appendix. -->
       </para>
     </sect2>
   </sect1>
+
+  <sect1 id="acct-import">
+    <title>Importieren von Konten</title>
+
+    <para>Dieser Assistent wird Sie dabei unterstützen, Konten aus einer CSV-Datei zu importieren. Die Datei
+      muss im dem gleichen Format vorliegen wie das, welches von GnuCash beim CSV Export erstellt
+      wird, da es sich um ein festes Format handelt. Falls ein Konto mit der
+      <guilabel>vollständigen Kontobezeichnung</guilabel> bisher nicht existiert, wird es erstellt,
+      sofern die Währung oder das Wertpapier, in dem es notiert wird, bereits im Programm oder
+      Ihrer &app;-Datei definiert ist.
+      <note>
+        <para>Eine weitere Möglichkeit, Konten zu importieren, bietet der Assistent für das
+          <xref linkend="trans-import-qif" />. Im Zuge diese Importvorgangs werden ebenfalls Konten
+          in Ihre &app;-Datendatei importiert.
+        </para>
+      </note>
+
+      <itemizedlist spacing="compact">
+        <para>Falls das Konto bereits existiert, werden diese vier Felder aktualisiert:
+        </para>
+
+        <listitem>
+          <para>Kontonummer
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>Beschreibung
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>Bemerkungen
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>Farbe
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    <figure pgwide="1">
+      <title>Assistent für den Import von Konten im CSV-Format</title><screenshot id="accounts-import-csv-wizard">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/AccountTree_Import_CSV.png" srccredit="Christian Wehling" width="&img-w;" />
+          </imageobject>
+
+          <imageobject role="fo">
+            <imagedata fileref="figures/AccountTree_Import_CSV.png" srccredit="Christian Wehling" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
+
+    <xi:include href="Help_para-assist-intro.xml"/>
+
+    <procedure>
+      <title>Schritte des CSV-Importprozesses</title>
+
+      <para>Die Funktion der Steuerelemente jedes Schritts sind nachstehend beschrieben. Sie werden aber auch
+        als Tooltip im Assistenten angezeigt.
+      </para>
+
+      <step>
+        <title><guilabel>Konten-Import-Assistent</guilabel></title>
+
+        <para>Übersichtsseite mit einer kurzen Erklärung hinsichtlich der Anforderungen an die zu importierende
+          CSV-Datei.
+        </para>
+      </step>
+
+      <step>
+        <title><guilabel>Wählen Sie die zu importierende Datei</guilabel></title>
+
+        <para>Navigieren Sie zu der Datei die Sie importieren möchten und wählen Sie diese aus.
+        </para>
+      </step>
+
+      <step>
+        <title><guilabel>Kontenimport-Vorschau der ersten 10 Zeilen</guilabel></title>
+
+        <para>Das Fenster <guilabel>Kontenimport-Vorschau</guilabel> steuert die Einstelloptionen für den Import
+          von CSV-Dateien und bietet eine Vorschau der zu importierenden Konten.
+        </para>
+
+        <figure pgwide="1">
+          <title>Der CSV Import Vorschau Bereich</title><screenshot id="accounts-import-csv-preview">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata  fileref="figures/AccountTree_Import_CSV_Preview.png" srccredit="Christian Wehling" width="&img-w;" />
+              </imageobject>
+
+              <imageobject role="fo">
+                <imagedata  fileref="figures/AccountTree_Import_CSV_Preview.png" srccredit="Christian Wehling" />
+              </imageobject>
+
+              <caption>
+                <para>Das Vorschaufenster für den CSV-Import mit Einstellungen zum Importieren der angezeigten Konten.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
+
+        <substeps>
+          <step>
+            <title><guilabel>Anzahl der Kopfzeilen</guilabel></title>
+
+            <para>Dieses Feld definiert die Anzahl der Ãœberschriftzeilen in der Datei. In der Vorschau werden,
+              entsprechend Ihrer Eingabe, die Zeilen farbig hinterlegt, die Sie als Ãœberschrift
+              gekennzeichnet haben und somit nicht importiert werden.
+            </para>
+          </step>
+
+          <step>
+            <title><guilabel>Wählen Sie das Trennzeichen</guilabel></title>
+
+            <para>Mit diesen Optionsfeldern können Sie auswählen, mit welchem Spaltentrenner Ihre Daten separiert
+              sind:
+            </para>
+
+            <substeps>
+              <step>
+                <title><guilabel>Komma (,)</guilabel></title>
+
+                <para>Das <keycap>,</keycap> sollte im deutschen Sprachraum nicht als Spaltentrennzeichen verwendet
+                  werden, es sei denn, der Punkt dient als Dezimaltrennzeichen in der Datei.
+                </para>
+              </step>
+
+              <step>
+                <title><guilabel>Semikolon (;)</guilabel></title>
+
+                <para>Wählen Sie ein <keycap>;</keycap> um die Spalten zu trennen, wenn das Komma als Dezimaltrennzeichen
+                  verwendet wird.
+                </para>
+              </step>
+
+              <step>
+                <title><guilabel>Doppelpunkt (:)</guilabel></title>
+
+                <para>Verwenden Sie einen <keycap>:</keycap> als Spaltentrennzeichen. Wird gerne von GNU-Programmen
+                  verwendet.
+                </para>
+              </step>
+
+              <step>
+                <title><guilabel>Benutzerdefinierter regulärer Ausdruck</guilabel></title>
+
+                <para>Mit Auswahl dieser Option öffnet sich ein kleines Eingabefenster in dem Sie einen <quote>regulären
+                  Ausdruck</quote>
+                  <footnote>
+                    <para>Für weitere Informationen können Sie den Artikel
+                      <ulink url="https://de.wikipedia.org/wiki/Regul%C3%A4rer_Ausdruck">Regulärer
+                      Ausdruck</ulink> im Wikipedia lesen.
+                    </para>
+                  </footnote>
+                  , auch als <foreignphrase><abbrev>RegEx</abbrev></foreignphrase> bekannt, eingeben
+                  können.
+                </para>
+              </step>
+            </substeps>
+          </step>
+
+          <step>
+            <title><guilabel>Vorschau</guilabel></title>
+
+            <para>In dem großen mittleren Bereich wird eine Vorschau auf die ersten 10 Zeilen der zuvor ausgewählten
+              Importdatei angezeigt. Hier können Sie gut überprüfen, ob Sie die richtige Datei
+              ausgewählt und das richtige Spaltentrennzeichen gewählt haben.
+            </para>
+
+            <tip>
+              <para>Wenn in der <guilabel>Vorschau</guilabel> keine Daten angezeigt werden oder die Darstellung nicht
+                Ihren Vorstellungen entspricht, dann probieren Sie einfach andere
+                <guilabel>Trennzeichen</guilabel> aus.
+              </para>
+            </tip>
+          </step>
+
+          <step>
+            <title><guilabel>Spaltenüberschriften</guilabel></title>
+
+            <para>Der Aufbau der zu importierenden Datei ist seitens &app; vorgeschrieben und kann nicht konfiguriert
+              werden. Aus dem Grund müssen, für einen erfolgreichen Import der Kontenstruktur, die
+              Inhalte in den einzelnen Spalten der CSV-Datei der Reihenfolge wie nachfolgend
+              aufgelistet entsprechen. Die Bedeutung der einzelnen Felder ist ausführlich in
+              <xref linkend="gen-info"/> erklärt.
+            </para>
+
+            <orderedlist spacing="compact">
+              <listitem>
+                <para><guilabel>Kontoart</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Volle Kontobezeichnung</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Kontobezeichnung</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Kontonummer</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Beschreibung</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Kontofarbe</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Bemerkungen</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Symbol</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Namensraum</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Versteckt</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Steuerrelevante Information</guilabel>
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Platzhalter</guilabel>
+                </para>
+              </listitem>
+            </orderedlist>
+          </step>
+        </substeps>
+      </step>
+
+      <step>
+        <title><guilabel>Konten jetzt importieren</guilabel></title>
+
+        <para>Der Dateiname und Pfad der zu importierenden Datei wird angezeigt. Um die Kontenstruktur jetzt
+          endgültig zu importieren betätigen Sie die <guibutton>Anwenden</guibutton>
+          Schaltfläche.
+        </para>
+
+        <para>Nach einer kurzen Zeit, in der die Daten verarbeitet werden, öffnet sich der Dialog
+          <guilabel>Buch-Optionen für neues Buch</guilabel>. Sie können jetzt einige Einstellungen
+          für das Buch vornehmen, siehe <xref linkend="book-options" />. Wenn Sie das nicht wollen
+          und stattdessen auf <guibutton>Abbrechen</guibutton> drücken, werden die Konten trotzdem
+          importiert.
+        </para>
+      </step>
+
+      <step>
+        <title><guilabel>Importübersicht</guilabel></title>
+
+        <para>Zeigt eine Zusammenfassung des Importvorgangs an. Diese besteht aus der Angabe, wieviele Konten
+          erfolgreich hinzugefügt und aktualisiert wurden, sowie ob Fehler aufgetreten sind
+          inklusive einer Auflistung der fehlerhaften Stellen mit Angabe der Zeilennummer in der
+          CSV-Datei.
+        </para>
+      </step>
+    </procedure>
+  </sect1>
+
+  <sect1 id="acct-export">
+    <title>Exportieren von Konten</title>
+
+    <itemizedlist spacing="compact">
+      <para>Wenn Sie den Bedarf haben, Ihre &app;-Konten zu exportieren, so haben Sie hierzu die Auswahl
+        zwischen zwei unterschiedlichen Exportformaten:
+      </para>
+
+      <listitem>
+        <para>XML-Format oder auch Datenbankformate. Welche Datenbank-Schnittstelle zur Verfügung steht, hängt
+          von den bei Ihnen installierten Systemen ab. &app; unterstützt z.B.
+          <acronym>SQLite3</acronym>, <acronym>mysql</acronym> und <acronym>postgres</acronym>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>CSV-Format als gängiges Austausch-Format für Tabellen.
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para>&app; wird bei beiden Verfahren jeweils die vollständige Kontenstruktur ohne weiter Inhalte, wie
+      z.B. Buchungsdaten und Kontenstände oder auch Kunden, Lieferanten, Budgets sowie terminierte
+      Buchungen, exportieren.
+    </para>
+
+    <sect2 id="acct-export-xml">
+      <title>Konten in ein neues &appname;-Buch exportieren</title>
+
+      <para>Mit dem Menüpunkt
+        <menuchoice>
+          <guimenu><accel>D</accel>atei</guimenu><guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem><accel>K</accel>onten
+          exportieren</guimenuitem>
+        </menuchoice>
+        können Sie Ihre vollständige &app;-Kontenhierarchie in eine <acronym>XML</acronym>- oder
+        <acronym>SQLite3</acronym>-Datei oder auch in eine Datenbank exportieren. Mit dieser
+        Funktion haben Sie die Möglichkeit z.B. am Ende eines Jahres einen Buchabschluss
+        vorzunehmen und mit einer leeren &app;-Datei in das neue Jahr zu starten.
+      </para>
+
+      <para>Es wird der übliche Datei-Speichern-Dialog geöffnet, der im oberen Bereich ein Auswahlfeld für die
+        Datenausgabe im <guilabel>XML</guilabel> oder <guilabel>SQLite3</guilabel>-Format anbietet. Haben
+        Sie bereits konfigurierte Datenbank-Systeme installiert, so werden diese ebenfalls hier zur
+        Auswahl angeboten.
+      </para>
+
+      <table id="Account-Export-Dialog">
+        <title>Dialog zum Exportieren von Konten</title>
+
+        <tgroup align="left" cols="2">
+        <colspec colwidth="0.5*"/>
+        <colspec colwidth="0.5*"/>
+
+          <tbody>
+            <row valign="top">
+               <entry> 
+                <para><figure>
+                    <title>Exportieren in Datei</title><screenshot>
+                      <mediaobject>
+                        <imageobject>
+                          <imagedata fileref="figures/AccountTree_Export_file.png" 
+                         srccredit="Frank H. Ellenberger" width="100%"></imagedata>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
+                </para>
+              </entry>
+
+              <entry>
+                <para><figure>
+                    <title>Exportieren in Datenbank</title><screenshot>
+                      <mediaobject>
+                        <imageobject>
+                          <imagedata fileref="figures/AccountTree_Export_dbms.png" 
+                         srccredit="Frank H. Ellenberger" width="100%"></imagedata>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
+                </para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <variablelist spacing="compact">
+        <varlistentry>
+          <term><guilabel>XML</guilabel></term>
+
+          <term><guilabel>SQLite3</guilabel></term>
+
+          <listitem>
+            <para>In dem Dateiauswahldialog können Sie Angaben zu dem Dateinamen und zu dem Verzeichnis/Ordner, in
+              dem die Datei gespeichert werden soll, machen. Mit Betätigen der Schaltfläche
+              <guilabel>Speichern unter…</guilabel> wird die Datei geschrieben. Sie haben hierbei
+              keinen weiteren Einfluss auf das Ergebnis der Exportdatei.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><guilabel>mysql</guilabel></term>
+
+          <term><guilabel>postgres</guilabel></term>
+
+          <listitem>
+            <para>Die Ansicht des Dialogs ändert sich und es werden Eingabefelder für die Informationen zur
+              Datenbankverbindung abgefragt. Wenn Sie Ihre &app;-Daten in einem Datenbanksystem
+              speichern möchten, so benötigen Sie schreibenden Zugriff auf eine vorhandene
+              Datenbank oder die Berechtigung eine neue Datenbank anzulegen.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
+      <para>Die exportierte Datei kann über
+        <menuchoice>
+          <guimenu><accel>D</accel>atei</guimenu><guimenuitem>Ö<accel>f</accel>fnen</guimenuitem>
+        </menuchoice>
+        in &app; geöffnet werden. Sie müssen dann noch für alle Konten manuell die
+        Anfangsbestände eintragen.
+        <tip>
+          <para>Öffnen sie hierfür z.B. eine 2. Instanz von &app;, um die Schlussbilanz der alten Datei als
+            Anfangsbestand in die neue Datei zu übertragen.
+          </para>
+        </tip>
+      </para>
+    </sect2>
+
+    <sect2 id="acct-export-csv">
+      <title>Konten als CSV exportieren</title>
+
+      <para>&app; ermöglicht den Export Ihrer Kontenhierarchie im <acronym>CSV</acronym>-Format, wobei Sie das
+        Spaltentrennzeichen an Ihre Bedürfnisse anpassen können. Dies kann sinnvoll sein, um in
+        einer anderen Anwendung, wie z.B. dem leider nicht mehr gepflegten &app-gfa;, dieselbe
+        Kontenstruktur zur Verfügung zu haben.
+      </para>
+
+      <para>Hierzu wählen Sie im Menü
+        <menuchoice>
+          <guimenu><accel>D</accel>atei</guimenu><guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem>Konten<accel>h</accel>ierarchie
+          nach CSV exportieren…</guimenuitem>
+        </menuchoice>
+        und es öffnet sich ein Dialog für die <guilabel>Export-Einstellungen</guilabel>.
+      </para>
+
+      <figure pgwide="1">
+        <title>Assistent für den Export der Kontenhierarchie im CSV-Format</title><screenshot id="accounts-export-wizard">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/AccountTree_Export_CSV.png" srccredit="Christian Wehling" width="&img-w;" />
+            </imageobject>
+
+            <imageobject role="fo">
+              <imagedata fileref="figures/AccountTree_Export_CSV.png" srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
+      <xi:include href="Help_para-assist-intro.xml"/>
+
+      <procedure>
+        <title>Schritte des Exportdialogs</title>
+
+        <para>Die Funktion der Steuerelemente jedes Schritts sind nachstehend beschrieben bzw. werden als Tooltip
+          in dem Assistenten angezeigt.
+        </para>
+
+        <step>
+          <title><guilabel>Export-Einstellungen</guilabel></title>
+
+          <para>In diesem Schritt können Sie verschiedene Vorgaben für die Formatierung der zu exportierenden
+            Konten machen.
+          </para>
+
+          <substeps>
+            <step>
+              <title><guilabel>Optionen</guilabel></title>
+
+              <para>Dieses Kontrollkästchen kann zusätzlich zu dem <guilabel>Trennzeichen</guilabel> verwendet werden:
+              </para>
+
+              <substeps>
+                <step>
+                  <title><guilabel>Anführungszeichen verwenden</guilabel></title>
+
+                  <para>Umgibt jedes Datenfeld mit Anführungszeichen.
+                  </para>
+                </step>
+              </substeps>
+            </step>
+
+            <step>
+              <title><guilabel>Trennzeichen</guilabel></title>
+
+              <para>Mit diesen Optionsfeldern können Sie auswählen, mit welchem Spaltentrenner Ihre Daten separiert
+                sind:
+              </para>
+
+              <substeps>
+                <step>
+                  <title><guilabel>Komma (,)</guilabel></title>
+
+                  <para>Das <keycap>,</keycap> sollte im deutschen Sprachraum nicht als Spaltentrennzeichen verwendet
+                    werden, es sei denn, der Punkt dient als Dezimaltrennzeichen in der Datei.
+                  </para>
+                </step>
+
+                <step>
+                  <title><guilabel>Semikolon (;)</guilabel></title>
+
+                  <para>Wählen Sie ein <keycap>;</keycap> um die Spalten zu trennen, wenn das Komma als Dezimaltrennzeichen
+                    verwendet wird.
+                  </para>
+                </step>
+
+                <step>
+                  <title><guilabel>Doppelpunkt (:)</guilabel></title>
+
+                  <para>Verwenden Sie einen <keycap>:</keycap> als Spaltentrennzeichen. Wird gerne von GNU-Programmen
+                    verwendet.
+                  </para>
+                </step>
+
+                <step>
+                  <title><guilabel>Benutzerdefiniert</guilabel></title>
+
+                  <para>Verwenden Sie beliebige Zeichen zur Trennung der Spalten, indem Sie diese in das Textfeld eingeben.
+                  </para>
+                </step>
+              </substeps>
+            </step>
+          </substeps>
+        </step>
+
+        <step>
+          <title><guilabel>Wählen Sie einen Dateinamen für den Export</guilabel></title>
+
+          <para>Es wird ein Dateiauswahldialog, zur Angabe eines Dateinamens und eines Pfades zu dem
+            Verzeichnis/Ordner, in dem die Datei gespeichert werden soll, angezeigt.
+          </para>
+        </step>
+
+        <step>
+          <title><guilabel>Datei jetzt exportieren…</guilabel></title>
+
+          <para>Der Dateiname und Pfad der zu exportierenden Datei und die Anzahl der zu exportierenden Konten wird
+            angezeigt. Um den Export fortzusetzen betätigen Sie die <guibutton>Anwenden</guibutton>
+            Schaltfläche.
+          </para>
+        </step>
+
+        <step>
+          <title><guilabel>Exportzusammenfassung</guilabel></title>
+
+          <para>Zeigt eine Meldung an, wenn die Datei erfolgreich exportiert wurde, oder eine Fehlermeldung mit
+            Hinweisen warum er gescheitert ist.
+          </para>
+        </step>
+      </procedure>
+    </sect2>
+  </sect1>
 </chapter>
diff --git a/help/de/Help_para-assist-intro.xml b/help/de/Help_para-assist-intro.xml
new file mode 100644
index 00000000..32988498
--- /dev/null
+++ b/help/de/Help_para-assist-intro.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE variablelist SYSTEM "gnc-docbookx.dtd">
+<variablelist spacing="compact">
+  <title>Dialogführung</title>
+
+  <para>Im linken Fensterbereich sind die einzelnen Schritte des Assistenten aufgelistet. Erläuternder Text
+    und die Bedienelemente zum Durchführen des jeweiligen Schritts werden im rechten Fensterbereich
+    angezeigt.
+  </para>
+<note><para>Die Schaltflächen befinden sich normalerweise im <quote>Aktionsbereich</quote> an der Unterkante des Dialogs. Bei einigen Fenstermanagern werden sie in die Titelleiste integriert.</para></note>
+  <important>
+    <para>Die nachfolgend beschriebenen Schaltflächen werden immer erst dann aktiviert, wenn die Navigation vom
+      aktuellen Schritt zum Zielschritt gültig ist. D.h. solange nicht alle notwendigen Angaben
+      gemacht sind, sind manche Schaltflächen deaktiviert.
+    </para>
+  </important>
+
+  <varlistentry>
+    <term><guibutton><accel>A</accel>bbrechen</guibutton> oder <keycap>ESC</keycap></term>
+
+    <listitem>
+      <para>Beendet den Assistenten, ohne Änderungen an Ihren Daten oder, bei Exporten, dem Dateisystem vorzunehmen.
+      </para>
+          <warning>
+            <para>Wenn Sie auf diese Schaltfläche klicken, gehen alle Änderungen, die Sie bis zu diesem Punkt
+              in den Assistenten eingetragen haben, verloren.
+            </para>
+          </warning>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><guibutton><accel>Z</accel>urück</guibutton></term>
+
+    <listitem>
+      <para>Geht zum vorherigen Schritt. Stehen Sie noch im ersten Schritt des Assistenten ist das
+        gleichbedeutend mit <guilabel>Abbrechen</guilabel>.
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><guibutton><accel>W</accel>eiter</guibutton></term>
+
+    <listitem>
+      <para>Geht zum nächsten Schritt.
+      <note><para>Sind Sie im letzten Schritt, dann wird stattdessen die Schaltfläche <guibutton>An<accel>w</accel>enden</guibutton> eingeblendet.</para></note>
+      </para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><guibutton>An<accel>w</accel>enden</guibutton></term>
+
+    <listitem>
+      <para>Haben Sie alle notwendigen Daten in dem Assistenten eingegeben, wird im letzten Schritt die
+        Schaltfläche <guilabel>Anwenden</guilabel> an Stelle von <guilabel>Weiter</guilabel> eingeblendet. Erst wenn Sie diese Schaltfläche
+        betätigen werden Ihre Eingaben verarbeitet und die Daten modifiziert.
+      </para>
+    </listitem>
+  </varlistentry>
+</variablelist>
diff --git a/help/de/Makefile.am b/help/de/Makefile.am
index 99ee79bd..71afe76d 100644
--- a/help/de/Makefile.am
+++ b/help/de/Makefile.am
@@ -17,6 +17,7 @@ entities = \
 	Help_legal.xml \
 	Help_chartofaccts.xml \
 	Help_chtacctseg.xml \
+	Help_para-assist-intro.xml \
 	Help_txf-categories.xml \
 	Help_tips-appendix.xml
 DISTCLEANFILES =  $(docname)-de.omf.out
diff --git a/help/de/figures/AccountTreeCreate.png b/help/de/figures/AccountTreeCreate.png
new file mode 100644
index 00000000..9fe8b314
Binary files /dev/null and b/help/de/figures/AccountTreeCreate.png differ
diff --git a/help/de/figures/AccountTree_Export_CSV.png b/help/de/figures/AccountTree_Export_CSV.png
new file mode 100644
index 00000000..af0e9865
Binary files /dev/null and b/help/de/figures/AccountTree_Export_CSV.png differ
diff --git a/help/de/figures/AccountTree_Export_dbms.png b/help/de/figures/AccountTree_Export_dbms.png
new file mode 100644
index 00000000..a5bbf529
Binary files /dev/null and b/help/de/figures/AccountTree_Export_dbms.png differ
diff --git a/help/de/figures/AccountTree_Export_file.png b/help/de/figures/AccountTree_Export_file.png
new file mode 100644
index 00000000..8e785e1f
Binary files /dev/null and b/help/de/figures/AccountTree_Export_file.png differ
diff --git a/help/de/figures/AccountTree_Import_CSV.png b/help/de/figures/AccountTree_Import_CSV.png
new file mode 100644
index 00000000..d9ba4d55
Binary files /dev/null and b/help/de/figures/AccountTree_Import_CSV.png differ
diff --git a/help/de/figures/AccountTree_Import_CSV_Preview.png b/help/de/figures/AccountTree_Import_CSV_Preview.png
new file mode 100644
index 00000000..fbf8eccd
Binary files /dev/null and b/help/de/figures/AccountTree_Import_CSV_Preview.png differ
diff --git a/help/de/figures/Help_AccountTreeCreate.png b/help/de/figures/Help_AccountTreeCreate.png
deleted file mode 100644
index 65cc0fe0..00000000
Binary files a/help/de/figures/Help_AccountTreeCreate.png and /dev/null differ

commit 7e4e560fee172a21c914f0b6f5e58e33f80b463f
Merge: 4183b55e 8276f1a8
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Sep 18 20:16:20 2021 +0200

    Merge branch 'PR_#192' into maint


commit 4183b55ef08252f7a0e5c239d9773cc7e914df88
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Sep 11 18:04:22 2021 +0200

    Remove some unresolved ID reference from Help-Files
    
    * id="Using-Help"
    * id="usage"

diff --git a/help/C/Help_ch_GUIMenus.xml b/help/C/Help_ch_GUIMenus.xml
index 0afed6e8..3cda5e2d 100644
--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml
@@ -1471,7 +1471,7 @@
       </sect3>
 
       <sect3 id="AccTree-business-menu">
-        <title id="usage">Account Tree - <guimenu><accel>B</accel>usiness</guimenu> Menu</title>
+        <title>Account Tree - <guimenu><accel>B</accel>usiness</guimenu> Menu</title>
 
         <table frame="topbot" id="AccTree-BusinessMenu">
           <title>Account Tree - Business-Menu - Access small business features of &app;.</title>
diff --git a/help/C/Help_ch_GettingHelp.xml b/help/C/Help_ch_GettingHelp.xml
index a8e821f8..d35ae394 100644
--- a/help/C/Help_ch_GettingHelp.xml
+++ b/help/C/Help_ch_GettingHelp.xml
@@ -18,7 +18,7 @@
                (translators put your name and email here)
 -->
 <chapter id="Getting-Help">
-  <title id="Using-Help">Using This Document & Getting Help</title>
+  <title>Using This Document & Getting Help</title>
 
   <para>This document is organized in two dimensions:
     <itemizedlist>
diff --git a/help/de/Help_ch_GUIMenus.xml b/help/de/Help_ch_GUIMenus.xml
index bddbcd4c..60e40904 100644
--- a/help/de/Help_ch_GUIMenus.xml
+++ b/help/de/Help_ch_GUIMenus.xml
@@ -1580,7 +1580,7 @@
       </sect3>
 
       <sect3 id="AccTree-business-menu">
-        <title id="usage">Kontenübersicht - <guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
+        <title>Kontenübersicht - <guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
 
         <table frame="topbot" id="AccTree-BusinessMenu">
           <title>Kontenübersicht - Geschäft-Menü - &app;-Funktionen für Kleinunternehmen</title>
diff --git a/help/de/Help_ch_GettingHelp.xml b/help/de/Help_ch_GettingHelp.xml
index e1fc5939..e09990d2 100644
--- a/help/de/Help_ch_GettingHelp.xml
+++ b/help/de/Help_ch_GettingHelp.xml
@@ -18,7 +18,7 @@
                Christian Wehling <christian.wehling at web.de>
 -->
 <chapter id="Getting-Help">
-  <title id="Using-Help">Dieses Dokument verwenden und Hilfe erhalten</title>
+  <title>Dieses Dokument verwenden und Hilfe erhalten</title>
 
   <para>Dieses Dokument ist in zwei Bereiche aufgeteilt:
     <itemizedlist>
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index 0296decc..6492ec0e 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -554,7 +554,7 @@
                (translators put your name and email here)
 -->
   <chapter id="Getting-Help">
-    <title id="Using-Help">Utilizzare questo documento e ottenere assistenza</title>
+    <title>Utilizzare questo documento e ottenere assistenza</title>
 
     <para>Questo documento è consultabile in due modi:
     </para>
@@ -2826,7 +2826,7 @@
         </sect3>
 
         <sect3 id="AccTree-business-menu">
-          <title id="usage">Struttura dei conti - Menu <guimenu>Impresa</guimenu></title>
+          <title>Struttura dei conti - Menu <guimenu>Impresa</guimenu></title>
 
           <table frame="topbot" id="AccTree-BusinessMenu">
             <title>Struttura dei conti - Menu <guimenu>Impresa</guimenu> - permette l’accesso alle funzioni di
diff --git a/help/pt/Help_ch_GUIMenus.xml b/help/pt/Help_ch_GUIMenus.xml
index 03aef292..e1074cbf 100644
--- a/help/pt/Help_ch_GUIMenus.xml
+++ b/help/pt/Help_ch_GUIMenus.xml
@@ -1372,7 +1372,7 @@
       </sect3>
 
       <sect3 id="AccTree-business-menu">
-        <title id="usage">Árvore de contas - menu <guimenu>Negócios</guimenu></title>
+        <title>Árvore de contas - menu <guimenu>Negócios</guimenu></title>
 
         <table frame="topbot" id="AccTree-BusinessMenu">
           <title>Árvore de contas - menu <guimenu>Negócios</guimenu> - acesso a funcionalidades do &app; para
diff --git a/help/pt/Help_ch_GettingHelp.xml b/help/pt/Help_ch_GettingHelp.xml
index d850ede6..f02f045e 100644
--- a/help/pt/Help_ch_GettingHelp.xml
+++ b/help/pt/Help_ch_GettingHelp.xml
@@ -19,7 +19,7 @@
   
 -->
 <chapter id="Getting-Help">
-  <title id="Using-Help">Usar este documento & Obter ajuda</title>
+  <title>Usar este documento & Obter ajuda</title>
 
   <para>Este documento está organizado em duas dimensões:
   </para>

commit 6bdee39fe4bb710492da31a073863f59989a6293
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Sep 9 23:55:15 2021 +0200

    Drop travis-ci in favour of github worflows

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6adc8e97..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Test
-sudo: required
-language: c++
-compiler: gcc
-env:
-    - BUILDENV=ubuntu-18.04 BUILDTYPE=autotools-make
-services:
-    - docker
-install:
-    - docker --version
-    - echo BUILDENV="$BUILDENV"
-    - docker build -f util/ci/${BUILDENV}-docker -t ${BUILDENV}-gnucashbuild util/ci
-script:
-    - echo BUILDTYPE="$BUILDTYPE"
-    - docker run -v "$(pwd)":/gnucash-docs:rw --env="BUILDTYPE=$BUILDTYPE" --rm ${BUILDENV}-gnucashbuild

commit 93ec8aa48f8df4d7acf9f40925260a2f66e22fb8
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Sep 9 22:46:37 2021 +0200

    Shrink .gitignore to autotools inserts
    
    For other purposes, users should use their personal
    "$XDG_CONFIG_HOME/git/ignore".
    $XDG_CONFIG_HOME defaults to "$HOME/.config".

diff --git a/.gitignore b/.gitignore
index 4ae155e2..30cfa985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,68 +1,18 @@
-*.bak
-*.fo
-*.gmo
-*.la
-*.lo
-*.omf.out
-*.orig
-*.pyc
-*.pyo
-*.schemas
-*~
-.*.marks
-.deps
-.libs
-.scm-links
-COPYING
-ChangeLog
-INSTALL
-Makefile
-Makefile.in
-TAGS
-aclocal.m4
-autom4te.cache
-build*
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-cscope.files
-cscope.out
-depcomp
-gnucash-*.*.*.tar.*
-gnucash-*.*.*/
-install-sh
-intl-scm/guile-strings.c
-intltool-extract
-intltool-extract.in
-intltool-merge
-intltool-merge.in
-intltool-update
-intltool-update.in
-libtool
-ltmain.sh
-make-gnucash-potfiles
-manifest.mf
-missing
-mkinstalldirs
-stamp-h1
-swig-*.c
-omf_timestamp
-*.spec
-*/*.html
-*/*/*/*.html
-*/*/*.html
-guide/ja/fop.xconf
-guide/*/gnucash-guide
-guide/*/gnc-docbookx.dtd
-help/*/gnucash-help
-help/*/gnc-docbookx.dtd
-/.settings/
-/.autotools
-/.cproject
-/.project
-/nbproject
+# We filter only autotools artefacts.
+# Use a separate build dirrectory!
+# For other purposes adjust "$XDG_CONFIG_HOME/git/ignore!
+
+#absolute:
+/COPYING
+/INSTALL
+/aclocal.m4
+/autom4te.cache/
+/config.guess
+/config.sub
+/configure
+/install-sh
+/ltmain.sh
+/missing
+
+#relative:
+Makefile.in
\ No newline at end of file

commit d637ab7dfe4ae99237e19aa7aeb382b81ae47497
Merge: 7593aee8 a53a0fd9
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Sep 9 20:25:52 2021 +0200

    Merge branch 'PR_#213' into maint


commit 7593aee801873dcae1db9700be6265bb418a883a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Sep 9 07:04:42 2021 +0200

    Remove obsolete appendixesalso from italian guide
    
    missed in PR #210

diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index ab80ab79..76f08e0e 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -1013,11 +1013,6 @@
             </para>
           </listitem>
 
-          <listitem>
-            <para><xref linkend="appendixc"/>
-            </para>
-          </listitem>
-
           <listitem>
             <para><xref linkend="appendixd"/>
             </para>
@@ -19000,469 +18995,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
         </para>
       </sect1>
     </appendix>
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-               (translators put your name and email here)
--->
-    <appendix id="appendixb">
-      <title>Domande poste frequentemente (FAQ)</title>
-
-      <para>Questo è un elenco delle domande poste nelle liste di discussione e per le quali non esiste una
-        sezione apposita nella documentazione.
-      </para>
-
-      <sect1 id="appendixb_info">
-        <title>Fonti di Informazione</title>
-
-        <sect2 id="appendixb_info_where">
-          <title>D: Dov’è la FAQ?</title>
-
-          <para>R: La stai leggendo! La versione più aggiornata è all’interno della
-            <ulink url="&url-wiki-faq;">Wiki di &app;</ulink>.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_info_mail">
-          <title>D: Ci sono delle liste di discussione dedicate a &app;?</title>
 
-          <para>R: Sì! qui: <ulink url="&url-mail-li;gnucash-user"/> e <ulink url="&url-mail-li;gnucash-devel"/>
-            per iscriverti.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_info_mailarchive">
-          <title>D: esiste la possibilità di cercare un argomento nell’archivio delle liste di discussione?</title>
-
-          <para>R: Sì, recati qui <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.devel"/> e qui
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.user"/> (anche qui
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.german"/> se conosci il
-            Tedesco).
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_info_other">
-          <title>D: Esistono altri mezzi per ottenere aiuto riguardo &app;?</title>
-
-          <para>R: Sì. La maggior parte dei programmatori si ritrovano su ICQ nella discussione #gnucash su
-            irc.gnome.org. È anche disponibile un wiki qui: <ulink url="&url-wiki;GnuCash"/>.
-          </para>
-        </sect2>
-      </sect1>
-
-      <sect1 id="appendixb_general">
-        <title>Informazioni generali</title>
-
-        <sect2 id="appendixb_software_windows">
-          <title>D: Posso usare &app; in ambiente &win;?</title>
-
-          <para>R: Sì. A partire dalla versione 2.2.0, &app; è disponibile anche per &win;.
-          </para>
-
-          <para>Altre opzioni correlate potrebbero essere coLinux, VMWare e un server-X basato su &win; che fa da
-            host per una sessione remota di &app;.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_general_hard2compile">
-          <title>D: Ho sentito dire che è troppo difficile compilare &app;!</title>
-
-          <para>R:Questo era probabilmente vero quando la versione 1.6.0 è stata rilasciata. Oggi non è più vero,
-            dato che quasi ogni distribuzione comprende già tutte le librerie necessarie (ad
-            eccezione di g-wrap, il che significa che di fatto manca <quote>una sola</quote>
-            libreria extra che deve essere installata prima di compilare &app;). Comunque,
-            normalmente le distribuzioni non installano i pacchetti di sviluppo delle librerie
-            necessarie, così potrebbe essere necessario avviare il programma di installazione della
-            distribuzione per impostarlo in modo da installare non solo i pacchetti delle librerie
-            ma anche i pacchetti di sviluppo (con suffisso <quote>-devel</quote>). In genere, è
-            stato puntualizzato che questo problema affligge diverse applicazioni
-            dell’ambiente Gnome e dipende dal fatto che non esiste niente di simile a un
-            <quote>unico enorme pacchetto di Gnome</quote>.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_general_batchmode">
-          <title>D: C’è un metodo automatico (non-interattivo) in &app;, per realizzare continuamente
-            rapporti, grafici ecc..?</title>
-
-          <para>R: No, per ora &app; funziona solo interattivamente.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_general_multuser">
-          <title>D: È possibile che più persone abbiano accesso allo stesso progetto in &app;?</title>
-
-          <para>R: È possibile che più persone possano accedere a un stesso progetto ma non contemporaneamente.
-          </para>
-
-          <para>Per creare un progetto multi-utente, tutte le persone devono avere accesso in lettura e scrittura
-            alla cartella contenente i dati (per leggere i file creati dagli altri e crearne di
-            nuovi). Un modo per farlo consiste nel creare un gruppo e assegnare la cartella al
-            gruppo creato con il codice 2775. Il <quote>2</quote> rappresenta l’attributo
-            setgid che copia i permessi a tutti i file.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_general_WhyC">
-          <title>D: Perché &app; è scritto in C?</title>
-
-          <para>R: Le funzionalità principali di &app; sono scritte in C, ma non dimentichiamo che la maggior parte
-            di queste sono accessibili tramite Guile (Scheme). Ci sono un sacco di ragioni per cui
-            &app; è stato scritto in C. La prima è storica, infatti &app; è nato nel 1996 (o
-            forse prima!) e la maggior parte dei compilatori OOP (C++, Java, Python) non erano
-            ancora maturi e sufficientemente standardizzati per la varietà di piattaforme presenti
-            a quel tempo, di conseguenza il C era l’unica scelta. Una seconda ragione è
-            rappresentata dal fatto che l’interfaccia grafica standard su cui si basa &app; è
-            GTK, che è scritta in C.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_general_rewrite">
-          <title>D: Perché non riscrivete &app; nel linguaggio pinco-pallino così che io possa contribuire più
-            facilmente?</title>
-
-          <para>R: La risposta più immediata è <quote>non lo faremo</quote>. Quella più lunga è anche più
-            complessa ma si conclude comunque con <quote>non lo faremo</quote>. &app; è un grosso
-            insieme di codice mantenuto da un piccolo gruppo di programmatori che conoscono bene i
-            linguaggi C e Scheme (Guile). Ad oggi, l’80% del codice è in C e circa il 13% in
-            Scheme/Lisp. Non c’è nessuna buona ragione che giustificherebbe la riscrittura di
-            una così grande quantità di codice in un nuovo linguaggio. Inoltre, creare dei
-            collegamenti a linguaggi più recenti quali Python e Ruby o (inserisci qui il nome del
-            tuo linguaggio preferito!) sarebbe un lavoro impegnativo, considerando che siamo già
-            piuttosto impegnati a mantenere ed evolvere il codice già esistente.
-          </para>
-
-          <para>Detto questo, &app; è un progetto open source e ognuno è libero di fare o contribuire come vuole.
-            Non aspettarti però un grande aiuto se la ragione del tuo cambio è dovuta solo alla
-            mancanza di voglia di imparare il C o Scheme. Inoltre, &app; aveva dei collegamenti a
-            SWIG (<ulink url="http://www.swig.org"/>) che sono state usate per alcune parti
-            programmate in perl. Stando ad una discussione, questi collegamenti a SWIG potrebbero
-            essere una strada per includere altri linguaggi in &app;, ma attualmente sono
-            inutilizzati e non supportati.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_general_newFeatures">
-          <title>D: Vorrei usare la funzione XYZ ma &app; non ce l’ha. Come posso fare?</title>
-
-          <para>R: Chiedi gentilmente. :-) Puoi presentare una richiesta qui <ulink url="&url-bug-start;"/>. Ricorda
-            di descrivere il più dettagliatamente possibile la caratteristica che vorresti vedere
-            implementata. Il trucco sta tutto nel riuscire a fornire più informazioni possibili ai
-            programmatori sulle caratteristiche della funzionalità da implementare. Se vuoi
-            accelerare lo sviluppo, considera la possibilità di effettuare una donazione come
-            descritto nella &app;Development.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_software_web">
-          <title>D: È disponibile un’interfaccia web in &app;?</title>
-
-          <para>R: No
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_software_security">
-          <title>D: Come posso proteggere i miei dati di &app; utilizzando CFS, e simili?</title>
-
-          <para>R: Senza risposta
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_software_contribute">
-          <title>D: Come posso contribuire al progetto &app;?</title>
-
-          <para>R: Stiamo organizzando un processo più formale ma per ora puoi iscriverti alla lista di discussione
-            raggiungibile all’indirizzo <ulink url="&url-mail-li;gnucash-user" /> e
-            <ulink url="&url-mail-li;gnucash-devel" /> e discutere con gli iscritti il modo in cui
-            puoi contribuire. Tieni però presente che &app; è costituito da una bella percentuale
-            di codice scritto in C e Scheme (vedi la domanda più sopra, <quote>Perché &app; è
-            scritto in C?</quote> se vuoi conoscerne i motivi). Se non ti senti di programmare con
-            questo linguaggio, puoi comunque contribuire in altro modo.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_software_bugs">
-          <title>D: Credo di aver trovato un bug. Come posso comunicarlo?</title>
-
-          <para>R: Prima di tutto, cerca di verificare che si tratti realmente di un bug e che non sia già stato
-            messo in evidenza in passato. Cerca nell’archivio delle liste di discussione (vedi
-            domanda più sopra). Poi passa a cercare in <ulink url="&url-bug-start;">&appname;
-            Bugzilla</ulink> database.
-          </para>
-
-          <para>Se sei convinto di aver trovato realmente un nuovo bug, puoi comunicarlo all’indirizzo
-            <ulink url="&url-bug-start;"/>. Per favore ricorda di descrivere il bug con il massimo
-            dettaglio possibile. Il trucco sta nel riuscire a fornire più informazioni possibili ai
-            programmatori per riuscire a riprodurre il bug. Un programmatore è in genere in grado
-            di risolvere un bug solo quando lo vede, se non riesci a mostrarlo al programmatore, non
-            verrà tolto!
-          </para>
-        </sect2>
-      </sect1>
-
-      <sect1 id="appendixb_using">
-        <title>Utilizzare &app;</title>
-
-        <sect2 id="appendixb_using_moveAtoB">
-          <title>D: Come posso spostare le transazioni da un conto <quote>A</quote> a un conto <quote>B</quote>, in
-            modo da unirli?</title>
-
-          <para>R: Al momento, &app; non offre un modo di spostare un gruppo di suddivisioni da un conto a un altro;
-            devono essere spostate una alla volta. Apri il registro per il conto <quote>A</quote> e
-            seleziona la voce del menu
-            <menuchoice>
-              <guimenu>Visualizza</guimenu><guimenuitem>Giornale della transazione</guimenuitem>
-            </menuchoice>
-            per rendere visibili tutte le suddivisioni. Per ogni suddivisione in cui il campo
-            <quote>conto</quote> mostra il conto <quote>A</quote>, reimpostalo come conto
-            <quote>B</quote>. Per fare questo velocemente e in sicurezza, utilizza prima la
-            combinazione di tasti
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>C</keycap>
-            </keycombo>
-            per copiare il nome del conto di destinazione (conto <quote>B</quote>) nella memoria.
-            Seleziona poi ogni riferimento al conto <quote>A</quote> con un doppio clic su di questo
-            e premi
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>V</keycap>
-            </keycombo>
-            per incollare il nome del conto di destinazione. Premendo
-            <keycap function="enter">Invio</keycap> dopo ogni operazione di incollaggio,
-            automaticamente verrà spostata la transazione fuori dal registro.
-          </para>
-
-          <para>FAI ATTENZIONE! se inavvertitamente imposti il campo <quote>Conto</quote> a una destinazione non
-            voluta, dovrai cercare tra tutti i tuoi conti per ritrovare la transazione persa e
-            correggere l’errore.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_using_merge2files">
-          <title>D: È possibile unire due progetti di &app;?</title>
-
-          <para>R: Al momento non è possibile.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_using_SaveAcctTemplate">
-          <title>D: Come posso salvare un modello predefinito della struttura del mio conto?</title>
-
-          <para>R: È disponibile un comando dal menu:
-            <menuchoice>
-              <guimenu>File</guimenu><guisubmenu>Esporta</guisubmenu><guimenuitem>Esporta
-              conti</guimenuitem>
-            </menuchoice>
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_using_ListAll">
-          <title>D: Quando cerco un cliente (o qualsiasi altra cosa), come posso ottenere una lista di tutto?</title>
-
-          <para>R: Seleziona l’opzione <guilabel>corrisponde all’espressione regolare</guilabel> e
-            inserisci un semplice punto <quote>.</quote> nel campo del testo da ricercare. Premi poi
-            <guibutton>Trova</guibutton>. L’espressione regolare <quote>.</quote> significa di
-            cercare tutto.
-          </para>
-        </sect2>
-
-        <sect2 id="appendixb_using_Dates">
-          <title>D: Come posso registrare una transazione in date diverse (la data reale e quella della banca)?</title>
-
-          <para>R: Conviene registrare la transazione con la data in cui hai firmato l’assegno o iniziato
-            l’operazione. Quando viene <quote>liquidata</quote> dalla banca, puoi fare clic
-            nel campo <guilabel>Riconciliata</guilabel> per <quote>liquidare</quote> la transazione
-            (cambierà la <quote>n</quote> in <quote>l</quote>).
-          </para>
-        </sect2>
-      </sect1>
-
-      <sect1 id="appendixb_accounting">
-        <title>Contabilità</title>
-
-        <sect2 id="appendixb_accounting_Taxes">
-          <title>D: Come devo trattare le tasse? Come un conto debiti correnti o come una uscita?</title>
-
-          <para>R: Questa è una bella domanda; dovresti consultare il tuo commercialista. Il modo in cui trattare
-            le tasse dipende fortemente dalla loro tipologia e da come tu vuoi trattarle... In
-            alcuni casi sono spese, in altri sono debiti.
-          </para>
-        </sect2>
-      </sect1>
-    </appendix>
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-               (translators put your name and email here)
--->
-    <appendix id="appendixc">
-      <title>Contributed Account Trees</title>
-
-      <para></para>
-
-      <sect1 id="appendixc_vat1">
-        <title>UK Vat</title>
-
-        <para>Tipo di conto (visualizzato solamente se diverso da quello genitore)
-        </para>
-
-        <itemizedlist>
-          <listitem>
-            <para>[u] Uscita
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[E] Entrata
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[A] Attività
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[p] Passività
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[C] CapitalE
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[B] Conti bancari
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[T] Carta di credito:
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[R] Crediti correnti
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>[P] Conti debitori
-            </para>
-          </listitem>
-        </itemizedlist>
-
-        <para>(Box n) refers to VAT form box number (I actually have these as descriptions to the account to
-          remind me)
-        </para>
-
-        <para>Add all the (Box n -part) together to get the whole (Box n) The VAT shows you liability - if its
-          negative they owe you.
-        </para>
-
-        <para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made
-          over the VAT return period - not the absolute value, nor the difference in value unless
-          that difference is wholly due to new purchases. Depreciation, losses (e.g a write off of
-          faulty item) and other reductions in capital value are not included. If you sell a capital
-          item then that sale and its VAT is recorded under Income. The asset is <quote>converted to
-          cash</quote>, so the <quote>net of VAT</quote> increase in your bank account, when the
-          invoice is payed, is matched by a decrease in capital.
-        </para>
-<literallayout>
-Bank Accounts [B]
-  |___ Main Account
-  |___  Reserve Account
-
-Cash [A]
-
-Assets [A]
-  |___ Capital Equipment    (Box 7 - Part) - additions only, not absolute value
-  |           |___ Computers      Can be depreciated to zero this year
-  |           |___ EU reverse VAT purchase  (Box 6 - Part) create sub-accounts if needed
-  |___  Other
-
-Receivable [R] Customers to whom you give credit - (business section)
-
-
-Cards [C]
-  |___  Card 1
-
-Liabilities [L]
-  |___  Owed Corp Tax
-  |___  Owed Fees
-  |___  Owed Tax / NI
-  |___  Other
-
-VAT [L]   Net (Box 5)
-  |___ i/p [A]   purchases (Box4)
-  |___  o/p [L]     (Box3)
-             |___EU   on reverse VAT purchases (Box 2)
-             |___Sales   all including zero rate UK/ EU  and World (Box1)
-
-Payable [P]   Suppliers who give you credit (business section)
-
-Equity [Q]
-  |___  Corp Tax
-  |___  Director’s Loan
-  |___  Dividends
-  |             |___  Director1
-  |             |___  Director2
-  |             |___  Shareholder 1
-  |___ Grants (and stuff that does not count as income)
-  |___Opening Balances
-
-Income [I]   (Box 6 - part)
-   |___ Interest
-   |___ Misc
-   | ___ Sales
-                |___ EU
-                |     |____ goods  (Box 8) (sub accounts as needed)
-                |     |____ services includes software (sub accounts as needed)
-                | ___ UK
-                |____ World
-
-Expenses [E]
-        |__Depreciation
-        |__ Emoluments
-        |            |___ Directors Fees
-        |            |___ NI Employer
-        |            |___ Employee 1
-        |                     |___NI
-        |                     |___Net Salary
-        |                     |___Stakeholder
-        |                     |___Tax
-        |___ Other Non VAT Expenses
-        |___ VAT Purchases    (Box 7 - part)
-                    |___  Accountancy
-                    |___  Bank Charges
-                    |___  Consumables
-                    |___  EU  reverse VAT purchases  (Box 6 - Part)
-                    |         |___ goods (Box 9) (sub accounts as needed)
-                    |         |___ services   includes software (sub accounts as needed)
-                    |___  Office
-                    |___  Phone and Internet
-                    |___  Software
-                    |___  Subscriptions
-                    |___  Sundry
-                    |___  Travel / Accom
-
-</literallayout>
-      </sect1>
-    </appendix>
 <!--
       (Do not remove this comment block.)
   Version: 2.0.0

commit b2130fda3aaa46ad1f3845d5f2dcaf80730c13c0
Merge: 7971617f 57439a2b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Sep 9 06:14:51 2021 +0200

    Merge branch 'PR_#210' into maint


commit 7971617f3c8ad9dc6aa91c569acdf67e998d9fdb
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Sep 5 02:19:22 2021 +0200

    Guide/C: Note on fieldnames in CSV import
    
    Port of PR #131 by flywire0 at gmail.com to guide

diff --git a/help/C/Help_ch_Transactions.xml b/help/C/Help_ch_Transactions.xml
index e58b3341..94d706f9 100644
--- a/help/C/Help_ch_Transactions.xml
+++ b/help/C/Help_ch_Transactions.xml
@@ -1784,13 +1784,15 @@ Translators:
 
                         <listitem>
                           <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>: Select the number of
-                            header lines to skip in the imported file;
+                            header lines to skip in the imported file;<footnote id='txn-imp-skip'><simpara>
+                              While we only want to import <emphasis>transactions</emphasis>, some banks send additional informations like
+                              a <emphasis>fieldname</emphasis> header or <emphasis>account status</emphasis> information as header or footer.</simpara></footnote>
                           </para>
                         </listitem>
 
                         <listitem>
                           <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>: Select the number of
-                            trailing lines to skip in the import file;
+                            trailing lines to skip in the import file;<footnoteref linkend='txn-imp-skip'/>
                           </para>
                         </listitem>
 

commit a53a0fd9b6212624a2d57d80761fa80f0b3df22e
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Tue Aug 24 17:37:57 2021 +0900

    * {guide,help}/*/.gitignore were deleted completely.

diff --git a/guide/C/.gitignore b/guide/C/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/guide/C/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/guide/de/.gitignore b/guide/de/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/guide/de/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/guide/it/.gitignore b/guide/it/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/guide/it/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/guide/ja/.gitignore b/guide/ja/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/guide/ja/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/guide/pt/.gitignore b/guide/pt/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/guide/pt/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/help/C/.gitignore b/help/C/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/help/C/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/help/de/.gitignore b/help/de/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/help/de/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help
diff --git a/help/it/.gitignore b/help/it/.gitignore
deleted file mode 100644
index 2d4c84b4..00000000
--- a/help/it/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.pdf
-gnucash-guide
-gnucash-help

commit 57439a2b0dd65b244efc542f8ea57277253e813e
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sun Aug 22 14:33:45 2021 +0900

    Remove obsolete appendix B about FAQ from guide.

diff --git a/guide/C/CMakeLists.txt b/guide/C/CMakeLists.txt
index ba9ee156..7ff2e324 100644
--- a/guide/C/CMakeLists.txt
+++ b/guide/C/CMakeLists.txt
@@ -23,7 +23,6 @@ set (entities
         ch_import_business_data.xml
         gnc-glossary.xml
         appendixa.xml
-        appendixb.xml
         appendixd.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/guide/C/Makefile.am b/guide/C/Makefile.am
index 4ff82fc6..fae5bf69 100644
--- a/guide/C/Makefile.am
+++ b/guide/C/Makefile.am
@@ -33,7 +33,6 @@ entities = \
 	ch_import_business_data.xml \
 	gnc-glossary.xml \
 	appendixa.xml \
-	appendixb.xml \
 	appendixd.xml
 DISTCLEANFILES =  $(docname)-C.omf.out
 CLEANFILES =  $(DISTCLEANFILES)
diff --git a/guide/C/appendixb.xml b/guide/C/appendixb.xml
deleted file mode 100644
index 7a3233c9..00000000
--- a/guide/C/appendixb.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Converted to qandaset 2019-09-09 by Frank H. Ellenberger
-  
-  Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-               (translators put your name and email here)
--->
-<appendix id="appendixb">
-  <title>Frequently Asked Questions</title>
-
-  <abstract>
-    <para>This is a list of questions asked on the mailing lists for which there really is no section in the
-      documentation covering the subject.
-    </para>
-  </abstract>
-
-  <qandaset defaultlabel='qanda'>
-    <qandadiv id="appendixb_info">
-      <title>Sources of Information</title>
-
-      <qandaentry id="appendixb_info_where">
-        <question>
-          <para>Where is the FAQ?
-          </para>
-        </question>
-
-        <answer>
-          <para>You’re looking at an very old copy of it. The most up-to-date copy can be found within the
-            <ulink url="&url-wiki-faq;">&app; Wiki</ulink>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mail">
-        <question>
-          <para>Are there mailing lists for &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes. Go to <ulink url="&url-mail-li;gnucash-user" /> and <ulink url="&url-mail-li;gnucash-devel" />
-            to subscibe.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mailarchive">
-        <question>
-          <para>Is there a searchable archive for the mailing lists?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes, you can search the mail list archives at
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.devel" /> and
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.user" /> (and
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.german" /> if you speak
-            German).
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_other">
-        <question>
-          <para>Are there other means of obtaining support for &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes. Many of the developers hang out on icq in the #gnucash discussion on <ulink url="&url-irc;" />.
-            Also, there is a <ulink url="&url-wiki;">wiki</ulink> online.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_general">
-      <title>General Information</title>
-
-      <qandaentry id="appendixb_software_windows">
-        <question>
-          <para>Can I run &app; on &win;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes. Starting with release 2.2.0, &app; is also available on &win;.
-          </para>
-        </answer>
-
-        <answer>
-          <para>Other related options would be coLinux, VMWare and a &win;-based X-server hosting a remote &app;
-            session.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_hard2compile">
-        <question>
-          <para>I heard it is too hard to compile &app;!
-          </para>
-        </question>
-
-        <answer>
-          <para>This was probably true at the time when 1.6.0 was released. It is no longer true today, as almost
-            every distribution ships with all the necessary libraries. However, by default,
-            distributions won’t install the development packages of the required libraries, so
-            you might need to start your distribution’s installer program and tell it to
-            install not only the library packages but also the -devel packages. In general, it was
-            noted that this problem concerns many applications in the gnome domain, and this also
-            boils down to the fact that there is no such thing as <quote>one monolithic gnome
-            package</quote>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_batchmode">
-        <question>
-          <para>Is there a batch mode (non-interactive) available for &app;, for building reports, etc?
-          </para>
-        </question>
-
-        <answer>
-          <para>No, for now &app; must be run interactively.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_multuser">
-        <question>
-          <para>Can multiple people access the same datafile in &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>You can have multiple people with access to the same datafile, but they cannot use the data file
-            simultaneously.
-          </para>
-
-          <para>To setup multi-person access, all the people must have read/write access to the directory containing
-            the file (to read the other’s created files, and to create new files). One way to
-            do this is by creating a user group and setting the data directory to be owned by the
-            shared group and set to mode 2775. The <quote>2</quote> makes the directory setgid which
-            copies the permissions to all files.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_WhyC">
-        <question>
-          <para id="appendixb_general_WhyC.q">Why is &app; written in C?
-          </para>
-        </question>
-
-        <answer>
-          <para>The core functionality of &app; is written in C, but do not forget that much of this can be accessed
-            through Guile (scheme). There are a number of reasons for why &app; is written in C. The
-            first is historical, &app; was started in 1996 (or maybe even earlier!) and many of the
-            OOP (C++, Java, Python) compilers were not yet mature and standarized enough on the
-            variety of platforms considered at that time, so C was the only option at that time. A
-            second reason is because the standard GUI &app; uses is GTK, which is written in C.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_rewrite">
-        <question>
-          <para>Why don’t you rewrite &app; in programming language xyz so that I can contribute easily?
-          </para>
-        </question>
-
-        <answer>
-          <para>The quick answer is <quote>We won’t</quote>.
-          </para>
-        </answer>
-
-        <answer>
-          <para>The longer answer is complex but still amounts to <quote>We won’t</quote>. &app; is a large
-            body of code maintained by a small group of developers who are comfortable in C and
-            Scheme (Guile). Actually, 80% of it is in C and approx. 13% is in Scheme/Lisp. There is
-            no valid reason that would justify rewriting this amount of existing code in a newer
-            language. Also, creating language bindings to recent languages such as Python or Ruby or
-            (insert your favourite language here) is labor intensive, and we’re already
-            stretched pretty thin maintaining and developing the existing code.
-          </para>
-        </answer>
-
-        <answer>
-          <para>Having said that, this is an open source project and you’re free to do with it or contribute
-            what you want. Just don’t expect much support if the reason for your changes is
-            that you’re not willing to learn C or Scheme. Also, &app; used to have SWIG
-            bindings (<ulink url="http://www.swig.org" />) which have been used for some perl
-            programming code. According to a list discussion, these SWIG bindings might still be a
-            way to include other languages into &app;, but currently they are unused and
-            unmaintained.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_newFeatures">
-        <question>
-          <para>I really want feature XYZ but &app; doesn’t have it. How do I get it added?
-          </para>
-        </question>
-
-        <answer>
-          <para>Ask nicely. :-) You can file an enhancement request at <ulink url="&url-bug-start;" />. Please bear
-            in mind to describe your proposed enhancement as verbosely as possible. The trick here
-            is to learn how to give the best information to the programmers about what your proposed
-            new feature should do. If you want to speed up development significantly, consider
-            donating some money as described on &app;Development.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_web">
-        <question>
-          <para>Is there a web interface available for &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>No
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_security">
-        <question>
-          <para>How can I provide security for &app; data using CFS, etc.)
-          </para>
-        </question>
-
-        <answer>
-          <para>Unanswered
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_contribute">
-        <question>
-          <para>How can I contribute to the &app; project?
-          </para>
-        </question>
-
-        <answer>
-          <para>We’re working on a more formal process, but for now you should subscribe to the mailing list
-            at <ulink url="&url-mail-li;gnucash-user" /> and
-            <ulink url="&url-mail-li;gnucash-devel" /> and discuss what you can contribute with the
-            participants on the lists. Please be aware that &app; is a large body of code written in
-            C and Scheme (see
-            <quote><link linkend="appendixb_general_WhyC" endterm="appendixb_general_WhyC.q"></link></quote>
-            above, if you want to know why). If these are languages that you are not willing to work
-            with, consider contributing in other ways.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_bugs">
-        <question>
-          <para>I think I found a bug. How do I report it?
-          </para>
-        </question>
-
-        <answer>
-          <para>First of all, try to verify that it is indeed a bug and that it has not been reported before. Search
-            the mail list archives (see FAQ above). Then search the
-            <ulink url="&url-bug-start;">&appname; Bugzilla</ulink> database.
-          </para>
-
-          <para>If you feel you have indeed found a bug, you can then report it at <ulink url="&url-bug-start;" />.
-            Please bear in mind to report your bug as verbosely as possible. The trick here is to
-            learn how to give the best information to the programmers about how to reproduce bugs. A
-            Programmer will usually only be able to fix a bug they can see, if you can’t make
-            the programmer see your bug, it won’t get fixed!
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_using">
-      <title>Using &app;</title>
-
-      <qandaentry id="appendixb_using_moveAtoB">
-        <question>
-          <para>How can I move the transactions from account <quote>A</quote> into account <quote>B</quote>, thus
-            combining them?
-          </para>
-        </question>
-
-        <answer>
-          <para>At present, &app; does not offer a way to move groups of splits from one account to another. You
-            will need to move them one at a time. Open the register for account <quote>A</quote> and
-            select the pulldown menu item
-            <menuchoice>
-              <guimenu>View</guimenu><guimenuitem>Transaction Journal</guimenuitem>
-            </menuchoice>
-            to expose all the splits. For every split where the <quote>Account</quote> field shows
-            account <quote>A</quote> reset it to account <quote>B</quote>. To do this quickly and
-            safely, first use
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>C</keycap>
-            </keycombo>
-            to copy the destination account name (<quote>account B</quote>) to the clipboard. Then
-            highlight each reference to account <quote>A</quote> by double clicking on it and use
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>V</keycap>
-            </keycombo>
-            to paste the destination account name. Pressing <keycap function="enter">Enter</keycap>
-            after each paste, silently moves the transaction out of the register.
-          </para>
-
-          <caution>
-            <para>If you inadvertently set the <quote>Account</quote> field to an unintended location, you will need
-              to search through all your accounts to find the lost transaction to correct your
-              mistake.
-            </para>
-          </caution>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_merge2files">
-        <question>
-          <para>Is it possible to merge two &app; files?
-          </para>
-        </question>
-
-        <answer>
-          <para>At present this is not possible.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_SaveAcctTemplate">
-        <question>
-          <para>How can I save a template of my account structure?
-          </para>
-        </question>
-
-        <answer>
-          <para>This is available from the menu:
-            <menuchoice>
-              <guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export
-              Accounts</guimenuitem>
-            </menuchoice>
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_ListAll">
-        <question>
-          <para>When I search for customers (or anything else for that matter), how can I return a list of
-            everything?
-          </para>
-        </question>
-
-        <answer>
-          <para>Enter a search criteria of <guilabel>matches regex</guilabel>, and place a single dot
-            <quote>.</quote> in the text field area. Then, click <guibutton>Find</guibutton>. The
-            regular expression <quote>.</quote> means to match anything.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_Dates">
-        <question>
-          <para>How can I record a transaction on different dates (actual date and bank date)?
-          </para>
-        </question>
-
-        <answer>
-          <para>You record the transaction on the date you write the check or initiate the transaction. When it
-            <quote>clears</quote> the bank, you can click in the <quote>Reconciled</quote> field to
-            <quote>clear</quote> the transaction (change the <quote>n</quote>on-reconciled to
-            <quote>c</quote>leared).
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_accounting">
-      <title>Accounting</title>
-
-      <qandaentry id="appendixb_accounting_Taxes">
-        <question>
-          <para>How do I treat taxes? As an account payable or as an expense?
-          </para>
-        </question>
-
-        <answer>
-          <para>This is a loaded question, and you should really talk to your accountant. How you treat taxes really
-            depends on what kind of taxes they are, and how you WANT to treat them.. In some cases
-            they are expenses, in some cases they are liabilities.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-  </qandaset>
-</appendix>
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index e5464825..e2660010 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -488,16 +488,6 @@
         </para>
       </listitem>
 
-      <listitem>
-        <para><xref linkend="appendixb"></xref>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para><xref linkend="appendixc"></xref>
-        </para>
-      </listitem>
-
       <listitem>
         <para><xref linkend="appendixd"></xref>
         </para>
@@ -542,23 +532,35 @@
       <title>&app; Website</title>
 
       <para>The <ulink
-      url="http://www.gnucash.org"><citetitle>&appname;</citetitle></ulink> website
+      url="&url-www;"><citetitle>&appname;</citetitle></ulink> website
         contains helpful information about the program and about any updates to it. It also contains
         links to other online resources.
       </para>
     </sect2>
 
     <sect2 id="wiki">
-      <title>&app; Wiki</title>
+      <title id="wiki.title">&app; Wiki</title>
 
       <para>An immense amount of less-formal documenation, both of &app; itself and its maintenance and
-        development may be found in the <ulink
-     url="https://wiki.gnucash.org/wiki">&app;
-        Wiki</ulink>; the <ulink
-     url="https://wiki.gnucash.org/wiki/FAQ">Frequently Asked
-        Questions</ulink> page should be a first stop whenever you encounter difficulty using &app;.
+        development may be found in the <ulink url="&url-wiki;">&app; Wiki</ulink>.
       </para>
     </sect2>
+        
+    <sect2 id="oview-faq">
+        <title>&app; Frequently Asked Questions</title>    
+
+        <para>
+            <ulink url="&url-wiki-faq;">&app; Frequently Asked Questions</ulink> (<acronym>FAQ</acronym>) page 
+            is also on the <xref linkend="wiki" endterm="wiki.title" />.
+            It should be a first stop whenever you encounter difficulty using &app;.
+            It is now translated into German and Simplified Chinese. If you'd like to access to the translated page,
+            see tabs on the top of the <ulink url="&url-wiki-faq;">&app; Frequently Asked Questions</ulink> page.
+
+        </para>
+    
+    </sect2>
+        
+        
 
     <sect2 id="on-line-assistance">
       <title>&app; On-line Assistance</title>
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 9afeab74..2ce2eb17 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -657,8 +657,6 @@
 
     <xi:include href="appendixa.xml" />
 
-    <xi:include href="appendixb.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="fdl-appendix.xml" />
diff --git a/guide/de/CMakeLists.txt b/guide/de/CMakeLists.txt
index d939fd3b..6d589907 100644
--- a/guide/de/CMakeLists.txt
+++ b/guide/de/CMakeLists.txt
@@ -22,7 +22,6 @@ set (entities
         ch_reports.xml
         ch_txns.xml
         appendixa.xml
-        appendixb.xml
         appendixd.xml
         appendixe.xml
         fdl-appendix.xml
diff --git a/guide/de/Makefile.am b/guide/de/Makefile.am
index 16d6d107..7c59f7bb 100644
--- a/guide/de/Makefile.am
+++ b/guide/de/Makefile.am
@@ -26,7 +26,6 @@ entities = \
  ch_reports.xml \
  ch_txns.xml \
  appendixa.xml \
- appendixb.xml \
  appendixd.xml \
  appendixe.xml \
  fdl-appendix.xml \
diff --git a/guide/de/appendixb.xml b/guide/de/appendixb.xml
deleted file mode 100644
index 0a449f9a..00000000
--- a/guide/de/appendixb.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Converted to qandaset 2019-09-09 by Frank H. Ellenberger
-  
-  Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-               (translators put your name and email here)
--->
-<appendix id="appendixb">
-  <title>Häufig gestellte Fragen</title>
-
-  <abstract>
-    <para>Dies ist eine [sehr alte] Liste von auf den Mailing-Listen gestellten Fragen, welche noch nicht in
-      die Dokumentation eingearbeitet wurden. Aktueller sind die Online-Versionen:
-      <simplelist>
-        <member>
-          <ulink url="&url-wiki-faq-de;">deutsch</ulink> (nicht unbedingt aktuell oder vollständig)
-        </member>
-
-        <member>
-          <ulink url="&url-wiki-faq;">englisch</ulink>
-        </member>
-      </simplelist>
-    </para>
-  </abstract>
-
-  <para>&untranslated-de;
-  </para>
-<!--
-  <qandaset defaultlabel='qanda'>
-    <qandadiv id="appendixb_info">
-      <title>Sources of Information</title>
-
-      <qandaentry id="appendixb_info_where">
-        <question><para>Where is the FAQ?</para></question>
-        <answer><para>You’re looking at an very old copy of it. The most up-to-date copy can be found within the <ulink url="&url-wiki-faq;">&app; Wiki</ulink>.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mail">
-        <question><para>Are there mailing lists for &app;?</para></question>
-        <answer><para>Yes. Go to <ulink url="&url-mail-li;gnucash-user" /> and <ulink url="&url-mail-li;gnucash-devel" /> to subscibe.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mailarchive">
-        <question><para>Is there a searchable archive for the mailing lists?</para></question>
-        <answer><para>Yes, you can search the mail list archives at <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.devel" /> and <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.user" /> (and <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.german" /> if you speak German).</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_other">
-        <question><para>Are there other means of obtaining support for &app;?</para></question>
-        <answer><para>Yes. Many of the developers hang out on icq in the #gnucash discussion on <ulink url="&url-irc;" />. Also, there is a <ulink url="&url-wiki;">wiki</ulink> online.</para></answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_general">
-      <title>General Information</title>
-
-      <qandaentry id="appendixb_software_windows">
-        <question><para>Can I run &app; on &win;?</para></question>
-        <answer><para>Yes. Starting with release 2.2.0, &app; is also available on &win;.</para></answer>
-        <answer><para>Other related options would be colinux, VMWare and a &win;-based X-server hosting a remote &app; session.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_hard2compile">
-        <question><para>I heard it is too hard to compile &app;!</para></question>
-        <answer><para>This was probably true at the time when 1.6.0 was released. It is no longer true today, as almost every distribution ships with all the necessary libraries. However, by default, distributions won’t install the development packages of the required libraries, so you might need to start your distribution’s installer program and tell it to install not only the library packages but also the -devel packages. In general, it was noted that this problem concerns many applications in the gnome domain, and this also boils down to the fact that there is no such thing as <quote>one monolithic gnome package</quote>.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_batchmode">
-        <question><para>Is there a batch mode (non-interactive) available for &app;, for building reports, etc?</para></question>
-        <answer><para>No, for now &app; must be run interactively.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_multuser">
-        <question><para>Can multiple people access the same datafile in &app;?</para></question>
-        <answer><para>You can have multiple people with access to the same datafile, but they cannot use the data file simultaneously.</para>
-        <para>To setup multi-person access, all the people must have read/write access to the directory containing the file (to read the other’s created files, and to create new files).  One way to do this is by creating a user group and setting the data directory to be owned by the shared group and set to mode 2775. The <quote>2</quote> makes the directory setgid which copies the permissions to all files.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_WhyC">
-        <question><para id="appendixb_general_WhyC.q">Why is &app; written in C?</para></question>
-        <answer><para>The core functionality of &app; is written in C, but do not forget that much of this can be accessed through Guile (scheme).  There are a number of reasons for why &app; is written in C.  The first is historical, &app; was started in 1996 (or maybe even earlier!) and many of the OOP (C++, Java, Python) compilers were not yet mature and standarized enough on the variety of platforms considered at that time, so C was the only option at that time.  A second reason is because the standard GUI &app; uses is GTK, which is written in C.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_rewrite">
-        <question><para>Why don’t you rewrite &app; in programming language xyz so that I can contribute easily?</para></question>
-        <answer><para>The quick answer is <quote>We won’t</quote>.</para></answer>
-        <answer><para>The longer answer is complex but still amounts to <quote>We won’t</quote>. &app; is a large body of code maintained by a small group of developers who are comfortable in C and Scheme (Guile). Actually, 80% of it is in C and approx. 13% is in Scheme/Lisp. There is no valid reason that would justify rewriting this amount of existing code in a newer language. Also, creating language bindings to recent languages such as Python or Ruby or (insert your favourite language here) is labor intensive, and we’re already stretched pretty thin maintaining and developing the existing code.</para></answer>
-        <answer><para>Having said that, this is an open source project and you’re free to do with it or contribute what you want. Just don’t expect much support if the reason for your changes is that you’re not willing to learn C or Scheme. Also, &app; used to have SWIG bindings (<ulink url="http://www.swig.org" />) which have been used for some perl programming code. According to a list discussion, these SWIG bindings might still be a way to include other languages into &app;, but currently they are unused and unmaintained.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_newFeatures">
-        <question><para>I really want feature XYZ but &app; doesn’t have it. How do I get it added?</para></question>
-        <answer><para>Ask nicely. :-) You can file an enhancement request at <ulink url="&url-bug-start;" />. Please bear in mind to describe your proposed enhancement as verbosely as possible. The trick here is to learn how to give the best information to the programmers about what your proposed new feature should do. If you want to speed up development significantly, consider donating some money as described on &app;Development.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_web">
-        <question><para>Is there a web interface available for &app;?</para></question>
-        <answer><para>No</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_security">
-        <question><para>How can I provide security for &app; data using CFS, etc.)</para></question>
-        <answer><para>Unanswered</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_contribute">
-        <question><para>How can I contribute to the &app; project?</para></question>
-        <answer><para>We’re working on a more formal process, but for now you should subscribe to the mailing list at <ulink url="&url-mail-li;gnucash-user" /> and <ulink url="&url-mail-li;gnucash-devel" /> and discuss what you can contribute with the participants on the lists. Please be aware that &app; is a large body of code written in C and Scheme (see <quote><link linkend="appendixb_general_WhyC" endterm="appendixb_general_WhyC.q"></link></quote> above, if you want to know why). If these are languages that you are not willing to work with, consider contributing in other ways.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_bugs">
-        <question><para>I think I found a bug. How do I report it?</para></question>
-        <answer><para>First of all, try to verify that it is indeed a bug and that it has not been reported before. Search the mail list archives (see FAQ above). Then search the <ulink url="&url-bug-start;">&appname; Bugzilla</ulink> database.</para>
-        <para>If you feel you have indeed found a bug, you can then report it at <ulink url="&url-bug-start;" />. Please bear in mind to report your bug as verbosely as possible. The trick here is to learn how to give the best information to the programmers about how to reproduce bugs. A Programmer will usually only be able to fix a bug they can see, if you can’t make the programmer see your bug, it won’t get fixed!</para></answer>
-      </qandaentry>
-
-    </qandadiv>
-    <qandadiv id="appendixb_using">
-      <title>Using &app;</title>
-
-      <qandaentry id="appendixb_using_moveAtoB">
-        <question><para>How can I move the transactions from account <quote>A</quote> into account <quote>B</quote>, thus combining them?</para></question>
-        <answer><para>At present, &app; does not offer a way to move groups of splits from one account to another. You will need to move them one at a time. Open the register for account <quote>A</quote> and select the pulldown menu item <menuchoice><guimenu>View</guimenu><guimenuitem>Transaction Journal</guimenuitem></menuchoice> to expose all the splits.  For every split where the <quote>Account</quote> field shows account <quote>A</quote> reset it to account <quote>B</quote>. To do this quickly and safely, first use <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> to copy the destination account name (<quote>account B</quote>) to the clipboard.  Then highlight each reference to account <quote>A</quote> by double clicking on it and use <keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> to paste the destination account name.  Pressing <keycap function="enter">Enter</keycap> after each paste, silently moves the transaction out of the register.</para>
-        <caution><para>If you inadvertently set the <quote>Account</quote> field to an unintended location, you will need to search through all your accounts to find the lost transaction to correct your mistake.</para></caution></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_merge2files">
-        <question><para>Is it possible to merge two &app; files?</para></question>
-        <answer><para>At present this is not possible.</para></answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_SaveAcctTemplate">
-        <question><para>How can I save a template of my account structure?</para></question>
-        <answer><para>This is available from the menu: <menuchoice><guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export Accounts</guimenuitem></menuchoice></para></answer>
-      </qandaentry>
-      <qandaentry id="appendixb_using_ListAll">
-        <question><para>When I search for customers (or anything else for that matter), how can I return a list of everything?</para></question>
-        <answer><para>Enter a search criteria of <guilabel>matches regex</guilabel>, and place a single dot <quote>.</quote> in the text field area. Then, click <guibutton>Find</guibutton>. The regular expression <quote>.</quote> means to match anything.</para></answer>
-      </qandaentry>
-      <qandaentry id="appendixb_using_Dates">
-        <question><para>How can I record a transaction on different dates (actual date and bank date)?</para></question>
-        <answer><para>You record the transaction on the date you write the check or initiate the transaction.  When it <quote>clears</quote> the bank, you can click in the <quote>Reconciled</quote> field to <quote>clear</quote> the transaction (change the <quote>n</quote>on-reconciled to <quote>c</quote>leared).</para></answer>
-      </qandaentry>
-    </qandadiv>
-    <qandadiv id="appendixb_accounting">
-      <title>Accounting</title>
-      <qandaentry id="appendixb_accounting_Taxes">
-        <question><para>How do I treat taxes?  As an account payable or as an expense?</para></question>
-        <answer><para>This is a loaded question, and you should really talk to your accountant.  How you treat taxes really depends on what kind of taxes they are, and how you WANT to treat them..  In some cases they are expenses, in some cases they are liabilities.</para></answer>
-      </qandaentry>
-    </qandadiv>
-  </qandaset>
-  untranslated -->
-</appendix>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 2552d541..47e260be 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -686,8 +686,6 @@
 
     <xi:include href="appendixa.xml" />
 
-    <xi:include href="appendixb.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="appendixe.xml" />
diff --git a/guide/it/CMakeLists.txt b/guide/it/CMakeLists.txt
index ad37fe68..9a53da33 100644
--- a/guide/it/CMakeLists.txt
+++ b/guide/it/CMakeLists.txt
@@ -22,7 +22,6 @@ set (COMPONENTS
         ${top_srcdir}/guide/C/ch_import_business_data.xml
         ${top_srcdir}/guide/C/gnc-glossary.xml
         ${top_srcdir}/guide/C/appendixa.xml
-        ${top_srcdir}/guide/C/appendixb.xml
         ${top_srcdir}/guide/C/appendixd.xml)
 
 #gnucash-guide.xml: ${COMPONENTS} ${srcdir}/it.po
diff --git a/guide/it/Makefile.am b/guide/it/Makefile.am
index 7025fdc5..f66e77bb 100644
--- a/guide/it/Makefile.am
+++ b/guide/it/Makefile.am
@@ -40,7 +40,6 @@ COMPONENTS = \
 	${top_srcdir}/guide/C/ch_import_business_data.xml \
 	${top_srcdir}/guide/C/gnc-glossary.xml \
 	${top_srcdir}/guide/C/appendixa.xml \
-	${top_srcdir}/guide/C/appendixb.xml \
 	${top_srcdir}/guide/C/appendixd.xml
 
 #gnucash-guide.xml: ${COMPONENTS} ${srcdir}/it.po
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index bb636fae..ab80ab79 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -1013,11 +1013,6 @@
             </para>
           </listitem>
 
-          <listitem>
-            <para><xref linkend="appendixb"/>
-            </para>
-          </listitem>
-
           <listitem>
             <para><xref linkend="appendixc"/>
             </para>
diff --git a/guide/ja/CMakeLists.txt b/guide/ja/CMakeLists.txt
index f95616c3..543ff529 100644
--- a/guide/ja/CMakeLists.txt
+++ b/guide/ja/CMakeLists.txt
@@ -19,7 +19,6 @@ set (entities
         ch_oth_assets.xml
         ch_python_bindings.xml
         appendixa.xml
-        appendixb.xml
         appendixd.xml)
 
 set (FOP_XCONF "${CMAKE_CURRENT_SOURCE_DIR}/fop.xconf.in")
diff --git a/guide/ja/Makefile.am b/guide/ja/Makefile.am
index 0f9dd8d9..a0367bdd 100644
--- a/guide/ja/Makefile.am
+++ b/guide/ja/Makefile.am
@@ -24,7 +24,6 @@ entities = \
 	ch_oth_assets.xml \
 	ch_python_bindings.xml \
 	appendixa.xml \
-	appendixb.xml \
 	appendixd.xml
 DISTCLEANFILES =  $(docname)-ja.omf.out mincho.xml gothic.xml $(fopconfig)
 CLEANFILES =  $(DISTCLEANFILES)
diff --git a/guide/ja/appendixb.xml b/guide/ja/appendixb.xml
deleted file mode 100644
index 546eae44..00000000
--- a/guide/ja/appendixb.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Maintainers: 
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators: Yasuaki Taniguchi <yasuakit at gmail.com>
-               (translators put your name and email here)
--->
-<appendix id="appendixb">
-  <title>良くある質問 (FAQ)</title>
-
-  <abstract>
-    <para>これは本文書では話題を扱っている項目が存在しない、メーリングリストで尋ねられる質問のリストです。
-    </para>
-  </abstract>
-
-  <qandaset defaultlabel='qanda'>
-    <qandadiv id="appendixb_info">
-      <title>Sources of Information</title>
-
-      <qandaentry id="appendixb_info_where">
-        <question>
-          <para>FAQはどこにありますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>あなたが調べている本文書です。<ulink url="&url-wiki-faq;">&appname;
-            Wiki</ulink>の中で最新版を見ることができます。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mail">
-        <question>
-          <para>&app;のためのメーリングリストがありますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>はい。<ulink url="&url-mail-li;gnucash-user" /> および
-            <ulink url="&url-mail-li;gnucash-usergnucash-devel" />
-            に移動して参加してください。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mailarchive">
-        <question>
-          <para>メーリングリストの検索可能なアーカイブがありますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>はい。はメーリングリストのアーカイブは
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.devel"></ulink>
-            および <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.user"></ulink>
-            で検索することができます。 (ドイツ語を話せるなら
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.german"></ulink>
-            もあります。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_other">
-        <question>
-          <para>&app;のサポートを得る他の手段がありますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>開発者の多くがirc.gnome.orgの#gnucashチャンネルにいます。また、<ulink url="&url-wiki;" />
-            のオンラインwikiがあります。
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_general">
-      <title>一般情報</title>
-
-      <qandaentry id="appendixb_software_windows">
-        <question>
-          <para>&app;は&win;で動作しますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>リリース2.2.0から&app;を&win;で利用可能です。
-          </para>
-
-          <para>他の関連するオプションとしてcoLinux、VMWare、および&win;ベースのXサーバーでリモートサーバーで提供されている&app;セッションを利用できます。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_hard2compile">
-        <question>
-          <para>&app;をコンパイルするのは難しすぎます!
-          </para>
-        </question>
-
-        <answer>
-          <para>1.6.0がリリースされたとき、これはたぶん真実でした。それは今日、もう真実ではありません。ほとんどすべてのディストリビューションがすべての必要なライブラリを提供するからです。(g-wrapを除きます。&app;をコンパイルする前にインストールする必要がある「一つの」追加ライブラリが実際には存在します。)しかしながら、デフォルトではディストリビューションは必要なライブラリの開発パッケージをインストールしません。あなたのディストリビューションのインストーラプログラムを開始させて、ライブラリパッケージだけではなく、開発パッケージもインストールするように設定する必要があります。一般にこの問題はGnome領域の多くのアプリケーションに関係する問題です。また、これは「1個の一体構造のGnomeパッケージ」になっていないという事実まで波及します。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_batchmode">
-        <question>
-          <para>&app;には帳票作成に利用可能なバッチモード (非対話型) などがありますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>いいえ、現在のところ&app;は対話的に実行しなければなりません。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_multuser">
-        <question>
-          <para>複数人が&app;の同じデータファイルにアクセスできますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>同じデータファイルへのアクセスを複数人で行うことができます。しかし、同時にデータファイルを使用できません。
-          </para>
-
-          <para>複数人でアクセスできるように設定するためにはすべての人々がファイルを含むディレクトリへの読書きアクセス権を持たなければなりません。(他の人が作ったファイルを読み込むためと、新規のファイルを作成するためです。)
-            これを行う一つの方法は、ユーザーグループを作成しデータディレクトリをグループで共有利用可能なようにモードを2775に設定します。「2」はディレクトリのすべてのファイルのパーミッションをコピーするsetgidです。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_WhyC">
-        <question>
-          <para>&app;はなぜCで書かれていますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>&app;に関する中心となる機能は、Cで書かれていますが、Guile (scheme)
-            を通してこれらの多くにアクセスできたのを忘れないでください。&app;がCで書かれているのは多くの理由があります。第一の理由は歴史的なものです。&app;は1996年(たぶんさらに早くから!)に開始しています。OOP
-            (C++、 Java、 Python)
-            コンパイラの多くが、その時考えられていた多種のプラットフォームで十分に成熟・標準化されていませんでした。よって、その時はCが唯一の選択肢でした。第二の理由は&app;が使用する標準のグラフィカルユーザーインターフェースがGTKであるからです。GTKはCで書かれています。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_rewrite">
-        <question>
-          <para>容易に貢献できるようにプログラミング言語xyzで&app;を書き直して頂けますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>「私たちはそうしません」と即答します。より長く答えるのは難しいです。でもやはり「私たちはそうしません」に達します。&app;は、CとScheme
-            (Guile)で満足な開発者の小集団によって維持された大規模なコードの集合体です。実際のところ、およそ80%がCで書かれています。およそ13%がScheme/Lispで書かれています。新規の言語でこの分量の既存のコードを書き直すのを正当化する理由が全くありません。また、Python、Rubyまたは(あなたのお気に入りの言語)などの最近の言語に言語バインディングを作成する方が労働集約的です。私たちは、既存のコードを維持・開発しながら、少しずつ広がっていっています。
-          </para>
-
-          <para>このようにも言うことができます。これはオープン・ソースプロジェクトです。あなたがそれを行うことも好きな貢献することも自由です。あなたの変更の理由があなたがCまたはSchemeを学ぶことを望んでいないということであれば、単に多くのサポートを期待しません。また、&app;はSWIGバインディング(
-            <ulink url="http://www.swig.org"></ulink>
-            )を持っており、何らかのPerlプログラミングコードのために使用されていました。メーリングリストの議論によると、これらのSWIGバインディングはまだ他の言語を&app;に含める方法であるかもしれません。しかし、現在それらは使用・維持されていません。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_newFeatures">
-        <question>
-          <para>XYZ機能が本当に欲しいです。しかし&app;は持っていません。
-          </para>
-        </question>
-
-        <answer>
-          <para>うまくお願いしてください :-) エンハンス要望書を
-            <ulink url="&url-bug-start;" />に発行できます。エンハンス要望を可能な限り冗長に記述することを念頭においてください。ここの手段は、あなたが提案した新機能が行わなければならないことに関して最良情報をプログラマに提供する方法を学ぶことです。開発がかなり加速するように望んでいるなら、&app;Developmentで説明してあるようにいくらかの金銭の寄付を行うことを考えてください。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_web">
-        <question>
-          <para>&app;で利用可能なウェブインターフェースがありますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>いいえ
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_security">
-        <question>
-          <para>どうしたら&app;データをCFSなどを利用して安全に提供できますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>答えはありません。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_contribute">
-        <question>
-          <para>どうしたら&app;プロジェクトに貢献できますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>私たちは、より正式な手続きで活動していますが、当分は
-            <ulink url="&url-mail-li;gnucash-user" /> および
-            <ulink url="&url-mail-li;gnucash-devel" />
-            でメーリングリストに加入して、リストで自分が参加者と共に貢献できることについて検討しなければなりません。&app;がCとSchemeで書かれたコードの大規模な集合体であることを意識してください。(理由を知りたいならFAQの上部、「&app;はなぜCで書かれていますか?」を参照してください。)
-            これらがあなたが扱うことを望んでいない言語であれば、他の方法で貢献することを考えてください。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_bugs">
-        <question>
-          <para>バグを見つけたようです。どうやってバグを報告しますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>まず、本当に、それがバグであり、以前報告されたことがないことを確かめるようにします。メーリングリストアーカイブを検索してください
-            (FAQの上部を参照)。後は、<ulink url="&url-bug-start;">Bugzilla</ulink>データベースを検索します。
-          </para>
-
-          <para>あなたが本当にバグを発見したと感じたら、後は <ulink url="&url-bug-start;"/>
-            でそれを報告できます。可能な限り冗長に報告することを念頭においてください。ここの手段は、バグをどう再生させるかに関して最良情報をプログラマに提供する方法を学ぶことです。通常、プログラマは彼らが理解できるバグを修正できるだけです。あなたがプログラマにバグを理解させることができないなら、それは修正されません!
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_using">
-      <title>&app;の使用</title>
-
-      <qandaentry id="appendixb_using_moveAtoB">
-        <question>
-          <para>取引を勘定科目Aから勘定科目Bに移動するにはどうすれば良いですか。それらを結合できますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>現在のところ、&app;は一つの勘定科目から別の勘定科目までスプリットのグループを移動する方法を提供しません。あなたは、一度に一つそれらを移動させる必要があります。勘定科目Aのために記録簿を開きます。すべてのスプリット取引を展開するためにプルダウンメニューから<guimenu>表示</guimenu>-><guisubmenu>スタイル</guisubmenu>-><guimenuitem>取引仕訳帳</guimenuitem>を選択します。すべてのスプリット対して、<guilabel>勘定科目</guilabel>欄に勘定科目Aとなっているのを勘定科目Bに再設定します。これを素早く安全に行うために、最初に変更先勘定科目名(<guilabel>勘定科目B</guilabel>)を<emphasis>CTRL-C</emphasis>でクリップボードにコピーします。後は、勘定科目Aとなっている各項目をダブルクリックして強調表示します。異動先勘定科目名を<emphasis>CTRL-V</emphasis>を使用して貼り付けます。各ペーストの後に<emphasis>Enter</emphasis>を押下すると記録簿からの取引は警告なしで移動されます。
-          </para>
-
-          <para>注意!
-            もしうっかり<quote>勘定科目</quote>欄を意図しない場所に設定したなら、あなたは誤りを修正する必要がある行方不明の取引を見つけるためにすべての勘定科目を検索する必要があります。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_merge2files">
-        <question>
-          <para>2個のgnucashファイルを統合することは可能ですか?
-          </para>
-        </question>
-
-        <answer>
-          <para>現在のところ不可能です。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_SaveAcctTemplate">
-        <question>
-          <para>どうしたら私の勘定科目構造のテンプレートを保存することができますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>これは<guimenu>ファイル</guimenu>-><guisubmenu>エクスポート</guisubmenu>-><guimenuitem>勘定科目</guimenuitem>メニューから利用可能です。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_ListAll">
-        <question>
-          <para>得意先 (またはその他の何か)
-            を検索するとき、すべてを表示するリストにどうやったら戻せますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>検索条件を<guilabel>正規表現に一致</guilabel>にして、単一のドット"."をテキストフィールド領域に入力します。そして<guibutton>検索</guibutton>をクリックします。正規表現"."はすべてに一致します。
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_Dates">
-        <question>
-          <para>異なった日付の取引 (実際の日付と銀行日付)
-            をどうしたらを記録できますか?
-          </para>
-        </question>
-
-        <answer>
-          <para>あなたが、小切手を書くか、または取引を開始した日に取引の日付を記録します。銀行で「清算」されたら取引の「照合」フィールドをクリックして「清算」に設定します。(「n:
-            未照合」から「c:清算」に変更されます。)
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_accounting">
-      <title>会計処理</title>
-
-      <qandaentry id="appendixb_accounting_Taxes">
-        <question>
-          <para>どのように税金を処理しますか? 買掛債務としてですか?
-            または、費用としてですか?
-          </para>
-        </question>
-
-        <answer>
-          <para>これは誘導尋問です。あなたは本当に会計士と話さなければなりません。あなたがどう税金を処理するかは、それらがどういう種類の税金でどのようにそれらを処理したいかに本当に依存します。ある場合は費用です。ある場合は負債です。
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-  </qandaset>
-</appendix>
diff --git a/guide/ja/ch_oview.xml b/guide/ja/ch_oview.xml
index f82433e4..4d35df4d 100644
--- a/guide/ja/ch_oview.xml
+++ b/guide/ja/ch_oview.xml
@@ -449,16 +449,6 @@ class="registered">Quicken</trademark>、MS
         </para>
       </listitem>
 
-      <listitem>
-        <para><xref linkend="appendixb"></xref>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para><xref linkend="appendixc"></xref>
-        </para>
-      </listitem>
-
       <listitem>
         <para><xref linkend="appendixd"></xref>
         </para>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index 88febffc..b69d8962 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -446,8 +446,6 @@
 
   <xi:include href="appendixa.xml" />
 
-  <xi:include href="appendixb.xml" />
-
   <xi:include href="appendixd.xml" />
 
   <xi:include href="fdl-appendix.xml" />
diff --git a/guide/pt/CMakeLists.txt b/guide/pt/CMakeLists.txt
index fee9f737..427ed2dd 100644
--- a/guide/pt/CMakeLists.txt
+++ b/guide/pt/CMakeLists.txt
@@ -22,7 +22,6 @@ set (entities
         ch_python_bindings.xml
         ch_import_business_data.xml
         appendixa.xml
-        appendixb.xml
         appendixd.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/guide/pt/Makefile.am b/guide/pt/Makefile.am
index d1ed2c9c..a23ffe43 100644
--- a/guide/pt/Makefile.am
+++ b/guide/pt/Makefile.am
@@ -32,7 +32,6 @@ entities = \
 	ch_python_bindings.xml \
 	ch_import_business_data.xml \
 	appendixa.xml \
-	appendixb.xml \
 	appendixd.xml
 DISTCLEANFILES =  $(docname)-C.omf.out
 CLEANFILES =  $(DISTCLEANFILES)
diff --git a/guide/pt/appendixb.xml b/guide/pt/appendixb.xml
deleted file mode 100644
index c2836f97..00000000
--- a/guide/pt/appendixb.xml
+++ /dev/null
@@ -1,400 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Converted to qandaset 2019-09-20 by Frank H. Ellenberger
-  
-  Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-               (Pedro Albuquerque <palbuquerque73 at gmail.com)
--->
-<appendix id="appendixb">
-  <title>Questões frequentes</title>
-
-  <abstract>
-    <para>Esta é uma lista de perguntas feitas nas listas de correio para as quais não há realmente uma
-      secção na documentação que lhes dê resposta.
-    </para>
-  </abstract>
-
-  <qandaset defaultlabel='qanda'>
-    <qandadiv id="appendixb_info">
-      <title>Fontes de informação</title>
-
-      <qandaentry id="appendixb_info_where">
-        <question>
-          <para>Onde estão as FAQ?
-          </para>
-        </question>
-
-        <answer>
-          <para>Está a olhar para elas. Pode encontrar a cópia mais atualizada na <ulink url="&url-wiki-faq;">wiki
-            do &app;</ulink>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mail">
-        <question>
-          <para>Há listas de correio para o &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Sim. Vá a <ulink url="&url-mail-li;gnucash-user" /> e a <ulink url="&url-mail-li;/gnucash-devel" />
-            para as subscrever.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mailarchive">
-        <question>
-          <para>Há algum arquivo onde se possa fazer procuras?
-          </para>
-        </question>
-
-        <answer>
-          <para>Sim, pode procurar nos arquivos de correio em
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.devel"></ulink> e
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.user"></ulink> (e em
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.german"></ulink> se fala
-            Alemão).
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_other">
-        <question>
-          <para>Há outros meios para obter assistência ao &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Sim. Muitos dos programadores estão no icq, discussão #gnucash em irc.gnome.org. Há ainda uma
-            wiki online em <ulink url="&url-wiki;Pt/&appname;" />.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_general">
-      <title>Informação geral</title>
-
-      <qandaentry id="appendixb_software_windows">
-        <question>
-          <para>Posso executar o &app; em &win;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Sim. A partir da versão 2.2.0, o &app; também está disponível para &win;.
-          </para>
-        </answer>
-
-        <answer>
-          <para>Outras opções disponíveis serão o coLinux, VMWare e &win;-based X-server hospedando uma
-            sessão remota do &app;.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_hard2compile">
-        <question>
-          <para>Ouvi dizer que era muito díficl compilar o &app;!
-          </para>
-        </question>
-
-        <answer>
-          <para>Isto foi provavelmente verdade quando a versão 1.6.0 foi lançada. Hoje em dia já não é verdade,
-            dado que a maioria das ditribuições &lin; já têm todas as bibliotecas necessárias
-            (exceto a g-wrap, ou seja, há realmente <quote>uma</quote> biblioteca extra a instalar
-            antes de compilar o &app;). Contudo, por predefinição, as distribuições não
-            instalam pacotes de desenvolvimento das bibliotecas requeridas, pelo que poderá ter que
-            iniciar o programa de instalação da sua distribuição e dizer-lhe que instale também
-            as bibliotecas de desenvolvimento (-devel). Em geral, notou-se que este problema afeta
-            muitas aplicações no domínio Gnome, o que se reduz ao fato de que não há
-            efetivamente algo como <quote>um pacote gnome monolítico</quote>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_batchmode">
-        <question>
-          <para>Há algum modo de o &app; construir relatórios em lote, de forma não interativa?
-          </para>
-        </question>
-
-        <answer>
-          <para>Não, por agora o &app; tem de usar interatividade.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_multuser">
-        <question>
-          <para>Pode o mesmo ficheiro de dados do &app; ser acedido por múltiplas pessoas?
-          </para>
-        </question>
-
-        <answer>
-          <para>Pode ter múltiplas pessoas com acesso ao mesmo ficheiro de dados, mas não em simultâneo.
-          </para>
-
-          <para>Para configurar o acesso multiutilizador, todos terão de ter direitos de leitura/escrita na pasta
-            que contém o ficheiro (para ler os ficheiros criados por outros e para criar novos
-            ficheiros). Uma forma de o fazer é criar um grupo de utilizadores e definir a pasta de
-            dados como propriedade partilhada do grupo, definida para modo 2775. O <quote>2</quote>
-            torna a pasta setgid, o que copia as permissões para todos os ficheiros.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_WhyC">
-        <question>
-          <para>Porque é que o &app; está escrito em C?
-          </para>
-        </question>
-
-        <answer>
-          <para>A funcionalidade central do &app; é escrita em C, mas não se esqueça que muito do núcleo pode
-            ser acedido pelo Guile (scheme). Há um sem número de razões para o &app; ser escrito
-            em C. A primeira é histórica, o &app; começou em 1996 (ou talvez antes!) e muitos dos
-            compiladores OOP (C++, Java, Python) ainda não tinham amadurecido e estabilizado o
-            suficiente nas várias plataformas consideradas na altura, portanto C era a única
-            opção nessa época. Uma segunda razão seria por o GUI (ambiente de trabalho) padrão
-            do &app; usar GTK, que é escrito em C.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_rewrite">
-        <question>
-          <para>Porque é que não reescrevem o &app; na linguagem xyz para que eu possa contribuir facilmente?
-          </para>
-        </question>
-
-        <answer>
-          <para>A resposta rápida é <quote>Não o faremos</quote>. A resposta mais longa é complexa mas é a
-            mesma. O &app; é um enorme corpo de código mantido por um pequeno grupo de
-            programadores que se sentem confotáveis com C e Scheme (Guile). De fato, 80% é em C e
-            aproximadamente 13% é em Scheme/Lisp. Não há nenhuma razão válida que justifique
-            reescrever a quantidade de código existente numa linguagem diferente. Além disso,
-            criar associações de linguagem a linguagens recentes como Python ou Ruby ou qualquer
-            outra da sua preferência é trabalho intenso e já temos trabalho que chegue mantendo e
-            desenvolvendo o código existente.
-          </para>
-        </answer>
-
-        <answer>
-          <para>Dito isto, este é um projeto de código aberto e é livre de fazer o que quiser ou de contribuir
-            com aquilo que quiser. Mas não espere assistência se o motivo das suas alterações
-            for não estar disposto a aprender C ou Scheme. Além disto, o &app; costumava ter
-            associações SWIG (<ulink url="http://www.swig.org" />) que foram usadas por algum
-            código programado em perl. De acordo com uma discussão na lista, estas associações
-            SWIG podem ainda ser uma forma de incluir outras linguagens no &app;, embora atualmente
-            não sejam usadas nem mantidas.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_newFeatures">
-        <question>
-          <para>Gostava realmente de ter a funcionalidade XYZ mas o &app; não a tem. Como é que a posso adicionar?
-          </para>
-        </question>
-
-        <answer>
-          <para>Peça com educação. :-) Pode fazer um pedido de melhoria em <ulink url="&url-bug-start;" />. Por
-            favor, lembre-se de descrever a sua melhoria proposta de forma bastante completa. O
-            truque aqui é aprender a dar a melhor informação aos programadores sobre o que a sua
-            melhoria proposta vai fazer. Se quer acelerar o processo de desenvolvimento, considere
-            doar algum dinheiro, conforme descrito em &app;Development.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_web">
-        <question>
-          <para>Há alguma interface web disponível para o &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Não
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_security">
-        <question>
-          <para>Como é que posso garantir a segurança dos dados do &app; usando CFS, etc.)
-          </para>
-        </question>
-
-        <answer>
-          <para>Sem resposta
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_contribute">
-        <question>
-          <para>Como é que posso contribuir para o projeto do &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Estamos a trabalhar num processo mais formal, mas para já, pode subscrever as listas de correio em
-            <ulink url="&url-mail-li;gnucash-user" /> e em
-            <ulink url="&url-mail-li;gnucash-devel" /> e discutir como pode contribuir com os
-            participantes da lista. Note que o &app; está escrito em C e Scheme (veja acima ,
-            <quote>Porque é que o &app; está escrito em C?</quote> se quiser saber porquê). Se
-            não está disposto a trabalhar com estas linguagens, considere outros tipos de
-            contribuição.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_bugs">
-        <question>
-          <para>Penso que encontrei um erro. Como é que o reporto?
-          </para>
-        </question>
-
-        <answer>
-          <para>Primeiro, tente verificar se é realmente um erro e se ainda não foi reportado. Procure nos
-            arquivos de correio (veja a FAQ acima). Depois procure na base de dados do
-            <ulink url="&url-bug-start;">Bugzilla do &appname;</ulink>.
-          </para>
-
-          <para>Se achar que realmente encontrou um novo erro, pode reportá-lo em <ulink url="&url-bug-start;" />.
-            Lembre-se de ser eloquente e claro. Tente aprender como deve informar os programadores a
-            reproduzir o erro. Um programador só consegue reparar um erro que consiga ver, se não
-            o conseguir ver, o erro não será reparado.!
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_using">
-      <title>Usando o &app;</title>
-
-      <qandaentry id="appendixb_using_moveAtoB">
-        <question>
-          <para>Como é que posso mover transações da conta <quote>A</quote> para a conta <quote>B</quote>, ou
-            seja, combinando-as?
-          </para>
-        </question>
-
-        <answer>
-          <para>De momento, o &app; não oferece uma forma de mover grupos de parcelas entre contas. Terá de as
-            mover uma a uma. Abra o diário da conta <quote>A</quote> e selecione
-            <menuchoice>
-              <guimenu>Ver</guimenu><guimenuitem>Diário de transações</guimenuitem>
-            </menuchoice>
-            para ver todas as parcelas. Para cada parcela onde o campo <quote>Conta</quote> mostrar
-            conta <quote>A</quote> altere para conta <quote>B</quote>. Para o fazer rapidamente e
-            com segurança, primeiro use
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>C</keycap>
-            </keycombo>
-            para copiar o nome da conta destino (<quote>conta B</quote>) para a área de
-            transferência. Em seguida, realce cada referência à conta <quote>A</quote> com um
-            duplo clique e use
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>V</keycap>
-            </keycombo>
-            para colar o nome da conta destino. Premindo <keycap function="enter">Enter</keycap>
-            após cada colagem, move a transação para fora do diário silenciosamente.
-          </para>
-
-          <caution>
-            <para>Se definir o campo <quote>Conta</quote> para uma localização errada inadvertidamente, terá de
-              procurar em todas as contas para localizar a transação perdida para corrigir o erro.
-            </para>
-          </caution>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_merge2files">
-        <question>
-          <para>É possível unir dois ficheiro do &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>De momento não.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_SaveAcctTemplate">
-        <question>
-          <para>Como é que posso gravar um modelo do meu plano de contas?
-          </para>
-        </question>
-
-        <answer>
-          <para>Isto está disponível no menu:
-            <menuchoice>
-              <guimenu>Ficheiro</guimenu> <guisubmenu>Exportar</guisubmenu><guimenuitem>Exportar
-              contas</guimenuitem>
-            </menuchoice>
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_ListAll">
-        <question>
-          <para>Quando procuro clientes (ou qualquer outra coisa), como é que posso obter uma lista de tudo?
-          </para>
-        </question>
-
-        <answer>
-          <para>Insira um critério de procura <guilabel>satizfaz expreg</guilabel> e ponha um único ponto
-            <quote>.</quote> na área do texto. Depois, clique em <guibutton>Procurar</guibutton>. A
-            expressão regular <quote>.</quote> significa procurar tudo.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_Dates">
-        <question>
-          <para>Como posso registar uma transação em datas diferentes (data real e data do banco)?
-          </para>
-        </question>
-
-        <answer>
-          <para>Regista a transação no dia em que passa o cheque ou inicia a transação. Quando
-            <quote>chegar</quote> ao banco, pode clicar no campo <quote>R</quote> para
-            <quote>confirmar</quote> a transação (altera <quote>nc</quote> para <quote>c</quote>).
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_accounting">
-      <title>Contabilidade</title>
-
-      <qandaentry id="appendixb_accounting_Taxes">
-        <question>
-          <para>Como é que trato os impostos? Como uma conta a pagar ou como despesa?
-          </para>
-        </question>
-
-        <answer>
-          <para>Esta é uma pergunta com rasteira e devia realmente falar com o seu contabilista. A forma como trata
-            dos impostos depende do tipo de imposto e de como o <emphasis>QUER</emphasis> tratar.
-            Nalguns casos são despesas, noutros são passivo.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-  </qandaset>
-</appendix>
diff --git a/guide/pt/ch_oview.xml b/guide/pt/ch_oview.xml
index 1686e26d..da0409d4 100644
--- a/guide/pt/ch_oview.xml
+++ b/guide/pt/ch_oview.xml
@@ -471,16 +471,6 @@
         </para>
       </listitem>
 
-      <listitem>
-        <para><xref linkend="appendixb"></xref>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para><xref linkend="appendixc"></xref>
-        </para>
-      </listitem>
-
       <listitem>
         <para><xref linkend="appendixd"></xref>
         </para>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 8fc10ebd..e4534192 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -568,8 +568,6 @@
 
     <xi:include href="appendixa.xml" />
 
-    <xi:include href="appendixb.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="fdl-appendix.xml" />
diff --git a/guide/ru/CMakeLists.txt b/guide/ru/CMakeLists.txt
index c8304cfa..d8fcd11e 100644
--- a/guide/ru/CMakeLists.txt
+++ b/guide/ru/CMakeLists.txt
@@ -21,7 +21,6 @@ set (entities
         fdl-appendix.xml
         legal.xml
         appendixa.xml
-        appendixb.xml
         appendixd.xml)
 
 set (FOP_XCONF "${CMAKE_CURRENT_SOURCE_DIR}/fop.xconf.in")
diff --git a/guide/ru/Makefile.am b/guide/ru/Makefile.am
index 56caab81..b8e98df3 100644
--- a/guide/ru/Makefile.am
+++ b/guide/ru/Makefile.am
@@ -26,7 +26,6 @@ entities = \
     fdl-appendix.xml \
     legal.xml \
     appendixa.xml \
-    appendixb.xml \
     appendixd.xml
 DISTCLEANFILES = $(docname)-ru.omf.out
 CLEANFILES = $(DISTCLEANFILES)
diff --git a/guide/ru/appendixb.xml b/guide/ru/appendixb.xml
deleted file mode 100644
index 7a3233c9..00000000
--- a/guide/ru/appendixb.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Converted to qandaset 2019-09-09 by Frank H. Ellenberger
-  
-  Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-  Author:
-  		Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-               (translators put your name and email here)
--->
-<appendix id="appendixb">
-  <title>Frequently Asked Questions</title>
-
-  <abstract>
-    <para>This is a list of questions asked on the mailing lists for which there really is no section in the
-      documentation covering the subject.
-    </para>
-  </abstract>
-
-  <qandaset defaultlabel='qanda'>
-    <qandadiv id="appendixb_info">
-      <title>Sources of Information</title>
-
-      <qandaentry id="appendixb_info_where">
-        <question>
-          <para>Where is the FAQ?
-          </para>
-        </question>
-
-        <answer>
-          <para>You’re looking at an very old copy of it. The most up-to-date copy can be found within the
-            <ulink url="&url-wiki-faq;">&app; Wiki</ulink>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mail">
-        <question>
-          <para>Are there mailing lists for &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes. Go to <ulink url="&url-mail-li;gnucash-user" /> and <ulink url="&url-mail-li;gnucash-devel" />
-            to subscibe.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_mailarchive">
-        <question>
-          <para>Is there a searchable archive for the mailing lists?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes, you can search the mail list archives at
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.devel" /> and
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.user" /> (and
-            <ulink url="http://news.gmane.org/gmane.comp.gnome.apps.gnucash.german" /> if you speak
-            German).
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_info_other">
-        <question>
-          <para>Are there other means of obtaining support for &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes. Many of the developers hang out on icq in the #gnucash discussion on <ulink url="&url-irc;" />.
-            Also, there is a <ulink url="&url-wiki;">wiki</ulink> online.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_general">
-      <title>General Information</title>
-
-      <qandaentry id="appendixb_software_windows">
-        <question>
-          <para>Can I run &app; on &win;?
-          </para>
-        </question>
-
-        <answer>
-          <para>Yes. Starting with release 2.2.0, &app; is also available on &win;.
-          </para>
-        </answer>
-
-        <answer>
-          <para>Other related options would be coLinux, VMWare and a &win;-based X-server hosting a remote &app;
-            session.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_hard2compile">
-        <question>
-          <para>I heard it is too hard to compile &app;!
-          </para>
-        </question>
-
-        <answer>
-          <para>This was probably true at the time when 1.6.0 was released. It is no longer true today, as almost
-            every distribution ships with all the necessary libraries. However, by default,
-            distributions won’t install the development packages of the required libraries, so
-            you might need to start your distribution’s installer program and tell it to
-            install not only the library packages but also the -devel packages. In general, it was
-            noted that this problem concerns many applications in the gnome domain, and this also
-            boils down to the fact that there is no such thing as <quote>one monolithic gnome
-            package</quote>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_batchmode">
-        <question>
-          <para>Is there a batch mode (non-interactive) available for &app;, for building reports, etc?
-          </para>
-        </question>
-
-        <answer>
-          <para>No, for now &app; must be run interactively.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_multuser">
-        <question>
-          <para>Can multiple people access the same datafile in &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>You can have multiple people with access to the same datafile, but they cannot use the data file
-            simultaneously.
-          </para>
-
-          <para>To setup multi-person access, all the people must have read/write access to the directory containing
-            the file (to read the other’s created files, and to create new files). One way to
-            do this is by creating a user group and setting the data directory to be owned by the
-            shared group and set to mode 2775. The <quote>2</quote> makes the directory setgid which
-            copies the permissions to all files.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_WhyC">
-        <question>
-          <para id="appendixb_general_WhyC.q">Why is &app; written in C?
-          </para>
-        </question>
-
-        <answer>
-          <para>The core functionality of &app; is written in C, but do not forget that much of this can be accessed
-            through Guile (scheme). There are a number of reasons for why &app; is written in C. The
-            first is historical, &app; was started in 1996 (or maybe even earlier!) and many of the
-            OOP (C++, Java, Python) compilers were not yet mature and standarized enough on the
-            variety of platforms considered at that time, so C was the only option at that time. A
-            second reason is because the standard GUI &app; uses is GTK, which is written in C.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_rewrite">
-        <question>
-          <para>Why don’t you rewrite &app; in programming language xyz so that I can contribute easily?
-          </para>
-        </question>
-
-        <answer>
-          <para>The quick answer is <quote>We won’t</quote>.
-          </para>
-        </answer>
-
-        <answer>
-          <para>The longer answer is complex but still amounts to <quote>We won’t</quote>. &app; is a large
-            body of code maintained by a small group of developers who are comfortable in C and
-            Scheme (Guile). Actually, 80% of it is in C and approx. 13% is in Scheme/Lisp. There is
-            no valid reason that would justify rewriting this amount of existing code in a newer
-            language. Also, creating language bindings to recent languages such as Python or Ruby or
-            (insert your favourite language here) is labor intensive, and we’re already
-            stretched pretty thin maintaining and developing the existing code.
-          </para>
-        </answer>
-
-        <answer>
-          <para>Having said that, this is an open source project and you’re free to do with it or contribute
-            what you want. Just don’t expect much support if the reason for your changes is
-            that you’re not willing to learn C or Scheme. Also, &app; used to have SWIG
-            bindings (<ulink url="http://www.swig.org" />) which have been used for some perl
-            programming code. According to a list discussion, these SWIG bindings might still be a
-            way to include other languages into &app;, but currently they are unused and
-            unmaintained.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_general_newFeatures">
-        <question>
-          <para>I really want feature XYZ but &app; doesn’t have it. How do I get it added?
-          </para>
-        </question>
-
-        <answer>
-          <para>Ask nicely. :-) You can file an enhancement request at <ulink url="&url-bug-start;" />. Please bear
-            in mind to describe your proposed enhancement as verbosely as possible. The trick here
-            is to learn how to give the best information to the programmers about what your proposed
-            new feature should do. If you want to speed up development significantly, consider
-            donating some money as described on &app;Development.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_web">
-        <question>
-          <para>Is there a web interface available for &app;?
-          </para>
-        </question>
-
-        <answer>
-          <para>No
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_security">
-        <question>
-          <para>How can I provide security for &app; data using CFS, etc.)
-          </para>
-        </question>
-
-        <answer>
-          <para>Unanswered
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_contribute">
-        <question>
-          <para>How can I contribute to the &app; project?
-          </para>
-        </question>
-
-        <answer>
-          <para>We’re working on a more formal process, but for now you should subscribe to the mailing list
-            at <ulink url="&url-mail-li;gnucash-user" /> and
-            <ulink url="&url-mail-li;gnucash-devel" /> and discuss what you can contribute with the
-            participants on the lists. Please be aware that &app; is a large body of code written in
-            C and Scheme (see
-            <quote><link linkend="appendixb_general_WhyC" endterm="appendixb_general_WhyC.q"></link></quote>
-            above, if you want to know why). If these are languages that you are not willing to work
-            with, consider contributing in other ways.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_software_bugs">
-        <question>
-          <para>I think I found a bug. How do I report it?
-          </para>
-        </question>
-
-        <answer>
-          <para>First of all, try to verify that it is indeed a bug and that it has not been reported before. Search
-            the mail list archives (see FAQ above). Then search the
-            <ulink url="&url-bug-start;">&appname; Bugzilla</ulink> database.
-          </para>
-
-          <para>If you feel you have indeed found a bug, you can then report it at <ulink url="&url-bug-start;" />.
-            Please bear in mind to report your bug as verbosely as possible. The trick here is to
-            learn how to give the best information to the programmers about how to reproduce bugs. A
-            Programmer will usually only be able to fix a bug they can see, if you can’t make
-            the programmer see your bug, it won’t get fixed!
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_using">
-      <title>Using &app;</title>
-
-      <qandaentry id="appendixb_using_moveAtoB">
-        <question>
-          <para>How can I move the transactions from account <quote>A</quote> into account <quote>B</quote>, thus
-            combining them?
-          </para>
-        </question>
-
-        <answer>
-          <para>At present, &app; does not offer a way to move groups of splits from one account to another. You
-            will need to move them one at a time. Open the register for account <quote>A</quote> and
-            select the pulldown menu item
-            <menuchoice>
-              <guimenu>View</guimenu><guimenuitem>Transaction Journal</guimenuitem>
-            </menuchoice>
-            to expose all the splits. For every split where the <quote>Account</quote> field shows
-            account <quote>A</quote> reset it to account <quote>B</quote>. To do this quickly and
-            safely, first use
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>C</keycap>
-            </keycombo>
-            to copy the destination account name (<quote>account B</quote>) to the clipboard. Then
-            highlight each reference to account <quote>A</quote> by double clicking on it and use
-            <keycombo>
-              <keycap>Ctrl</keycap><keycap>V</keycap>
-            </keycombo>
-            to paste the destination account name. Pressing <keycap function="enter">Enter</keycap>
-            after each paste, silently moves the transaction out of the register.
-          </para>
-
-          <caution>
-            <para>If you inadvertently set the <quote>Account</quote> field to an unintended location, you will need
-              to search through all your accounts to find the lost transaction to correct your
-              mistake.
-            </para>
-          </caution>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_merge2files">
-        <question>
-          <para>Is it possible to merge two &app; files?
-          </para>
-        </question>
-
-        <answer>
-          <para>At present this is not possible.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_SaveAcctTemplate">
-        <question>
-          <para>How can I save a template of my account structure?
-          </para>
-        </question>
-
-        <answer>
-          <para>This is available from the menu:
-            <menuchoice>
-              <guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export
-              Accounts</guimenuitem>
-            </menuchoice>
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_ListAll">
-        <question>
-          <para>When I search for customers (or anything else for that matter), how can I return a list of
-            everything?
-          </para>
-        </question>
-
-        <answer>
-          <para>Enter a search criteria of <guilabel>matches regex</guilabel>, and place a single dot
-            <quote>.</quote> in the text field area. Then, click <guibutton>Find</guibutton>. The
-            regular expression <quote>.</quote> means to match anything.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry id="appendixb_using_Dates">
-        <question>
-          <para>How can I record a transaction on different dates (actual date and bank date)?
-          </para>
-        </question>
-
-        <answer>
-          <para>You record the transaction on the date you write the check or initiate the transaction. When it
-            <quote>clears</quote> the bank, you can click in the <quote>Reconciled</quote> field to
-            <quote>clear</quote> the transaction (change the <quote>n</quote>on-reconciled to
-            <quote>c</quote>leared).
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-
-    <qandadiv id="appendixb_accounting">
-      <title>Accounting</title>
-
-      <qandaentry id="appendixb_accounting_Taxes">
-        <question>
-          <para>How do I treat taxes? As an account payable or as an expense?
-          </para>
-        </question>
-
-        <answer>
-          <para>This is a loaded question, and you should really talk to your accountant. How you treat taxes really
-            depends on what kind of taxes they are, and how you WANT to treat them.. In some cases
-            they are expenses, in some cases they are liabilities.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandadiv>
-  </qandaset>
-</appendix>
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index 5afb1af0..435efce5 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -582,16 +582,6 @@
         </para>
       </listitem>
 
-      <listitem>
-        <para><xref linkend="appendixb"></xref>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para><xref linkend="appendixc"></xref>
-        </para>
-      </listitem>
-
       <listitem>
         <para><xref linkend="appendixd"></xref>
         </para>
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index 86aef630..e7395626 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -540,8 +540,6 @@
 
     <xi:include href="appendixa.xml" />
 
-    <xi:include href="appendixb.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="fdl-appendix.xml" />

commit 66874285eb76692931e378c9b6ce66df2b5a8eb8
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sun Aug 22 14:00:38 2021 +0900

    Remove obsolete appendix C about VAT from guide.

diff --git a/guide/C/CMakeLists.txt b/guide/C/CMakeLists.txt
index 69f3deb9..ba9ee156 100644
--- a/guide/C/CMakeLists.txt
+++ b/guide/C/CMakeLists.txt
@@ -24,7 +24,6 @@ set (entities
         gnc-glossary.xml
         appendixa.xml
         appendixb.xml
-        appendixc.xml
         appendixd.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/guide/C/Makefile.am b/guide/C/Makefile.am
index 3b9c5282..4ff82fc6 100644
--- a/guide/C/Makefile.am
+++ b/guide/C/Makefile.am
@@ -34,7 +34,6 @@ entities = \
 	gnc-glossary.xml \
 	appendixa.xml \
 	appendixb.xml \
-	appendixc.xml \
 	appendixd.xml
 DISTCLEANFILES =  $(docname)-C.omf.out
 CLEANFILES =  $(DISTCLEANFILES)
diff --git a/guide/C/appendixc.xml b/guide/C/appendixc.xml
deleted file mode 100644
index 3421cd24..00000000
--- a/guide/C/appendixc.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: 2019-09-12 Fell: EEC->EU
-   modified: July 9th 2006
-  Maintainers:
-    Chris Lyttle <chris at wilddev.net>
-  Author:
-    Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-    (translators put your name and email here)
--->
-<appendix id="appendixc">
-  <title>Contributed Account Trees</title>
-
-  <para>This is an ancient example. For recent account trees see
-    <ulink url="&url-src-maint;data/accounts" />, select your language and if existing region.
-  </para>
-
-  <para>If you want to contribute your new or improved templates, read
-    <ulink url="&url-wiki;Translation#How_to_translate_the_files_containing_the_new_account_hierarchies" />.
-  </para>
-
-  <sect1 id="appendixc_vat1">
-    <title>UK Vat</title>
-
-    <para>Account types (only shown if different to parent type)
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>[E] Expense
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[I] Income
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[A] Asset
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[L] Liability
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[Q] Equity
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[B] Bank accounts
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[C] Credit Cards
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[R] Accounts Receivable
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[P] Accounts Payable
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>(Box n) refers to VAT form box number (I actually have these as descriptions to the account to
-      remind me)
-    </para>
-
-    <para>Add all the (Box n -part) together to get the whole (Box n) The VAT shows you liability - if its
-      negative they owe you.
-    </para>
-
-    <para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made
-      over the VAT return period - not the absolute value, nor the difference in value unless that
-      difference is wholly due to new purchases. Depreciation, losses (e.g a write off of faulty
-      item) and other reductions in capital value are not included. If you sell a capital item then
-      that sale and its VAT is recorded under Income. The asset is <quote>converted to cash</quote>,
-      so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
-      matched by a decrease in capital.
-    </para>
-<screen>
-Bank Accounts [B]
-  |___ Main Account
-  |___  Reserve Account
-
-Cash [A]
-
-Assets [A]
-  |___ Capital Equipment    (Box 7 - Part) - additions only, not absolute value
-  |           |___ Computers      Can be depreciated to zero this year
-  |           |___ EU reverse VAT purchase  (Box 6 - Part) create sub-accounts if needed
-  |___  Other
-
-Receivable [R] Customers to whom you give credit - (business section)
-
-
-Cards [C]
-  |___  Card 1
-
-Liabilities [L]
-  |___  Owed Corp Tax
-  |___  Owed Fees
-  |___  Owed Tax / NI
-  |___  Other
-
-VAT [L]   Net (Box 5)
-  |___ i/p [A]   purchases (Box4)
-  |___  o/p [L]     (Box3)
-             |___EU   on reverse VAT purchases (Box 2)
-             |___Sales   all including zero rate UK/ EU  and World (Box1)
-
-Payable [P]   Suppliers who give you credit (business section)
-
-Equity [Q]
-  |___  Corp Tax
-  |___  Director’s Loan
-  |___  Dividends
-  |             |___  Director1
-  |             |___  Director2
-  |             |___  Shareholder 1
-  |___ Grants (and stuff that does not count as income)
-  |___Opening Balances
-
-Income [I]   (Box 6 - part)
-   |___ Interest
-   |___ Misc
-   | ___ Sales
-                |___ EU
-                |     |____ goods  (Box 8) (sub accounts as needed)
-                |     |____ services includes software (sub accounts as needed)
-                | ___ UK
-                |____ World
-
-Expenses [E]
-        |__Depreciation
-        |__ Emoluments
-        |            |___ Directors Fees
-        |            |___ NI Employer
-        |            |___ Employee 1
-        |                     |___NI
-        |                     |___Net Salary
-        |                     |___Stakeholder
-        |                     |___Tax
-        |___ Other Non VAT Expenses
-        |___ VAT Purchases    (Box 7 - part)
-                    |___  Accountancy
-                    |___  Bank Charges
-                    |___  Consumables
-                    |___  EU  reverse VAT purchases  (Box 6 - Part)
-                    |         |___ goods (Box 9) (sub accounts as needed)
-                    |         |___ services   includes software (sub accounts as needed)
-                    |___  Office
-                    |___  Phone and Internet
-                    |___  Software
-                    |___  Subscriptions
-                    |___  Sundry
-                    |___  Travel / Accom</screen>
-  </sect1>
-</appendix>
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 7fee4aba..9afeab74 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -659,8 +659,6 @@
 
     <xi:include href="appendixb.xml" />
 
-    <xi:include href="appendixc.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="fdl-appendix.xml" />
diff --git a/guide/de/CMakeLists.txt b/guide/de/CMakeLists.txt
index 2e8b32c0..d939fd3b 100644
--- a/guide/de/CMakeLists.txt
+++ b/guide/de/CMakeLists.txt
@@ -23,7 +23,6 @@ set (entities
         ch_txns.xml
         appendixa.xml
         appendixb.xml
-        appendixc.xml
         appendixd.xml
         appendixe.xml
         fdl-appendix.xml
diff --git a/guide/de/Makefile.am b/guide/de/Makefile.am
index 2ac59b36..16d6d107 100644
--- a/guide/de/Makefile.am
+++ b/guide/de/Makefile.am
@@ -27,7 +27,6 @@ entities = \
  ch_txns.xml \
  appendixa.xml \
  appendixb.xml \
- appendixc.xml \
  appendixd.xml \
  appendixe.xml \
  fdl-appendix.xml \
diff --git a/guide/de/appendixc.xml b/guide/de/appendixc.xml
deleted file mode 100644
index 258d6012..00000000
--- a/guide/de/appendixc.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: 2019-09-12 Fell: EEC->EU
-   modified: July 9th 2006
-  Maintainers:
-    Chris Lyttle <chris at wilddev.net>
-  Author:
-    Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-    (translators put your name and email here)
--->
-<appendix id="appendixc">
-  <title>Contributed Account Trees</title>
-
-  <para>&untranslated-de;
-  </para>
-<!-- 
-  <para>This is an ancient example. For recent account trees see
-    <ulink url="&url-src-maint;data/accounts" />, select your language and if existing region.
-  </para>
-
-  <para>If you want to contribute your new or improved templates, read
-    <ulink url="&url-wiki;Translation#How_to_translate_the_files_containing_the_new_account_hierarchies" />.
-  </para>
-
-  <sect1 id="appendixc_vat1">
-    <title>UK Vat</title>
-
-    <para>Account types (only shown if different to parent type)
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>[E] Expense
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[I] Income
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[A] Asset
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[L] Liability
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[Q] Equity
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[B] Bank accounts
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[C] Credit Cards
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[R] Accounts Receivable
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[P] Accounts Payable
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>(Box n) refers to VAT form box number (I actually have these as descriptions to the account to
-      remind me)
-    </para>
-
-    <para>Add all the (Box n -part) together to get the whole (Box n) The VAT shows you liability - if its
-      negative they owe you.
-    </para>
-
-    <para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made
-      over the VAT return period - not the absolute value, nor the difference in value unless that
-      difference is wholly due to new purchases. Depreciation, losses (e.g a write off of faulty
-      item) and other reductions in capital value are not included. If you sell a capital item then
-      that sale and its VAT is recorded under Income. The asset is <quote>converted to cash</quote>,
-      so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
-      matched by a decrease in capital.
-    </para>
-<screen>
-Bank Accounts [B]
-  |___ Main Account
-  |___  Reserve Account
-
-Cash [A]
-
-Assets [A]
-  |___ Capital Equipment    (Box 7 - Part) - additions only, not absolute value
-  |           |___ Computers      Can be depreciated to zero this year
-  |           |___ EU reverse VAT purchase  (Box 6 - Part) create sub-accounts if needed
-  |___  Other
-
-Receivable [R] Customers to whom you give credit - (business section)
-
-
-Cards [C]
-  |___  Card 1
-
-Liabilities [L]
-  |___  Owed Corp Tax
-  |___  Owed Fees
-  |___  Owed Tax / NI
-  |___  Other
-
-VAT [L]   Net (Box 5)
-  |___ i/p [A]   purchases (Box4)
-  |___  o/p [L]     (Box3)
-             |___EU   on reverse VAT purchases (Box 2)
-             |___Sales   all including zero rate UK/ EU  and World (Box1)
-
-Payable [P]   Suppliers who give you credit (business section)
-
-Equity [Q]
-  |___  Corp Tax
-  |___  Director’s Loan
-  |___  Dividends
-  |             |___  Director1
-  |             |___  Director2
-  |             |___  Shareholder 1
-  |___ Grants (and stuff that does not count as income)
-  |___Opening Balances
-
-Income [I]   (Box 6 - part)
-   |___ Interest
-   |___ Misc
-   | ___ Sales
-                |___ EU
-                |     |____ goods  (Box 8) (sub accounts as needed)
-                |     |____ services includes software (sub accounts as needed)
-                | ___ UK
-                |____ World
-
-Expenses [E]
-        |__Depreciation
-        |__ Emoluments
-        |            |___ Directors Fees
-        |            |___ NI Employer
-        |            |___ Employee 1
-        |                     |___NI
-        |                     |___Net Salary
-        |                     |___Stakeholder
-        |                     |___Tax
-        |___ Other Non VAT Expenses
-        |___ VAT Purchases    (Box 7 - part)
-                    |___  Accountancy
-                    |___  Bank Charges
-                    |___  Consumables
-                    |___  EU  reverse VAT purchases  (Box 6 - Part)
-                    |         |___ goods (Box 9) (sub accounts as needed)
-                    |         |___ services   includes software (sub accounts as needed)
-                    |___  Office
-                    |___  Phone and Internet
-                    |___  Software
-                    |___  Subscriptions
-                    |___  Sundry
-                    |___  Travel / Accom</screen>
-  </sect1>-->
-</appendix>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 1d51710a..2552d541 100644
--- a/guide/de/gnucash-guide.xml
+++ b/guide/de/gnucash-guide.xml
@@ -688,8 +688,6 @@
 
     <xi:include href="appendixb.xml" />
 
-    <xi:include href="appendixc.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="appendixe.xml" />
diff --git a/guide/it/CMakeLists.txt b/guide/it/CMakeLists.txt
index 9a957a17..ad37fe68 100644
--- a/guide/it/CMakeLists.txt
+++ b/guide/it/CMakeLists.txt
@@ -23,7 +23,6 @@ set (COMPONENTS
         ${top_srcdir}/guide/C/gnc-glossary.xml
         ${top_srcdir}/guide/C/appendixa.xml
         ${top_srcdir}/guide/C/appendixb.xml
-        ${top_srcdir}/guide/C/appendixc.xml
         ${top_srcdir}/guide/C/appendixd.xml)
 
 #gnucash-guide.xml: ${COMPONENTS} ${srcdir}/it.po
diff --git a/guide/it/Makefile.am b/guide/it/Makefile.am
index 91f63d18..7025fdc5 100644
--- a/guide/it/Makefile.am
+++ b/guide/it/Makefile.am
@@ -41,7 +41,6 @@ COMPONENTS = \
 	${top_srcdir}/guide/C/gnc-glossary.xml \
 	${top_srcdir}/guide/C/appendixa.xml \
 	${top_srcdir}/guide/C/appendixb.xml \
-	${top_srcdir}/guide/C/appendixc.xml \
 	${top_srcdir}/guide/C/appendixd.xml
 
 #gnucash-guide.xml: ${COMPONENTS} ${srcdir}/it.po
diff --git a/guide/ja/CMakeLists.txt b/guide/ja/CMakeLists.txt
index 65215a1d..f95616c3 100644
--- a/guide/ja/CMakeLists.txt
+++ b/guide/ja/CMakeLists.txt
@@ -20,7 +20,6 @@ set (entities
         ch_python_bindings.xml
         appendixa.xml
         appendixb.xml
-        appendixc.xml
         appendixd.xml)
 
 set (FOP_XCONF "${CMAKE_CURRENT_SOURCE_DIR}/fop.xconf.in")
diff --git a/guide/ja/Makefile.am b/guide/ja/Makefile.am
index 94f9b828..0f9dd8d9 100644
--- a/guide/ja/Makefile.am
+++ b/guide/ja/Makefile.am
@@ -25,7 +25,6 @@ entities = \
 	ch_python_bindings.xml \
 	appendixa.xml \
 	appendixb.xml \
-	appendixc.xml \
 	appendixd.xml
 DISTCLEANFILES =  $(docname)-ja.omf.out mincho.xml gothic.xml $(fopconfig)
 CLEANFILES =  $(DISTCLEANFILES)
diff --git a/guide/ja/appendixc.xml b/guide/ja/appendixc.xml
deleted file mode 100644
index 6cfc378e..00000000
--- a/guide/ja/appendixc.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Maintainers:
-    Chris Lyttle <chris at wilddev.net>
-  Author:
-    Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-    Yasuaki Taniguchi <yasuakit at gmail.com>
--->
-<appendix id="appendixc">
-  <title>寄付された勘定科目ツリー</title>
-
-  <para></para>
-
-  <sect1 id="appendixc_vat1">
-    <title>英国付加価値税</title>
-
-    <para>勘定科目タイプ (親のタイプと異なる場合だけ表示)
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>[E] 費用
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[I] 収益
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[A] 資産
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[L] 負債
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[Q] 純資産
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[B] 銀行預金口座
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[C] クレジットカード
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[R] 売掛金
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[P] 買掛金
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>(Box n)
-      は付加価値税形式ボックス番号を示します。(実際には勘定科目を思い出すための説明としてこれらがあります)
-    </para>
-
-    <para>(ボックスn
-      の一部)をすべて加えると、全体(ボックスn)を得られます。付加価値税は負債です。負であったら、支払い超過です。
-    </para>
-
-    <para>資本設備(ボックス7 の一部)と(ボックス6
-      の一部)は、付加価値税返金期間でのすべての*加算*(購入)金額です。差異が完全な新規の購入のためでないなら、金額の絶対値でも金額の変化でもありません。そして、減価償却費、損失、(例:不完全な商品の清算)、可変資本における営業外費用は含まれていません。あなたが資本設備を売却する場合、その売却とその付加価値税は収益として記録されます。資産が「お金に変換」され、請求の支払があった時に銀行預金口座の「付加価値税の総額」が増加します。これは資本の減少と一致します。
-    </para>
-<screen>
-銀行預金口座 [B]
-  |___ 主口座
-  |___ 積立金口座
-
-現金 [A]
-
-資産 [A]
-  |___ 資本設備    (ボックス7 の一部) - 絶対値ではなく、加算専用
-  |           |___ コンピューター     今年、ゼロに減価償却するであることができます。
-  |           |___ EU 購入付加価値税還付  (ボックス6の一部) 必要であるなら、子勘定科目を作成します。
-  |___ その他
-
-売掛金 [R] 信用取引を行う得意先 - (ビジネス領域)
-
-
-クレジットカード [C]
-  |___  クレジットカード1
-
-負債 [L]
-  |___  会社の税金負担
-  |___  手数料負担
-  |___  税金/国民保険(NI)負担
-  |___  その他
-
-付加価値税 [L]   総額 (ボックス5)
-  |___ i/p [A]   仕入(Box4)
-  |___ o/p [L]   (Box3)
-             |___欧州経済共同体   付加価値税の還付(ボックス2)
-             |___売上   UK/EU および世界でのゼロ税率を全て含む(Box1)
-
-買掛金 [P]   信用取引を行う仕入先 (ビジネス領域)
-
-純資産 [Q]
-  |___  会社の税金
-  |___  取締役のローン
-  |___  配当
-  |        |___  取締役1
-  |        |___  取締役2
-  |        |___  株主1
-  |___ 寄付金   (これとささいな物は収益にみなしません)
-  |___ 開始残高
-
-収益 [I]   (ボックス6の一部)
-   |___ 利子
-   |___ 雑収入
-   |___ 売上
-                |___ EU
-                |     |____ 商品 (ボックス8) (子勘定科目が必要です。)
-                |     |____ サービスとソフトウェアソフトウェア (子勘定科目が必要です)
-                | ___ 英国
-                |____ 世界
-
-費用 [E]
-        |__ 減価償却費
-        |__ 報酬
-        |            |___ 取締役報酬
-        |            |___ 雇用者国民保険
-        |            |___ 従業員1
-        |                     |___国民保険
-        |                     |___税込給与
-        |                     |___利害関係者
-        |                     |___税金
-        |___ 他の非付加価値税費用
-        |___ 付加価値税購入(ボックス7の一部)
-                    |___  会計業務
-                    |___  銀行手数料
-                    |___  消耗品
-                    |___  EU 購入付加価値税還付 (ボックス6の一部)
-                    |         |___ 商品 (ボックス9) (子勘定科目が必要です)
-                    |         |___ サービスとソフトウェア  (子勘定科目が必要です)
-                    |___  事務所費
-                    |___  電話料金とインターネット料金
-                    |___  ソフトウェア
-                    |___  定期購読
-                    |___  雑費
-                    |___  出張費/宿泊費</screen>
-  </sect1>
-</appendix>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index 6808b104..88febffc 100644
--- a/guide/ja/gnucash-guide.xml
+++ b/guide/ja/gnucash-guide.xml
@@ -448,8 +448,6 @@
 
   <xi:include href="appendixb.xml" />
 
-  <xi:include href="appendixc.xml" />
-
   <xi:include href="appendixd.xml" />
 
   <xi:include href="fdl-appendix.xml" />
diff --git a/guide/pt/CMakeLists.txt b/guide/pt/CMakeLists.txt
index b76fb419..fee9f737 100644
--- a/guide/pt/CMakeLists.txt
+++ b/guide/pt/CMakeLists.txt
@@ -23,7 +23,6 @@ set (entities
         ch_import_business_data.xml
         appendixa.xml
         appendixb.xml
-        appendixc.xml
         appendixd.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/guide/pt/Makefile.am b/guide/pt/Makefile.am
index 2ac960d3..d1ed2c9c 100644
--- a/guide/pt/Makefile.am
+++ b/guide/pt/Makefile.am
@@ -33,7 +33,6 @@ entities = \
 	ch_import_business_data.xml \
 	appendixa.xml \
 	appendixb.xml \
-	appendixc.xml \
 	appendixd.xml
 DISTCLEANFILES =  $(docname)-C.omf.out
 CLEANFILES =  $(DISTCLEANFILES)
diff --git a/guide/pt/appendixc.xml b/guide/pt/appendixc.xml
deleted file mode 100644
index 1cd6ef1e..00000000
--- a/guide/pt/appendixc.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: July 9th 2006
-  Maintainers:
-    Chris Lyttle <chris at wilddev.net>
-  Author:
-    Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-    Pedro Albuquerque <palbuquerque73 at gmail.com>
--->
-<appendix id="appendixc">
-  <title>Planos de contas contribuídos</title>
-
-  <para></para>
-
-  <sect1 id="appendixc_vat1">
-    <title>IVA da Grã-Bretanha</title>
-
-    <subtitle>Dado que é um plano de contas específico para a Grã-Bretanha, não vemos necessidade de traduzir
-      este apêndice. Muito pelo contrário, seria prejudicial à intenção com que foi criado.
-    </subtitle>
-
-    <para>Account types (only shown if different to parent type)
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>[E] Expense
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[I] Income
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[A] Asset
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[L] Liability
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[Q] Equity
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[B] Bank accounts
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[C] Credit Cards
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[R] Accounts Receivable
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[P] Accounts Payable
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>(Box n) refers to VAT form box number (I actually have these as descriptions to the account to
-      remind me)
-    </para>
-
-    <para>Add all the (Box n -part) together to get the whole (Box n) The VAT shows you liability - if its
-      negative they owe you.
-    </para>
-
-    <para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made
-      over the VAT return period - not the absolute value, nor the difference in value unless that
-      difference is wholly due to new purchases. Depreciation, losses (e.g a write off of faulty
-      item) and other reductions in capital value are not included. If you sell a capital item then
-      that sale and its VAT is recorded under Income. The asset is <quote>converted to cash</quote>,
-      so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
-      matched by a decrease in capital.
-    </para>
-<screen>
-Bank Accounts [B]
-  |___ Main Account
-  |___  Reserve Account
-
-Cash [A]
-
-Assets [A]
-  |___ Capital Equipment    (Box 7 - Part) - additions only, not absolute value
-  |           |___ Computers      Can be depreciated to zero this year
-  |           |___ EU reverse VAT purchase  (Box 6 - Part) create sub-accounts if needed
-  |___  Other
-
-Receivable [R] Customers to whom you give credit - (business section)
-
-
-Cards [C]
-  |___  Card 1
-
-Liabilities [L]
-  |___  Owed Corp Tax
-  |___  Owed Fees
-  |___  Owed Tax / NI
-  |___  Other
-
-VAT [L]   Net (Box 5)
-  |___ i/p [A]   purchases (Box4)
-  |___  o/p [L]     (Box3)
-             |___EU   on reverse VAT purchases (Box 2)
-             |___Sales   all including zero rate UK/ EU  and World (Box1)
-
-Payable [P]   Suppliers who give you credit (business section)
-
-Equity [Q]
-  |___  Corp Tax
-  |___  Director’s Loan
-  |___  Dividends
-  |             |___  Director1
-  |             |___  Director2
-  |             |___  Shareholder 1
-  |___ Grants (and stuff that does not count as income)
-  |___Opening Balances
-
-Income [I]   (Box 6 - part)
-   |___ Interest
-   |___ Misc
-   | ___ Sales
-                |___ EU
-                |     |____ goods  (Box 8) (sub accounts as needed)
-                |     |____ services includes software (sub accounts as needed)
-                | ___ UK
-                |____ World
-
-Expenses [E]
-        |__Depreciation
-        |__ Emoluments
-        |            |___ Directors Fees
-        |            |___ NI Employer
-        |            |___ Employee 1
-        |                     |___NI
-        |                     |___Net Salary
-        |                     |___Stakeholder
-        |                     |___Tax
-        |___ Other Non VAT Expenses
-        |___ VAT Purchases    (Box 7 - part)
-                    |___  Accountancy
-                    |___  Bank Charges
-                    |___  Consumables
-                    |___  EU  reverse VAT purchases  (Box 6 - Part)
-                    |         |___ goods (Box 9) (sub accounts as needed)
-                    |         |___ services   includes software (sub accounts as needed)
-                    |___  Office
-                    |___  Phone and Internet
-                    |___  Software
-                    |___  Subscriptions
-                    |___  Sundry
-                    |___  Travel / Accom</screen>
-  </sect1>
-</appendix>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 35fccc69..8fc10ebd 100644
--- a/guide/pt/gnucash-guide.xml
+++ b/guide/pt/gnucash-guide.xml
@@ -570,8 +570,6 @@
 
     <xi:include href="appendixb.xml" />
 
-    <xi:include href="appendixc.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="fdl-appendix.xml" />
diff --git a/guide/ru/CMakeLists.txt b/guide/ru/CMakeLists.txt
index 3f401bba..c8304cfa 100644
--- a/guide/ru/CMakeLists.txt
+++ b/guide/ru/CMakeLists.txt
@@ -22,7 +22,6 @@ set (entities
         legal.xml
         appendixa.xml
         appendixb.xml
-        appendixc.xml
         appendixd.xml)
 
 set (FOP_XCONF "${CMAKE_CURRENT_SOURCE_DIR}/fop.xconf.in")
diff --git a/guide/ru/Makefile.am b/guide/ru/Makefile.am
index b9883667..56caab81 100644
--- a/guide/ru/Makefile.am
+++ b/guide/ru/Makefile.am
@@ -27,7 +27,6 @@ entities = \
     legal.xml \
     appendixa.xml \
     appendixb.xml \
-    appendixc.xml \
     appendixd.xml
 DISTCLEANFILES = $(docname)-ru.omf.out
 CLEANFILES = $(DISTCLEANFILES)
diff --git a/guide/ru/appendixc.xml b/guide/ru/appendixc.xml
deleted file mode 100644
index 3421cd24..00000000
--- a/guide/ru/appendixc.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!-- (Do not remove this comment block.)
-  Version: 2.0.0
-  Last modified: 2019-09-12 Fell: EEC->EU
-   modified: July 9th 2006
-  Maintainers:
-    Chris Lyttle <chris at wilddev.net>
-  Author:
-    Jon Lapham <lapham at extracta.com.br>
-  Originally designed by Carol Champagne.
-  Translators:
-    (translators put your name and email here)
--->
-<appendix id="appendixc">
-  <title>Contributed Account Trees</title>
-
-  <para>This is an ancient example. For recent account trees see
-    <ulink url="&url-src-maint;data/accounts" />, select your language and if existing region.
-  </para>
-
-  <para>If you want to contribute your new or improved templates, read
-    <ulink url="&url-wiki;Translation#How_to_translate_the_files_containing_the_new_account_hierarchies" />.
-  </para>
-
-  <sect1 id="appendixc_vat1">
-    <title>UK Vat</title>
-
-    <para>Account types (only shown if different to parent type)
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>[E] Expense
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[I] Income
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[A] Asset
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[L] Liability
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[Q] Equity
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[B] Bank accounts
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[C] Credit Cards
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[R] Accounts Receivable
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>[P] Accounts Payable
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>(Box n) refers to VAT form box number (I actually have these as descriptions to the account to
-      remind me)
-    </para>
-
-    <para>Add all the (Box n -part) together to get the whole (Box n) The VAT shows you liability - if its
-      negative they owe you.
-    </para>
-
-    <para>Capital Equipment (Box 7 - part) and (Box 6 - part) is the value of all *additions* (purchases) made
-      over the VAT return period - not the absolute value, nor the difference in value unless that
-      difference is wholly due to new purchases. Depreciation, losses (e.g a write off of faulty
-      item) and other reductions in capital value are not included. If you sell a capital item then
-      that sale and its VAT is recorded under Income. The asset is <quote>converted to cash</quote>,
-      so the <quote>net of VAT</quote> increase in your bank account, when the invoice is payed, is
-      matched by a decrease in capital.
-    </para>
-<screen>
-Bank Accounts [B]
-  |___ Main Account
-  |___  Reserve Account
-
-Cash [A]
-
-Assets [A]
-  |___ Capital Equipment    (Box 7 - Part) - additions only, not absolute value
-  |           |___ Computers      Can be depreciated to zero this year
-  |           |___ EU reverse VAT purchase  (Box 6 - Part) create sub-accounts if needed
-  |___  Other
-
-Receivable [R] Customers to whom you give credit - (business section)
-
-
-Cards [C]
-  |___  Card 1
-
-Liabilities [L]
-  |___  Owed Corp Tax
-  |___  Owed Fees
-  |___  Owed Tax / NI
-  |___  Other
-
-VAT [L]   Net (Box 5)
-  |___ i/p [A]   purchases (Box4)
-  |___  o/p [L]     (Box3)
-             |___EU   on reverse VAT purchases (Box 2)
-             |___Sales   all including zero rate UK/ EU  and World (Box1)
-
-Payable [P]   Suppliers who give you credit (business section)
-
-Equity [Q]
-  |___  Corp Tax
-  |___  Director’s Loan
-  |___  Dividends
-  |             |___  Director1
-  |             |___  Director2
-  |             |___  Shareholder 1
-  |___ Grants (and stuff that does not count as income)
-  |___Opening Balances
-
-Income [I]   (Box 6 - part)
-   |___ Interest
-   |___ Misc
-   | ___ Sales
-                |___ EU
-                |     |____ goods  (Box 8) (sub accounts as needed)
-                |     |____ services includes software (sub accounts as needed)
-                | ___ UK
-                |____ World
-
-Expenses [E]
-        |__Depreciation
-        |__ Emoluments
-        |            |___ Directors Fees
-        |            |___ NI Employer
-        |            |___ Employee 1
-        |                     |___NI
-        |                     |___Net Salary
-        |                     |___Stakeholder
-        |                     |___Tax
-        |___ Other Non VAT Expenses
-        |___ VAT Purchases    (Box 7 - part)
-                    |___  Accountancy
-                    |___  Bank Charges
-                    |___  Consumables
-                    |___  EU  reverse VAT purchases  (Box 6 - Part)
-                    |         |___ goods (Box 9) (sub accounts as needed)
-                    |         |___ services   includes software (sub accounts as needed)
-                    |___  Office
-                    |___  Phone and Internet
-                    |___  Software
-                    |___  Subscriptions
-                    |___  Sundry
-                    |___  Travel / Accom</screen>
-  </sect1>
-</appendix>
diff --git a/guide/ru/gnucash-guide.xml b/guide/ru/gnucash-guide.xml
index da83aeed..86aef630 100644
--- a/guide/ru/gnucash-guide.xml
+++ b/guide/ru/gnucash-guide.xml
@@ -542,8 +542,6 @@
 
     <xi:include href="appendixb.xml" />
 
-    <xi:include href="appendixc.xml" />
-
     <xi:include href="appendixd.xml" />
 
     <xi:include href="fdl-appendix.xml" />

commit 731dcdf4e4d0e5bc8d3e24ca8040d83f6581c68d
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 17:38:27 2021 +0900

    Add a comment for translators.

diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index 7c900a6b..ced84014 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -620,6 +620,12 @@ TODO -->
           able to track the various income and expense amounts per stock and broker.
         </para>
 
+ <!-- 
+ As for brokerage "Bank" account, see 
+ https://github.com/Gnucash/gnucash-docs/pull/198#discussion_r679289248
+ 
+ It depends on the countries and financial systems. Therefore translate it according to your country.
+  -->
         <para>You decide to purchase stock in the Beijing Airport (Hong Kong). The ticker for this stock is
           0694.HK on Yahoo! Since you wanted to track all various income and expense amounts, here
           is the necessary account structure:

commit b3072cb91727bbe395a3b96ce40453bbc56dda99
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Tue Jul 20 01:13:16 2021 +0900

    Unify words and account names.
    Fix minor typos and tags.
    Add commas to the numbers.
    Add some tags.
    Fix according to the review comments.

diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index bbab1ae7..b8b0c79d 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -27,7 +27,7 @@
     </para>
 
     <para>Certain resellable assets can change value over time, such as stocks, bonds, houses, or cars. Some
-      assets (eg: a stock) could increase in value, some (eg: a car) could decrease in value. It is
+      assets could increase in value, some could decrease in value. It is
       important to be able to track some of these time-dependent asset valuations, this chapter will
       show you how.
     </para>
@@ -38,7 +38,7 @@
       taxation.
     </para>
 
-    <para>Consumable and disposable items (eg: food, gas for your car, or printer paper) are obviously not
+    <para>Consumable and disposable items (for example, food, gas for your car, or printer paper) are obviously not
       involved. Thus, even though the new clothes you recently bought will certainly depreciate, you
       would not want to track this depreciation since you have no intention of reselling the clothes
       and there is no tax implications to the depreciation on clothing. So, for this example, the
@@ -110,9 +110,19 @@
   <sect1 id="capgain_accounts1">
     <title>Account Setup</title>
 
+    <important>
+      <para>
+        In the next few sections, unrealized gain accounts are created, and the estimated unrealized gain transactions 
+        are recorded there in order for users to understand unrealized gain easily. However, it is not necessary
+        to record unrealized gains unless large corporations like which adopt IFRS in actual accounting.
+        The small enterprise users, who are using &app;, should not record unrealized gains. Record into &app; 
+        only when realized gains are fixed.
+      </para>
+    </important>
+
     <para>As with most accounting practices, there are a number of different ways to setup capital gains
       accounts. We will present here a general method which should be flexible enough to handle most
-      situations. The first account you will need is an <emphasis>Asset Cost</emphasis> account
+      situations. The first account you will need is an asset <emphasis>Cost</emphasis> account
       (&app; account type <guilabel>Asset</guilabel>), which is simply a place where you record the
       original purchase of the asset. Usually this purchase is accomplished by a transaction from
       your bank account.
@@ -129,21 +139,21 @@
     <para>Below is a generic account hierarchy for tracking the appreciation of 2 assets,
       <emphasis>ITEM1</emphasis> and <emphasis>ITEM2</emphasis>. The <emphasis>Assets:Fixed
       Assets:ITEM1:Cost</emphasis> accounts are balanced by the <emphasis>Assets:Current
-      Assets:Savings Account</emphasis> account, the <emphasis>Assets:Fixed Assets:ITEM1:Unrealized
+      Assets:Savings</emphasis> account, the <emphasis>Assets:Fixed Assets:ITEM1:Unrealized
       Gains</emphasis> accounts are balanced by the <emphasis>Income:Unrealized Gains</emphasis>
       account (similar for <emphasis>ITEM2</emphasis>).
     </para>
 <screen>
 -Assets
     -Current Assets
-        -Savings Account
+        -Savings
     -Fixed Assets
         -ITEM1
             -Cost
-            -Unrealized Gain
+            -Unrealized Gains
         -ITEM2
             -Cost
-            -Unrealized Gain
+            -Unrealized Gains
 -Income
     -Realized Gains
     -Unrealized Gains</screen>
@@ -158,8 +168,8 @@
 
     <para>Start with an account hierarchy similar to that shown in <xref
     linkend="capgain_accounts1" />,
-      but replace <quote>ITEM1</quote> with <quote>Degas</quote> and you can remove the
-      <quote>ITEM2</quote> accounts. We will assume that the Degas painting had an initial value of
+      but replace <emphasis>ITEM1</emphasis> with <emphasis>Degas</emphasis> and remove the
+      <emphasis>ITEM2</emphasis> accounts. We will assume that the Degas painting had an initial value of
       one hundred thousand dollars. Begin by giving your self $100,000 in the bank and then
       transferring that from your bank account to your <emphasis>Assets:Fixed
       Assets:Degas:Cost</emphasis> account (the asset purchase transaction). You should now have a
@@ -189,9 +199,8 @@
 
       <para>A month later, you have reason to suspect that the value of your painting has increased by $10,000
         (an unrealized gain). In order to record this you transfer $10,000 from your
-        <emphasis>Accrued Gains</emphasis> income account (<emphasis>Income:Unrealized
-        Gains</emphasis>) to your asset Unrealized Gains account (<emphasis>Assets:Fixed
-        Assets:Degas:Unrealized Gain</emphasis>). Your main window will resemble this:
+        <emphasis>Income:Unrealized Gains</emphasis> account to your <emphasis>Assets:Fixed Assets:Degas:Unrealized Gains</emphasis> account.
+         Your main window will resemble this:
       </para>
 
       <screenshot id="capgain_app2main">
@@ -228,7 +237,7 @@
 
       <orderedlist>
         <listitem>
-          <para><emphasis>Accurate estimation</emphasis> of unrealized gain.
+          <para><emphasis>Accurate estimation</emphasis> of unrealized gains.
           </para>
 
           <para>Your optimistic estimate of the painting’s value was correct. First you must record that the
@@ -240,16 +249,16 @@
           <para>Secondly, you must credit your bank account with the selling price of the painting. This money comes
             directly from your <emphasis>Assets:Fixed Assets:Degas</emphasis> sub-accounts. Transfer
             the full <emphasis>Assets:Fixed Assets:Degas:Cost</emphasis> value into
-            <emphasis>Assets:Current Assets:Savings Account</emphasis>, and the full
-            <emphasis>Assets:Fixed Assets:Degas:Unrealized Gain</emphasis> into
-            <emphasis>Assets:Current Assets:Savings Account</emphasis>.
+            <emphasis>Assets:Current Assets:Savings</emphasis>, and the full
+            <emphasis>Assets:Fixed Assets:Degas:Unrealized Gains</emphasis> into
+            <emphasis>Assets:Current Assets:Savings</emphasis>.
           </para>
 
           <para>These transactions should now appear as follows:
           </para>
 
           <para><table>
-              <title>Turning an Accrued Gain into a Realized Gain - Accurate Estimation</title>
+              <title>Turning an Unrealized Gain into a Realized Gain - Accurate Estimation</title>
 
               <tgroup cols="4">
                 <tbody>
@@ -295,7 +304,7 @@
                     </entry>
 
                     <entry>
-                      Assets:Current Assets:Savings Account
+                      Assets:Current Assets:Savings
                     </entry>
 
                     <entry>
@@ -313,7 +322,7 @@
                     </entry>
 
                     <entry>
-                      Assets:Current Assets:Savings Account
+                      Assets:Current Assets:Savings
                     </entry>
 
                     <entry>
@@ -329,8 +338,8 @@
             </table>
           </para>
 
-          <para>This leaves the <emphasis>Assets:Current Assets:Savings Account</emphasis> account with a total of
-            $130000 and <emphasis>Income:Realized Gains</emphasis> with a total of $30000.
+          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of
+            $130,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $30,000.
           </para>
 
           <screenshot id="capgain_app3main">
@@ -345,7 +354,7 @@
               </textobject>
 
               <caption>
-                <para>Chart of Accounts after realized gain
+                <para>Chart of Accounts after realized gains
                 </para>
               </caption>
             </mediaobject>
@@ -353,21 +362,21 @@
         </listitem>
 
         <listitem>
-          <para><emphasis>Over estimation</emphasis> of unrealized gain.
+          <para><emphasis>Over estimation</emphasis> of unrealized gains.
           </para>
 
-          <para>You were over-optimistic about the value of the painting. Instead of the $130000 you thought the
-            painting was worth you are only offered $120000. But you still decide to sell, because
-            you value $120000 more than you value the painting. The numbers change a little bit, but
+          <para>You were over-optimistic about the value of the painting. Instead of the $130,000 you thought the
+            painting was worth you are only offered $120,000. But you still decide to sell, because
+            you value $120,000 more than you value the painting. The numbers change a little bit, but
             not too dramatically.
           </para>
 
           <para>The transactions should now appear as follows (observe the last transaction which balances the
-            <emphasis>Unrealized Gains</emphasis> accounts):
+            <emphasis>Unrealized Gains</emphasis> account):
           </para>
 
           <para><table>
-              <title>Turning an Accrued Gain into a Realized Gain - Underestimation</title>
+              <title>Turning an Unrealized Gain into a Realized Gain - Over estimation</title>
 
               <tgroup cols="4">
                 <tbody>
@@ -413,7 +422,7 @@
                     </entry>
 
                     <entry>
-                      Assets:Current Assets:Savings Account
+                      Assets:Current Assets:Savings
                     </entry>
 
                     <entry>
@@ -431,7 +440,7 @@
                     </entry>
 
                     <entry>
-                      Assets:Current Assets:Savings Account
+                      Assets:Current Assets:Savings
                     </entry>
 
                     <entry>
@@ -465,25 +474,25 @@
             </table>
           </para>
 
-          <para>This leaves the <emphasis>Assets:Current Assets:Savings Account</emphasis> account with a total of
-            $120000 and <emphasis>Income:Realized Gains</emphasis> with a total of $20000.
+          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of
+            $120,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $20,000.
           </para>
         </listitem>
 
         <listitem>
-          <para><emphasis>Under estimation</emphasis> of unrealized gain.
+          <para><emphasis>Under estimation</emphasis> of unrealized gains.
           </para>
 
           <para>You manage to sell your painting for more than you thought in your wildest dreams ($150,000). The
-            extra value is, again, recorded as a gain, i.e. an income.
+            extra value is, again, recorded as a gain, that is an income.
           </para>
 
           <para>The transactions should now appear as follows (observe the last transaction which balances the
-            Unrealized Gains accounts):
+            <emphasis>Unrealized Gains</emphasis> accounts):
           </para>
 
           <para><table>
-              <title>Turning an Accrued Gain into a Realized Gain - Overestimation</title>
+              <title>Turning an Unrealized Gain into a Realized Gain - Under estimation</title>
 
               <tgroup cols="4">
                 <tbody>
@@ -529,7 +538,7 @@
                     </entry>
 
                     <entry>
-                      Assets:Current Assets:Savings Account
+                      Assets:Current Assets:Savings
                     </entry>
 
                     <entry>
@@ -547,7 +556,7 @@
                     </entry>
 
                     <entry>
-                      Assets:Current Assets:Savings Account
+                      Assets:Current Assets:Savings
                     </entry>
 
                     <entry>
@@ -581,7 +590,7 @@
             </table>
           </para>
 
-          <para>This leaves the <emphasis>Assets:Current Assets:Savings Account</emphasis> account with a total of
+          <para>This leaves the <emphasis>Assets:Current Assets:Savings</emphasis> account with a total of
             $150,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $50,000.
           </para>
         </listitem>

commit 8276f1a8687244481342b250231d9122adde4e59
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 16:31:59 2021 +0900

    Change the system order of procedure. &lin;, &mac;, &win;

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 3b86c783..74b9f39a 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1366,33 +1366,6 @@ Income
         <title>Installing &app-fq;</title>
         <para>The process of installing &app-fq; depends on the system. </para>
 
-        <procedure>
-          <title>Installing &app-fq; on &win;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Run <menuchoice>
-                               <guimenu>Start</guimenu>
-                               <guisubmenu>&app;</guisubmenu>
-                               <guimenuitem>Install Online Price Retrieval</guimenuitem></menuchoice>.
-            </simpara>
-          </step>
-        </procedure>
-
-        <procedure>
-          <title>Installing &app-fq; on &mac;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Install Xcode if it is not installed.</simpara>
-              <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
-          </step>
-          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
-              <para>You can run it from the dmg or copy it to the same
-                folder to which you copied &app;.
-                It will open a Terminal window and run a script for you
-                which will ask lots of questions. Accept the default for each unless you know what
-                you’re doing.
-            </para>
-          </step>
-        </procedure>
-
         <procedure>
           <title>Installing &app-fq; on &lin;</title>
           <step><simpara>Close &app;.</simpara></step>
@@ -1421,6 +1394,34 @@ Income
           <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
         </procedure>
 
+
+        <procedure>
+          <title>Installing &app-fq; on &mac;</title>
+          <step><simpara>Close &app;.</simpara></step>
+          <step><simpara>Install Xcode if it is not installed.</simpara>
+              <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
+          </step>
+          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
+              <para>You can run it from the dmg or copy it to the same
+                folder to which you copied &app;.
+                It will open a Terminal window and run a script for you
+                which will ask lots of questions. Accept the default for each unless you know what
+                you’re doing.
+            </para>
+          </step>
+        </procedure>
+
+        <procedure>
+          <title>Installing &app-fq; on &win;</title>
+          <step><simpara>Close &app;.</simpara></step>
+          <step><simpara>Run <menuchoice>
+                               <guimenu>Start</guimenu>
+                               <guisubmenu>&app;</guisubmenu>
+                               <guimenuitem>Install Online Price Retrieval</guimenuitem></menuchoice>.
+            </simpara>
+          </step>
+        </procedure>
+
         <note>
           <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
             mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the &app; IRC

commit 3f4628ea52f27260b4cbbf29cb30c42cd461b5f0
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 16:12:18 2021 +0900

    Fix comment below:
    https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680355097

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 1db35f40..3b86c783 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1089,7 +1089,7 @@ Income
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the
-          purchase (for example, Jan. 3 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
+          purchase (for example, Jan. 3, 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
           Purchase). On the first split line, enter <userinput>50</userinput> in <guilabel>Shares</guilabel>, delete
           <guilabel>Price</guilabel> (leave it empty so it will be calculated), and enter <userinput>5000</userinput> in
           <guilabel>Buy</guilabel>. You do not need to fill in the <guilabel>Price</guilabel>
@@ -1136,7 +1136,7 @@ Income
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the
-          purchase (for example, Jan. 3 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
+          purchase (for example, Jan. 3, 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
           Purchase). On the first split line, optionally enter more details in <guilabel>Memo
           </guilabel>, then <userinput>50</userinput> in <guilabel>Shares</guilabel>, delete anything in
           <guilabel>Price</guilabel> (so it will be calculated by dividing <guilabel>Buy</guilabel>
@@ -1397,32 +1397,28 @@ Income
           <title>Installing &app-fq; on &lin;</title>
           <step><simpara>Close &app;.</simpara></step>
           <step><simpara>Run the command <command>which gnc-fq-update</command> to check <filename>gnc-fq-update</filename> program is in your PATH environment
-            variable.
+            variable.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote>
           </simpara>
-            <substeps><step  id="gnc-fq-update-not-found">
+            <substeps><step id="gnc-fq-update-not-found">
                 <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is 
-                installed.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote></simpara>
+                installed.</simpara>
                 </step>
             </substeps>
           </step>
-          <step><simpara>Open a root shell by using <command>su -</command> or <command>sudo su -</command>. It depends on your distribution.</simpara></step>
-          <step><simpara>Run the command <command>gnc-fq-update</command>. If <filename>gnc-fq-update</filename> is not in your PATH, specify full path of <filename>gnc-fq-update</filename>
-            instead which is found by <xref linkend="gnc-fq-update-not-found" />.
-            </simpara>
+          <step><simpara>Run the command <command>sudo gnc-fq-update</command> or <command>su -c gnc-fq-update</command> in order to run it with root privilege.
+            It depends on your distribution.
+          If <filename>gnc-fq-update</filename> is not in your PATH, specify full path of <filename>gnc-fq-update</filename>
+            instead, which is found by <xref linkend="gnc-fq-update-not-found" />.</simpara>
             <para>
               This will launch a <application>Perl</application> <acronym><ulink url="https://www.cpan.org/">CPAN</ulink></acronym><footnote>
                 <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
-              update session that will go out
-              onto the internet and install the &app-fq; module on your
-              system. The <filename>gnc-fq-update program</filename> is interactive, however, with most systems you should be
-              able to answer the first question <computeroutput>Are you ready for manual
-              configuration? [yes]</computeroutput> with <userinput>no</userinput>. Then the update will continue automatically from that point.
-            </para>
-            <para>After installation is complete, you should run the <quote><filename>gnc-fq-dump</filename></quote> test program, in the
-              same directory, distributed with &app; to test if
-              &app-fq; is installed and working properly.
-            </para>
+              module internally. When you launch the CPAN module for the first time, you must setup and configure it. However, on the most systems if you accept the default settings
+              or answer the first question <computeroutput>Are you ready for manual
+              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully. 
+              </para>
           </step>
+          
+          <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
         </procedure>
 
         <note>

commit a9e32318f6866a81a7716afe7a1189bb403e78df
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 14:31:05 2021 +0900

    Fix comment below:
     - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680359545

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 6a98b866..1db35f40 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -3445,7 +3445,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <orderedlist>
           <listitem>
             <para>&app; implements only the First In/ First Out (<acronym>FIFO</acronym>) cost method when automatically linking buy
-              transactions to sell transactions. That is the oldest securities are always sold first.
+              transactions to sell transactions. That means the oldest securities are always sold first.
               The Last In First Out (<acronym>LIFO</acronym>) cost method may be used by manually linking the most
               recent buy security splits to the sell split before scrubbing.
             </para>

commit ab6c958138e618c21fad2b6b0222748d0be6c590
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 14:27:32 2021 +0900

    Fix comments below:
     - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680356731
     - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680358015
     - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680359138

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index d0a32cc5..6a98b866 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1550,7 +1550,7 @@ Income
       <title>The <quote>Price Source</quote> in Reports</title>
 
       <para>Most &app; reports have options to set/modify a number of parameters for the report. The Options
-        dialog box is displayed by selecting the report tab then clicking on either the
+        dialog box is displayed by selecting the report tab, then ether clicking on the
         <guibutton>Options</guibutton> icon in the <emphasis>Menubar</emphasis> or selecting
         <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Report Options</guimenuitem>
@@ -1560,10 +1560,11 @@ Income
         report the selector may appear in either the <guilabel>General</guilabel>, the
         <guilabel>Commodities</guilabel>, or the <guilabel>Display</guilabel> tab of the
         <guilabel>Report Options</guilabel> dialog box.
-         <note>
-          <para>In the example below, the report is a customization of the <emphasis role="strong">Average
-            Balance</emphasis> report in the Assets & Liabilities reports submenu.
-          </para>
+
+        <note>
+          <simpara>In the example the report can be customized using the  
+            <menuchoice><guimenu>Reports</guimenu><guisubmenu>Assets & Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem></menuchoice> menu.
+          </simpara>
         </note>
       </para> 
         <screenshot id="invest-stockvalue-report-options">
@@ -2114,7 +2115,7 @@ Income
           </screenshot>
           </figure>
           <note>
-            <para>In the above screenshot, it appears there are 2 transactions for Mar 21st, 2006. This is because the
+            <para>In the above screenshot, it appears there are 2 transactions for Mar. 21, 2006. This is because the
               register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
               the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
               view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
@@ -3212,11 +3213,11 @@ Income
         <para>The term <emphasis>scrub</emphasis> is used because security accounts need to be cleaned after sales
           to ensure the difference between the cost paid for securities, and value received from
           selling them, is accounted for as capital gain or loss. If the capital gain/loss is not
-          correct, the <guimenuitem>Trial Balance</guimenuitem> 
-          (<menuchoice>
+          correct, the <guimenuitem>Trial Balance</guimenuitem> bottom line total debits will not balance to total credits.
+          To see the <guimenuitem>Trial Balance</guimenuitem>, select <menuchoice>
             <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
-          </menuchoice>) bottom line total debits will not balance to total credits.
+          </menuchoice>. 
         </para>
 
         <note>

commit 56c74d578921b8213a03b81ab9cd51294cb55f98
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 13:37:45 2021 +0900

    Fix comment below:
    https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680356197

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 5f4aee49..36cc64a5 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -128,6 +128,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY url-wiki-pmt-term "https://wiki.gnucash.org/wiki/Payment_Terms">
 <!ENTITY url-wiki-ofx "https://wiki.gnucash.org/wiki/Setting_up_OFXDirectConnect">
 <!ENTITY url-wiki-ofx-banks "https://wiki.gnucash.org/wiki/OFX_Direct_Connect_Bank_Settings">
+<!ENTITY url-wiki-OQ "https://wiki.gnucash.org/wiki/Online_Quotes">
 <!ENTITY url-wiki-qif "https://wiki.gnucash.org/wiki/Quicken_Migration">
 <!ENTITY url-wiki-xslt "https://wiki.gnucash.org/wiki/De/export_to_excel_xls_transform">
   <!-- wiki Special: translation is done by mediawiki: -->
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 84384860..d0a32cc5 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1495,8 +1495,8 @@ Income
           <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
         </procedure>
 
-        <para>See <ulink url="https://code.gnucash.org/docs/C/gnucash-help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
-          and <ulink url="https://wiki.gnucash.org/wiki/Online_Quotes#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
+        <para>See <ulink url="&url-docs-build-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
+          and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
         </para>
 
         <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and

commit 35c8e580b921c82c8c1e30b950a9a63a8acdd611
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Aug 4 13:28:21 2021 +0900

    Fix comments bellow:
     - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r682260218
     - https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680355097

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 63bc2f8d..84384860 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1379,6 +1379,7 @@ Income
 
         <procedure>
           <title>Installing &app-fq; on &mac;</title>
+          <step><simpara>Close &app;.</simpara></step>
           <step><simpara>Install Xcode if it is not installed.</simpara>
               <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
           </step>
@@ -1394,14 +1395,26 @@ Income
 
         <procedure>
           <title>Installing &app-fq; on &lin;</title>
-          <step><simpara>Close any running &app; instances.</simpara></step>
-          <step><simpara>Locate the folder where &app; is installed by searching for <filename>gnc-fq-update</filename>.</simpara></step>
-          <step><simpara>Change to that directory, open a root shell.</simpara></step>
-          <step><simpara>Run the command <command>./gnc-fq-update</command>.</simpara>
+          <step><simpara>Close &app;.</simpara></step>
+          <step><simpara>Run the command <command>which gnc-fq-update</command> to check <filename>gnc-fq-update</filename> program is in your PATH environment
+            variable.
+          </simpara>
+            <substeps><step  id="gnc-fq-update-not-found">
+                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is 
+                installed.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote></simpara>
+                </step>
+            </substeps>
+          </step>
+          <step><simpara>Open a root shell by using <command>su -</command> or <command>sudo su -</command>. It depends on your distribution.</simpara></step>
+          <step><simpara>Run the command <command>gnc-fq-update</command>. If <filename>gnc-fq-update</filename> is not in your PATH, specify full path of <filename>gnc-fq-update</filename>
+            instead which is found by <xref linkend="gnc-fq-update-not-found" />.
+            </simpara>
             <para>
-              This will launch a <application>Perl</application> CPAN update session that will go out
+              This will launch a <application>Perl</application> <acronym><ulink url="https://www.cpan.org/">CPAN</ulink></acronym><footnote>
+                <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
+              update session that will go out
               onto the internet and install the &app-fq; module on your
-              system. The gnc-fq-update program is interactive, however, with most systems you should be
+              system. The <filename>gnc-fq-update program</filename> is interactive, however, with most systems you should be
               able to answer the first question <computeroutput>Are you ready for manual
               configuration? [yes]</computeroutput> with <userinput>no</userinput>. Then the update will continue automatically from that point.
             </para>

commit 9f20dded5a9a0a8705106de088b27244374609ea
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Tue Jul 20 01:55:11 2021 +0900

    Change a paragraph to itemizedlist to make translation easier.
    Change a hardcoded numbered list to docbook numbered list.
    Replace starting balance with opening balance.
    Fix typos and minor mistakes.
    Fix RewordMiles account name.
    Change CoA to Chart of Accounts
    Unify currency expression like 12,345 USD for foreign currencies.
    Normailze account names.
    Change one of the note because English sentenses are too difficult.
    Change the date format like Jan. 2, 2020.
    Replace Price Editor with Price Database.
    Change +ve and -ve to positive and negative, respectively.
    Fix according to the pull request comment.

diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index dc094469..7c900a6b 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -28,9 +28,12 @@
       example, you can have a bank account set up in Euros, and another using Hong Kong Dollars.
     </para>
 
-    <para>Some of the issues which arise when using multiple currencies are, how do you transfer funds between
-      accounts with different currencies? How do you calculate the overall value when you have mixed
-      currency accounts? How do reports deal with mixed currencies?
+    <para>Some of the issues which arise when using multiple currencies are as follows:
+    <itemizedlist>
+        <listitem><simpara>How do you transfer funds between accounts with different currencies?</simpara></listitem>
+        <listitem><simpara>How do you calculate the overall value when you have mixed currency accounts?</simpara></listitem>
+        <listitem><simpara>How do reports deal with mixed currencies?</simpara></listitem>
+      </itemizedlist>
     </para>
 
     <para>You can either deal with multiple currencies using manually entered transactions to record currency
@@ -70,7 +73,7 @@ TODO -->
         <guilabel>&appname; Preferences</guilabel> screen. You’ll want to set both options
         when you start using &app; because if (for example) your accounts are all in Canadian
         Dollars but the generated reports are all in US Dollars, the reports will just say that
-        there are <quote>no data/transactions (or only zeroes) for the selected time period</quote>.
+        there are <quote><computeroutput>no data/transactions (or only zeroes) for the selected time period</computeroutput></quote>.
       </para>
 
       <para>When you create a new account, you have the option to define the commodity in which that account is
@@ -105,19 +108,19 @@ TODO -->
       <para>Since in this example you mostly work in USD, all of the parent accounts are set to USD. Of course,
         if you mostly work in Euros, you could change the currency of these parent accounts to EUR.
         The totals shown in the account tree window will always be converted to the currency of each
-        particular account. Notice, we also set up 3 Starting Balances equity accounts, used to
+        particular account. Notice, we also set up 3 Opening Balances equity accounts, used to
         initially populate the 3 banks.
       </para>
 
       <note>
-        <para>You could also set up just a single Starting Balance account and use a currency transfer to populate
+        <para>You could also set up just a single Opening Balance account and use a currency transfer to populate
           the <quote>different currency</quote> accounts. However, this is more advanced option,
           which is explained in a later section (<xref linkend="currency_purchase2" />).
         </para>
       </note>
 
-      <para>Below you see the result of this example, in which you start with USD 10,000, EUR 10,000 as well as
-        HKD 10,000 in the three bank accounts. Notice that the total of the parent accounts only
+      <para>Below you see the result of this example, in which you start with 10,000 USD, 10,000 EUR as well as
+        10,000 HKD in the three bank accounts. Notice that the total of the parent accounts only
         shows the value of the currency of sub-accounts with matching currencies. In other words,
         the Total Assets and Total Equity values only reflect USD amounts, because &app; has no way
         of evaluating the value of EUR or HKD yet. Once you set up exchange rates between the
@@ -143,60 +146,65 @@ TODO -->
         </mediaobject>
       </screenshot>
 
-      <para>Notice that the "Total (Report)" column is being displayed. This is configured in the column header
-        row, select <guibutton>Arrow down</guibutton> and select <quote>Total(USD)</quote>.
+      <para>Notice that the <guilabel>Total (Report)</guilabel> column is being displayed. This is configured in the column header
+        row, select <guibutton>Arrow down</guibutton> and select <guilabel>Total(USD)</guilabel>.
       </para>
 
       <sect3 id="currency_acct_user2">
         <title>User-Defined Currencies</title>
 
         <para>Usually when we talk about currencies, we mean government-backed currencies (or more precisely,
-          currencies defined in <ulink
-        url="&url-wp-en;ISO_4217">ISO 4217</ulink>). &app;
+          currencies defined in <ulink url="&url-wp-en;ISO_4217">ISO 4217</ulink>). &app;
           does not allow you to create your own currencies. If you want to track
           non-<acronym>ISO</acronym> currencies, you can use either of two workarounds, depending on
           which fits your needs better.
-        </para>
-
-        <para>The <emphasis role="strong">first method</emphasis> is to treat these as if they were a
-          security—that is, like a stock or mutual fund. The second method is to use one of
-          the <quote>dummy</quote> currencies for them.
-        </para>
 
+        <orderedlist>
+        <title>User-Defined Currencies Workarounds</title>
         <para>Let’s say for example that you want to track loyalty points you’ve earned by buying from
-          a certain group of businesses. The account which tracks your loyalty points will be
-          <emphasis>Assets:Other:LoyaltyGroupRewardMiles</emphasis>.
-        </para>
-
-        <para>In the first method, you define a new security, of type <guilabel>FUND</guilabel>, called
-          RewardMiles. This is pretty straightforward—when you create the new
-          <emphasis>LoyaltyGroupRewardMiles</emphasis> account, just set the account type to
-          <guilabel>Stock</guilabel> or <guilabel>Mutual Fund</guilabel>, click the
-          <guibutton>Select...</guibutton> button next to the
-          <guilabel>Security/currency:</guilabel> box, and click <guibutton>New</guibutton> to
-          define a new security of type <guilabel>FUND</guilabel>.
-        </para>
-
-        <para>This is not really what the stock and mutual fund account types are meant for, but &app; will allow
-          it. The downside is that you’ll have to enter a <quote>price</quote> for every
-          transaction involving this account, because &app; needs the prices to figure out the
-          monetary value of the points and treat them as one of your assets.
+            a certain group of businesses. The account which tracks your loyalty points will be
+            <emphasis>Assets:Other:LoyaltyPoints</emphasis>.
         </para>
-
-        <para>In the <emphasis role="strong">second method</emphasis>, you use one of the dummy currencies to
-          track the loyalty points. These currencies are <quote>XTS (Code for testing
-          purposes)</quote> and <quote>XXX (No currency)</quote>. If you use one of these for your
-          LoyaltyGroupRewardMiles account, you can enter transactions into the account without
-          having to enter share prices for every transaction. And, you can keep using the same two
-          dummy currencies to track all sorts of amounts—vacation dollars earned and used so
-          far this year, vacation hours earned and used, health insurance benefits allowance used
-          and remaining, and so on.
+        <listitem><simpara>
+            Treat these as if they were a security—that is, like a stock or mutual fund.
+            </simpara>
+	        <para>
+            In this workaround, you define a new security, of type <guilabel>FUND</guilabel>, called
+            LoyalityPoints. This is pretty straightforward—when you create the new
+            <emphasis>LoyaltyPoints</emphasis> account, just set the account type to
+            <guilabel>Stock</guilabel> or <guilabel>Mutual Fund</guilabel>, click the
+            <guibutton>Select...</guibutton> button next to the
+            <guilabel>Security/currency:</guilabel> box, and click <guibutton>New</guibutton> to
+            define a new security of type <guilabel>FUND</guilabel>.
+            </para>
+            <para>
+            This is not really what the stock and mutual fund account types are meant for, but &app; will allow
+            it. The downside is that you’ll have to enter a <quote>price</quote> for every
+            transaction involving this account, because &app; needs the prices to figure out the
+            monetary value of the points and treat them as one of your assets.
+            </para>
+        </listitem>
+
+        <listitem><simpara>
+            Use one of the <quote>dummy</quote> currencies for them.
+            </simpara>
+            <para>In this workaround, you use one of the dummy currencies to
+            track the loyalty points. These currencies are <quote>XTS (Code for testing
+            purposes)</quote> and <quote>XXX (No currency)</quote>. If you use one of these for your
+            LoyaltyPoints account, you can enter transactions into the account without
+            having to enter share prices for every transaction. And, you can keep using the same two
+            dummy currencies to track all sorts of amounts—vacation dollars earned and used so
+            far this year, vacation hours earned and used, health insurance benefits allowance used
+            and remaining, and so on.
+            </para>
+            <para>The drawback with this workaround is that you cannot define exchange rates for the dummy
+            currencies to convert them to <acronym>ISO</acronym> currencies. If you want to do that,
+            you really should use the first workaround.
+            </para>
+        </listitem>
+        </orderedlist>
         </para>
 
-        <para>The drawback with this second method is that you cannot define exchange rates for the dummy
-          currencies to convert them to <acronym>ISO</acronym> currencies. If you want to do that,
-          you really should use the first method.
-        </para>
       </sect3>
     </sect2>
 
@@ -209,7 +217,7 @@ TODO -->
         both methods.
       </para>
 
-      <para>Before we start, let’s have a quick look at the Chart of Accounts
+      <para>Before we start, let’s have a quick look at the Chart of Accounts.
       </para>
 
       <screenshot id="currency_main1a">
@@ -237,11 +245,10 @@ TODO -->
       <sect3 id="currency_howto_Manual">
         <title>Manually Updating Exchange Rates</title>
 
-        <para>Open the <guilabel>Price Editor</guilabel> by going to
+        <para>Open the <guilabel>Price Database</guilabel> by going to
           <menuchoice>
-            <guimenu>Tools</guimenu> <guimenuitem>Price Editor</guimenuitem>
-          </menuchoice>
-          .
+            <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
+          </menuchoice>.
         </para>
 
         <screenshot id="currency_peditor">
@@ -252,11 +259,11 @@ TODO -->
             </imageobject>
 
             <textobject>
-              <phrase>Price Editor window</phrase>
+              <phrase>Price Database window</phrase>
             </textobject>
 
             <caption>
-              <para>Price Editor Window.
+              <para>Price Database Window.
               </para>
             </caption>
           </mediaobject>
@@ -278,16 +285,16 @@ TODO -->
             </textobject>
 
             <caption>
-              <para>Add Price Editor Window
+              <para>Add Price Database Window
               </para>
             </caption>
           </mediaobject>
         </screenshot>
 
-        <para>Set the <guilabel>Namespace</guilabel> to Currency and the <guilabel>Security</guilabel> to EUR
-          (Euro). Then set the exchange rate between the selected security and the selected
-          currency. The price box defines how many units of currency are required to purchase one
-          unit of the security. In this case, how many dollars it will take to purchase on Euro. In
+        <para>Set the <guilabel>Namespace</guilabel> to <guilabel>CURRENCY</guilabel> and the <guilabel>Security</guilabel> to <guilabel>EUR
+          (Euro)</guilabel>. Then set the exchange rate between the selected security and the selected
+          currency. The <guilabel>Price</guilabel> box defines how many units of currency are required to purchase one
+          unit of the security. In this case, how many dollars it will take to purchase on 1 Euro. In
           this example, you will set the exchange rate to 1 EUR for 1 USD.
         </para>
 
@@ -299,11 +306,11 @@ TODO -->
             </imageobject>
 
             <textobject>
-              <phrase>Price Editor Window</phrase>
+              <phrase>Price Database Window</phrase>
             </textobject>
 
             <caption>
-              <para>The Price Editor window after setting the exchange rate between Euros and US Dollars
+              <para>The Price Database window after setting the exchange rate between Euros and US Dollars
               </para>
             </caption>
           </mediaobject>
@@ -339,11 +346,10 @@ TODO -->
           includes an automatic price update feature, which will now be described.
         </para>
 
-        <para>Open the <guilabel>Price Editor</guilabel> by going to
+        <para>Open the <guilabel>Price Database</guilabel> by going to
           <menuchoice>
-            <guimenu>Tools</guimenu> <guimenuitem>Price Editor</guimenuitem>
-          </menuchoice>
-          .
+            <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
+          </menuchoice>.
         </para>
 
         <screenshot id="currency_BeforeGetOnline">
@@ -354,11 +360,11 @@ TODO -->
             </imageobject>
 
             <textobject>
-              <phrase>Price Editor window</phrase>
+              <phrase>Price Database window</phrase>
             </textobject>
 
             <caption>
-              <para>Price Editor Window before you obtain online quotes.
+              <para>Price Database Window before you obtain online quotes.
               </para>
             </caption>
           </mediaobject>
@@ -370,9 +376,9 @@ TODO -->
 
         <note>
           <para>If the <guibutton>Get Quotes</guibutton> button is disabled, that means that the
-            <application>Perl</application> module <application>Finance::Quote</application> is not
+            <application>Perl</application> module &app-fq; is not
             installed. For information on how to install it, please see
-            <xref linkend="invest-stockprice-auto2" ></xref>
+            <xref linkend="invest-stockprice-auto2" />.
           </para>
         </note>
 
@@ -384,11 +390,11 @@ TODO -->
               </imageobject>
 
               <textobject>
-                <phrase>Price Editor window</phrase>
+                <phrase>Price Database window</phrase>
               </textobject>
 
               <caption>
-                <para>Price Editor Window after we obtained online quotes.
+                <para>Price Database Window after we obtained online quotes.
                 </para>
               </caption>
             </mediaobject>
@@ -397,12 +403,12 @@ TODO -->
 
         <para>&app; downloads exchange rates for all currencies that are in use in your various accounts. This
           will happen every time you click on <guibutton>Get Quotes</guibutton> or request &app; to
-          download quotes as per <xref linkend="invest-stockprice-auto2" />
+          download quotes as per <xref linkend="invest-stockprice-auto2" />.
         </para>
 
         <para>Now when you check the main Chart of Accounts you will see that &app; has automatically converted
           the HKD amount to USD amount on the parent accounts that are in USD, as well as on the
-          Total (USD) column. Also the Euro accounts have been been updated with the latest exchange
+          <guilabel>Total (USD)</guilabel> column. Also the Euro accounts have been been updated with the latest exchange
           rate.
         </para>
 
@@ -414,7 +420,7 @@ TODO -->
             </imageobject>
 
             <textobject>
-              <phrase>Price Editor window</phrase>
+              <phrase>Price Database window</phrase>
             </textobject>
 
             <caption>
@@ -437,56 +443,44 @@ TODO -->
           exchange rates for that currency anymore, do the following:
         </para>
 
-        <itemizedlist>
-          <listitem>
-            <para>Open the Securities window by selecting
-              <menuchoice>
-                <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
-              </menuchoice>
-              .
-            </para>
-          </listitem>
+        <procedure>
+          <step><simpara>Open the Securities window by selecting <menuchoice>
+                <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem></menuchoice>.</simpara>
+          </step>
 
-          <listitem>
-            <para>Make sure the <guilabel>Show National Currencies</guilabel> box is selected.
-            </para>
-          </listitem>
+          <step><simpara>Make sure the <guilabel>Show National Currencies</guilabel> box is selected.</simpara></step>
 
-          <listitem>
-            <para>Expand the CURRENCY row.
-            </para>
-          </listitem>
+          <step><simpara>Expand the <guilabel>CURRENCY</guilabel> row.</simpara></step>
 
-          <listitem>
-            <para>Double click on the currency for which you want to disable exchange rate retrieval.
-            </para>
-          </listitem>
+          <step><simpara>Double click on the currency for which you want to disable exchange rate retrieval.</simpara></step>
 
-          <listitem>
-            <para>Deselect the <guilabel>Get Online Quotes</guilabel> box and click <guibutton>OK</guibutton>.
-            </para>
-          </listitem>
-        </itemizedlist>
+          <step><simpara>Deselect the <guilabel>Get Online Quotes</guilabel> box and click <guibutton>OK</guibutton>.</simpara></step>
+        </procedure>
       </sect3>
     </sect2>
 
     <sect2 id="currency_purchase1">
       <title>Recording Purchases in a Foreign Currency</title>
 
-      <para>Purchases in a foreign currency can be managed in two different ways.
-      </para>
-
-      <para>1) Use &app;'s built-in currency exchange functions when you do your transactions. This is mainly
-        used for one-time transactions, and nothing which happens regularly.
-      </para>
-
-      <para>2) Use separate accounts to track transactions, where all involved accounts use the same currency.
-        This is the recommended method, since it allows much better tracking and follow up. In this
-        way, you do one currency exchange transaction, and after that you do normal transactions in
-        the native currency.
+      <para>Purchases in a foreign currency can be managed in two different options.
+      
+        <orderedlist numeration="upperalpha">
+            <listitem><para>    
+                Use &app;'s built-in currency exchange functions when you do your transactions. This is mainly
+                used for one-time transactions, and nothing which happens regularly.
+                </para>
+            </listitem>
+
+            <listitem id="currency_purchase1.ol.2"><para>
+	           Use separate accounts to track transactions, where all involved accounts use the same currency.
+               This is the recommended method, since it allows much better tracking and follow up. In this
+               way, you do one currency exchange transaction, and after that you do normal transactions in
+               the native currency.
+            </para></listitem>
+        </orderedlist>
       </para>
 
-      <para>The rest of this section will explain more based upon option 2).
+      <para>The rest of this section will explain more based upon option <quote><xref linkend="currency_purchase1.ol.2" /></quote>.
       </para>
 
       <sect3 id="currency_purchase2">
@@ -514,9 +508,9 @@ TODO -->
           </para>
         </note>
 
-        <para>First you need to transfer some money ($10,000) to Jamaica, and you use your US bank account (with a
-          balance of $100,000) for that. The bank gives you an exchange rate of USD 1 = JMD 64, but
-          charges you USD 150 to transfer the money.
+        <para>First you need to transfer 10,000 USD to Jamaica, and you use your US bank account (with a
+          balance of 100,000 USD) for that. The bank gives you an exchange rate of 1 USD = 64 JMD, but
+          charges you 150 USD to transfer the money.
         </para>
 
         <screenshot id="currency_purchase_MoveMoney.png">
@@ -537,7 +531,7 @@ TODO -->
           </mediaobject>
         </screenshot>
 
-        <para>Select the Jamaica transaction line ($9,850.00), right click and select <guilabel>Edit Exchange
+        <para>Select the Jamaica transaction line (9,850.00 USD), right click and select <guilabel>Edit Exchange
           Rate</guilabel>
         </para>
 
@@ -553,7 +547,7 @@ TODO -->
             </textobject>
 
             <caption>
-              <para>A dialog window where the exchange rate in a currency transaction is specified
+              <para>A dialog window where the exchange rate in a currency transaction is specified.
               </para>
             </caption>
           </mediaobject>
@@ -582,10 +576,10 @@ TODO -->
           </mediaobject>
         </screenshot>
 
-        <para>You choose to buy a boat for JMD 509,000. To record this transaction in &app;, you will need to
+        <para>You choose to buy a boat for 509,000 JMD. To record this transaction in &app;, you will need to
           enter a simple transaction in <emphasis>Assets:Current Assets:Jamaican Bank</emphasis>
-          withdrawing JMD 509,000 and transferring it to <emphasis>Assets:Fixed
-          Assets:Boat</emphasis>
+          withdrawing 509,000 JMD and transferring it to <emphasis>Assets:Fixed
+          Assets:Boat</emphasis>.
         </para>
 
         <screenshot id="currency_purchase_AfterBoat.png">
@@ -606,9 +600,9 @@ TODO -->
           </mediaobject>
         </screenshot>
 
-        <para>The Chart of Accounts now reflects that your bank account has been reduced by JMD 509,000, and that
+        <para>The Chart of Accounts now reflects that your bank account has been reduced by 509,000 JMD, and that
           your Fixed Assets boat account has been increased by the same amount. If you also have
-          turned on the CoA (Column Choice) "Total (USD)" you will see the corresponding value in
+          turned on the Chart of Accounts (Column Choice) <guilabel>Total (USD)</guilabel> you will see the corresponding value in
           USD. The USD value will always reflect the latest currency exchange rate you have either
           automatically or manually retrieved.
         </para>
@@ -629,13 +623,14 @@ TODO -->
         <para>You decide to purchase stock in the Beijing Airport (Hong Kong). The ticker for this stock is
           0694.HK on Yahoo! Since you wanted to track all various income and expense amounts, here
           is the necessary account structure:
+        <itemizedlist>
+            <listitem><simpara>Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)</simpara></listitem>
+            <listitem><simpara>Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)</simpara></listitem>
+            <listitem><simpara>Equity:Opening Balances:HKD (HKD)</simpara></listitem>
+            <listitem><simpara>Expenses:Commissions:Boom:0694.HK (HKD)</simpara></listitem>
+            <listitem><simpara>Income:Investments:Dividend:Boom:0694.HK (HKD)</simpara></listitem>
+        </itemizedlist>
         </para>
-<screen>
-Assets:Investments:Brokerage Accounts:Boom:0694.HK (0694.HK)
-Assets:Investments:Brokerage Accounts:Boom:Bank (HKD)
-Equity:Opening Balances:HKD (HKD)
-Expenses:Commissions:Boom.0694.HK (HKD)
-Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
         <para>The Chart of Accounts looks like this after creating all the needed accounts:
         </para>
 
@@ -657,11 +652,10 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
           </mediaobject>
         </screenshot>
 
-        <para>The stock definition can be seen in the Security Editor. (
+        <para>The stock definition can be seen in the Security Editor (
           <menuchoice>
-            <guimenu>Tools</guimenu><guimenu>Security Editor</guimenu>
-          </menuchoice>
-          )
+            <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
+          </menuchoice>.)
         </para>
 
         <screenshot id="currency_purchase_Commodities.png">
@@ -682,28 +676,26 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
           </mediaobject>
         </screenshot>
 
-        <para>If you have not moved money (HKD 50,000) into the brokerage cash account
-          (<emphasis>Assets:Investments:Brokerage Account:Boom:Bank</emphasis>), do so now, either
+        <para>If you have not moved money (50,000 HKD) into the brokerage cash account
+          (<emphasis>Assets:Investments:Brokerage Accounts:Boom:Bank</emphasis>), do so now, either
           using the Equity (HKD) account, or an existing bank account (Currency Transfer).
         </para>
 
         <para>There are two ways to enter the actual purchase transaction: you can enter it from the cash account
-          (shown below), or you can enter it from the stock account. <emphasis>If entered from the
-          stock account, the stock is assumed to be priced in the currency of the parent
-          account</emphasis>.
+          (shown below), or you can enter it from the stock account. 
+          <note><para>If entered from the stock account, the stock is assumed to be priced in the currency of the parent
+          account.</para></note>
         </para>
 
-        <para>Let’s assume that the stock price is HKD 3 per share. To record the purchase, open the
+        <para>Let’s assume that the stock price is 3 HKD per share. To record the purchase, open the
           brokerage’s HKD cash account (<emphasis>Assets:Investments:Brokerage
-          Account:Boom:Bank</emphasis>), and enter the following:
+          Accounts:Boom:Bank</emphasis>), and enter the following:
         </para>
 
-        <bridgehead renderas='sect4'>
-          Buy Stocks
-        </bridgehead>
-
-        <informaltable frame='none' colsep='0' rowsep='0'>
-          <tgroup cols='3'>
+ 
+        <informaltable>
+            <textobject><phrase><emphasis>Buy Stocks</emphasis></phrase></textobject>
+            <tgroup cols='3'>
             <colspec colwidth='3*' align='left'/>
 
             <colspec colwidth='1*' align='left'/>
@@ -713,7 +705,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
             <tbody>
               <row>
                 <entry>
-                  Assets:Investments:Brokerage Account:Boom:Bank
+                  Assets:Investments:Brokerage Accounts:Boom:Bank
                 </entry>
 
                 <entry>
@@ -727,7 +719,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
 
               <row>
                 <entry>
-                  Expenses:Investments:Commission:Boom_HKD
+                  Expenses:Commissions:Boom:0694.HK
                 </entry>
 
                 <entry>
@@ -741,7 +733,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
 
               <row>
                 <entry>
-                  Assets:Investments:Brokerage Account:Boom:0694
+                  Assets:Investments:Brokerage Accounts:Boom:0694.HK
                 </entry>
 
                 <entry>
@@ -804,7 +796,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
         <para>However, as you can see, the USD totals may be zero if &app; doesn’t have an exchange rate
           between USD and HKD. To fix this, go to
           <menuchoice>
-            <guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem>
+            <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
           </menuchoice>
           and click the <guibutton>Get Quotes</guibutton> button to automatically retrieve the
           exchange rates you need.
@@ -837,34 +829,35 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
       </para>
 
       <para>If you are not interested in detail at all, a very simple account structure would suffice:
+        <itemizedlist>
+            <listitem><simpara>Assets:Investments:Currency:Bank (USD)</simpara></listitem>
+            <listitem><simpara>Assets:Investments:Currency:XXX (XXX)</simpara></listitem>
+        </itemizedlist>
       </para>
-<screen>
-Assets:Investments:Currency:Bank (USD)
-Assets:Investments:Currency:XXX (XXX)</screen>
+
       <para>You would simply enter transfers between the two accounts, noting exchange rates as you went.
       </para>
 
       <para>But, if you do want to be able to track capital gains or losses, as well as any fees, you do need a
         more complex account structure, such as:
+        <itemizedlist>
+            <listitem><simpara>Assets:Investments:Currency:Bank (USD)</simpara></listitem>
+            <listitem><simpara>Assets:Investments:Currency:Currency Bank:XXX (XXX)</simpara></listitem>
+            <listitem><simpara>Expenses:Investments:Currency:Bank (USD)</simpara></listitem>
+            <listitem><simpara>Income:Investments:Currency:Currency Bank:Capital Gains:XXX (XXX)</simpara></listitem>
+        </itemizedlist>
       </para>
-<screen>
-Assets:Investments:Currency:Bank (USD)
-Assets:Investments:Currency:Currency Bank:XXX (XXX)
-Expenses:Investments:Currency:Currency Bank:XXX (XXX)
-Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
+
       <sect3 id="currency_invest12">
         <title>Purchasing Currency</title>
 
-        <para>When purchasing another currency, you will buy a certain number of units of foreign currency with
-          your own currency, at a particular rate. For example, you might buy USD 10,000 worth of
-          Andorran Francs, at 5 Francs to the dollar, with a transaction fee of $150.
+        <para>When purchasing an another currency, you will buy a certain number of units of foreign currency with
+          your own currency, at a particular rate. For example, you might buy 10,000 USD worth of
+          Andorran Francs, 1 USD = 5 ADF, with a transaction fee of 150 USD.
         </para>
 
-        <bridgehead renderas='sect4'>
-          Buy Currency
-        </bridgehead>
-
-        <informaltable frame='none' colsep='0' rowsep='0'>
+        <informaltable>
+          <textobject><phrase><emphasis>Buy Currency</emphasis></phrase></textobject>
           <tgroup cols='3'>
             <colspec colwidth='5*' align='left'/>
 
@@ -875,7 +868,7 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
             <tbody>
               <row>
                 <entry>
-                  Assets:Investments:Currency:Bank
+                  Assets:Investments:Currency:Bank (USD)
                 </entry>
 
                 <entry>
@@ -889,11 +882,11 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
 
               <row>
                 <entry>
-                  Expenses:Investments:Currency:Currency Bank:ADF
+                  Expenses:Investments:Currency:Bank (USD)
                 </entry>
 
                 <entry>
-                  Deposit
+                  Expense
                 </entry>
 
                 <entry>
@@ -903,7 +896,7 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
 
               <row>
                 <entry>
-                  Assets:Investments:Currency:ADF
+                  Assets:Investments:Currency:Currency Bank:ADF (ADF)
                 </entry>
 
                 <entry>
@@ -929,22 +922,21 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
         <title>Selling a currency investment</title>
 
         <para>Entering a currency sale is done in the same way as a currency buy except that you are now
-          transferring money from the Currency account to your Savings account (very similar to
-          <xref
-        linkend="invest-sell1" />).
+          transferring money from the Currency account to your native currency’s Bank account (very similar to
+          <xref linkend="invest-sell1" />).
         </para>
 
-        <para>The proper recording of the currency sale *must* account for realized gains or losses. This can be
+        <para>The proper recording of the currency sale <emphasis>must</emphasis> account for realized gains or losses. This can be
           done using a split transaction. In the split transaction, you must account for the profit
-          (or loss) as coming from an <emphasis>Income:Capital Gains</emphasis> account (or
-          <emphasis>Expenses:Capital Loss</emphasis>). To balance this income, you will need to
+          (or loss) as coming from an <emphasis>Income:Investments:Currency:Currency Bank:Capital Gains:XXX</emphasis> account (or
+          <emphasis>Expense:Investments:Currency:Currency Bank:Capital Loss:XXX</emphasis>). To balance this income, you will need to
           enter the Currency asset twice in the split—once to record the actual sale (using
           the correct amount and correct exchange rate), and once to balance the income profit
           (setting the amount to 0).
         </para>
 
         <para>In short, a selling Currency transaction should look something like below, seen again from the
-          <emphasis>Assets:Investments:Currency:Bank</emphasis>.
+          <emphasis>Assets:Investments:Currency:Currency Bank:XXX</emphasis>.
         </para>
 
         <table>
@@ -964,11 +956,11 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
                 </entry>
 
                 <entry>
-                  Deposit
+                  Deposit/Expense
                 </entry>
 
                 <entry>
-                  Withdrawal
+                  Withdrawal/Income
                 </entry>
               </row>
             </thead>
@@ -976,7 +968,7 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
             <tbody>
               <row>
                 <entry>
-                  Assets:Investments:Currency:Bank
+                  Assets:Investments:Currency:Bank (USD)
                 </entry>
 
                 <entry>
@@ -988,7 +980,7 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
 
               <row>
                 <entry>
-                  Expenses:Investments:Currency:Currency Bank:XXX
+                  Expenses:Investments:Currency:Bank (USD)
                 </entry>
 
                 <entry>
@@ -1000,19 +992,19 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
 
               <row>
                 <entry>
-                  Assets:Investments:Currency:XXX
+                  Assets:Investments:Currency:Currency Bank:XXX (XXX)
                 </entry>
 
                 <entry></entry>
 
                 <entry>
-                  Sold Amount
+                  Sold Amount (= Purchased Balance + PROFIT)
                 </entry>
               </row>
 
               <row>
                 <entry>
-                  Income:Investments:Currency Bank:Capital Gains:XXX
+                  Income:Investments:Currency:Currency Bank:Capital Gains:XXX (XXX)
                 </entry>
 
                 <entry>
@@ -1026,7 +1018,7 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
 
               <row>
                 <entry>
-                  Assets:Investments:Currency:XXX
+                  Assets:Investments:Currency:Currency Bank:XXX (XXX)
                 </entry>
 
                 <entry>
@@ -1064,22 +1056,20 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
     <para>Trading accounts were introduced as a feature from &app; version 2.3.14. The conceptual basis for
       trading accounts is described in <ulink url="&url-selinger;accounting/tutorial.html">
       &tit-sel-tut;</ulink> by Peter Selinger. A second tutorial
-      <ulink url="&url-selinger;accounting/gnucash.html"> &tit-sel-gnc;</ulink> by Peter Selinger
+      <ulink url="&url-selinger;accounting/gnucash.html">&tit-sel-gnc;</ulink> by Peter Selinger
       describes the manual creation and use of trading accounts in &app; prior to version 2.3.14.
     </para>
 
     <para>Trading accounts are not enabled by default in &app;. To enable them go to
-      <menuchoice>
-        <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem> <guimenuitem>Accounts
-        tab</guimenuitem>
-      </menuchoice>
-      and check the <guilabel>Use Trading Accounts</guilabel> checkbox.
+        <menuchoice>
+            <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem><guilabel>Accounts</guilabel>
+        </menuchoice> tab and check the <guilabel>Use Trading Accounts</guilabel> checkbox.
     </para>
 
     <sect2 id="trading_acct_concepts">
       <title>Trading Account Concepts</title>
 
-      <para>In accounting terms, trading accounts are specialized equity accounts to record changes in revenue
+      <para>In accounting terms, trading accounts are specialized equity accounts to record changes in income
         which result from transactions between two or more currencies. In &app; they are implemented
         as a top level account type of Trading. When trading accounts are enabled the required sub
         accounts of Trading are automatically created if they do not already exist when a
@@ -1096,14 +1086,14 @@ Income:Investments:Currency Bank:Capital Gains:XXX (XXX)</screen>
         <para>The user is prevented from manually making entries directly to the registers for any of the accounts
           in the Trading top level account group. All entries to these accounts are automatically
           generated when transactions between currencies are created in other account registers
-          within the &app;account heirarchy.
+          within the &app; account hierarchy.
         </para>
       </caution>
 
       <para>The Trading account group is structured below the top level account <guilabel>Trading</guilabel>
         with a sub-account <guilabel>CURRENCY</guilabel> which in turn has a sub-account for each
         currency between which transactions have been made. For the example previously used in
-        <link linkend="currency_manual">Manually Recording Currency Transactions</link>, the
+        <xref linkend="currency_manual" />, the
         additional accounts which will be created automatically when transactions are created
         between different currencies with trading accounts enabled are:
       </para>
@@ -1126,7 +1116,7 @@ Trading
       <sect3 id="currency_trading_account_setup">
         <title>Setup of Accounts for Trading Accounts</title>
 
-        <para>The same account structure useds in the manual recording of currency transactions in the previous
+        <para>The same account structure used in the manual recording of currency transactions in the previous
           section is required. The initial account configuration for Assets and Equity accounts are
           as follows:
         </para>
@@ -1156,9 +1146,9 @@ Trading
 
         <para>The following prices were entered in the Price Database (
           <menuchoice>
-            <guimenu>Tools</guimenu><guisubmenu>Price Database</guisubmenu>
+            <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
           </menuchoice>
-          ) as at 01/01/2020 to convert the account balances for the foreign currency accounts to
+          ) as at Jan. 1, 2020 to convert the account balances for the foreign currency accounts to
           USD:
         </para>
 
@@ -1179,7 +1169,7 @@ Trading
             </textobject>
 
             <caption>
-              <para>Price Database window after setting initial exchange rates between USD and HKD and EUR.
+              <para>Price Database window after setting initial exchange rates between USD, HKD and EUR.
               </para>
             </caption>
           </mediaobject>
@@ -1202,8 +1192,8 @@ Trading
             </imageobject>
 
             <textobject>
-              <phrase>Initial multi currency setup after entering exchange rates between USD and HKD
-              and EUR </phrase>
+              <phrase>Initial multi currency setup after entering exchange rates between USD, HKD
+              and EUR</phrase>
             </textobject>
 
             <caption>
@@ -1217,12 +1207,12 @@ Trading
       <sect3 id="currency_trading_transfer">
         <title>Transfer of Funds to a Foreign Currency</title>
 
-        <para>Let us assume we wish to purchase at item in Hong Kong using the Hong Kong bank account for $20000
-          HKD on 01/02/2020. The current funds in the Hong Kong account are insufficient and we will
-          need to transfer another $10200 HKD from the US bank account. The exchange rate at the
-          time of the transfer is 1 USD = 7.7884 HKD and we will have to transfer $1309.64 USD for
-          which the bank charges a $40 USD transfer fee. The transaction to effect this is created
-          with the transfer funds dialog as shown below:
+        <para>Let us assume we wish to purchase at item in Hong Kong using the Hong Kong bank account for 20,000
+          HKD on Feb. 1, 2020. The current funds in the Hong Kong account are insufficient and we will
+          need to transfer another 10,200 HKD from the US bank account. The exchange rate at the
+          time of the transfer is 1 USD = 7.7884 HKD and we will have to transfer 1,309.64 USD for
+          which the bank charges a 40 USD transfer fee. The transaction to effect this is created
+          with the <guilabel>Transfer Funds</guilabel> dialog as shown below:
         </para>
 
         <screenshot id="currency__trading_tfr_dialog">
@@ -1242,23 +1232,22 @@ Trading
             </textobject>
 
             <caption>
-              <para>Transfer of 10200 HKD from US Bank account to Hong Kong bank account.
+              <para>Transfer of 10,200 HKD from US Bank account to Hong Kong bank account.
               </para>
             </caption>
           </mediaobject>
         </screenshot>
 
-        <para>The debit amount has been specified in HKD and the transaction amount being transferred in USD.
+        <para>The <guilabel>Debit Amount</guilabel> has been specified in HKD and the transaction <guilabel>Amount</guilabel> being transferred in USD.
           There is no provision to enter the transfer fee in the dialog. On closing the dialog the
           following transaction as viewed in the US Bank Account register has been created:
         </para>
 
         <note>
-          <para>Entering the Amount for the account that the funds are being transferred from the selected Credit
-            Account and selecting the Debit Amount radio button and then entering the foreign
-            currency amount to be debited generally provides a transaction recording the correct
-            amounts whereas entering an exchange rate will often not give the exact value actually
-            transferred in the foreign currency because of rounding errors.
+          <para><guilabel>Amount</guilabel> entered in the <guilabel>Transfer Funds</guilabel> are transferred from the selected <guilabel>Credit
+            Account</guilabel> to the selected <guilabel>Debit Account</guilabel>. And if <guilabel>Debit Amount</guilabel> radio button is selected and the foreign
+            currency amounts are entered, the transaction is recorded on the correct debit amounts. Whereas if <guilabel>Exchange Rate</guilabel> is selected
+            and entered, the exact value is not often recorded due to the rounding errors.
           </para>
         </note>
 
@@ -1342,7 +1331,7 @@ Trading
         </screenshot>
 
         <para>The balances of the Asset and Equity accounts are presented with values set by the exchange rate
-          entered in the transaction to transfer funds on 01/02/2020.
+          entered in the transaction to transfer funds on Feb. 1, 2020.
         </para>
 
         <para>The trading accounts have been automatically created and the amounts of the transfer have been
@@ -1352,17 +1341,17 @@ Trading
         </para>
 
         <para>At this point there have been no trading gains or losses. The balances of the USD and HKD trading
-          accounts are the same when converted to USD. The HKD trading account has a debit (-ve
-          balance) and the USD trading account has a credit balance (+ve balance). The nett balance
+          accounts are the same when converted to USD. The HKD trading account has a debit (negative
+          balance) and the USD trading account has a credit balance (positive balance). The net balance
           of the CURRENCY sub account of Trading, and Trading itself, is 0 indicating that at this
           point no gains or losses have been recorded in the trading of currencies.
         </para>
 
-        <para>The hypothetical purchase in Hong Kong fails to take place and a month later on 01/03/2020 the funds
-          are required in the US account for another purpose. A transfer of $10200.00 HKD is made
+        <para>The hypothetical purchase in Hong Kong fails to take place and a month later on Mar. 1, 2020 the funds
+          are required in the US account for another purpose. A transfer of 10,200.00 HKD is made
           from the Hong Kong bank account back to the US bank account. The exchange rate at the time
-          of the transfer is 1USD = 7.7933 HKD and a fee of $20.00 USD is charged for the transfer.
-          The transaction to effect the transfer is:
+          of the transfer is 1 USD = 7.7933 HKD and a fee of 20.00 USD is charged for the transfer.
+          The transaction to effect the transfer is as follows:
         </para>
 
         <screenshot id="currency_trading_tfr_back">
@@ -1382,7 +1371,7 @@ Trading
             </textobject>
 
             <caption>
-              <para>The transaction transfers $10200.00 HKD from the Hong Kong Bank account to the US Bank account.
+              <para>The transaction transfers 10,200.00 HKD from the Hong Kong Bank account to the US Bank account.
               </para>
             </caption>
           </mediaobject>
@@ -1415,7 +1404,7 @@ Trading
           </mediaobject>
         </screenshot>
 
-        <para>The Accounts tab balances after transferring the funds back are:
+        <para>The Accounts tab balances after transferring the funds back are as follows:
         </para>
 
         <screenshot id="currency_trading_accts_after_trf_back">
@@ -1442,9 +1431,8 @@ Trading
         </screenshot>
 
         <para>The Assets and Equity balances now reflect the the values of the accounts at the exchange rate for
-          the transfer of funds back to the US Bank account. The Trading accounts now indicate a
-          modest realized loss of US$0.82 on the currency transactions indicated by the balances in
-          the CURRENCY and Trading placeholder accounts. The associated transfer fees appear in the
+          the transfer of funds back to the US Bank account. The Trading and CURRENCY placeholder accounts now indicate a
+          modest realized loss of 0.82 USD on the currency transactions. The associated transfer fees appear in the
           Expenses total. Not a profitable exercise but still illustrative.
         </para>
 

commit 0777dffbc7282c0048b1a2aff79ebce5f2e5325a
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 31 10:23:57 2021 +0900

    Fix comment https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676279712

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 0cf71d22..63bc2f8d 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1085,8 +1085,7 @@ Income
 
         <para>In this example you will purchase 100 shares at $50 per share of IBM stock with a commission of $100. First step will be
           to create the stock account for IBM. The existing <emphasis>Expenses:Commission</emphasis>
-          account will be used. If you wish to track commissions to the individual stock level an
-          additional sub-account would be necessary, like <emphasis>Expenses:Commission:IBM</emphasis>.
+          account will be used.
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the

commit 1e176058c9b50a85b250a1d59e390ae0bbb9ea2b
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 31 10:06:36 2021 +0900

    Fix comment https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r680092489
     and https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676052158a

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 44b31268..0cf71d22 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1440,31 +1440,51 @@ Income
           Quotes</guibutton> button to update your stock prices on the Internet.
         </para>
 
-        <para>The command <command>gnucash-cli --quotes get <filename><replaceable>$HOME/gnucash-filename</replaceable></filename></command> can be used to
+        <para>The command <command>gnucash-cli --quotes get <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command><footnote>
+          <simpara>The Online Quotes Retrieval command has been changed from &app; 4.0. The old command
+            <command>gnucash --add-price-quotes <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command> is 
+            still available, but it is deprecated and will be removed in the future release.
+            If you've upgraded from &app; 3.11 or previous version, 
+            it is recommended to use the new command <command>gnucash-cli</command>.</simpara>
+          </footnote> can be used to
           fetch the current prices of your stocks. The file specified
-          <filename><replaceable>$HOME/gnucash-filename</replaceable></filename> will depend on the name and
+          <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename> will depend on the name and
           location of your data file. This can be determined by the name displayed in the top frame
           of the &app; window, before the <quote>-</quote>. The file name can also be found under
           <guimenu>File</guimenu> in the recently opened file list; the first item, numbered 1, is
           the name of the currently open file.
         </para>
 
-        <note>
-          <simpara>The Online Quotes Retrieval command has been changed from &app; 4.0. If you've upgraded from &app; 3.11 or previous version, 
-           be sure to change the command.</simpara>
-        </note>
+        
       </sect3>
 
       <sect3 id="invest-stockprice-auto-scheduler">
         <title>Configuring for Getting Online Quotes Periodically</title>
         
-        <para>This can be automated by creating a <application>crontab</application> entry. For example, to update
-          your file every Friday evening (16:00) after the relevant exchange markets close (modify
-          the time accordingly for your time zone), you could add the following to your personal
-          <application>crontab</application>:
-          <informalexample>
-            <screen>0 16 * * 5 gnucash-cli --quotes get <replaceable>$HOME/gnucash-filename</replaceable> > /dev/null 2>&1</screen>
-          </informalexample>
+        <para>You have to register the <command>gnucash-cli</command> with a scheduler in order to get Online Quotes automatically and periodically.
+          The method depends on your OS. For example, suppose you want to update
+          your file on 16:00 on every Friday.
+        </para>
+
+        <procedure>
+          <title>Register <command>gnucash-cli</command> with <application>cron</application> on &lin; and &mac;</title>
+          <step><simpara>Run <command>crontab -e</command>.</simpara></step>
+          <step><para>Add the following line to your crontab:
+            <informalexample>
+              <screen>0 16 * * 5 gnucash-cli --quotes get <replaceable>${HOME}/gnucash-filename</replaceable> > /dev/null 2>&1</screen>
+            </informalexample></para>
+          </step>
+        </procedure>
+
+        <procedure>
+          <title>Register <command>gnucash-cli</command> with Task Scheduler on &win;</title>
+          <step><simpara>Select <menuchoice><guimenu>Start</guimenu><guisubmenu>Windows Administrative Tools</guisubmenu><guimenuitem>Task Scheduler</guimenuitem></menuchoice>.</simpara></step>
+          <step><simpara>Select <guimenuitem>Create Task</guimenuitem>.</simpara></step>
+          <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
+        </procedure>
+
+        <para>See <ulink url="https://code.gnucash.org/docs/C/gnucash-help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
+          and <ulink url="https://wiki.gnucash.org/wiki/Online_Quotes#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
         </para>
 
         <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and

commit b80e1d6d67e1c38e0b8cafa59ec87e208d8122cb
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Jul 16 20:19:08 2021 +0900

    Fix typos.
    Change some itemizelist to variablelist.
    Remove extra spaces within inline tags for translation.
    Modify tags to make translation easier.
    Replace Finance::Quote with &app-fq;.
    Fix according to the comment https://github.com/Gnucash/gnucash-docs/pull/192
    Added a space between a word and a tag.
    Replace misused acronyms with guilabels.
    Add spaces between words and tags to avoid word concatenation.
    Change German word Strg to English word Ctrl.
    Add replaceable tag, see
    https://github.com/Gnucash/gnucash-docs/pull/190#discussion_r671407584
    
    This reverts commit 2f2e0150a643f01f2711732bdac461db481b6c3e.
    
    Revert "Add spaces between words and tags to avoid word concatenation."
    
    This reverts commit 3477ab14a1c2e9def0bb8b6e5e9add47d156b905.
    
    Revert "Fix typos."
    
    This reverts commit 06540fceefe517fd91d9fc02cb569c3040028f97.
    
    Fix typos.
    Change some itemizelist to variablelist.
    Remove extra spaces within inline tags for translation.
    Modify tags to make translation easier.
    Replace Finance::Quote with &app-fq;.
    Unify Savings account name.
    Replace CD with certificate of deposit.
    
    Fix according to the pull request comments.
    https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676045943
    https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676179884
    
    Fix 1 of https://github.com/Gnucash/gnucash-docs/pull/192#discussion_r676050567
    
    Add sect3 "Configuring for Getting Online Quotes Periodically"
     to add gnucash-cli to time scheduler that depends on the OS.

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index b94d0275..44b31268 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -19,9 +19,9 @@
   <title>Investments</title>
 
   <para>This chapter explains how to manage your investments with &app;. Most people have an investment
-    plan, whether its just putting money into a CD account, investing through a company sponsored
+    plan, whether its just putting money into a certificate of deposit (<acronym>CD</acronym> for short) account, investing through a company sponsored
     plan at your workplace or buying and selling stocks and bonds through a brokerage. &app; gives
-    you tools to help you manage these investments such as the <emphasis>Price Editor </emphasis>
+    you tools to help you manage these investments such as the <emphasis>Price Database</emphasis>
     which allows you to record changes in the prices of stocks you own.
   </para>
 
@@ -46,7 +46,7 @@
 
       <variablelist>
         <varlistentry>
-          <term><emphasis>Capital gains</emphasis></term>
+          <term id="invest_terms2.capgain">Capital gains</term>
 
           <listitem>
             <para>The difference between the purchase and selling prices of an investment. If the selling price is
@@ -57,7 +57,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Commission</emphasis></term>
+          <term>Commission</term>
 
           <listitem>
             <para>The fee you pay to a broker to buy or sell securities.
@@ -66,7 +66,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Common stock</emphasis></term>
+          <term>Common stock</term>
 
           <listitem>
             <para>A security that represents a certain fractional ownership of a company. This is what you buy when
@@ -77,7 +77,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Compounding</emphasis></term>
+          <term>Compounding</term>
 
           <listitem>
             <para>The concept that the reinvested interest can later earn interest of its own (interest on interest).
@@ -87,7 +87,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Dividends</emphasis></term>
+          <term>Dividends</term>
 
           <listitem>
             <para>Dividends are cash payments a company makes to shareholders. The amount of this payment is usually
@@ -98,7 +98,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Equities</emphasis></term>
+          <term>Equities</term>
 
           <listitem>
             <para>Equities are investments in which the investor becomes part (or whole) owner in something. This
@@ -108,7 +108,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Interest</emphasis></term>
+          <term>Interest</term>
 
           <listitem>
             <para>What a borrower pays a lender for the use of their money. Normally, this is expressed in terms of a
@@ -120,7 +120,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Liquidity</emphasis></term>
+          <term>Liquidity</term>
 
           <listitem>
             <para>A measure of how easily convertible an investment is to cash. Money in a savings account is very
@@ -131,7 +131,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Principal</emphasis></term>
+          <term>Principal</term>
 
           <listitem>
             <para>The original amount of money invested or borrowed.
@@ -140,27 +140,26 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Realized vs Unrealized Gain/Loss</emphasis></term>
+          <term>Realized vs Unrealized Gain/Loss</term>
 
           <listitem>
             <para>Unrealized gain or loss occurs when you’ve got a change in price of an asset. You realize the
-              gain/loss when you actually sell the asset. See also <emphasis>capital
-              gain/loss</emphasis>.
+              gain/loss when you actually sell the asset. See also <xref linkend="invest_terms2.capgain" />.
             </para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Return</emphasis></term>
+          <term id="invest_terms2.return">Return</term>
 
           <listitem>
-            <para>The total income plus capital gains or losses of an investment. See also <emphasis>Yield</emphasis>.
+            <para>The total income plus capital gains or losses of an investment. See also <xref linkend="invest_terms2.yield" />.
             </para>
           </listitem>
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Risk</emphasis></term>
+          <term>Risk</term>
 
           <listitem>
             <para>The probability that the return on investment is different from what was expected. Investments are
@@ -172,7 +171,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Shareholder</emphasis></term>
+          <term>Shareholder</term>
 
           <listitem>
             <para>A shareholder is a person who holds common stock in a company.
@@ -181,7 +180,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Stock split</emphasis></term>
+          <term>Stock split</term>
 
           <listitem>
             <para>Occurs when a company offers to issue some additional multiple of shares for each existing stock.
@@ -194,7 +193,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Valuation</emphasis></term>
+          <term>Valuation</term>
 
           <listitem>
             <para>The process of determining the market value or the price the investment would sell at in a
@@ -204,12 +203,12 @@
         </varlistentry>
 
         <varlistentry>
-          <term><emphasis>Yield</emphasis></term>
+          <term id="invest_terms2.yield">Yield</term>
 
           <listitem>
-            <para>A measure of the amount of money you earn from an investment (IE: how much income you receive from
+            <para>A measure of the amount of money you earn from an investment (That is how much income you receive from
               the investment). Typically this is reported as a percentage of the principal amount.
-              Yield does not include capital gains or loses (see Return). Eg: A stock sells for $100
+              Yield does not include capital gains or loses (see <xref linkend="invest_terms2.return" />). For example, a stock sells for $100
               and gives $2 in dividends per year has a yield of 2%.
             </para>
           </listitem>
@@ -258,7 +257,7 @@
           </para>
 
           <para>A mutual fund is a group investment mechanism in which you can buy into many stocks simultaneously.
-            For example, a "S&P 500 index fund" is a fund which purchases all 500 stocks listed
+            For example, a <quote>S&P 500 index fund</quote> is a fund which purchases all 500 stocks listed
             in the Standard and Poor’s index. When you buy a share of this fund, you are
             really buying a small amount of each of the 500 stocks contained within the fund. Mutual
             funds are treated exactly like a single stock, both for tax purposes and in accounting.
@@ -314,8 +313,8 @@
         &app; file is open, switch to the <guilabel>Accounts</guilabel> tab, and choose
         <menuchoice>
           <guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy</guimenuitem>
-        </menuchoice>
-        . This will run the <guilabel>New Account Hierarchy Setup</guilabel> assistant and allow you
+        </menuchoice>.
+        This will run the <guilabel>New Account Hierarchy Setup</guilabel> assistant and allow you
         to select additional accounts to add to your account hierarchy. Choose the
         <guilabel>Investment Accounts</guilabel> option (along with any others you are interested
         in). Assuming only investment accounts were selected, this will create an account hierarchy
@@ -352,7 +351,7 @@
         </mediaobject>
       </screenshot>
 
-      <para>You will probably at least want to add a <emphasis>Bank</emphasis> account to the Assets and
+      <para>You will probably at least want to add a <emphasis>Bank</emphasis> account to the <emphasis>Assets</emphasis> account and
         probably an <emphasis>Equity:Opening Balances</emphasis> account, as we have done in
         previous chapters. Don’t forget to save your new account file with a relevant name!
       </para>
@@ -381,11 +380,8 @@
         as the brokerage account.
       </para>
 
-      <para>Security prices are kept in a separate area of &app; (the Price Database -
-        <menuchoice>
-          <guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem>
-        </menuchoice>
-        ). This contains prices for individual securities (not security accounts). All prices for an
+      <para>Security prices are kept in the <guilabel>Price Database</guilabel> of &app; (see <xref linkend="invest-stockprice1" />).
+        This contains prices for individual securities (not security accounts). All prices for an
         individual security are in a single currency. If a security is traded in multiple
         currencies, then a separate security and separate accounts should be set up for each
         currency.
@@ -479,15 +475,16 @@
 <screen>
 Assets
    Bank ABC
-      CD
+      Certificate of Deposit
       Savings
 Expenses
    Bank ABC
       Charges
 Income
    Interest Income
-      CD
+      Certificate of Deposit
       Savings</screen>
+
       <para>As usual, this account hierarchy is simply presented as an example, you should create your accounts
         in a form which best matches your actual situation.
       </para>
@@ -497,9 +494,9 @@ Income
       <title>Example</title>
 
       <para>Now let’s populate these accounts with real numbers. Let’s assume that you start with
-        $10000 in your bank account, which pays 1% interest and you buy a $5000 certificate of
+        $10,000 in your bank account, which pays 1% interest and you buy a $5,000 certificate of
         deposit with a 6 month maturity date and a 2% yield. Clearly, it is much better to keep your
-        money in the CD than in the savings account. After the initial purchase, your accounts
+        money in the certificate of deposit than in the savings account. After the initial purchase, your accounts
         should look something like this:
       </para>
 
@@ -520,7 +517,7 @@ Income
           </textobject>
 
           <caption>
-            <para>This is an image of the account register after creating and investing in a CD investment.
+            <para>This is an image of the account register after creating and investing in a certificate of deposit investment.
             </para>
           </caption>
         </mediaobject>
@@ -529,7 +526,7 @@ Income
       <para>Now, during the course of the next 6 months, you receive monthly bank statements which describe the
         activity of your account. In our fictional example, we do nothing with the money at this
         bank, so the only activity is income from interest and bank charges. The monthly bank
-        charges are $2. After 6 months, the register window for the CD and for the savings account
+        charges are $2. After 6 months, the register window for the certificate of deposit and for the savings account
         should look like these:
       </para>
 
@@ -550,7 +547,7 @@ Income
           </textobject>
 
           <caption>
-            <para>This is an image of the register of the CD account after 6 months.
+            <para>This is an image of the register of the certificate of deposit account after 6 months.
             </para>
           </caption>
         </mediaobject>
@@ -606,14 +603,14 @@ Income
       </screenshot>
 
       <para>From the above image of the main &app; account window you see a nice summary of what happened to
-        these investments over the 6 months. While the yield on the CD is double that of the savings
-        account, the return on the CD was $50.21 versus $13.03 for the savings account, or almost 4
+        these investments over the 6 months. While the yield on the certificate of deposit is double that of the savings
+        account, the return on the certificate of deposit was $50.21 versus $13.03 for the savings account, or almost 4
         times more. Why? Because of the pesky $2 bank charges that hit the savings account (which
         counted for $12 over 6 months).
       </para>
 
-      <para>After this 6 month period, the CD has reached maturity which means you may sell it with no early
-        withdrawal penalty. To do so, simply transfer the $5050.21 from the CD account into the
+      <para>After this 6 month period, the certificate of deposit has reached maturity which means you may sell it with no early
+        withdrawal penalty. To do so, simply transfer the $5,050.21 from the certificate of deposit account into the
         savings account.
       </para>
     </sect2>
@@ -626,9 +623,9 @@ Income
       to create and populate the accounts with your investment portfolio. After this initial setup
       of your portfolio, you may have shares of stock purchased from before you started using &app;.
       For these stocks, follow the instructions in the
-      <link linkend="invest-buy-stock2"><emphasis>Entering Preexisting Shares</emphasis></link>
-      section below. If you have just purchased your stocks, then use the
-      <link linkend="invest-buy-new2"><emphasis>Buying New Shares</emphasis> </link> section.
+      <xref linkend="invest-buy-stock2" endterm="invest-buy-stock2.title" /> section.
+      If you have just purchased your stocks, then use the
+      <xref linkend="invest-buy-new2" endterm="invest-buy-new2.title" /> section.
     </para>
 
     <sect2 id="invest-setup-stockaccounts2">
@@ -680,8 +677,8 @@ Income
         menu
         <menuchoice>
           <guimenu>Actions</guimenu><guimenu>New Account...</guimenu>
-        </menuchoice>
-        . The New Account dialog will appear, follow the steps, in the sequence below to setup your
+        </menuchoice>.
+        The New Account dialog will appear, follow the steps, in the sequence below to setup your
         new stock account.
       </para>
 
@@ -710,8 +707,8 @@ Income
 
       <orderedlist>
         <listitem>
-          <para><emphasis>Account Name</emphasis> - Usually, use the stock ticker abbreviation, IE:
-            <quote>AMZN</quote>
+          <para><emphasis>Account Name</emphasis> - Usually, use the stock ticker abbreviation, like
+            <quote><userinput>AMZN</userinput></quote>.
           </para>
         </listitem>
 
@@ -741,20 +738,20 @@ Income
 
         <listitem>
           <para><emphasis>Create the New Security</emphasis> - To use a new stock, you must create the stock as a
-            new commodity
+            new commodity.
           </para>
 
           <note>
-            <para>Be sure to first select Account Type <emphasis>Stock </emphasis> or <emphasis>Mutual Fund</emphasis>
-              so that the <guilabel>Select...</guilabel> button brings up the list of securites
+            <para>Be sure to first select Account Type <emphasis>Stock</emphasis> or <emphasis>Mutual Fund</emphasis>
+              so that the <guibutton>Select...</guibutton> button brings up the list of securities
               rather than currencies.
             </para>
           </note>
 
           <itemizedlist>
             <listitem>
-              <para><emphasis>Select Security/Currency</emphasis> - Click on the <guibutton>Select ...</guibutton>
-                button next to the <guilabel>security/currency</guilabel> line. We must change the
+              <para><emphasis>Select Security/Currency</emphasis> - Click on the <guibutton>Select...</guibutton>
+                button next to the <guilabel>Security/currency</guilabel> line. We must change the
                 security from the default (your default currency) to this specific stock. This will
                 bring up the <guilabel>Select Security</guilabel> dialog.
               </para>
@@ -801,16 +798,18 @@ Income
 -->
               <itemizedlist>
                 <listitem>
-                  <para>The <guilabel>Full name:</guilabel> is <quote>Amazon.com</quote>.
+                  <para>The <guilabel>Full name:</guilabel> is <userinput>Amazon.com</userinput>.
                   </para>
                 </listitem>
 
                 <listitem>
-                  <para>The <guilabel>Symbol/abbreviation:</guilabel> is <quote>AMZN</quote>. The symbol is the stock ticker
-                    used in your quote source several lines down on the form. Note that different
-                    symbols will be utilized on different price sources for the same stock, an
+                  <para>The <guilabel>Symbol/abbreviation:</guilabel> is <userinput>AMZN</userinput>. The symbol is the stock ticker
+                    used in your quote source several lines down on the form. 
+                    <note><para>
+                    Different symbols will be used on different price sources for the same stock, an
                     example is Ericsson on the Stockholm Exchange is ERIC-B while on Yahoo it is
-                    ERRICB.ST
+                    ERRICB.ST.</para>
+                    </note>
                   </para>
                 </listitem>
 
@@ -830,22 +829,20 @@ Income
 
                 <listitem>
                   <para>The <guilabel>Fraction traded</guilabel> should be adjusted to the smallest fraction of this
-                    security which can be traded, usually 1/100 or 1/10000.
+                    security which can be traded, usually <guilabel>1/100</guilabel> or <guilabel>1/10000</guilabel>.
                   </para>
                 </listitem>
 
                 <listitem>
                   <para>The checkbox <quote>Get Online Quotes</quote>, the quote source and the timezone should be selected
-                    to define the sources for updating prices on-line. See Also
-                    <link linkend="invest-stockprice-auto2"> <quote>Setting Stock Price
-                    Automatically</quote></link>.
+                    to define the sources for updating prices on-line. See also
+                    <xref linkend="invest-stockprice-auto2" />.
                   </para>
 
                   <note>
                     <para>If the <guibutton>Get Online Quotes</guibutton> button is not highlighted, and it is not tickable,
-                      then the <application>Finance::Quote</application> package is not installed.
-                      See the section on <link linkend="invest-stockprice-auto-install3">
-                      <quote>Installing <application>Finance::Quote</application></quote></link>.
+                      then the &app-fq; package is not installed.
+                      See the section on <xref linkend="invest-stockprice-auto-install3"/>.
                     </para>
                   </note>
 
@@ -955,7 +952,7 @@ Income
           </textobject>
 
           <caption>
-            <para>This image is after the creation of the first stock account (AMZN)
+            <para>This image is after the creation of the first stock account (AMZN).
             </para>
           </caption>
         </mediaobject>
@@ -975,22 +972,22 @@ Income
     <title>Buying Shares</title>
 
     <sect2 id="invest-buy-stock2">
-      <title>Entering Preexisting Shares</title>
+      <title id="invest-buy-stock2.title">Entering Preexisting Shares</title>
 
-      <para>The examples in this section use <guilabel>Transaction Journal </guilabel> view.
+      <para>The examples in this section use <guilabel>Transaction Journal</guilabel> view.
       </para>
 
-      <para>To register the initial 100 shares of this stock that you purchased previously, on the first
-        (transaction) line, enter the date of the purchase (eg: Jan. 1 2005) and
-        <guilabel>Description</guilabel> (eg: Opening Balance). On the first split line, enter 100
-        in <guilabel>Shares </guilabel>, delete the (unit) <guilabel>Price</guilabel> (it will be
-        calculated when you <keycap>Tab</keycap> out of the split) and enter 2000 in the
+      <para>To register the initial <userinput>100</userinput> shares of this stock that you purchased previously, on the first
+        (transaction) line, enter the date of the purchase (for example, Jan. 1 2005) and
+        <guilabel>Description</guilabel> (for example, Opening Balance). On the first split line, enter <userinput>100</userinput>
+        in <guilabel>Shares</guilabel>, delete the (unit) <guilabel>Price</guilabel> (it will be
+        calculated when you <keycap>Tab</keycap> out of the split) and enter <userinput>2000</userinput> in the
         <guilabel>Buy</guilabel> column.
       </para>
 
       <note>
         <para>It is also possible to use &app; to calculate <guilabel>Shares</guilabel> or
-          <guilabel>Buy</guilabel> from the other 2 columns but to avoid rounding errors, it is
+          <guilabel>Buy</guilabel> from the other 2 columns. But to avoid rounding errors, it is
           better to automatically calculate <guilabel>Price</guilabel>.
         </para>
       </note>
@@ -1017,7 +1014,7 @@ Income
           </textobject>
 
           <caption>
-            <para>This image is of the transaction register of the AMZN account after the first stock
+            <para>This image is the transaction register of the AMZN account after the first stock
               <quote>purchase</quote>.
             </para>
           </caption>
@@ -1025,18 +1022,18 @@ Income
       </screenshot>
 
       <para>Notice that the <guilabel>Balance</guilabel> (last column) is in the units of the commodity (AMZN
-        shares) not in currency units. Thus, the balance is 100 (AMZN units) rather than $2000. This
+        shares) not in currency units. Thus, the balance is 100 (AMZN units) rather than $2,000. This
         is how it should be.
       </para>
     </sect2>
 
     <sect2 id="invest-buy-new2">
-      <title>Buying New Shares</title>
+      <title id="invest-buy-new2.title">Buying New Shares</title>
 
       <para>The main difference between setting up a new stock purchase versus the setup for preexisting stocks
         as described in the previous section is that instead of transferring the money used to
         purchase the stock from the <emphasis>Equity:Opening Balances</emphasis> account, you
-        transfer from your <emphasis>Assets:Bank ABC</emphasis> or <emphasis> Assets:Brokerage
+        transfer from your <emphasis>Assets:Bank ABC</emphasis> or <emphasis>Assets:Brokerage
         Account</emphasis> account.
       </para>
 
@@ -1044,41 +1041,39 @@ Income
         <title>Handling Commissions and Fees</title>
 
         <para>For conciseness, this document will refer to the money you pay to a broker for buying and selling
-          securities as <emphasis>Commissions </emphasis>. Government fees may also be payable.
+          securities as <emphasis>Commissions</emphasis>. Government fees may also be payable.
           Unless otherwise stated, fees are handled in a similar way.
         </para>
 
-        <para>In &app; there are 2 alternate ways to handle commissions (for simplicity this document section will
-          refer to these ways as net pricing and gross pricing):
-        </para>
-
-        <itemizedlist>
-          <listitem>
-            <para><emphasis>Net Pricing:</emphasis> You enter a net price (adjusted by commissions) when buying and
-              selling securities. You do <emphasis>not</emphasis> also record commissions in a
-              specific commissions account in order to later claim it as an expense, as this would
-              be claiming commissions twice. This way <emphasis>is</emphasis> compatible with using
-              <xref linkend="invest-sellLots"></xref>. This results in a slightly misleading price
-              being added to the price database (the effective price you paid) but is not usually of
-              any concern.
-            </para>
-          </listitem>
-        </itemizedlist>
-
-        <para>OR
-        </para>
+        <para>In &app; 2 alternate ways can be used to handle commissions (for simplicity this document section will
+          refer to these ways as net pricing and gross pricing).</para>
 
-        <itemizedlist>
-          <listitem>
-            <para><emphasis>Gross Pricing:</emphasis> You enter the price not adjusted by commissions and enter the
-              commissions expense on a separate split in the transaction. This enables the tracking
-              of commissions but is <emphasis>not</emphasis> compatible with using
-              <xref linkend="invest-sellLots"></xref>. Scrubbing doesn't know to deduct commissions
-              and fees from the gains, so capital gains or losses must be manually calculated (see
-              <xref linkend="invest-sell-man"></xref>).
-            </para>
-          </listitem>
-        </itemizedlist>
+		<variablelist>
+        <varlistentry>
+        <term>Gross Pricing</term>
+	    <listitem><para>You enter the price not adjusted by commissions and enter the
+	       commissions expense on a separate split in the transaction. This enables the tracking
+	       of commissions but is <emphasis>not</emphasis> compatible with using
+	       <xref linkend="invest-sellLots"/>. Scrubbing doesn't know to deduct commissions
+	       and fees from the gains, so capital gains or losses must be manually calculated (see
+	       <xref linkend="invest-sell-man"/>).
+           </para>
+        </listitem>
+        </varlistentry>
+		<varlistentry>
+	    <term>Net Pricing</term>
+        <listitem><para>
+            You enter a net price (adjusted by commissions) when buying and
+            selling securities. You do <emphasis>not</emphasis> also record commissions in a
+            specific commissions account in order to later claim it as an expense, as this would
+            be claiming commissions twice. This way <emphasis>is</emphasis> compatible with using
+            <xref linkend="invest-sellLots"/>. This results in a slightly misleading price
+            being added to the price database (the effective price you paid) but is not usually of
+            any concern.
+	    </para>
+        </listitem>
+		</varlistentry>
+		</variablelist>
 
         <para>Please get professional advice if you are unsure which of these ways are applicable to your
           jurisdiction.
@@ -1088,22 +1083,21 @@ Income
       <sect3 id="invest-buy-gross">
         <title>Example: Buying Shares with Gross Pricing</title>
 
-        <para>In this example you will purchase $5000 of IBM stock, with a commission of $100. First step will be
+        <para>In this example you will purchase 100 shares at $50 per share of IBM stock with a commission of $100. First step will be
           to create the stock account for IBM. The existing <emphasis>Expenses:Commission</emphasis>
           account will be used. If you wish to track commissions to the individual stock level an
-          additional sub-account would be necessary. E.g.
-          <emphasis>Expenses:Commission:IBM</emphasis>.
+          additional sub-account would be necessary, like <emphasis>Expenses:Commission:IBM</emphasis>.
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the
-          purchase (eg: Jan. 3 2005) and <guilabel>Description</guilabel> (eg: Initial IBM
-          Purchase). On the first split line, enter 50 in <guilabel>Shares</guilabel>, delete
-          <guilabel>Price</guilabel> (leave it empty so it will be calculated)), and enter 5000 in
+          purchase (for example, Jan. 3 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
+          Purchase). On the first split line, enter <userinput>50</userinput> in <guilabel>Shares</guilabel>, delete
+          <guilabel>Price</guilabel> (leave it empty so it will be calculated), and enter <userinput>5000</userinput> in
           <guilabel>Buy</guilabel>. You do not need to fill in the <guilabel>Price</guilabel>
           column, as it will be calculated for you when you <keycap>Tab</keycap> to the next split.
-          The next line in the split transaction will be <emphasis>Expenses:Commissions </emphasis>
-          and fill in <guilabel>Buy</guilabel> ($100). The third line will be to transfer $5100 from
-          account <emphasis> Assets:Bank ABC</emphasis> to balance the transaction. Your IBM
+          The next line in the split transaction will be <emphasis>Expenses:Commissions</emphasis>
+          and fill <userinput>100</userinput> in <guilabel>Buy</guilabel>. The third split line will be to transfer $5,100 from
+          <emphasis>Assets:Bank ABC</emphasis> account to balance the transaction. Your IBM
           Commodity view should now appear like this:
         </para>
 
@@ -1136,30 +1130,30 @@ Income
         <title>Example: Buying Shares with Net Pricing</title>
 
         <para>Repeating the previous example using Net Pricing instead of Gross Pricing, in Transaction Journal
-          view:
+          view.
         </para>
 
-        <para>Purchase $5000 of IBM stock being 50 Shares for $100.00 each, plus a commission of $100.
+        <para>Purchase $5,000 of IBM stock being 50 Shares for $100.00 each, plus a commission of $100.
         </para>
 
         <para>Now for the transaction, on the first (transaction) line, enter the <guilabel>Date</guilabel> of the
-          purchase (eg: Jan. 3 2005) and a <guilabel>Description</guilabel> (eg: Initial IBM
+          purchase (for example, Jan. 3 2005) and <guilabel>Description</guilabel> (for example, Initial IBM
           Purchase). On the first split line, optionally enter more details in <guilabel>Memo
-          </guilabel>, then 50 in <guilabel>Shares</guilabel>, delete anything in
+          </guilabel>, then <userinput>50</userinput> in <guilabel>Shares</guilabel>, delete anything in
           <guilabel>Price</guilabel> (so it will be calculated by dividing <guilabel>Buy</guilabel>
           by <guilabel>Shares</guilabel> when you <keycap>Tab</keycap> out of the split), 5100 in
-          <guilabel>Buy </guilabel> (50 * $100.00 + $100). Alternatively use &app; to calculate
-          <guilabel>Buy</guilabel> by entering the formula <emphasis>5000+100</emphasis> or
-          <emphasis> (50 * 100) + 100 </emphasis> in <guilabel>Buy</guilabel> (
-          <guilabel>Buy</guilabel> will be calculated when you <keycap>Tab </keycap> out of the
-          column. Use the <keycap>Tab</keycap> key as many times as needed to proceed to the next
+          <guilabel>Buy</guilabel> (50 * $100.00 + $100). Alternatively use &app; to calculate
+          <guilabel>Buy</guilabel> by entering the formula <userinput>5000 + 100</userinput> or
+          <userinput>(50 * 100) + 100</userinput> in <guilabel>Buy</guilabel> (
+          <guilabel>Buy</guilabel> will be calculated when you <keycap>Tab</keycap> out of the
+          column.) Use the <keycap>Tab</keycap> key as many times as needed to proceed to the next
           split.
         </para>
 
         <para>Do <emphasis>not</emphasis> enter a separate split for Commission as it has already been included in
-          the <guilabel>Buy</guilabel> value. The second split line will be to transfer from
-          <emphasis> Assets:Bank ABC</emphasis> $5100 to balance the transaction. After the splits
-          are all correct, use the <keycap function="enter">Enter </keycap> key to save the
+          the <guilabel>Buy</guilabel> value. The second split line will be to transfer $5,100 from
+          <emphasis>Assets:Bank ABC</emphasis> account to balance the transaction. After the splits
+          are all correct, use the <keycap function="enter">Enter</keycap> key to save the
           transaction. Your IBM Commodity view should now appear like this:
         </para>
 
@@ -1195,21 +1189,21 @@ Income
 
     <para>The value of a commodity, such as a stock, must be explicitly set. The stock accounts track the
       quantity of stocks you own, but the value of the stock is stored in the <emphasis>Price
-      Editor</emphasis>. The values set in the <guilabel>Price Editor</guilabel> can be updated
+      Database</emphasis>. The values set in the <guilabel>Price Database</guilabel> can be updated
       manually or automatically.
     </para>
 
     <sect2 id="invest-stockprice-initial2">
-      <title>Initial Price Editor Setup</title>
-
-      <para>To use the <guilabel>Price Editor</guilabel> to track a stock value, you must initially insert the
-        stock. To do so, open the <guilabel>Price Editor</guilabel> (
-        <menuchoice>
-          <guimenu>Tools</guimenu><guimenuitem>Price Editor</guimenuitem>
-        </menuchoice>
-        ) and click on <guibutton>Add</guibutton> button. The first time a Commodity/Stock is
+      <title>Initial Price Database Setup</title>
+
+      <para>To use the <guilabel>Price Database</guilabel> to track a stock value, you must initially insert the
+        stock. To do so, open the <guilabel>Price Database</guilabel> 
+        (<menuchoice>
+          <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
+        </menuchoice>)
+        and click on <guibutton>Add</guibutton> button. The first time a Commodity/Stock is
         entered this window will be blank except for the control buttons on the bottom. Select the
-        appropriate Commodity you want to insert into the <guilabel>Price Editor</guilabel>. At this
+        appropriate Commodity you want to insert into the <guilabel>Price Database</guilabel>. At this
         point, you can input the price of the commodity manually. There are 6 fields in the New
         Commodity window:
       </para>
@@ -1219,7 +1213,7 @@ Income
           <term><guilabel>Namespace</guilabel></term>
 
           <listitem>
-            <para>The exchange market where the security/commodity is traded (in this example NASDAQ)
+            <para>The exchange market where the security/commodity is traded (in this example NASDAQ.)
             </para>
           </listitem>
         </varlistentry>
@@ -1228,7 +1222,7 @@ Income
           <term><guilabel>Security</guilabel></term>
 
           <listitem>
-            <para>The name of the commodity, must be chosen from the <guibutton>Select...</guibutton> list
+            <para>The name of the commodity, must be chosen from the <guibutton>Select...</guibutton> list.
             </para>
           </listitem>
         </varlistentry>
@@ -1246,7 +1240,7 @@ Income
           <term><guilabel>Date</guilabel></term>
 
           <listitem>
-            <para>Date that the price is valid
+            <para>Date that the price is valid.
             </para>
           </listitem>
         </varlistentry>
@@ -1257,7 +1251,7 @@ Income
           <listitem>
             <para>One of: <guilabel>Bid</guilabel> (the market buying price), <guilabel>Ask</guilabel> (the market
               selling price), <guilabel>Last</guilabel> (the last transaction price), <guilabel>Net
-              Asset Value</guilabel> (mutual fund price per share), or <guilabel>Unknown</guilabel>.
+              Asset Value</guilabel> (mutual fund price per share, <acronym>NAV</acronym> for short), or <guilabel>Unknown</guilabel>.
               Stocks and currencies will usually give their quotes as one of bid, ask or last.
               Mutual funds are often given as net asset value. For other commodities, simply choose
               <guilabel>Unknown</guilabel>. This option is for informational purposes only, it is
@@ -1276,7 +1270,7 @@ Income
         </varlistentry>
       </variablelist>
 
-      <para>As an example of adding the AMZN commodity to the price editor, with an initial value of $40.50 per
+      <para>As an example of adding the AMZN commodity to the price database, with an initial value of $40.50 per
         share.
       </para>
 
@@ -1293,28 +1287,27 @@ Income
           </imageobject>
 
           <textobject>
-            <phrase>Price Editor</phrase>
+            <phrase>Price Database</phrase>
           </textobject>
 
           <caption>
-            <para>Adding the AMZN commodity to the price editor, with an initial value of $40.50 per share.
+            <para>Adding the AMZN commodity to the price database, with an initial value of $40.50 per share.
             </para>
           </caption>
         </mediaobject>
       </screenshot>
 
       <para>Click <guibutton>OK</guibutton> when finished. Once you have performed this initial placement of the
-        commodity into the <guilabel>Price Editor</guilabel>, you will not have to do it again, even
+        commodity into the <guilabel>Price Database</guilabel>, you will not have to do it again, even
         if you use the same commodity in another account.
       </para>
 
       <note>
         <para>If you have online retrieval of quotes activated (see
-          <xref
-        linkend="invest-stockprice-auto2"></xref>), you can initialize a commodity
+          <xref linkend="invest-stockprice-auto2" />), you can initialize a commodity
           without manually making an entry. When you initially add the security in the
-          <guilabel>Security Editor</guilabel>, check <guibutton>Get Online Quotes</guibutton> and
-          save the security. Then, in the <guilabel>Price Editor</guilabel>, click <guibutton>Get
+          <guilabel>Security Editor</guilabel>, check <guilabel>Get Online Quotes</guilabel> and
+          save the security. Then, in the <guilabel>Price Database</guilabel>, click <guibutton>Get
           Quotes</guibutton>, and the new security will be inserted into the price list with the
           retrieved price.
         </para>
@@ -1325,7 +1318,7 @@ Income
       <title>Setting Stock Price Manually</title>
 
       <para>If the value of the commodity (stock) changes, you can adjust the value by entering the
-        <guilabel>Price Editor</guilabel>, selecting the commodity, clicking on
+        <guilabel>Price Database</guilabel>, selecting the commodity, clicking on
         <guibutton>Edit</guibutton> and entering the new price.
       </para>
 
@@ -1342,11 +1335,11 @@ Income
           </imageobject>
 
           <textobject>
-            <phrase>Price Editor</phrase>
+            <phrase>Price Database</phrase>
           </textobject>
 
           <caption>
-            <para>The main price editor window, showing the list of all known commodities.
+            <para>The main price database window, showing the list of all known commodities.
             </para>
           </caption>
         </mediaobject>
@@ -1359,11 +1352,11 @@ Income
       <para>If you have more than a couple of commodities, you will tire of having to update their prices
         constantly. &app; has the ability to automatically download the most recent price for your
         commodities using the Internet. This is accomplished through the
-        <application>Perl</application> module <application>Finance::Quote</application>, which must
+        <application>Perl</application> module &app-fq;, which must
         be installed in order to activate this feature.
       </para>
 
-      <para>To determine if the <application>Perl</application> module <application>Finance::Quote</application>
+      <para>To determine if the <application>Perl</application> module &app-fq;
         is already installed on your system, type <command>perldoc Finance::Quote</command> in a
         terminal window and check to see if there is any documentation available. If you see the
         documentation, then the module is installed, if you do not see the documentation, then it
@@ -1371,64 +1364,54 @@ Income
       </para>
 
       <sect3 id="invest-stockprice-auto-install3">
-        <title>Installing <application>Finance::Quote</application></title>
-
-        <para>&win;:
-          <itemizedlist>
-            <listitem>
-              <para>Close &app;.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>Run <emphasis role="strong">Install Online Price Retrieval</emphasis> which can be found in the
-                &app; <quote>Start</quote> menu entry.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </para>
-
-        <para>&mac;: You need to have XCode installed. XCode is an optional
-          item from your &mac; distribution DVD. Run the <emphasis role="strong">Update Finance
-          Quote</emphasis> app in the &app; dmg. You can run it from the dmg or copy it to the same
-          folder to which you copied &app;. It will open a Terminal window and run a script for you
-          which will ask lots of questions. Accept the default for each unless you know what
-          you’re doing.
-        </para>
-
-        <para>&lin;:
-          <itemizedlist>
-            <listitem>
-              <para>Close any running &app; instances.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>Locate the folder where &app; is installed by searching for <application>gnc-fq-update</application>
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>Change to that directory, open a root shell
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>Run the command <command>gnc-fq-update</command>
-              </para>
-            </listitem>
-          </itemizedlist>
-          This will launch a <application>Perl</application> CPAN update session that will go out
-          onto the internet and install the <application>Finance::Quote</application> module on your
-          system. The gnc-fq-update program is interactive, however, with most systems you should be
-          able to answer <quote>no</quote> to the first question: <quote>Are you ready for manual
-          configuration? [yes]</quote> and the update will continue automatically from that point.
-        </para>
-
-        <para>After installation is complete, you should run the <quote>gnc-fq-dump</quote> test program, in the
-          same directory, distributed with &app; to test if
-          <application>Finance::Quote</application> is installed and working properly.
-        </para>
+        <title>Installing &app-fq;</title>
+        <para>The process of installing &app-fq; depends on the system. </para>
+
+        <procedure>
+          <title>Installing &app-fq; on &win;</title>
+          <step><simpara>Close &app;.</simpara></step>
+          <step><simpara>Run <menuchoice>
+                               <guimenu>Start</guimenu>
+                               <guisubmenu>&app;</guisubmenu>
+                               <guimenuitem>Install Online Price Retrieval</guimenuitem></menuchoice>.
+            </simpara>
+          </step>
+        </procedure>
+
+        <procedure>
+          <title>Installing &app-fq; on &mac;</title>
+          <step><simpara>Install Xcode if it is not installed.</simpara>
+              <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
+          </step>
+          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
+              <para>You can run it from the dmg or copy it to the same
+                folder to which you copied &app;.
+                It will open a Terminal window and run a script for you
+                which will ask lots of questions. Accept the default for each unless you know what
+                you’re doing.
+            </para>
+          </step>
+        </procedure>
+
+        <procedure>
+          <title>Installing &app-fq; on &lin;</title>
+          <step><simpara>Close any running &app; instances.</simpara></step>
+          <step><simpara>Locate the folder where &app; is installed by searching for <filename>gnc-fq-update</filename>.</simpara></step>
+          <step><simpara>Change to that directory, open a root shell.</simpara></step>
+          <step><simpara>Run the command <command>./gnc-fq-update</command>.</simpara>
+            <para>
+              This will launch a <application>Perl</application> CPAN update session that will go out
+              onto the internet and install the &app-fq; module on your
+              system. The gnc-fq-update program is interactive, however, with most systems you should be
+              able to answer the first question <computeroutput>Are you ready for manual
+              configuration? [yes]</computeroutput> with <userinput>no</userinput>. Then the update will continue automatically from that point.
+            </para>
+            <para>After installation is complete, you should run the <quote><filename>gnc-fq-dump</filename></quote> test program, in the
+              same directory, distributed with &app; to test if
+              &app-fq; is installed and working properly.
+            </para>
+          </step>
+        </procedure>
 
         <note>
           <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
@@ -1442,37 +1425,46 @@ Income
       <sect3 id="invest-stockprice-auto-configure3">
         <title>Configuring Securities for Online Quotes</title>
 
-        <para>With <application>Finance::Quote</application> installed and functioning correctly, you must
+        <para>With &app-fq; installed and functioning correctly, you must
           configure your &app; securities to use this feature to obtain updated price information
           automatically. Whether creating new securities or modifying securities that have already
           been setup, use the
           <menuchoice>
             <guimenu>Tools</guimenu><guimenuitem>Security Editor</guimenuitem>
-          </menuchoice>
-          , to edit the security and check the <guilabel>Get Online Quotes</guilabel> box. You will
+          </menuchoice>,
+          to edit the security and check the <guilabel>Get Online Quotes</guilabel> box. You will
           now be able to modify the radio buttons for <guilabel>Type of quote source</guilabel>, the
           pull-down menus to specify the specific source(s) and <guilabel>The timezone for these
           quotes</guilabel>. When finished editing, <guilabel>Close</guilabel> the Security Editor
-          to return to the <guilabel>Price Editor</guilabel> and click on the <guibutton>Get
+          to return to the <guilabel>Price Database</guilabel> and click on the <guibutton>Get
           Quotes</guibutton> button to update your stock prices on the Internet.
         </para>
 
-        <para>The command <command>gnucash --add-price-quotes $HOME/gnucash-filename</command> can be used to
+        <para>The command <command>gnucash-cli --quotes get <filename><replaceable>$HOME/gnucash-filename</replaceable></filename></command> can be used to
           fetch the current prices of your stocks. The file specified
-          <filename class="directory">$HOME/gnucash-filename</filename> will depend on the name and
+          <filename><replaceable>$HOME/gnucash-filename</replaceable></filename> will depend on the name and
           location of your data file. This can be determined by the name displayed in the top frame
           of the &app; window, before the <quote>-</quote>. The file name can also be found under
           <guimenu>File</guimenu> in the recently opened file list; the first item, numbered 1, is
           the name of the currently open file.
         </para>
 
+        <note>
+          <simpara>The Online Quotes Retrieval command has been changed from &app; 4.0. If you've upgraded from &app; 3.11 or previous version, 
+           be sure to change the command.</simpara>
+        </note>
+      </sect3>
+
+      <sect3 id="invest-stockprice-auto-scheduler">
+        <title>Configuring for Getting Online Quotes Periodically</title>
+        
         <para>This can be automated by creating a <application>crontab</application> entry. For example, to update
           your file every Friday evening (16:00) after the relevant exchange markets close (modify
           the time accordingly for your time zone), you could add the following to your personal
           <application>crontab</application>:
-        </para>
-
-        <para>0 16 * * 5 gnucash --add-price-quotes $HOME/gnucash-filename > /dev/null 2>&1
+          <informalexample>
+            <screen>0 16 * * 5 gnucash-cli --quotes get <replaceable>$HOME/gnucash-filename</replaceable> > /dev/null 2>&1</screen>
+          </informalexample>
         </para>
 
         <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and
@@ -1530,18 +1522,18 @@ Income
         <guibutton>Options</guibutton> icon in the <emphasis>Menubar</emphasis> or selecting
         <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Report Options</guimenuitem>
-        </menuchoice>
-        . <guilabel>Price Source</guilabel> determines how accounts denominated in commodities
+        </menuchoice>.
+        <guilabel>Price Source</guilabel> determines how accounts denominated in commodities
         different from the report currency are converted to the report currency. Depending on the
         report the selector may appear in either the <guilabel>General</guilabel>, the
         <guilabel>Commodities</guilabel>, or the <guilabel>Display</guilabel> tab of the
         <guilabel>Report Options</guilabel> dialog box.
-        <note>
+         <note>
           <para>In the example below, the report is a customization of the <emphasis role="strong">Average
             Balance</emphasis> report in the Assets & Liabilities reports submenu.
           </para>
         </note>
-
+      </para> 
         <screenshot id="invest-stockvalue-report-options">
           <mediaobject>
             <imageobject>
@@ -1560,64 +1552,63 @@ Income
             </caption>
           </mediaobject>
         </screenshot>
+   
 
-        <itemizedlist>
-          <listitem>
-            <para><guilabel>Weighted Average</guilabel>: Calculates the price by summing the absolute value of the
+      <variablelist>
+      <varlistentry>
+        <term><guilabel>Weighted Average</guilabel></term>        
+        <listitem><para>Calculates the price by summing the absolute value of the
               amount and the absolute value of every split in every account denominated in the
               commodity, excluding those splits with a zero amount, and dividing the sum of values
               by the sum of amounts to obtain a price. For example, if you had a buy transaction for
               200 shares of XYZ for a total of 2000 and a sell of 100 for 1300 the weighted average
               would be 3300/300 or 11/share.
-            </para>
-
             <note>
               <para>Gain/Loss splits have an amount of 0 and are <emphasis>not</emphasis> included in this calculation.
               </para>
             </note>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Average Cost</guilabel>: Calculates the price by summing the amounts and values of every
-              split in every account denominated in the commodity, including the zero amount splits.
-              In the example above, with an additional split (either part of the sale transaction or
-              in a separate transaction) booking the gain at 0 shares and a 300 gain, the average
-              cost is 1000/100 (2000 original cost - 1300 proceeds from the sale + 300 gain)/(200 -
-              100) shares or 10/share.
-            </para>
-
-            <note>
-              <para>Gain/Loss splits <emphasis>are</emphasis> included in this calculation.
-              </para>
-            </note>
-
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><guilabel>Average Cost</guilabel></term>
+        <listitem><para>Calculates the price by summing the amounts and values of every
+            split in every account denominated in the commodity, including the zero amount splits.
+            In the example above, with an additional split (either part of the sale transaction or
+            in a separate transaction) booking the gain at 0 shares and a 300 gain, the average
+            cost is 1000/100 (2000 original cost − 1300 proceeds from the sale + 300 gain)/(200 −
+            100) shares or 10/share.
             <note>
-              <para>This is the <emphasis>only</emphasis> <guilabel>Price Source</guilabel> that will balance the
-                <guilabel>Trial Balance Report</guilabel> and in order for it to balance you
-                <emphasis>must</emphasis> correctly book your gains and losses.
-              </para>
+              <itemizedlist>
+                <listitem><simpara>Gain/Loss splits <emphasis>are</emphasis> included in this calculation.</simpara></listitem>
+                <listitem><simpara>This is the <emphasis>only</emphasis> <guilabel>Price Source</guilabel> that will balance the
+              <guilabel>Trial Balance Report</guilabel> and in order for it to balance you
+              <emphasis>must</emphasis> correctly book your gains and losses.</simpara></listitem>
+              </itemizedlist>
             </note>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Most Recent</guilabel>: Uses the latest price from the price database.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Nearest in time</guilabel>: Uses the price nearest in time to the report date—the
-              datum date for time series reports like <guilabel>Assets Over
-              Time</guilabel>—from the price database.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><guilabel>Most Recent</guilabel></term>
+        <listitem><para>Uses the latest price from the price database.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><guilabel>Nearest in time</guilabel></term>
+        <listitem><para>Uses the price nearest in time to the report date—the
+            datum date for time series reports like <guilabel>Assets Over
+            Time</guilabel>—from the price database.
+              <note>
+                <simpara>The nearest date isn’t necessarily before the date in question.</simpara>
+              </note>
             </para>
-
-            <note>
-              <para>The nearest date isn’t necessarily before the date in question.
-              </para>
-            </note>
-          </listitem>
-        </itemizedlist>
-      </para>
-
+        </listitem>
+      </varlistentry>
+      </variablelist>        
+        
       <screenshot id="invest-stockvalue-report">
         <mediaobject>
           <imageobject>
@@ -1644,22 +1635,18 @@ Income
 
     <para>Entering an investment sale transaction is done in a similar way to entering a buy transaction (see
       <xref linkend="invest-buy-new2" />) except the amount entered in the
-      <emphasis>Shares</emphasis> column is negative and the proceeds of the transaction is entered
-      in the <emphasis>Sell </emphasis> column. The net proceeds from the sale should be transferred
+      <guilabel>Shares</guilabel> column is negative and the proceeds of the transaction is entered
+      in the <guilabel>Sell</guilabel> column. The net proceeds from the sale should be transferred
       from the shares account to your bank or brokerage account.
     </para>
 
     <para>For information on handling <emphasis>commissions</emphasis> and the use of <emphasis>Net
       Pricing</emphasis> or <emphasis>Gross Pricing</emphasis>, please see
       <xref linkend="invest-buy-com" />.
-    </para>
-
-    <para>If you will be recording a capital gain or loss on the sale, please see
+      If you will be recording a capital gain or loss on the sale, please see
       <xref linkend="chapter_capgain" /> and <xref linkend="chapter_dep" /> for more information on
       this topic.
-    </para>
-
-    <para>To use the &app;<emphasis> Automatic Calculation of Capital Gain or Loss Using Lots</emphasis>
+      To use the &app; <emphasis>Automatic Calculation of Capital Gain or Loss Using Lots</emphasis>
       feature, please see <xref linkend="invest-sellLots" /> otherwise continue to the next section.
     </para>
 
@@ -1668,79 +1655,102 @@ Income
 
       <note>
         <para>In order for &app; to commit the zero-share, zero-price split for account
-          <emphasis>Assets:Stock:SYMBOL </emphasis> to the transaction in the following schemes, you
-          *must* <keycap>Tab</keycap> out of that split. If you use the
+          <emphasis>Assets:Stock:SYMBOL</emphasis> to the transaction in the following schemes, you
+          <emphasis>must</emphasis> <keycap>Tab</keycap> out of that split. If you use the
           <keycap function="enter">Enter</keycap> key, &app; will convert the split into shares of
           the commodity.
         </para>
       </note>
 
       <para>In the schemes of transaction splits presented below, the following symbols are used:
-      </para>
 
-      <itemizedlist>
+      <variablelist>
+        <varlistentry>
+            <term>NUM_SHARES</term>
         <listitem>
-          <para>NUM_SHARES: number of shares you are selling
-          </para>
+            <simpara>the number of shares you are selling</simpara>
         </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>COMMISSION: brokerage commissions or fees
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>COMMISSION</term>
+            <listitem>
+                <simpara>brokerage commissions or fees</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>GROSS_SELL_PRICE: unit price for which you sold the shares, not reduced by COMMISSION
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>GROSS_SELL_PRICE</term>
+            <listitem>
+                <simpara>unit price for which you sold the shares, not reduced by COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>NET_SELL_PRICE: unit price for which you sold the shares, reduced by COMMISSION
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>NET_SELL_PRICE</term>
+            <listitem>
+                <simpara>unit price for which you sold the shares, reduced by COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>GROSS_BUY_PRICE: unit price for which you bought the shares, not increased by COMMISSION
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>GROSS_BUY_PRICE</term>
+            <listitem>
+                <simpara>unit price for which you bought the shares, not increased by COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>NET_BUY_PRICE: unit price for which you bought the shares, increased by COMMISSION
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>NET_BUY_PRICE</term>
+            <listitem>
+                <simpara>unit price for which you bought the shares, increased by COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>GROSS_BUY: total price for which you bought shares, excluding COMMISSION, equal to NUM_SHARES *
-            GROSS_BUY_PRICE
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>GROSS_BUY</term>
+            <listitem>
+                <simpara>total price for which you bought shares, excluding COMMISSION, equal to NUM_SHARES * GROSS_BUY_PRICE</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>NET_BUY: amount of money for which you bought shares including COMMISSION, equal to GROSS_BUY +
-            COMMISSION.
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>NET_BUY</term>
+            <listitem>
+                <simpara>amount of money for which you bought shares including COMMISSION, equal to GROSS_BUY + COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>GROSS_SALE: total price for which you sold shares, equal to NUM_SHARES * GROSS_SELL_PRICE
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>GROSS_SALE</term>
+            <listitem>
+                <simpara>total price for which you sold shares, equal to NUM_SHARES * GROSS_SELL_PRICE</simpara>
+            </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>NET_SALE: amount of money received from the sale, equal to GROSS_SALE − COMMISSION
-          </para>
+        <varlistentry>
+            <term>NET_SALE</term>
+            <listitem>
+                <simpara>amount of money received from the sale, equal to GROSS_SALE − COMMISSION</simpara>
         </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para>GROSS_PROFIT: amount of money you made on the sale, not reduced by COMMISSION
-          </para>
-        </listitem>
+        <varlistentry>
+            <term>GROSS_PROFIT</term>
+            <listitem>
+                <simpara>amount of money you made on the sale, not reduced by COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
+
+        <varlistentry>
+            <term>NET_PROFIT</term>
+            <listitem>
+                <simpara>amount of money you made on the sale, reduced by COMMISSION</simpara>
+            </listitem>
+        </varlistentry>
+      </variablelist>
+    </para>
 
-        <listitem>
-          <para>NET_PROFIT: amount of money you made on the sale, reduced by COMMISSION
-          </para>
-        </listitem>
-      </itemizedlist>
 
       <para>There are 2 ways of manually recording the capital gain or loss. The capital gain/loss can be
         combined with the sale in one transaction or it can be entered in a separate transaction.
@@ -1758,7 +1768,7 @@ Income
 
         <para>When the capital gain/loss splits are combined with the sale splits in one transaction, there are 2
           splits for the security account in the same transaction, so the transaction must be
-          entered with the security register in <guilabel> Auto-Split Ledger</guilabel> or
+          entered with the security register in <guilabel>Auto-Split Ledger</guilabel> or
           <guilabel>Transaction Journal</guilabel> view. One of the splits for the security account
           is for the sale and the other is for the capital gain or loss. The security account split
           for the capital gain or loss must be entered with 0 number of shares and 0 price per share
@@ -1903,51 +1913,256 @@ Income
               </tbody>
             </tgroup>
           </table>
-        </sect4>
 
-        <sect4 id="invest-sell-man-comb-net">
-          <title>Combined, Net Pricing</title>
+      <example>
 
-          <table>
-            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Combined, Net Pricing</title>
+        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
+          Gross Pricing</title>
+      
+        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+        <para>
+        You bought 100 shares of AMZN for $20 per share, then later sell them all for $36
+          per share with a commission of $75. The split transaction scheme is as follows:
+          <itemizedlist>
+            <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+            <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
+            <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
+            <listitem><simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+          </itemizedlist>
+        </para>
+        <para>
+        <table>
+          <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
 
-            <tgroup cols="5">
-              <colspec colnum="1" colwidth="2*"/>
+<?dbfo table-width="70%" ?>
+          <tgroup cols="5">
+            <colspec colnum="1" colwidth="4*"/>
 
-              <colspec colnum="1" colwidth="2*"/>
+            <colspec colnum="1" colwidth="2*"/>
 
-              <colspec colnum="1" colwidth="2*"/>
+            <colspec colnum="1" colwidth="2*"/>
 
-              <colspec colnum="1" colwidth="2*"/>
+            <colspec colnum="1" colwidth="1*"/>
 
-              <colspec colnum="1" colwidth="2*"/>
+            <colspec colnum="1" colwidth="1*"/>
 
-              <tbody>
-                <row>
-                  <entry>
-                    <emphasis>Account</emphasis>
-                  </entry>
+            <tbody>
+              <row>
+                <entry>
+                  <emphasis>Account</emphasis>
+                </entry>
 
-                  <entry>
-                    <emphasis>Number of Shares</emphasis>
-                  </entry>
+                <entry>
+                  <emphasis>Shares</emphasis>
+                </entry>
 
-                  <entry>
-                    <emphasis>Share Price</emphasis>
-                  </entry>
+                <entry>
+                  <emphasis>Price</emphasis>
+                </entry>
 
-                  <entry>
-                    <emphasis>Total Buy</emphasis>
-                  </entry>
+                <entry>
+                  <emphasis>Buy</emphasis>
+                </entry>
 
-                  <entry>
-                    <emphasis>Total Sell</emphasis>
-                  </entry>
-                </row>
+                <entry>
+                  <emphasis>Sell</emphasis>
+                </entry>
+              </row>
 
-                <row>
-                  <entry>
-                    Assets:Bank ABC
+              <row>
+                <entry>
+                  Assets:Bank ABC
+                </entry>
+
+                <entry></entry>
+
+                <entry></entry>
+
+                <entry>
+                  3525.00
+                </entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Assets:Brokerage Account:Stock:AMZN
+                </entry>
+
+                <entry>
+                  0
+                </entry>
+
+                <entry>
+                  0
+                </entry>
+
+                <entry>
+                  1600.00
+                </entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Expenses:Commission
+                </entry>
+
+                <entry></entry>
+
+                <entry></entry>
+
+                <entry>
+                  75.00
+                </entry>
+
+                <entry></entry>
+              </row>
+
+              <row>
+                <entry>
+                  Assets:Brokerage Account:Stock:AMZN
+                </entry>
+
+                <entry>
+                  −100
+                </entry>
+
+                <entry>
+                  36.00
+                </entry>
+
+                <entry></entry>
+
+                <entry>
+                  3600.00
+                </entry>
+              </row>
+
+              <row>
+                <entry>
+                  Income:Capital Gain (Long Term):AMZN
+                </entry>
+
+                <entry></entry>
+
+                <entry></entry>
+
+                <entry></entry>
+
+                <entry>
+                  1600.00
+                </entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+        </para>
+        <para>
+          <figure pgwide="1">
+          <title>Selling Shares, Gain Combined, Gross Pricing</title>
+          <screenshot id="invest-sellstockManProfComb">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+                           srccredit="Chris Good" width="510px"></imagedata>
+              </imageobject>
+
+              <imageobject role="fo">
+                <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+                           srccredit="Chris Good"></imagedata>
+              </imageobject>
+    
+              <textobject><phrase>Selling Shares,Gain Combined, Gross Pricing</phrase></textobject>
+    
+            </mediaobject>
+          </screenshot>
+          </figure>
+          <note>
+            <para>In the above screenshot, it appears there are 2 transactions for Mar 21st, 2006. This is because the
+              register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
+              the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
+              view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
+              splits for the register account in the sale transaction, this transaction must be
+              entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction
+              Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
+            </para>
+          </note>
+        </para>
+        <para>
+          <figure pgwide="1">
+            <title>the Account Tree after the Example of Selling Shares for a Gain</title>
+            <screenshot id="invest-sellstockManProfComb2">
+              <mediaobject>
+                <imageobject role="html">
+                  <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+                             srccredit="Chris Good" width="510px"></imagedata>
+                  </imageobject>
+
+                  <imageobject role="fo">
+                    <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+                               srccredit="Chris Good"></imagedata>
+                  </imageobject>
+
+                  <textobject><phrase>Selling Shares Example</phrase></textobject>
+        
+              </mediaobject>
+            </screenshot>
+          </figure>
+        </para>
+
+   </example>
+
+
+
+        </sect4>
+
+        <sect4 id="invest-sell-man-comb-net">
+          <title>Combined, Net Pricing</title>
+
+          <table>
+            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Combined, Net Pricing</title>
+
+            <tgroup cols="5">
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <tbody>
+                <row>
+                  <entry>
+                    <emphasis>Account</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Number of Shares</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Share Price</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Total Buy</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Total Sell</emphasis>
+                  </entry>
+                </row>
+
+                <row>
+                  <entry>
+                    Assets:Bank ABC
                   </entry>
 
                   <entry></entry>
@@ -2005,7 +2220,7 @@ Income
 
                 <row>
                   <entry>
-                    Income:Capital Gain
+                    Income:Capital Gains
                   </entry>
 
                   <entry></entry>
@@ -2023,15 +2238,170 @@ Income
               </tbody>
             </tgroup>
           </table>
+          
+                <example>
+        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net Pricing</title>
+        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+        <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later
+          sell them all for $36 per share with a commission of $75. The split transaction scheme
+          is as follows:
+          <itemizedlist>
+            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+            <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+            <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
+            <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
+            <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
+            <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
+          </itemizedlist>
+        </para>
+
+        <para>
+            <table>
+              <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
+<?dbfo table-width="70%" ?>
+              <tgroup cols="5">
+                <colspec colnum="1" colwidth="4*"/>
+    
+                <colspec colnum="1" colwidth="2*"/>
+    
+                <colspec colnum="1" colwidth="2*"/>
+    
+                <colspec colnum="1" colwidth="1*"/>
+    
+                <colspec colnum="1" colwidth="1*"/>
+    
+                <tbody>
+                  <row>
+                    <entry>
+                      <emphasis>Account</emphasis>
+                    </entry>
+    
+                    <entry>
+                      <emphasis>Shares</emphasis>
+                    </entry>
+    
+                    <entry>
+                      <emphasis>Price</emphasis>
+                    </entry>
+    
+                    <entry>
+                      <emphasis>Buy</emphasis>
+                    </entry>
+    
+                    <entry>
+                      <emphasis>Sell</emphasis>
+                    </entry>
+                  </row>
+    
+                  <row>
+                    <entry>
+                      Assets:Bank ABC
+                    </entry>
+    
+                    <entry></entry>
+    
+                    <entry></entry>
+    
+                    <entry>
+                      3525.00
+                    </entry>
+    
+                    <entry></entry>
+                  </row>
+    
+                  <row>
+                    <entry>
+                      Assets:Brokerage Account:Stock:AMZN
+                    </entry>
+    
+                    <entry>
+                      0
+                    </entry>
+    
+                    <entry>
+                      0
+                    </entry>
+    
+                    <entry>
+                      1525.00
+                    </entry>
+    
+                    <entry></entry>
+                  </row>
+    
+                  <row>
+                    <entry>
+                      Assets:Brokerage Account:Stock:AMZN
+                    </entry>
+    
+                    <entry>
+                      −100
+                    </entry>
+    
+                    <entry>
+                      35.25
+                    </entry>
+    
+                    <entry></entry>
+    
+                    <entry>
+                      3525.00
+                    </entry>
+                  </row>
+    
+                  <row>
+                    <entry>
+                      Income:Capital Gain (Long Term):AMZN
+                    </entry>
+    
+                    <entry></entry>
+    
+                    <entry></entry>
+    
+                    <entry></entry>
+    
+                    <entry>
+                      1525.00
+                    </entry>
+                  </row>
+                </tbody>
+              </tgroup>
+            </table>
+        </para>
+
+        <para>
+          <figure pgwide="1">
+            <title>Selling Shares for Gain using Net Pricing in Transaction Journal View</title>
+            <screenshot id="invest-sellstockManProfCombNet">
+              <mediaobject>
+                <imageobject role="html">
+                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
+                              srccredit="Chris Good" width="510px"></imagedata>
+                </imageobject>
+    
+                <imageobject role="fo">
+                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
+                              srccredit="Chris Good"></imagedata>
+                </imageobject>
+    
+                <textobject><phrase>Selling Shares Example</phrase></textobject>
+    
+              </mediaobject>
+            </screenshot>
+          </figure>
+        </para>        
+      </example>
+          
+          
         </sect4>
       </sect3>
 
       <sect3 id="invest-sell-man-sep">
-        <title>Separate the Capital Gain/Loss Transaction from the Sale Transaction.</title>
+        <title>Separate the Capital Gain/Loss Transaction from the Sale Transaction</title>
 
-        <para>This is <emphasis>required</emphasis> if using <emphasis>scrubbing </emphasis> to automatically
-          calculate and create capital gain/loss transactions (otherwise scrubbing will not detect
-          them and will create an incorrectly valued gain/loss transaction).
+        <para>This is <emphasis>required</emphasis> if using <emphasis>scrubbing</emphasis> to
+          calculate and create capital gain/loss transactions automatically. Otherwise scrubbing will not detect
+          them and will create an incorrectly valued capital gain/loss transaction.
         </para>
 
         <sect4 id="invest-sell-man-sep-gr">
@@ -2167,581 +2537,64 @@ Income
                   </entry>
                 </row>
 
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    GROSS_PROFIT
-                  </entry>
-
-                  <entry>
-                    (Loss)
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Income:Capital Gain
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    (Loss)
-                  </entry>
-
-                  <entry>
-                    GROSS_PROFIT
-                  </entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </sect4>
-
-        <sect4 id="invest-sell-man-sep-net">
-          <title>Separated, Net Pricing</title>
-
-          <table>
-            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Separate Transactions, Sale Transaction</title>
-
-            <tgroup cols="5">
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <tbody>
-                <row>
-                  <entry>
-                    <emphasis>Account</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Number of Shares</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Share Price</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Buy</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Sell</emphasis>
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Bank ABC
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    NET_SALE
-                  </entry>
-
-                  <entry></entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    −NUM_SHARES
-                  </entry>
-
-                  <entry>
-                    NET_SELL_PRICE
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    NET_SALE
-                  </entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-
-          <table>
-            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Separate Transactions, Capital Gain/Loss
-              Transaction</title>
-
-            <tgroup cols="5">
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <tbody>
-                <row>
-                  <entry>
-                    <emphasis>Account</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Number of Shares</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Share Price</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Buy</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Sell</emphasis>
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    NET_PROFIT
-                  </entry>
-
-                  <entry>
-                    (Loss)
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Income:Capital Gain
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    (Loss)
-                  </entry>
-
-                  <entry>
-                    NET_PROFIT
-                  </entry>
-                </row>
-              </tbody>
-            </tgroup>
-          </table>
-        </sect4>
-      </sect3>
-    </sect2>
-
-    <sect2 id="invest-sell-man-examples">
-      <title>Examples of Selling Shares with Manually Entry of Capital Gain or Loss</title>
-
-      <para>In these examples we will use the AMZN account created in the previous section.
-      </para>
-
-      <sect3 id="invest-sell-man-prof-comb-gross">
-        <title>Example: Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
-          Gross Pricing</title>
-
-        <para>In this example you bought 100 shares of AMZN for $20 per share, then later sell them all for $36
-          per share with a commission of $75. In the split transaction scheme above, GROSS_BUY_PRICE
-          is $20 (the original buying price), NUM_SHARES is 100, GROSS_BUY is $2000 (the original
-          buying cost), GROSS_SALE is $3600, and finally GROSS_PROFIT is $1600 (GROSS_SALE −
-          GROSS_BUY).
-        </para>
-
-        <table>
-          <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  1600.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Expenses:Commission
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  75.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  36.00
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3600.00
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  1600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-
-        <screenshot id="invest-sellstockManProfComb">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstock.png" format="PNG"
-                          srccredit="Chris Good" width="510px"></imagedata>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstock.png" format="PNG"
-                          srccredit="Chris Good"></imagedata>
-            </imageobject>
-
-            <textobject>
-              <phrase>Selling Shares Example</phrase>
-            </textobject>
-
-            <caption>
-              <para>An example of selling shares for gain. You bought 100 shares of AMZN for $20 per share, and sold for
-                $36.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
-
-        <note>
-          <para>In the above screenshot, it appears there are 2 transactions for Mar 21st 2006. This is because the
-            register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
-            the register account in the 1 transaction. <guilabel>Transaction Journal </guilabel>
-            view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
-            splits for the register account in the sale transaction, this transaction must be
-            entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel> Transaction
-            Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
-          </para>
-        </note>
-
-        <para></para>
-
-        <screenshot id="invest-sellstockManProfComb2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
-                          srccredit="Chris Good" width="510px"></imagedata>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
-                          srccredit="Chris Good"></imagedata>
-            </imageobject>
-
-            <textobject>
-              <phrase>Selling Shares Example</phrase>
-            </textobject>
-
-            <caption>
-              <para>An image of the account tree after the example of selling shares for gain.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
-      </sect3>
-
-      <sect3 id="invest-sell-man-prof-comb-net">
-        <title>Example: Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net
-          Pricing</title>
-
-        <para>In this example you bought 100 shares of AMZN for $20 per share (including commissions), then later
-          sell them all for $36 per share with a commission of $75. In the split transaction scheme
-          above, NUM_SHARES is 100, NET_BUY_PRICE is $20 (the original buying price), NET_BUY is
-          $2000 (the original buying cost), NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),
-          GROSS_SALE is $3600, NET_SALE is $3525, and finally NET_PROFIT is $1525 (NET_SALE −
-          NET_BUY).
-        </para>
-
-        <table>
-          <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  1525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  35.25
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
 
-                <entry></entry>
+                  <entry>
+                    0
+                  </entry>
 
-                <entry></entry>
+                  <entry>
+                    0
+                  </entry>
 
-                <entry>
-                  1525.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
+                  <entry>
+                    GROSS_PROFIT
+                  </entry>
 
-        <screenshot id="invest-sellstockManProfCombNet">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
-                          srccredit="Chris Good" width="510px"></imagedata>
-            </imageobject>
+                  <entry>
+                    (Loss)
+                  </entry>
+                </row>
 
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
-                          srccredit="Chris Good"></imagedata>
-            </imageobject>
+                <row>
+                  <entry>
+                    Income:Capital Gains
+                  </entry>
 
-            <textobject>
-              <phrase>Selling Shares Example</phrase>
-            </textobject>
+                  <entry></entry>
 
-            <caption>
-              <para>An example of selling shares for gain using net pricing in transaction journal view. You bought 100
-                shares of AMZN for $20 per share, and sold for $36.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+                  <entry></entry>
 
-        <para></para>
-      </sect3>
+                  <entry>
+                    (Loss)
+                  </entry>
 
-      <sect3 id="invest-sell-man-prof-sep-gross">
-        <title>Example: Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated,
-          Gross Pricing</title>
+                  <entry>
+                    GROSS_PROFIT
+                  </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+      <example>
+        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross Pricing</title>
+        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
 
         <para>You bought 100 shares of AMZN for $20 per share and commissions $20, then later sell them all for
-          $36 per share with a commission of $75. In the split transaction scheme above,
-          GROSS_BUY_PRICE is $20 (the original buying price), NUM_SHARES is 100, GROSS_BUY is $2000
-          (the original buying cost), GROSS_SALE is $3600, and finally GROSS_PROFIT is $1600
-          (GROSS_SALE − GROSS_BUY).
+          $36 per share with a commission of $75. The split transaction scheme is as follows:
+          <itemizedlist>
+            <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+            <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
+            <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
+            <listitem><simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+          </itemizedlist>
         </para>
 
+        <para>
         <table>
           <title>Selling Shares Split Scheme, Sale Transaction, Gross Pricing</title>
 <?dbfo table-width="70%" ?>
@@ -2833,7 +2686,9 @@ Income
             </tbody>
           </tgroup>
         </table>
-
+        </para>
+        
+        <para>
         <table>
           <title>Selling Shares Split Scheme, Gain Transaction, Gross Pricing</title>
 <?dbfo table-width="70%" ?>
@@ -2909,7 +2764,11 @@ Income
             </tbody>
           </tgroup>
         </table>
-
+        </para>
+        <para>
+        <figure pgwide="1">
+        <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
+                in <guilabel>Transaction Journal</guilabel> View</title>
         <screenshot id="invest-sellstockManProfSep">
           <mediaobject>
             <imageobject role="html">
@@ -2922,31 +2781,195 @@ Income
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
-            <textobject>
-              <phrase>Selling Shares Example</phrase>
-            </textobject>
+            <textobject><phrase>Selling Shares Example</phrase></textobject>
 
-            <caption>
-              <para>An example of selling shares for gain where the sale and gain are recorded in separate transactions,
-                in <guilabel> Transaction Journal</guilabel> view. You bought 100 shares of AMZN for
-                $20 per share, and sold for $36.
-              </para>
-            </caption>
           </mediaobject>
         </screenshot>
-      </sect3>
+        </figure>
+        </para>
+      </example>
+
+
+
+        </sect4>
+
+        <sect4 id="invest-sell-man-sep-net">
+          <title>Separated, Net Pricing</title>
+
+          <table>
+            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Separate Transactions, Sale Transaction</title>
+
+            <tgroup cols="5">
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <tbody>
+                <row>
+                  <entry>
+                    <emphasis>Account</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Number of Shares</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Share Price</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Total Buy</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Total Sell</emphasis>
+                  </entry>
+                </row>
+
+                <row>
+                  <entry>
+                    Assets:Bank ABC
+                  </entry>
+
+                  <entry></entry>
+
+                  <entry></entry>
+
+                  <entry>
+                    NET_SALE
+                  </entry>
+
+                  <entry></entry>
+                </row>
+
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
+
+                  <entry>
+                    −NUM_SHARES
+                  </entry>
+
+                  <entry>
+                    NET_SELL_PRICE
+                  </entry>
+
+                  <entry></entry>
+
+                  <entry>
+                    NET_SALE
+                  </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+
+          <table>
+            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Separate Transactions, Capital Gain/Loss
+              Transaction</title>
+
+            <tgroup cols="5">
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <colspec colnum="1" colwidth="2*"/>
+
+              <tbody>
+                <row>
+                  <entry>
+                    <emphasis>Account</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Number of Shares</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Share Price</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Total Buy</emphasis>
+                  </entry>
+
+                  <entry>
+                    <emphasis>Total Sell</emphasis>
+                  </entry>
+                </row>
+
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
+
+                  <entry>
+                    0
+                  </entry>
+
+                  <entry>
+                    0
+                  </entry>
+
+                  <entry>
+                    NET_PROFIT
+                  </entry>
+
+                  <entry>
+                    (Loss)
+                  </entry>
+                </row>
+
+                <row>
+                  <entry>
+                    Income:Capital Gains
+                  </entry>
+
+                  <entry></entry>
 
-      <sect3 id="invest-sell-man-prof-sep-net">
-        <title>Example: Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated,
-          Net Pricing</title>
+                  <entry></entry>
+
+                  <entry>
+                    (Loss)
+                  </entry>
+
+                  <entry>
+                    NET_PROFIT
+                  </entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+
+      <example id="invest-sell-man-prof-sep-net">
+        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Net Pricing</title>
+        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
 
         <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later sell them all
-          for $36 per share with a commission of $75. In the split transaction scheme above,
-          NUM_SHARES is 100, NET_BUY_PRICE is $20 (the original buying price), NET_BUY is $2000 (the
-          original buying cost), NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)), GROSS_SALE
-          is $3600, NET_SALE is $3525, and finally NET_PROFIT is $1525 (NET_SALE − NET_BUY).
+          for $36 per share with a commission of $75. In the split transaction scheme is as follows:
+          <itemizedlist>
+            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+            <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+            <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
+            <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
+            <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
+            <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
+          </itemizedlist>
         </para>
 
+        <para>
         <table>
           <title>Selling Shares Split Scheme, Sale Transaction, Net Pricing</title>
 <?dbfo table-width="70%" ?>
@@ -3022,7 +3045,9 @@ Income
             </tbody>
           </tgroup>
         </table>
-
+        </para>
+        
+        <para>
         <table>
           <title>Selling Shares Split Scheme, Gain Transaction, Net Pricing</title>
 <?dbfo table-width="70%" ?>
@@ -3094,35 +3119,39 @@ Income
                 <entry>
                   1525.00
                 </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-
-        <screenshot id="invest-sellstockManProfSepNet">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfSepNet.png" format="PNG"
-                          srccredit="Chris Good" width="510px"></imagedata>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
-                          srccredit="Chris Good"></imagedata>
-            </imageobject>
+              </row>
+            </tbody>
+          </tgroup>
+        </table>
+        </para>
+        
+        <para>
+        <figure pgwide="1">
+          <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
+                    in <guilabel>Transaction Journal</guilabel> View</title>
+            <screenshot id="invest-sellstockManProfSepNet">
+              <mediaobject>
+                <imageobject role="html">
+                  <imagedata fileref="figures/invest_sellstockManProfSepNet.png" format="PNG"
+                              srccredit="Chris Good" width="510px"></imagedata>
+                </imageobject>
+    
+                <imageobject role="fo">
+                  <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+                              srccredit="Chris Good"></imagedata>
+                </imageobject>
+    
+                <textobject><phrase>Selling Shares Example</phrase>
+                
+                </textobject>
+              </mediaobject>
+            </screenshot>
+        </figure>
+        </para>
+      </example>
 
-            <textobject>
-              <phrase>Selling Shares Example</phrase>
-            </textobject>
 
-            <caption>
-              <para>An example of selling shares for gain where the sale and gain are recorded in separate transactions,
-                in <guilabel>Transaction Journal</guilabel> view. You bought 100 shares of AMZN for
-                $20 per share, and sold for $36.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        </sect4>
       </sect3>
     </sect2>
 
@@ -3132,12 +3161,12 @@ Income
       <sect3 id="invest-sellLotsIntro">
         <title>Introduction</title>
 
-        <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot
+        <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot.
         </para>
 
-        <para><quote>a set of goods for sale together in an auction; or a quantity of a financial
-          instrument</quote>.
-        </para>
+        <blockquote>
+          <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument</simpara>
+        </blockquote>
 
         <para>&app; has a built-in lot management facility that can be used to keep track of capital gains or
           losses resulting from security sales. Buy and sell transactions are put into lots for the
@@ -3151,12 +3180,11 @@ Income
         <para>The term <emphasis>scrub</emphasis> is used because security accounts need to be cleaned after sales
           to ensure the difference between the cost paid for securities, and value received from
           selling them, is accounted for as capital gain or loss. If the capital gain/loss is not
-          correct, the Trial Balance (
-          <menuchoice>
+          correct, the <guimenuitem>Trial Balance</guimenuitem> 
+          (<menuchoice>
             <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
-          </menuchoice>
-          ) bottom line total debits will not balance to total credits.
+          </menuchoice>) bottom line total debits will not balance to total credits.
         </para>
 
         <note>
@@ -3168,11 +3196,11 @@ Income
           </para>
         </note>
 
-        <para>If you are not familiar with FIFO, LIFO or Average costing, please see Wikipedia
+        <para>If you are not familiar with <acronym>FIFO</acronym>, <acronym>LIFO</acronym> or Average costing, please see Wikipedia
           <ulink
-            url="&url-wp-en;FIFO_and_LIFO_accounting"> FIFO and LIFO
+            url="&url-wp-en;FIFO_and_LIFO_accounting">FIFO and LIFO
           accounting</ulink> and <ulink
-            url="&url-wp-en;Average_cost_method"> Average
+            url="&url-wp-en;Average_cost_method">Average
           cost method</ulink>.
         </para>
 
@@ -3182,10 +3210,10 @@ Income
 
         <para>The &app; lot management facility can be a useful feature, reducing manual calculation, especially
           if dividends have been reinvested over years and there are many different costs involved.
-          It can automatically link buy transactions to sell transactions using FIFO cost method and
-          one can manually link specific buy transactions to sell transactions in order to use LIFO.
+          It can automatically link buy transactions to sell transactions using <acronym>FIFO</acronym> cost method and
+          one can manually link specific buy transactions to sell transactions in order to use <acronym>LIFO</acronym>.
           Advanced Portfolio Report basis costs and gains/losses will agree with the costs and
-          gain/loss transactions created by scrubbing if either the FIFO or LIFO cost methods are
+          gain/loss transactions created by scrubbing if either the <acronym>FIFO</acronym> or <acronym>LIFO</acronym> cost methods are
           used.
         </para>
       </sect3>
@@ -3203,8 +3231,7 @@ Income
           select
           <menuchoice>
             <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
-          </menuchoice>
-          .
+          </menuchoice>.
         </para>
 
         <figure pgwide="1">
@@ -3225,7 +3252,7 @@ Income
               </textobject>
 
               <caption>
-                <para>An image of the <emphasis>Lots in Account </emphasis> window.
+                <para>An image of the <emphasis>Lots in Account</emphasis> window.
                 </para>
               </caption>
             </mediaobject>
@@ -3244,39 +3271,35 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
         <para>Using the lot management facility for the automatic calculation of capital gain or loss typically
           follows these steps:
-        </para>
 
         <orderedlist>
           <listitem>
-            <para>Record the sale transaction using Net Pricing (but stop short of entering the Capital Gain
+            <simpara>Record the sale transaction using Net Pricing (but stop short of entering the Capital Gain
               transaction as it will be created by scrubbing). See
               <xref linkend="invest-sell-man-prof-sep-net" />.
-            </para>
+            </simpara>
           </listitem>
 <!-- Manual Lot Creation and Linking -->
           <listitem>
-            <para><xref linkend="invest-sellManual" /> (Optional depending on cost method)
-            </para>
+            <simpara><xref linkend="invest-sellManual" /> (Optional depending on cost method)</simpara>
           </listitem>
 
           <listitem>
 <!-- Automatic Creation of Capital Gain Or Loss Transactions -->
-            <para><xref linkend="invest-sellAuto" />
-            </para>
+            <simpara><xref linkend="invest-sellAuto" /></simpara>
           </listitem>
 
           <listitem>
 <!-- Change Orphaned Gains-CCC to Gain/Loss Account -->
-            <para><xref linkend="invest-sellChgCapGainsAcct" />
-            </para>
+            <simpara><xref linkend="invest-sellChgCapGainsAcct" /></simpara>
           </listitem>
 
           <listitem>
 <!-- Run a Trial Balance  -->
-            <para><xref linkend="invest-sellTrialBal" /> report to ensure total debits balance to total credits
-            </para>
+            <simpara><xref linkend="invest-sellTrialBal" /> report to ensure total debits balance to total credits.</simpara>
           </listitem>
         </orderedlist>
+        </para>
       </sect3>
 
       <sect3 id="invest-sellManual">
@@ -3285,17 +3308,16 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <para>Before using this feature, ensure you have read <xref linkend="invest-sellConsiderations" />.
         </para>
 
-        <para>This functionality allows the manual linking of specfic buy and sell transactions. It may be used in
+        <para>This functionality allows the manual linking of specific buy and sell transactions. It may be used in
           the case where a user wishes to use a different cost method than the automatic linking
-          method (FIFO). Effectively, if one wishes the cost basis and capital gains in the Advanced
+          method (<acronym>FIFO</acronym>). Effectively, if one wishes the cost basis and capital gains in the Advanced
           Portfolio Report to be consistent with the capital gains transactions created by
-          scrubbing, manual lot creation only needs to be used when using LIFO or <quote>sale of
+          scrubbing, manual lot creation only needs to be used when using <acronym>LIFO</acronym> or <quote>sale of
           designated lots</quote> (the same thing for securities as far as US personal tax law is
-          concerned). This is because the scrub function can automatically do FIFO linking so there
+          concerned). This is because the scrub function can automatically do <acronym>FIFO</acronym> linking so there
           is no need to do it manually and scrubbing cannot be used for average costing.
-        </para>
 
-        <para>See <xref linkend="invest-sellManualExample" />.
+          See <xref linkend="invest-sellManualExample" />.
         </para>
       </sect3>
 
@@ -3303,8 +3325,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
 
         <note>
-          <para>Do <emphasis>NOT</emphasis> do this unless you are using FIFO or LIFO to cost sales. See
-            <xref linkend="invest-sellConsiderations" />
+          <para>Do <emphasis>not</emphasis> do this unless you are using <acronym>FIFO</acronym> or <acronym>LIFO</acronym> to cost sales. See
+            <xref linkend="invest-sellConsiderations" />.
           </para>
         </note>
 
@@ -3312,20 +3334,17 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
           used to link buy transaction splits with sell transaction splits so the correct cost of
           the securities sold can be determined. &app; will use any existing lots, and create new
           lots for any buy transaction splits not already linked to a lot. Buy and sell transaction
-          splits are linked to lots using FIFO method.
+          splits are linked to lots using <acronym>FIFO</acronym> method.
         </para>
 
         <para>See:
+          <itemizedlist>
+            <listitem><simpara><xref linkend="invest-sellAutoExample" />,</simpara></listitem>
+            <listitem><simpara><xref linkend="invest-sellAutoExample2" />,</simpara></listitem>
+            <listitem><simpara><xref linkend="invest-sellFifoSplit" />.</simpara></listitem>
+          </itemizedlist>
         </para>
 
-        <para><xref linkend="invest-sellAutoExample" />
-        </para>
-
-        <para><xref linkend="invest-sellAutoExample2" />
-        </para>
-
-        <para><xref linkend="invest-sellFifoSplit" />
-        </para>
       </sect3>
 
       <sect3 id="invest-sellChgCapGainsAcct">
@@ -3336,7 +3355,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
           because &app; doesn't know which capital gain or loss account should be used. After
           scrubbing, the user should edit the <emphasis> Orphaned Gains-CCC</emphasis> transaction
           split to re-assign the income account to a more meaningful income (or expense) gain or
-          loss account (e.g. <emphasis>Income:Long Term Capital Gain:IBM</emphasis>).
+          loss account (for example, <emphasis>Income:Capital Gain (Long Term):IBM</emphasis>).
         </para>
 
         <para>See <xref linkend="invest-sellChgCapGainsAcctExample" />.
@@ -3360,22 +3379,26 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <tip>
           <para>A Trial Balance may not balance due to some other problem. To determine if the cause of an imbalance
             is from incorrectly accounting for capital gain/loss:
-          </para>
-
-          <para>If necessary, temporarily change the date of the sell transaction and the capital gain/loss
-            transaction, so they are the only transactions for a particular date, then run the Trial
-            Balance as at the day before. If the Trial Balance is still out by the same amount, it
-            is not the capital gain/loss that is causing the problem.
-          </para>
-
-          <para>If you find a prior <emphasis>out of balance </emphasis> Trial Balance, keep running the Trial
-            Balance report with different dates until you find the date it starts being out of
-            balance. Temporarily change the transaction dates for each transaction on the problem
-            date to the following day, then change the dates back to the correct date 1 at a time,
-            running the Trial Balance each time, until you identify the problem transaction. When
-            you change the date of a security sell transaction, you also need to change the date of
-            the corresponding capital gain transaction as it is only the sum of these that will
-            balance in the Trial Balance.
+            <orderedlist>
+              <listitem>
+                <para>If necessary, temporarily change the date of the sell transaction and the capital gain/loss
+                  transaction, so they are the only transactions for a particular date, then run the Trial
+                  Balance as at the day before. If the Trial Balance is still out by the same amount, it
+                  is not the capital gain/loss that is causing the problem.
+                </para>
+              </listitem>
+              <listitem>
+                <para>If you find a prior <emphasis>out of balance</emphasis> Trial Balance, keep running the Trial
+                  Balance report with different dates until you find the date it starts being out of
+                  balance. Temporarily change the transaction dates for each transaction on the problem
+                  date to the following day, then change the dates back to the correct date 1 at a time,
+                  running the Trial Balance each time, until you identify the problem transaction. When
+                  you change the date of a security sell transaction, you also need to change the date of
+                  the corresponding capital gain transaction as it is only the sum of these that will
+                  balance in the Trial Balance.
+                </para>
+              </listitem>
+            </orderedlist>
           </para>
         </tip>
       </sect3>
@@ -3388,9 +3411,9 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
         <orderedlist>
           <listitem>
-            <para>&app; implements only the First In/ First Out (FIFO) cost method when automatically linking buy
-              transactions to sell transactions. I.e. The oldest securities are always sold first.
-              The Last In First Out (LIFO) cost method may be used by manually linking the most
+            <para>&app; implements only the First In/ First Out (<acronym>FIFO</acronym>) cost method when automatically linking buy
+              transactions to sell transactions. That is the oldest securities are always sold first.
+              The Last In First Out (<acronym>LIFO</acronym>) cost method may be used by manually linking the most
               recent buy security splits to the sell split before scrubbing.
             </para>
           </listitem>
@@ -3398,8 +3421,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
           <listitem>
             <para>The Advanced Portfolio Report does not use lot information when calculating costs, just the security
               transaction splits. It calculates the cost basis and gains or losses using the
-              selected <emphasis>Basis calculation method</emphasis> report option (Average, FIFO or
-              LIFO). If one wishes the Advanced Portfolio Report costs and gains/losses to be
+              selected <emphasis>Basis calculation method</emphasis> report option (Average, <acronym>FIFO</acronym> or
+              <acronym>LIFO</acronym>). If one wishes the Advanced Portfolio Report costs and gains/losses to be
               consistent with the capital gain/loss transactions created by scrubbing, the same cost
               model must be used in both places.
             </para>
@@ -3561,19 +3584,20 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         </orderedlist>
       </sect3>
 
-      <sect3 id="invest-sellManualExample">
-        <title>Example 1: Manual Lot Creation and Linking</title>
+      <sect3>
+      <title>Examples</title>
+      <example id="invest-sellManualExample">
+        <title>Manual Lot Creation and Linking</title>
 
-        <para>Here is an example of selling part of a security holding using the LIFO method. In this example, the
-          most recent buy transaction (dated 01/07/2016, a reinvested dividend), is linked to a lot,
+        <para>Here is an example of selling part of a security holding using the <acronym>LIFO</acronym> method. In this example, the
+          most recent buy transaction (dated Jul. 1, 2016, a reinvested dividend), is linked to a lot,
           along with the sell transaction, and the &app; scrub function is used to calculate capital
           gain or loss and create the capital gain/loss transaction.
         </para>
 
-        <orderedlist>
-          <listitem>
-            <para>Open the security account's register.
-            </para>
+        <procedure>
+          <step>
+            <simpara>Open the security account's register.</simpara>
 
             <figure pgwide="1">
               <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title><screenshot id="invest-lots0reg">
@@ -3589,33 +3613,30 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </imageobject>
 
                   <textobject>
-                    <phrase>Example of security register before lot scrubbing </phrase>
+                    <phrase>Example of security register before lot scrubbing</phrase>
                   </textobject>
 
                   <caption>
-                    <para>An image of the Security Account register in transaction journal view, before lot scrubbing.
-                    </para>
+                    <simpara>An image of the Security Account register in transaction journal view, before lot scrubbing.</simpara>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </listitem>
-
-          <listitem>
-            <para>Ensure all previous capital gain/loss transactions are separate transactions to the sell
+          </step>
+ 
+          <step>
+            <simpara>Ensure all previous capital gain/loss transactions are separate transactions to the sell
               transactions which record the reduction in the number of shares and the value
-              received.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>Select
+              received.</simpara>
+          </step>
+ 
+          <step><simpara>Select
               <menuchoice>
                 <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
               security account.
-            </para>
+            </simpara>
 
             <figure pgwide="1">
               <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title><screenshot id="invest-lots1B4CreateLot">
@@ -3631,66 +3652,58 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </imageobject>
 
                   <textobject>
-                    <phrase>Example of Lots in Account window before lot scrubbing </phrase>
+                    <phrase>Example of Lots in Account window before lot scrubbing</phrase>
                   </textobject>
 
                   <caption>
-                    <para>An image of the <emphasis>Lots in Account </emphasis> window before lot scrubbing.
+                    <para>An image of the <emphasis>Lots in Account</emphasis> window before lot scrubbing.
                     </para>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </listitem>
+          </step>
 
-          <listitem>
-            <para>Create a new lot using the <guimenu>New Lot</guimenu> button. Initially this lot is not linked to
-              any buy or sell split.
-            </para>
-          </listitem>
+          <step><simpara>Create a new lot using the <guibutton>New Lot</guibutton> button. Initially this lot is not linked to
+              any buy or sell split.</simpara>
+          </step>
 
-          <listitem>
-            <para>Highlight the new lot in the <guilabel>Lots in This Account</guilabel> panel.
-            </para>
-          </listitem>
+          <step>
+            <simpara>Highlight the new lot in the <guilabel>Lots in This Account</guilabel> panel.</simpara>
+          </step>
 
-          <listitem>
-            <para>Highlight the buy split (dated 01/07/2016) of the security to be sold in the <guilabel>Splits
-              free</guilabel> panel.
-            </para>
-          </listitem>
+          <step><simpara>Highlight the buy split (dated Jul. 1, 2016) of the security to be sold in the <guilabel>Splits
+              free</guilabel> panel.</simpara>
+          </step>
 
-          <listitem>
-            <para>Click the <guilabel>>></guilabel> button to link the buy split with the highlighted lot. The
-              split moves from the <guilabel> Splits free</guilabel> panel to the <guilabel>Splits
-              in Lot </guilabel> panel.
-            </para>
-          </listitem>
+          <step><simpara>Click the <guilabel>>></guilabel> button to link the buy split with the highlighted lot. The
+              split moves from the <guilabel>Splits free</guilabel> panel to the <guilabel>Splits
+              in Lot</guilabel> panel.
+            </simpara>
+          </step>
 
-          <listitem>
-            <para>Repeat the previous 2 steps for any other buy splits that should be included in the lot (in this
+          <step><simpara>Repeat the previous 2 steps for any other buy splits that should be included in the lot (in this
               example, there is only 1 buy split in the sale).
-            </para>
-          </listitem>
+            </simpara>
+          </step>
 
-          <listitem>
-            <para>Highlight the sell split in the <guilabel>Splits free </guilabel> panel.
-            </para>
-          </listitem>
+          <step>
+            <simpara>Highlight the sell split in the <guilabel>Splits free</guilabel> panel.</simpara>
+          </step>
 
-          <listitem>
-            <para>Click the <guilabel>>></guilabel> button to link the sell split with the highlighted lot.
-            </para>
-          </listitem>
+          <step>
+            <simpara>Click the <guilabel>>></guilabel> button to link the sell split with the highlighted lot.</simpara>
+          </step>
 
-          <listitem>
-            <para>Check the lot <guilabel>Balance</guilabel> is as expected. I.e. in this example the lot balance
+          <step>
+            <simpara>Check the lot <guilabel>Balance</guilabel> is as expected. In this example the lot balance
               should be zero as the number of securities sold in the lot, is matched with the same
               number of security buys.
-            </para>
+            </simpara>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title><screenshot id="invest-lots2B4Scrub1Lot">
+              <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot, after manual linking</title>
+              <screenshot id="invest-lots2B4Scrub1Lot">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
@@ -3703,36 +3716,33 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </imageobject>
 
                   <textobject>
-                    <phrase>Example of Lots in Account window before scrubbing a single lot
-                    </phrase>
+                    <phrase>Example of Lots in Account window before scrubbing a single lot</phrase>
                   </textobject>
 
                   <caption>
-                    <para>An image of the <emphasis>Lots in Account </emphasis> window before scrubbing a single lot.
-                    </para>
+                    <simpara>An image of the <emphasis>Lots in Account</emphasis> window before scrubbing a single lot.</simpara>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </listitem>
-
-          <listitem>
-            <para>Click the <guilabel>Scrub</guilabel> button (<emphasis>NOT </emphasis> the <guilabel>Scrub
-              Account</guilabel> button).
-            </para>
+          </step>
 
+          <step>
+            <simpara>Click the <guibutton>Scrub</guibutton> button (<emphasis>not</emphasis> the <guibutton>Scrub Account</guibutton> button.)
+            </simpara>
             <para>The <guilabel>Lots in Account</guilabel> window has not changed after using the
               <guilabel>Scrub</guilabel> button so no example screen image is supplied.
             </para>
-          </listitem>
+          </step>
 
-          <listitem>
-            <para>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account
+          <step>
+            <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account
               register.
-            </para>
+            </simpara>
 
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after manual linking and scrubbing a single lot</title><screenshot id="invest-lots2RegAftScrub1Lot">
+              <title>Selling Shares - Capital Gains - Register after manual linking and scrubbing a single lot</title>
+              <screenshot id="invest-lots2RegAftScrub1Lot">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
@@ -3745,68 +3755,62 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </imageobject>
 
                   <textobject>
-                    <phrase>Example of Register after scrubbing a single lot </phrase>
+                    <phrase>Example of Register after scrubbing a single lot</phrase>
                   </textobject>
 
                   <caption>
-                    <para>An image of the Register after scrubbing a single lot.
-                    </para>
+                    <simpara>An image of the Register after scrubbing a single lot.</simpara>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </listitem>
+          </step>
 
-          <listitem>
-            <para>Continue to <xref linkend="invest-sellChgCapGainsAcct" />
-            </para>
-          </listitem>
-        </orderedlist>
-      </sect3>
+          <step>
+            <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
+          </step>
+        
+        </procedure>
+      </example>
 
-      <sect3 id="invest-sellAutoExample">
-        <title>Example 2: Automatic Creation of Capital Gain Or Loss Transactions</title>
+      
+      <example id="invest-sellAutoExample">
+        <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
 
-        <para>Create the capital gains transaction by following these steps:
-        </para>
+        <simpara>Create the capital gains transaction by following these steps:</simpara>
 
-        <orderedlist>
-          <listitem>
-            <para>Open the security account's register.
-            </para>
-          </listitem>
+        <procedure>
+          <step>
+            <simpara>Open the security account's register.</simpara>
+          </step>
 
-          <listitem>
-            <para>Ensure any previous manually entered capital gain/loss transaction splits have been entered in
-              separate transactions to the the sell transactions.
-            </para>
-          </listitem>
+          <step>
+            <simpara>Ensure any previous manually entered capital gain/loss transaction splits have been entered in
+            separate transactions to the the sell transactions.</simpara>
+          </step>
 
-          <listitem>
-            <para>Select
+          <step>
+            <simpara>Select
               <menuchoice>
-                <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
-              security account.
-            </para>
-          </listitem>
+              security account.</simpara>
+          </step>
 
-          <listitem>
-            <para>If using LIFO, use the above procedure <xref linkend="invest-sellManual" /> to create a lot for each
+          <step>
+            <simpara>If using <acronym>LIFO</acronym>, use the above procedure <xref linkend="invest-sellManual" /> to create a lot for each
               sell transaction, link the lot with the sell transaction and each of the buy
-              transactions that make up the sale.
-            </para>
-          </listitem>
+              transactions that make up the sale.</simpara>
+          </step>
 
-          <listitem>
-            <para>Click the <guilabel>Scrub Account</guilabel> button which:
-            </para>
+          <step>
+            <simpara>Click the <guilabel>Scrub Account</guilabel> button which:</simpara>
 
             <itemizedlist>
               <listitem>
                 <para>Creates lots for any buy transactions that are not already linked to a lot and links them to sell
-                  transactions splits using the FIFO method. As a transaction split can only be
+                  transactions splits using the <acronym>FIFO</acronym> method. As a transaction split can only be
                   linked to 1 lot, if a sell transaction needs to be linked to multiple lots, the
                   sell transaction split is itself split into multiple subsplits. In the case of
                   multiple subsplits, it is possible to have different splits from the same
@@ -3816,65 +3820,61 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               </listitem>
 
               <listitem>
-                <para>Creates a separate transaction per lot for capital gain/loss.
-                </para>
+                <simpara>Creates a separate transaction per lot for capital gain/loss.</simpara>
               </listitem>
             </itemizedlist>
-          </listitem>
+          </step>
 
-          <listitem>
-            <para>Continue to <xref linkend="invest-sellChgCapGainsAcct" />
-            </para>
-          </listitem>
-        </orderedlist>
-      </sect3>
+          <step>
+            <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
+          </step>
+        </procedure>
+      </example>
 
-      <sect3 id="invest-sellAutoExample2">
-        <title>Example 3: Automatic Creation of Capital Gain Or Loss Transactions, 2 Sales at Once</title>
 
-        <para>Here is an example of FIFO scrubbing without manual lot creation. In this example, the transactions
+      <example id="invest-sellAutoExample2">
+        <title>Automatic Creation of Capital Gain Or Loss Transactions, 2 Sales at Once</title>
+
+        <para>Here is an example of <acronym>FIFO</acronym> scrubbing without manual lot creation. In this example, the transactions
           for 2 sales are scrubbed at once but usually scrubbing would be performed after each sale.
           One reason for scrubbing 2 sales at once, could be because there were multiple sales on
           the same day.
+          <figure pgwide="1">
+            <title>Selling Shares - Capital Gains - Register before Scrub Account</title>
+            <screenshot id="invest2-lots0reg">
+              <mediaobject>
+                <imageobject role="html">
+                  <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
+                  format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                </imageobject>
+  
+                <imageobject role="fo">
+                  <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
+                             format="PNG" srccredit="Chris Good"></imagedata>
+                </imageobject>
+  
+                <textobject>
+                  <phrase>Example of security register before Scrub Account is used. </phrase>
+                </textobject>
+  
+                <caption>
+                  <simpara>An image of the Security Account register in transaction journal view, before Scrub Account is used.</simpara>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </para>
 
-        <figure pgwide="1">
-          <title>Selling Shares - Capital Gains - Register before Scrub Account</title><screenshot id="invest2-lots0reg">
-            <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
-              </imageobject>
-
-              <imageobject role="fo">
-                <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
-              </imageobject>
-
-              <textobject>
-                <phrase>Example of security register before Scrub Account is used. </phrase>
-              </textobject>
-
-              <caption>
-                <para>An image of the Security Account register in transaction journal view, before Scrub Account is used.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
-        </figure>
-
-        <orderedlist>
-          <listitem>
-            <para>Select
+        <procedure>
+          <step><simpara>Select
               <menuchoice>
                 <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
-              security account.
-            </para>
-
+              security account.</simpara>
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots before Scrub Account</title><screenshot id="invest2-lots1B4ScrubAcct">
+              <title>Selling Shares - Capital Gains - Lots before Scrub Account</title>
+              <screenshot id="invest2-lots1B4ScrubAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
@@ -3892,20 +3892,18 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </textobject>
 
                   <caption>
-                    <para>An image of the <emphasis>Lots in Account </emphasis> window before Scrub Account is used.
-                    </para>
+                    <simpara>An image of the <emphasis>Lots in Account</emphasis> window before Scrub Account is used.</simpara>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </listitem>
-
-          <listitem>
-            <para>Click the <guilabel>Scrub Account</guilabel> button.
-            </para>
+          </step>
 
+          <step>
+            <simpara>Click the <guilabel>Scrub Account</guilabel> button.</simpara>
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Lots after Scrub Account</title><screenshot id="invest2-lots2AftScrubAcct">
+              <title>Selling Shares - Capital Gains - Lots after Scrub Account</title>
+              <screenshot id="invest2-lots2AftScrubAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
@@ -3918,7 +3916,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </imageobject>
 
                   <textobject>
-                    <phrase>Example of Lots in Account window after using Scrub Account </phrase>
+                    <phrase>Example of Lots in Account window after using Scrub Account</phrase>
                   </textobject>
 
                   <caption>
@@ -3935,15 +3933,13 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 reopened so all the lots show.
               </para>
             </note>
-          </listitem>
-
-          <listitem>
-            <para>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account
-              register.
-            </para>
+          </step>        
 
+          <step>
+            <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account register.</simpara>
             <figure pgwide="1">
-              <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="invest2-lots3AftScrubAcct">
+              <title>Selling Shares - Capital Gains - Register after Scrub Account</title>
+              <screenshot id="invest2-lots3AftScrubAcct">
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
@@ -3956,11 +3952,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </imageobject>
 
                   <textobject>
-                    <phrase>Example of security register after using Scrub Account </phrase>
+                    <phrase>Example of security register after using Scrub Account</phrase>
                   </textobject>
 
                   <caption>
-                    <para>An image of the <emphasis>security register </emphasis> after using Scrub Account.
+                    <para>An image of the <emphasis>security register</emphasis> after using Scrub Account.
                     </para>
                   </caption>
                 </mediaobject>
@@ -3973,25 +3969,24 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 sell transaction.
               </para>
             </note>
-          </listitem>
+          </step>
 
-          <listitem>
-            <para>Continue to <xref linkend="invest-sellChgCapGainsAcct" />
-            </para>
-          </listitem>
-        </orderedlist>
-      </sect3>
+          <step>
+            <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
+          </step>
+        </procedure>
+      </example>
 
-      <sect3 id="invest-sellFifoSplit">
-        <title>Example 4: Automatic Creation of Capital Gain Or Loss Transactions - After a Simple Stock Split</title>
+      <example id="invest-sellFifoSplit">
+        <title>Automatic Creation of Capital Gain Or Loss Transactions - After a Simple Stock Split</title>
 
-        <para>Here is an example of FIFO scrubbing without manual lot creation/linking, where the Stock Split
+        <para>Here is an example of <acronym>FIFO</acronym> scrubbing without manual lot creation/linking, where the Stock Split
           Assistant has been used for a simple stock split. In this example, 100 shares of security
           XYZ were bought for $10.00 each, there was a simple 2 for 1 stock split for zero cost (so
           the holding was then 200 shares @ $5.00 each), then all 200 shares were sold for $6.00
           each.
         </para>
-
+        <para>
         <figure pgwide="1">
           <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="investLotsSplitReg">
             <mediaobject>
@@ -4066,45 +4061,40 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             </mediaobject>
           </screenshot>
         </figure>
-
-        <para>The above screen shots show that scrubbing created:
         </para>
-
-        <para>2 lots. A separate lot for each buy (it essentially treats the stock split as a buy of 100 for no
-          cost)
-        </para>
-
-        <para>2 capital gain transactions (one for each lot) on the date of the sale:
+        <para>The above screenshots show that scrubbing created:
+          <itemizedlist>
+            <listitem>
+              <simpara>2 lots. A separate lot for each buy (it essentially treats the stock split as a buy of 100 for no cost.)</simpara>
+            </listitem>
+            <listitem>
+              <simpara>2 capital gain transactions (one for each lot) on the date of the sale:</simpara>
+              <itemizedlist>
+                <listitem>
+                  <simpara>Lot 0: Jul. 1, 2009 loss $400 (sale $600 − cost $1,000.)</simpara>
+                </listitem>
+                <listitem>
+                  <simpara>Lot 1: Jul. 1, 2009 gain $600 (sale $600 − cost $0.)</simpara>
+                </listitem>
+              </itemizedlist>
+            </listitem>
+          </itemizedlist>
         </para>
 
-        <itemizedlist>
-          <listitem>
-            <para>Lot 0: 1/7/2009 loss $400 (sale $600 − cost $1000)
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>Lot 1: 1/7/2009 gain $600 (sale $600 − cost $0)
-            </para>
-          </listitem>
-        </itemizedlist>
-
         <para>Total gain $200 is correct. Whether the gain is a single long-term one or one each of long-term and
           short-term or whether there's even a distinction depends on the user's tax jurisdiction
           and the way the split is structured. If the user needs help figuring it out they should
           consult a professional.
         </para>
-      </sect3>
 
-      <sect3 id="invest-sellChgCapGainsAcctExample">
-        <title>Example 5: Changing the Orphaned Gains-CCC to Gain/Loss Account</title>
-
-        <orderedlist>
-          <listitem>
-            <para>Close the <guilabel>Lots in Account SSSS</guilabel> window if open and return to the security
-              account register.
-            </para>
+      </example>
 
+      <example id="invest-sellChgCapGainsAcctExample">
+        <title>Changing the Orphaned Gains-CCC to Gain/Loss Account</title>
+        <procedure>
+          <step>
+            <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window if open and return to the security
+              account register.</simpara>
             <figure pgwide="1">
               <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title><screenshot id="invest-lots4AftScrub1LotReg">
                 <mediaobject>
@@ -4123,29 +4113,33 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                   </textobject>
 
                   <caption>
-                    <para>An image of the <emphasis>security register </emphasis> after scrubbing a single lot.
+                    <para>An image of the <emphasis>security register</emphasis> after scrubbing a single lot.
                     </para>
                   </caption>
                 </mediaobject>
               </screenshot>
             </figure>
-          </listitem>
-
-          <listitem>
-            <para>Find each new <emphasis>Realized Gain/Loss</emphasis> transaction in the security account register
-              (they will have the same date as the sell transactions). Edit the <emphasis> Orphaned
-              Gains-CCC</emphasis> transaction split to re-assign the income account to a more
-              meaningful income (or expense) gain or loss account (e.g. <emphasis>Income:Long Term
-              Capital Gain:IBM</emphasis>).
-            </para>
-
+          </step>
+
+          <step>
+            <simpara>Find each new <emphasis>Realized Gain/Loss</emphasis> transaction in the security account register
+              (they will have the same date as the sell transactions). 
+              </simpara>
+          </step>
+          
+          <step>
+            <simpara>Edit the <emphasis>Orphaned Gains-CCC</emphasis> transaction split to re-assign the income account to a more
+              meaningful income (or expense) gain or loss account (for example, <emphasis>Income:Capital Gain (Long Term):IBM</emphasis>).</simpara>
             <tip>
-              <para>You may like to split the capital gain/loss into taxable and non taxable parts if that is in accord
+              <simpara>You may like to split the capital gain/loss into taxable and non taxable parts if that is in accord
                 with your tax laws.
-              </para>
+              </simpara>
             </tip>
-          </listitem>
-        </orderedlist>
+          </step>        
+        </procedure>
+
+
+      </example>
       </sect3>
     </sect2>
   </sect1>
@@ -4208,8 +4202,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
       <para>If you receive the dividend in the form of an automatic reinvestment, the transaction for this
         should be handled within the stock or mutual fund account as income from
-        <quote>Income:Dividend</quote> for the appropriate number of reinvested shares. This type of
-        reinvest account is often referred to as a DRIP (Dividend Re-Investment Program).
+        <emphasis>Income:Dividends</emphasis> for the appropriate number of reinvested shares. This type of
+        reinvest account is often referred to as a <acronym>DRIP</acronym> (Dividend Re-Investment Program).
       </para>
 
       <para>As an example consider the following purchase of NSTAR (NST) stock with the dividends reinvested
@@ -4219,9 +4213,9 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <para>Starting with the purchase of 100 shares on Jan. 3, 2005, all dividends will be reinvested and an
         account is created to track the dividend to the specific stock. &app; simplifies the entry
         by allowing calculations within the cells of the transaction. If the first dividend is
-        $.29/share, enter $53.28 (purchase price + dividend) in the share <guilabel>Price</guilabel>
-        cell and 100*.29 in the <guilabel>Buy</guilabel> cell. &app; will calculate for you the
-        corresponding numer of <guilabel>Shares</guilabel>
+        $0.29/share, enter <userinput>53.28</userinput> (purchase price + dividend) in the share <guilabel>Price</guilabel>
+        cell and <userinput>100*0.29</userinput> in the <guilabel>Buy</guilabel> cell. &app; will calculate for you the
+        corresponding number of <guilabel>Shares</guilabel>.
       </para>
 
       <screenshot id="invest-dividendreinvest1">
@@ -4258,7 +4252,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
     </para>
 
     <para>A Return of Capital transaction can be entered in the stock register by entering the stock split
-      with
+      with:
     </para>
 
     <informaltable>
@@ -4333,9 +4327,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         price database entry which could cause reports to be wrong. Check for and remove such an
         unwanted entry from the price database using
         <menuchoice>
-          <guimenu>Tools </guimenu><guimenuitem>Price Editor</guimenuitem>
-        </menuchoice>
-        .
+          <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
+        </menuchoice>.
       </para>
     </tip>
   </sect1>
@@ -4347,9 +4340,9 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
     <para>Companies may split their stock for many reasons but the most common is that the price has risen
       higher than management thinks is a reasonable price for many investors. Some of these splits
-      are simple exchanges (eg 2 for 1 or 3 for 2) and some are complex exchanges with cash
+      are simple exchanges (for example, 2 for 1 or 3 for 2) and some are complex exchanges with cash
       distributions. Splits may also result in fewer shares if the exchange rate is a reverse split
-      (1 for 3 or .75 for 1).
+      (1 for 3 or 0.75 for 1).
     </para>
 
     <sect2 id="invest-simplesplit">
@@ -4412,39 +4405,36 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <para>The next screen presents 5 fields in the Stock Splits Details window:
       </para>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Date</guilabel> - Enter the date of the split.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Shares</guilabel> - The number of shares increased (or decreased) in the transaction.
-          </para>
-
-          <para>In our example it is a 2 for 1 split so the number of additional shares is the number of shares
-            currently in the register.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Description</guilabel> - The Description should give a brief explanation of the
-            transaction.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>New Price</guilabel> - If desired the new price of the stock, after the split, may be
-            entered.
-          </para>
-        </listitem>
+      <variablelist>
+      <varlistentry>
+        <term>Date</term>
+        <listitem><simpara>Enter the date of the split.</simpara></listitem>
+      </varlistentry>
+      
+      <varlistentry>
+        <term>Shares</term>
+        <listitem><para>The number of shares increased (or decreased) in the transaction.
+          In this example, it is a 2 for 1 split so the number of additional shares is the number of shares
+          currently in the register.
+          </para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Description</term>
+        <listitem><simpara>The Description should give a brief explanation of the transaction.</simpara></listitem>
+      </varlistentry>      
+      
+      <varlistentry>
+        <term>New Price</term>
+        <listitem><simpara>If desired the new price of the stock, after the split, may be entered.</simpara></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Currency</term>
+        <listitem><simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.</simpara></listitem>
+      </varlistentry>
 
-        <listitem>
-          <para><guilabel>Currency</guilabel> - The currency of the transaction is required. This should be the same
-            as the stock purchase currency.
-          </para>
-        </listitem>
-      </itemizedlist>
+      </variablelist>
 
       <para>Click on the <guibutton>Forward</guibutton> button.
       </para>
@@ -4523,7 +4513,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         been paid in cash, therefore not entered into the AT&T stock register.
       </para>
 
-      <para>The conditions of the merger were .77942 share of SBC stock were exchanged for each share of
+      <para>The conditions of the merger were 0.77942 share of SBC stock were exchanged for each share of
         AT&T stock. The merged company continued to use the symbol <quote>T</quote> from
         AT&T.
       </para>
@@ -4563,42 +4553,38 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <para>The next screen presents 5 fields in the Stock Splits Details window:
       </para>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Date</guilabel> - Enter the date of the split. Here we’ll enter November 18, 2005.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Shares</guilabel> - The number of shares increased (or decreased) in the transaction.
-          </para>
-
-          <para>In our example it is a .77942 for 1 split so the number of shares will decrease from the number of
-            shares currently in the register. You may use &app;’s ability to perform
-            calculations on an entry form by entering data directly (E.g.
-            <quote>(.77942*100)−100</quote>) to calculate the decrease in shares from the
-            split.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Description</guilabel> - The Description should give a brief explanation of the
-            transaction.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>New Price</guilabel> - If desired the new price of the stock, after the split, may be
-            entered.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para><guilabel>Currency</guilabel> - The currency of the transaction is required. This should be the same
-            as the stock purchase currency.
-          </para>
-        </listitem>
-      </itemizedlist>
+      <variablelist>
+      <varlistentry>
+        <term>Date</term>
+        <listitem><simpara>Enter the date of the split. Here we’ll enter November 18, 2005.</simpara></listitem>
+      </varlistentry>
+      
+      <varlistentry>
+        <term>Shares</term>
+        <listitem><para>The number of shares increased (or decreased) in the transaction.
+          In this example it is a 0.77942 for 1 split so the number of shares will decrease from the number of
+          shares currently in the register. You may use &app;’s ability to perform
+          calculations on an entry form by entering data directly (
+          <userinput>0.77942*100 − 100</userinput>) to calculate the decrease in shares from the
+          split.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Description</term>
+        <listitem><simpara>The Description should give a brief explanation of the transaction.</simpara></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>New Price</term>
+        <listitem><simpara>If desired the new price of the stock, after the split, may be entered.</simpara></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Currency</term>
+        <listitem><simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.</simpara></listitem>
+      </varlistentry>
+      
+      </variablelist>
 
       <para>Click on the <guibutton>Forward</guibutton> button.
       </para>

commit 45ddec8919526557fbe7c8e02fb9c682180d84fd
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jul 23 03:05:18 2021 +0200

    Improve last commit (Guide:txns): Change in GTK3

diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index bb2b8cef..c36d3ebb 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -352,9 +352,10 @@
 
         <listitem>
           <para>All of the menu items have access keys defined, and these are marked by underlined characters in the
-            menu names. Press <keycap>Alt</keycap> + [<replaceable>underlined character</replaceable>] to bring up the menu,
-            then select an item by typing its underlined character. For example, typing <keycombo>
-              <keycap>Alt</keycap> <keycap>A</keycap>
+            menu names while <keycap>Alt</keycap> is hold. Press
+            <keycombo><keycap>Alt</keycap><keycap><replaceable>underlined character</replaceable></keycap></keycombo>
+            to bring up the menu, then select an item by typing its underlined character. For example, typing <keycombo>
+              <keycap>Alt</keycap><keycap>A</keycap>
             </keycombo> brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A few of the
             menu items also have shortcut keys that immediately invoke the command (typically using
             the <keycap>Ctrl</keycap> key). These shortcuts are listed next to the item.

commit 509b6f4563204a9c380625011c6bf0028fa2f4c0
Merge: f05cf389 d0ac4737
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jul 23 01:43:11 2021 +0200

    Merge branch 'PR_#196' into maint


commit f05cf3894f79e0f2b53f0813618a143a2c2238fe
Merge: 05a7cf54 bbcc94f2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Jul 20 01:16:26 2021 +0200

    Merge PR #195 into maint


commit 05a7cf54a01bf1d923fe37fdb0ce20b868d0889e
Merge: 52706bef c6e3f506
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Jul 20 01:07:25 2021 +0200

    Merge PR #194 into maint


commit 52706bef362ea6b0f397559acc488cff38deb9db
Merge: 8ab1689c ffb82c08
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Jul 20 00:40:33 2021 +0200

    Merge PR #193 into maint


commit bbcc94f2797c880fd572a90d2c13f039534dc2f0
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sun Jul 18 01:04:36 2021 +0900

    Minor fix.

diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 00da9832..7d667adb 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -104,7 +104,7 @@
   <sect1 id="rpt_standardrpts">
     <title>Standard Reports Overview</title>
 
-    <para>The standard reports that are included in &app; are presented in this chapter. For each report, a
+    <para>The standard reports that are included in &app; are presented in this section. For each report, a
       short description is given, which explains what the report is intended to show and its primary
       purpose. We begin with a description of the Transaction Report, which is an all-purpose report
       with many features and settings that allow sophisticated examination of the data in a file.

commit d0ac473705277f9d72391a357e3664f219b9436e
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 17 23:54:17 2021 +0900

    Add replaceable tag, see
    https://github.com/Gnucash/gnucash-docs/pull/190#discussion_r671407584

diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index d6a06de6..bb2b8cef 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -352,7 +352,7 @@
 
         <listitem>
           <para>All of the menu items have access keys defined, and these are marked by underlined characters in the
-            menu names. Press <keycap>Alt</keycap> + [underlined character] to bring up the menu,
+            menu names. Press <keycap>Alt</keycap> + [<replaceable>underlined character</replaceable>] to bring up the menu,
             then select an item by typing its underlined character. For example, typing <keycombo>
               <keycap>Alt</keycap> <keycap>A</keycap>
             </keycombo> brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A few of the

commit 1e334a8a80eee737ae6b5b65ced29fd4d0ad6f9a
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 17 22:58:19 2021 +0900

    More markups.

diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index b2b75e08..00da9832 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -79,25 +79,25 @@
     </para>
 
     <para>The first time you save a report with a name that has not already been saved, you can use either the
-      Save Report Configuration or the Save Report Configuration As... button. You can modify the
+      <guibutton>Save Report Configuration</guibutton> or the <guibutton>Save Report Configuration As...</guibutton> button. You can modify the
       report name before saving it.
     </para>
 
-    <para>Once a report has been saved with the current name, the Save Report Configuration button will
-      immediately update the saved report configuration. Use the Save Report Configuration As button
+    <para>Once a report has been saved with the current name, the <guibutton>Save Report Configuration</guibutton> button will
+      immediately update the saved report configuration. Use the <guibutton>Save Report Configuration As...</guibutton> button
       to save the current report configuration with a new name.
     </para>
 
-    <para>Saved report configurations are available for use under the Reports->Saved Report Configurations
+    <para>Saved report configurations are available for use under the <menuchoice><guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem></menuchoice>
       entry. They will also be available for use on multicolumn reports.
     </para>
 
-    <para>Saved report configurations can be deleted in the Saved Report Configurations dialog by clicking the
-      trashcan icon.
+    <para>Saved report configurations can be deleted in the <guilabel>Saved Report Configurations</guilabel> dialog by clicking the
+      <guiicon>trashcan</guiicon> icon.
     </para>
 
-    <para>To edit saved report configurations, open the report via Reports->Saved Report Configurations, edit
-      and apply the new options, and click Save Report Configuration.
+    <para>To edit saved report configurations, open the report via <menuchoice><guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem></menuchoice>, edit
+      and apply the new options, and click <guibutton>Save Report Configuration</guibutton>.
     </para>
   </sect1>
 

commit e51efec7e5854bab4cc4ea08042bd802d214d040
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 17 22:05:40 2021 +0900

    Add markups.

diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index 1b5c9d07..b2b75e08 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -24,8 +24,9 @@
   </para>
 
   <para>&app;'s reporting features allow you to display nearly any group of transactions in a wide variety
-    of formats. This makes it easy to answer questions about your finances, such as "How much did I
-    spend on groceries last month?" or "How much did I earn in the previous six months?"
+    of formats. This makes it easy to answer questions about your finances, such as 
+    <quote>How much did I spend on groceries last month?</quote>
+	or <quote>How much did I earn in the previous six months?</quote>
   </para>
 
   <para>&app; includes a number of common report types, which can be modified to meet your specific needs.
@@ -42,7 +43,7 @@
 
     <para>When you select a report from the list of reports, that report is first run with its default
       settings. Once you have opened the report, you can modify its parameters by clicking on the
-      Options button on the toolbar. Under Options, you will see the different settings that you can
+      <guibutton>Options</guibutton> button on the toolbar. Under <guilabel>Options</guilabel>, you will see the different settings that you can
       change for each report. Note that for different reports, the options will be different.
     </para>
   </sect1>
@@ -51,40 +52,28 @@
     <title>Saved Reports Configurations Concepts</title>
 
     <para>Once you have modified a report to meet your needs, you may wish to save that report for reuse at a
-      later point. &app; allows custom reports to be saved, using the Save Report Configuration
+      later point. &app; allows custom reports to be saved, using the <guimenuitem>Save Report Configuration</guimenuitem>
       command.
     </para>
 
-    <para>To save a report configuration:
-    </para>
+    <procedure>
+        <title>Save a report configuration</title>
 
-    <itemizedlist>
-      <listitem>
-        <para>Go to the Reports Menu and choose the desired report.
-        </para>
-      </listitem>
+        <step><para>Go to the <guilabel>Reports</guilabel> Menu and choose the desired report.</para></step>
 
-      <listitem>
-        <para>Change the settings on the report until it includes what is needed.
-        </para>
-      </listitem>
+        <step><para>Change the settings on the report until it includes what is needed.</para></step>
+
+        <step><para>Go to the <guilabel>General</guilabel> tab of the report's options and change the Report Name to something meaningful 
+            (Do not confuse this with the Report Title.)
+        </para></step>
+
+        <step><para>Apply the changes and close the dialog.</para></step>
+
+        <step><para>Click the <guibutton>Save Report Configuration</guibutton> or <guibutton>Save Report Configuration As...</guibutton> button.</para></step>
+    </procedure>
 
-      <listitem>
-        <para>Go to the General tab of the report's options and change the Report Name to something meaningful (Do
-          not confuse this with the Report Title).
-        </para>
-      </listitem>
 
-      <listitem>
-        <para>Apply the changes and close the dialog.
-        </para>
-      </listitem>
 
-      <listitem>
-        <para>Click the Save Report Configuration or Save Report Configuration As... button
-        </para>
-      </listitem>
-    </itemizedlist>
 
     <para>This will store the report options in a file in your home directory.
     </para>

commit d4bce16112284b9a9abc770291c985348e1c8767
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 17 01:54:42 2021 +0900

    Fix typos.

diff --git a/guide/C/ch_reports.xml b/guide/C/ch_reports.xml
index d2b4dbcf..1b5c9d07 100644
--- a/guide/C/ch_reports.xml
+++ b/guide/C/ch_reports.xml
@@ -157,7 +157,7 @@
 
         <listitem>
           <para>Indenting of columns will indent the report columns for easier understanding of grouping and
-            sorting. (This is now enabled by default for Gnucash 3.0 onwards)
+            sorting. (This is now enabled by default for &app; 3.0 onwards)
           </para>
         </listitem>
 
@@ -1242,7 +1242,7 @@
     <sect2 id="rpt_grp_sampcust">
       <title>Sample & Custom Group</title>
 
-      <para>The reports in this group offer examples on how reports can be customized or podified to suit
+      <para>The reports in this group offer examples on how reports can be customized or modified to suit
         personal need.
       </para>
 

commit c6e3f50668f56a34b4e8f72bbeb17c60948820d6
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Sat Jul 17 01:01:53 2021 +0900

    Fix typos.

diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 1dea9703..e7ca124a 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -379,7 +379,7 @@ Discrete Interest:   <emphasis>ieff = (1 + i/CF)^(CF/PF) - 1</emphasis>
 Continuous Interest: <emphasis>ieff = e^(i/PF) - 1 = exp(i/PF) - 1</emphasis>
 
 To convert from ieff to i, the following expressions are used:
-Discrete Interst:    <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
+Discrete Interest:    <emphasis>i = CF*[(1+ieff)^(PF/CF) - 1]</emphasis>
 Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis></screen>
         <note>
           <para>In the equations below for the financial transaction, all interest rates are the effective interest
@@ -670,7 +670,7 @@ The simple case for when  PMT == 0 gives the solution:
 
       <para>In summary we have the below details. Peter’s loan details:<itemizedlist>
           <listitem>
-            <para>Pinciple Amount - $2,000
+            <para>Principal Amount - $2,000
             </para>
           </listitem>
 
@@ -1043,7 +1043,7 @@ The simple case for when  PMT == 0 gives the solution:
           <para>To record this you need to increase your Saving account with the $600,000, and decrease some other
             accounts with $600,000. The house account only contains $300,000 which is what you
             bought it for, so you move this amount to your Saving account. That means you are
-            lacking $300,000. This amount you fetch from the <emphasis>Income:Captial Gains
+            lacking $300,000. This amount you fetch from the <emphasis>Income:Capital Gains
             Long:House</emphasis> account. The split transaction you enter into your
             <emphasis>Saving</emphasis> account (<emphasis>Assets:Current Assets:Saving</emphasis>)
             should look like this.

commit 8ab1689c76b7aff2e232fb9dfe5f56596133b1fd
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Jul 16 23:30:20 2021 +0900

    Add spaces between words and tags to avoid word concatenation.
    Change German word Strg to English word Ctrl.

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index fd6486b9..df8ee3db 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -425,7 +425,7 @@ Translators:
         <xref linkend="chapter_currency" /> for more information.
       </para>
 
-      <para><emphasis>Money Market</emphasis> and <emphasis>Credit Line </emphasis>are used only in the OFX
+      <para><emphasis>Money Market</emphasis> and <emphasis>Credit Line</emphasis> are used only in the OFX
         importer, apparently for completeness with the specification.
       </para>
     </sect3>

commit 5904fb0056052902fc5e7ef01e82e99b5f73968d
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Jul 16 23:30:20 2021 +0900

    Add spaces between words and tags to avoid word concatenation.
    Change German word Strg to English word Ctrl.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index f6bc1331..1e367797 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -483,7 +483,7 @@ Translators:
         in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select <menuchoice>
           <shortcut>
           <keycombo>
-            <keycap>Strg</keycap><keycap>N</keycap>
+            <keycap>Ctrl</keycap><keycap>N</keycap>
           </keycombo>
           </shortcut> <guimenu><accel>F</accel>ile</guimenu><guimenuitem><accel>N</accel>ew
           File</guimenuitem>
@@ -510,7 +510,7 @@ Translators:
             These items are explained elsewhere in the Guide, and can be changed at any time from <menuchoice>
               <shortcut>
               <keycombo>
-                <keycap>Strg</keycap><keycap>Enter</keycap>
+                <keycap>Ctrl</keycap><keycap>Enter</keycap>
               </keycombo>
               </shortcut>
               <guimenu><accel>F</accel>ile</guimenu><guimenuitem>Proper<accel>t</accel>ies</guimenuitem>
@@ -603,7 +603,7 @@ Translators:
             the process, back up to change something, or apply to confirm your choices. If you're
             creating a new book, &app; will present a dialog to select a backend and either a file
             to save it or database server, database name, and credentials to create a MySQL or
-            Postgresql database if GnuCash was built with those features and you have the necessary
+            PostgreSQL database if GnuCash was built with those features and you have the necessary
             dependencies installed.
           </para>
 
@@ -868,9 +868,9 @@ Translators:
       <para>All of the menu items have access keys which are marked by underlined characters in the menu names.
         Pressing the <keycap>Alt</keycap> key with the underlined character in the menu heading will
         bring up the menu items for that heading. Once the menu items are displayed, type the
-        underlined character in the menu item to activate it. For example, typing<keycombo>
+        underlined character in the menu item to activate it. For example, typing <keycombo>
           <keycap>Alt</keycap><keycap>F</keycap>
-        </keycombo>in the main window brings up the <guimenu>File</guimenu> menu, then typing <keycap>S</keycap> will
+        </keycombo> in the main window brings up the <guimenu>File</guimenu> menu, then typing <keycap>S</keycap> will
         save the file. Access keys are fixed and cannot be changed by users.
       </para>
 
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 1d049d15..d6a06de6 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -353,9 +353,9 @@
         <listitem>
           <para>All of the menu items have access keys defined, and these are marked by underlined characters in the
             menu names. Press <keycap>Alt</keycap> + [underlined character] to bring up the menu,
-            then select an item by typing its underlined character. For example, typing<keycombo>
+            then select an item by typing its underlined character. For example, typing <keycombo>
               <keycap>Alt</keycap> <keycap>A</keycap>
-            </keycombo>brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A few of the
+            </keycombo> brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A few of the
             menu items also have shortcut keys that immediately invoke the command (typically using
             the <keycap>Ctrl</keycap> key). These shortcuts are listed next to the item.
           </para>
@@ -367,9 +367,9 @@
 
           <itemizedlist>
             <listitem>
-              <para><keycap>Tab</keycap> to move to the next field,<keycombo>
+              <para><keycap>Tab</keycap> to move to the next field, <keycombo>
                   <keycap>Shift</keycap> <keycap>Tab</keycap>
-                </keycombo>to move to the previous field
+                </keycombo> to move to the previous field
               </para>
             </listitem>
 
@@ -393,9 +393,9 @@
             <listitem>
               <para><keycombo>
                   <keycap>Shift</keycap> <keycap>Page Up</keycap>
-                </keycombo>to go to the first transaction,<keycombo>
+                </keycombo> to go to the first transaction, <keycombo>
                   <keycap>Shift</keycap> <keycap>Page Down</keycap>
-                </keycombo>to go to the last transaction
+                </keycombo> to go to the last transaction
               </para>
             </listitem>
           </itemizedlist>
@@ -407,9 +407,9 @@
 
       <itemizedlist>
         <listitem>
-          <para><keycap>Tab</keycap> moves to the next box and<keycombo>
+          <para><keycap>Tab</keycap> moves to the next box and <keycombo>
               <keycap>Shift</keycap><keycap>Tab</keycap>
-            </keycombo>moves to the previous box
+            </keycombo> moves to the previous box
           </para>
         </listitem>
 
@@ -1029,7 +1029,7 @@
       create it for you.
     </para>
 
-    <para>In this howto, we’ll take a monthly Internet subscription of 20 USD as example, which is taken
+    <para>In this how-to, we’ll take a monthly Internet subscription of 20 USD as example, which is taken
       on the 28th of each month.
     </para>
 

commit f8c4af017ab03b5ef2ffb9a28d43f26fbc80e7f1
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Thu Jul 15 12:15:35 2021 +0900

    Replace misused acronyms with guilabels.

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 336cd867..f6bc1331 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -1156,7 +1156,7 @@ Translators:
 
         <listitem>
           <para>Select the <guilabel>Data Format</guilabel> of the file you are saving from the drop down list. The
-            default selection is <acronym>XML</acronym> but if you have set up a database back end
+            default selection is <guilabel>xml</guilabel> but if you have set up a database back end
             you can change to that format.
           </para>
 
@@ -1166,16 +1166,16 @@ Translators:
         </listitem>
 
         <listitem>
-          <para></para>
 
           <itemizedlist>
             <listitem>
-              <para>If you selected <acronym>XML</acronym> or <acronym>sqlite3</acronym> you will see a screen like
+              <para>If you selected <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel> you will see a screen like
                 this:
               </para>
 
               <figure>
-                <title>Save screen when <acronym>XML</acronym> or <acronym>sqlite3</acronym> is selected.</title><screenshot id="basics-SaveXML">
+                <title>Save screen when <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel> is selected.</title>
+                <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
@@ -1193,7 +1193,7 @@ Translators:
 
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
-                        Format</guilabel> is <acronym>XML</acronym> or <acronym>sqlite3</acronym>.
+                        Format</guilabel> is <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel>.
                       </para>
                     </caption>
                   </mediaobject>
@@ -1226,12 +1226,13 @@ Translators:
             </listitem>
 
             <listitem>
-              <para>If you selected <acronym>mysql</acronym> or <acronym>postgres</acronym> <guilabel>Data
-                Format</guilabel> you will see a screen like this:
+              <para>If you selected <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> <guilabel>Data
+                Format</guilabel>, you will see a screen like this:
               </para>
 
               <figure>
-                <title>Save screen when <acronym>mysql</acronym> or <acronym>postgres</acronym> is selected.</title><screenshot id="basics-SaveSQL">
+                <title>Save screen when <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> is selected.</title>
+                <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
@@ -1249,8 +1250,8 @@ Translators:
 
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
-                        Format</guilabel> is <acronym>mysql</acronym> or
-                        <acronym>postgres</acronym>.
+                        Format</guilabel> is <guilabel>mysql</guilabel> or
+                        <guilabel>postgres</guilabel>.
                       </para>
                     </caption>
                   </mediaobject>
@@ -1263,7 +1264,7 @@ Translators:
               </para>
 
               <warning>
-                <para>Saving to <acronym>mysql</acronym> or <acronym>postgres</acronym> requires the proper permissions in
+                <para>Saving to <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> requires the proper permissions in
                   that database, that is you need to have the permissions to create a new database
                   with the given database name, or you need to have write access to an existing
                   database with the given database name.

commit ffb82c08532f756c42f6b7624e2dbe001f8dadf0
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Fri Jul 16 21:26:19 2021 +0900

    Added a space between a word and a tag.

diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index c2e71cc6..e5464825 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -524,7 +524,7 @@
       <title>Context Help</title>
 
       <para>The context help provides detailed instructions for using &app;'s menus, windows, and controls. To
-        open online help, select<menuchoice>
+        open online help, select <menuchoice>
           <guimenu>Help</guimenu> <guimenuitem>Contents</guimenuitem>
         </menuchoice>.
       </para>

commit 0389e0aa1e073e097052886f7758f34e426a7268
Merge: 4998ad75 e4f9068b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jul 16 05:07:41 2021 +0200

    Merge PR #189 into maint

diff --cc docbook/gnc-docbookx.dtd
index bfec6d2d,fd3269de..5f4aee49
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@@ -49,7 -49,8 +49,9 @@@ own entity definitions to use across al
  <!ENTITY appname "GnuCash">  <!-- This should be used, where no further markup is desired, e.g. in GUI elements, URLs -->
  <!ENTITY app "<application>GnuCash</application>">  <!-- This should be used in normal text -->
  <!ENTITY app-fq "<application>Finance::Quote</application>">
+ <!ENTITY app-aoo "<application>Apache OpenOffice</application>">
+ <!ENTITY app-lo "<application>LibreOffice</application>">
 +<!ENTITY app-py "<application>Python</application>">
  
    <!-- Operating Systems (3 letters), Bundles: -->
  <!ENTITY lin "<systemitem class='osname'>Linux</systemitem>">

commit e4f9068be65fa6100a4cc853e16d37ccd95f0d61
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Jul 14 22:04:21 2021 +0900

    Add entities for Apache OpenOffice, LibreOffice, and a GnuCash file
    fin.c.
    Replace hardcorded Office Suite and path of fin.c with the entities.
    Replace k(thousand) with 000.
    Add commas into the numbers over 1,000 except user's input.
    Change Terminology's list from itemizedlist to variablelist.
    Move Car loan section before personal loan section.
    Fix some typos.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 3f5a934b..fd3269de 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -49,6 +49,8 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY appname "GnuCash">  <!-- This should be used, where no further markup is desired, e.g. in GUI elements, URLs -->
 <!ENTITY app "<application>GnuCash</application>">  <!-- This should be used in normal text -->
 <!ENTITY app-fq "<application>Finance::Quote</application>">
+<!ENTITY app-aoo "<application>Apache OpenOffice</application>">
+<!ENTITY app-lo "<application>LibreOffice</application>">
 
   <!-- Operating Systems (3 letters), Bundles: -->
 <!ENTITY lin "<systemitem class='osname'>Linux</systemitem>">
@@ -61,12 +63,13 @@ own entity definitions to use across all of our DocBook pages. -->
   Last version of branch n -->
 <!ENTITY vers-last-2 "2.6.21">
 <!-- 
-  3. Some common directories - change rarely.
+  3. Some common files and directories - change rarely.
   FIXME: OS independed?
 -->
 <!ENTITY dir-conf "~/.conf/gnucash/">
 <!ENTITY dir-data "~/.local/share/gnucash/">
 <!ENTITY dir-old "~/.gnucash/">  <!-- Up to 2.6.21 common for conf & data -->
+<!ENTITY file-finc "libgnucash/app-utils/calculation/fin.c">
 
 <!-- 
   4. Some common URLs - should be changed on demand.
diff --git a/guide/C/appendixa.xml b/guide/C/appendixa.xml
index aaae878f..22b2250b 100644
--- a/guide/C/appendixa.xml
+++ b/guide/C/appendixa.xml
@@ -179,7 +179,7 @@
 
       <listitem>
         <para>You will now have a file in the desired output format. An enterprising individual could go so far as
-          to write a stylesheet to transform the &app; data file to an OpenOffice spreadsheet (or
+          to write a stylesheet to transform the &app; data file to an &app-aoo;/&app-lo; Calc (or
           vice-versa, for that matter). Such things as <acronym>QIF</acronym> ought to be a little
           less work.
         </para>
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index 8dd6442a..bc50f880 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -1267,8 +1267,8 @@
       </para>
 
       <para>To include a company logo, banner heading and background image, use your favorite graphics
-        application such as <application>The Gimp</application> or <application>OpenOffice
-        Draw</application> to save the images in either <acronym>GIF</acronym> or
+        application such as <application>The Gimp</application> or &app-aoo;/&app-lo; 
+        Draw to save the images in either <acronym>GIF</acronym> or
         <acronym>PNG</acronym> format. Then import them into the style sheet using the
         <guilabel>Images</guilabel> section described above.
       </para>
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 7e588d85..1dea9703 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -35,74 +35,114 @@
         this list if you encounter an unfamiliar word in the later sections.
       </para>
 
-      <itemizedlist>
-        <listitem>
-          <para><emphasis>Amortization</emphasis> - the repayment plan which will insure that a loan is eventually
-            paid off, typically utilizing equal valued monthly payments. These payments are usually
-            split into principal and interest, where the amount of principal per payment increases
-            (and interest decreases) as the amortization period elapses.
-          </para>
-        </listitem>
+      <variablelist>
+        <varlistentry>
+          <term>Amortization</term>
 
-        <listitem>
-          <para><emphasis>Borrower</emphasis> - the person or company that receives the money from a loan.
-          </para>
-        </listitem>
+          <listitem>
+            <para>The repayment plan which will insure that a loan is eventually paid off, typically utilizing equal
+              valued monthly payments. These payments are usually split into principal and interest,
+              where the amount of principal per payment increases (and interest decreases) as the
+              amortization period elapses.
+            </para>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><emphasis>Default</emphasis> - when a borrower fails to repay a loan according to the terms agreed
-            upon with the lender.
-          </para>
-        </listitem>
+        <varlistentry>
+          <term>Borrower</term>
 
-        <listitem>
-          <para><emphasis>Deferment</emphasis> - a temporary delay in the repayment of a loan.
-          </para>
-        </listitem>
+          <listitem>
+            <para>The person or company that receives the money from a loan.
+            </para>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><emphasis>Delinquency</emphasis> - is the term that refers to late payments.
-          </para>
-        </listitem>
+        <varlistentry>
+          <term>Default</term>
 
-        <listitem>
-          <para><emphasis>Disbursement</emphasis> - amount of the loan paid to the borrower. Some loans have
-            multiple disbursements, meaning the borrower does not receive the full amount of the
-            loan at one time.
-          </para>
-        </listitem>
+          <listitem>
+            <para>The time when a borrower fails to repay a loan according to the terms agreed upon with the lender.
+            </para>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><emphasis>Interest</emphasis> - the expense charged by the lender to the borrower for the use of the
-            money loaned. This is typically expressed in terms of a yearly percentage charged on the
-            principal borrowed, known as the <emphasis>Annual Percentage Rate</emphasis> or APR.
-          </para>
-        </listitem>
+        <varlistentry>
+          <term>Deferment</term>
 
-        <listitem>
-          <para><emphasis>Lender</emphasis> - the company or person who lends money to a borrower.
-          </para>
-        </listitem>
+          <listitem>
+            <para>A temporary delay in the repayment of a loan.
+            </para>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><emphasis>Loan Fee</emphasis> - a processing fee removed from the principal at the time the borrower
-            receives a loan.
-          </para>
-        </listitem>
+        <varlistentry>
+          <term>Delinquency</term>
 
-        <listitem>
-          <para><emphasis>Principal</emphasis> - the original amount of the loan, or the amount of the original loan
-            that is still owed. When you make a monthly payment on a loan, part of the money pays
-            the interest, and part pays the principal.
-          </para>
-        </listitem>
+          <listitem>
+            <para>It is the term that refers to late payments.
+            </para>
+          </listitem>
+        </varlistentry>
 
-        <listitem>
-          <para><emphasis>Promissory Note</emphasis> - the legal agreement between the borrower and lender
-            concerning the loan.
-          </para>
-        </listitem>
-      </itemizedlist>
+        <varlistentry>
+          <term>Disbursement</term>
+
+          <listitem>
+            <para>An amount of the loan paid to the borrower. Some loans have multiple disbursements, meaning the
+              borrower does not receive the full amount of the loan at one time.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Interest</term>
+
+          <listitem>
+            <para>The expense charged by the lender to the borrower for the use of the money loaned. This is typically
+              expressed in terms of a yearly percentage charged on the principal borrowed, known as
+              the <emphasis>Annual Percentage Rate</emphasis> or <acronym>APR</acronym>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Lender</term>
+
+          <listitem>
+            <para>The company or person who lends money to a borrower.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Loan Fee</term>
+
+          <listitem>
+            <para>A processing fee removed from the principal at the time the borrower receives a loan.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Principal</term>
+
+          <listitem>
+            <para>The original amount of the loan, or the amount of the original loan that is still owed. When you
+              make a monthly payment on a loan, part of the money pays the interest, and part pays
+              the principal.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Promissory Note</term>
+
+          <listitem>
+            <para>The legal agreement between the borrower and lender concerning the loan.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
   </sect1>
 
@@ -125,11 +165,14 @@
       money from a loan is an asset. With these parameters, we can now present a basic loan account
       structure:
     </para>
-<screen>Basic Loan Account Structure
 
+    <bridgehead>
+      Basic Loan Account Structure
+    </bridgehead>
+<screen>
 -Asset
     -Current Assets
-        -Savings Account
+        -Saving
     -Fixed Assets
         -Asset Purchased
 -Liability
@@ -140,11 +183,9 @@
        -Mortgage Interest
    -Mortgage Adm Fees</screen>
     <para>&app; has a number of predefined loan account hierarchies available, including Car Loans and Home
-      Mortgage Loans. To access these predefined account structures, click on
-      <menuchoice>
-        <guimenu>Actions</guimenu> <guimenuitem>New Account Hierarchy...</guimenuitem>
-      </menuchoice>
-      and select the loan types in which you are interested.
+      Mortgage Loans. To access these predefined account structures, click on <menuchoice>
+        <guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem>
+      </menuchoice> and select the loan types in which you are interested.
     </para>
   </sect1>
 
@@ -153,11 +194,9 @@
 
     <para>Determining loan amortization schedules, periodic payment amounts, total payment value, or interest
       rates can be somewhat complex. To help facilitate these kinds of calculations, &app; has a
-      built-in <guilabel>Loan Repayment Calculator</guilabel>. To access the calculator, go to
-      <menuchoice>
+      built-in <guilabel>Loan Repayment Calculator</guilabel>. To access the calculator, go to <menuchoice>
         <guimenu>Tools</guimenu> <guimenuitem>Loan Repayment Calculator</guimenuitem>
-      </menuchoice>
-      .
+      </menuchoice>.
     </para>
 
     <screenshot id="loans_fcalc">
@@ -185,63 +224,91 @@
       compounding and payment methods.
     </para>
 
-    <itemizedlist>
-      <listitem>
-        <para><emphasis>Payment Periods</emphasis> - the number of payment periods.
-        </para>
-      </listitem>
+    <variablelist>
+      <varlistentry>
+        <term>Payment Periods</term>
 
-      <listitem>
-        <para><emphasis>Interest Rate</emphasis> - the nominal interest rate of the loan, ie: the yearly interest
-          rate.
-        </para>
-      </listitem>
+        <listitem>
+          <para>The number of payment periods.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <listitem>
-        <para><emphasis>Present Value</emphasis> - the present value of the loan, ie: current amount owed on the
-          loan.
-        </para>
-      </listitem>
+      <varlistentry>
+        <term>Interest Rate</term>
 
-      <listitem>
-        <para><emphasis>Periodic Payment</emphasis> - the amount to pay per period.
-        </para>
-      </listitem>
+        <listitem>
+          <para>The nominal interest rate of the loan, i.e., the yearly interest rate.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <listitem>
-        <para><emphasis>Future Value</emphasis> - the future value of the loan, ie: the amount owed after all
-          payment periods are over.
-        </para>
-      </listitem>
+      <varlistentry>
+        <term>Present Value</term>
 
-      <listitem>
-        <para><emphasis>Compounding</emphasis> - two interest compounding methods exist, discrete or continuous.
-          For discrete compounding select the compounding frequency from the popup menu with a range
-          from yearly to daily.
-        </para>
-      </listitem>
+        <listitem>
+          <para>The present value of the loan, i.e., current amount owed on the loan.
+          </para>
+        </listitem>
+      </varlistentry>
 
-      <listitem>
-        <para><emphasis>Payments</emphasis> - the popup menu allows you to select the payment frequency with a
-          range from yearly to daily. You can also select whether your payments occur at the
-          beginning or end of the period. Payments made at the beginning of the payment period have
-          interest applied to the payment as well as any previous money paid or money still owed.
-        </para>
-      </listitem>
-    </itemizedlist>
+      <varlistentry>
+        <term>Periodic Payment</term>
+
+        <listitem>
+          <para>The amount to pay per period.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Future Value</term>
+
+        <listitem>
+          <para>The future value of the loan, i.e., the amount owed after all payment periods are over.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Compounding</term>
+
+        <listitem>
+          <para>Two interest compounding methods exist, discrete or continuous. For discrete compounding select the
+            compounding frequency from the popup menu with a range from yearly to daily.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>Payments</term>
+
+        <listitem>
+          <para>The popup menu allows you to select the payment frequency with a range from yearly to daily. You can
+            also select whether your payments occur at the beginning or end of the period. Payments
+            made at the beginning of the payment period have interest applied to the payment as well
+            as any previous money paid or money still owed.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <sect2 id="loans_calcsexample1_2">
       <title>Example: Monthly Payments</title>
 
-      <para>What is your monthly payment on a $100000 30 year loan at a fixed rate of 4% compounded monthly?
+      <para>What is your monthly payment on a $100,000 30 year loan at a fixed rate of 4% compounded monthly?
       </para>
 
-      <para>This scenario is shown in the example image above. To perform this calculation, set Payment Periods
-        to 360 (12 months x 30 years), Interest Rate to 4, Present Value to 100000, leave Periodic
-        Payment empty and set Future Value to 0 (you do not want to owe anything at the end of the
-        loan). Compounding is Monthly, Payments are Monthly, assume End of Period Payments, and
-        Discrete Compounding. Now, click on the <guibutton>Calculate</guibutton> button next to the
-        Periodic Payment area. You should see $-477.42.
+      <para>This scenario is shown in the example image above. To perform this calculation, set
+        <guilabel>Payment Periods</guilabel> to <userinput>360</userinput> (12 months x 30 years),
+        <guilabel>Interest Rate</guilabel> to <userinput>4</userinput>, <guilabel>Present
+        Value</guilabel> to <userinput>100000</userinput>, leave <guilabel>Periodic
+        Payment</guilabel> empty and set <guilabel>Future Value</guilabel> to
+        <userinput>0</userinput> (you do not want to owe anything at the end of the loan).
+        <guilabel>Compounding</guilabel> is Monthly, <guilabel>Payments</guilabel> are Monthly,
+        assume End of Period Payments, and Discrete Compounding. Now, click on the
+        <guibutton>Calculate</guibutton> button next to the Periodic Payment area. You should see
+        $<computeroutput>-477.42</computeroutput>.
       </para>
 
       <para>Answer: You must make monthly payments of 477.42.
@@ -251,7 +318,7 @@
     <sect2 id="loans_calcsexample2_2">
       <title>Example: Length of Loan</title>
 
-      <para>How long will you be paying back a $20000 loan at 10% fixed rate interest compounded monthly if you
+      <para>How long will you be paying back a $20,000 loan at 10% fixed rate interest compounded monthly if you
         pay $500 per month?
       </para>
 
@@ -263,8 +330,8 @@
         is <emphasis>Monthly</emphasis>, <guilabel>Payments</guilabel> are
         <emphasis>Monthly</emphasis>, assume <guilabel>End</guilabel> of <guilabel>Period</guilabel>
         payments, and <guilabel>Discrete</guilabel> <guilabel>Compounding</guilabel>. Now, click on
-        the <guibutton>Calculate</guibutton>. You should see 49 in the <guilabel>Payment
-        Periods</guilabel> field.
+        the <guibutton>Calculate</guibutton>. You should see <computeroutput>49</computeroutput> in
+        the <guilabel>Payment Periods</guilabel> field.
       </para>
 
       <para>Answer: You will pay off the loan in 4 years and 1 month (49 months).
@@ -275,8 +342,7 @@
       <title>Advanced: Calculation Details</title>
 
       <para>In order to discuss the mathematical formulas used by the <guilabel>Loan Repayment
-        Calculator</guilabel>, we first must define some variables.
-<screen>
+        Calculator</guilabel>, we first must define some variables.<screen>
  n   == number of payment periods
  %i  == nominal interest rate, NAR, charged
  PV  == Present Value
@@ -336,8 +402,9 @@ Continuous Interest: <emphasis>i = ln[(1+ieff)^PF]</emphasis></screen>
          X = 1 for beginning of period payments</screen>
         <para>From this equation, functions which solve for the individual variables can be derived. For a
           detailed explanation of the derivation of this equation, see the comments in the file
-          src/calculation/fin.c from the &app; source code. The A, B, and C variables are defined
-          first, to make the later equations simpler to read.
+          <ulink url="&url-gh-gc-maint;&file-finc;"><filename>&file-finc;</filename></ulink> from
+          the &app; source code. The A, B, and C variables are defined first, to make the later
+          equations simpler to read.
         </para>
 <screen>
 <emphasis>A = (1 + i)^n - 1</emphasis>
@@ -355,8 +422,8 @@ The simple case for when  PMT == 0 gives the solution:
 </screen>
         <para>The case where PMT != 0 is fairly complex and will not be presented here. Rather than involving an
           exactly solvable function, determining the interest rate when PMT !=0 involves an
-          iterative process. Please see the src/calculation/fin.c source file for a detailed
-          explanation.
+          iterative process. Please see the <filename>&file-finc;</filename> source file for a
+          detailed explanation.
         </para>
       </sect3>
 
@@ -365,7 +432,7 @@ The simple case for when  PMT == 0 gives the solution:
 
         <para>Let’s recalculate <xref linkend="loans_calcsexample1_2"/>, this time using the mathematical
           formulas rather than the <guilabel>Loan Repayment Calculator</guilabel>. What is your
-          monthly payment on a $100000 30 year loan at a fixed rate of 4% compounded monthly?
+          monthly payment on a $100,000 30 year loan at a fixed rate of 4% compounded monthly?
         </para>
 
         <para>First, let’s define the variables: n = (30*12) = 360, PV = 100000, PMT = unknown, FV = 0, i =
@@ -399,10 +466,10 @@ The simple case for when  PMT == 0 gives the solution:
       <xref linkend="loans_accounts1" />.
     </para>
 
-    <para>As an example, assume you have $60k in you bank account, and you buy a $150k house. The mortgage is
-      charging 6% APR, and has administrative fees (closing costs, etc) of 3%. You decide to put
-      $50k down, and thus will need to borrow $103k, which will give you $100 after the closing
-      costs are paid (3% of $100k).
+    <para>As an example, assume you have $60,000 in you Saving account, and you buy a $150,000 house. The
+      mortgage is charging 6% APR, and has administrative fees (closing costs, etc) of 3%. You
+      decide to put $50,000 down, and thus will need to borrow $103,000, which will give you $100
+      after the closing costs are paid (3% of $100,000).
     </para>
 
     <para>Your accounts before borrowing the money:
@@ -426,10 +493,10 @@ The simple case for when  PMT == 0 gives the solution:
       </mediaobject>
     </screenshot>
 
-    <para>The purchase of the house is recorded with a split transaction in the
-      <emphasis>Assets:House</emphasis> account, with $50k coming from the bank (IE: your down
-      payment), and $100k coming from the Mortgage. You can place the $3k closing costs in the same
-      split, and we increase the house loan to $103k to include the closing costs as well.
+    <para>The purchase of the house is recorded with a split transaction in the <emphasis>Assets:Fixed
+      Assets:House</emphasis> account, with $50,000 coming from the bank (i.e., your down payment),
+      and $100,000 coming from the Mortgage. You can place the $3,000 closing costs in the same
+      split, and we increase the house loan to $103,000 to include the closing costs as well.
     </para>
 
     <para><table>
@@ -493,7 +560,7 @@ The simple case for when  PMT == 0 gives the solution:
               </entry>
 
               <entry>
-                $3000
+                $3,000
               </entry>
 
               <entry></entry>
@@ -546,6 +613,30 @@ The simple case for when  PMT == 0 gives the solution:
     </screenshot>
   </sect1>
 
+  <sect1 id="loans_CarLoan">
+    <title>Automobile Loan (How-To)</title>
+
+    <para>The automobile Loan, or in common terms, car Loan, is treated more or less exactly as the house
+      loan. The only difference is different accounts, and different interest rates. The basic car
+      loan account structure is as follows:<screen>-Asset
+    -Current Assets
+        -Saving
+    -Fixed Assets
+        -Car
+-Liability
+   -Loans
+       -Car Loan
+-Expenses
+   -Interest
+       -Car Loan Interest
+   -Car Loan Adm Fees</screen>
+    </para>
+
+    <para>For more information, please check <xref
+    linkend="loans_mortgage1" />.
+    </para>
+  </sect1>
+
   <sect1 id="loans_personalLoanToSomeOne">
     <title>A Personal Loan to a friend (How-To)</title>
 
@@ -566,7 +657,7 @@ The simple case for when  PMT == 0 gives the solution:
    -Interest Income
         -Person</screen>
     <para>This example will show how to track a personal loan of 2,000 USD (default currency) to your friend
-      Peter
+      Peter.
     </para>
 
     <sect2 id="loans_personalLoanToSomeOne_loan">
@@ -577,8 +668,7 @@ The simple case for when  PMT == 0 gives the solution:
         rate of 5%.
       </para>
 
-      <para>In summary we have the below details. Peter’s loan details:
-        <itemizedlist>
+      <para>In summary we have the below details. Peter’s loan details:<itemizedlist>
           <listitem>
             <para>Pinciple Amount - $2,000
             </para>
@@ -604,7 +694,7 @@ The simple case for when  PMT == 0 gives the solution:
       <para>So how do you calculate the Monthly Payment?
       </para>
 
-      <para>You have a number of different options, like paper and pen, &lin; Calculator, Open Office’s
+      <para>You have a number of different options, like paper and pen, &lin; Calculator, &app-aoo;/&app-lo;
         Calc module, but the easiest is to use &app; <link linkend="loans_calcs1"><guilabel>Loan
         Repayment Calculator</guilabel></link>. This tells you that the Monthly Payment should be
         $115.56.
@@ -612,8 +702,8 @@ The simple case for when  PMT == 0 gives the solution:
 
       <para>But you need to know how much of this is Interest and how much is Principal to be able to do a
         proper bookkeeping. For this you need a more powerful tool, something like the
-        <application>Calc</application> module in <application>OpenOffice.org</application>, and in
-        particular the <acronym>PMT</acronym> function.
+        <application>Calc</application> module in &app-aoo;/&app-lo;, and in particular the
+        <acronym>PMT</acronym> function.
       </para>
 
       <screenshot id="loans_OpenOfficePrivateLoanDetails">
@@ -627,9 +717,8 @@ The simple case for when  PMT == 0 gives the solution:
             <phrase>Calculation of Private Loan details</phrase>
           </textobject>
 
-          <caption>
-            <para>Detailed view over the private loan to Peter
-            </para>
+          <caption id="loans_OpenOfficePrivateLoanDetails.caption">
+            Detailed view over the private loan to Peter
           </caption>
         </mediaobject>
       </screenshot>
@@ -638,14 +727,32 @@ The simple case for when  PMT == 0 gives the solution:
     <sect2 id="loans_personalLoanToSomeOne_accounts">
       <title>Accounts for the loan</title>
 
-      <para>Let’s start with the following accounts (all accounts have the same currency, in this case
-        USD)
+      <para>Let’s start with the following accounts. They all have the same currency, in this case USD.<example>
+          <title>Accounts for the loan to Peter</title>
+
+          <itemizedlist>
+            <listitem>
+              <simpara>Assets:Bank:USD
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Assets:Money owed to you:Peter
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Income:Interest Income:Peter
+              </simpara>
+            </listitem>
+
+            <listitem>
+              <simpara>Equity:Opening Balances:USD
+              </simpara>
+            </listitem>
+          </itemizedlist>
+        </example>
       </para>
-<screen>
-Assets:Bank:USD
-Assets:Money owed to you:Peter
-Income:Interest Income:Peter
-Equity:Opening Balances:USD</screen>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_InitialSetup">
@@ -654,11 +761,11 @@ Equity:Opening Balances:USD</screen>
       <para>When you have lent money to your friend, you have in fact moved money from an Asset account (like
         Bank, Checking or similar) to your Asset account <emphasis>Money owed to you</emphasis>. To
         record this you enter the following transaction into the <emphasis>Assets:Money owed to
-        you:Friend</emphasis> account.
+        you:Peter</emphasis> account.
       </para>
 
       <para><table>
-          <title>Personal loan to a Friend</title>
+          <title>Personal loan to Peter</title>
 
           <tgroup cols="3">
             <tbody>
@@ -678,7 +785,7 @@ Equity:Opening Balances:USD</screen>
 
               <row>
                 <entry>
-                  Assets:Money owed to you:Friend
+                  Assets:Money owed to you:Peter
                 </entry>
 
                 <entry>
@@ -778,7 +885,7 @@ Equity:Opening Balances:USD</screen>
         </mediaobject>
       </screenshot>
 
-      <para>The balance on Peter’s loan is now $2,000 - $107.23 = $1,892.77
+      <para>The balance on Peter’s loan is now $2,000 - $107.23 = $1,892.77.
       </para>
     </sect2>
 
@@ -816,7 +923,7 @@ Equity:Opening Balances:USD</screen>
         </listitem>
       </itemizedlist>
 
-      <para>This can be translated to the following &app; entry
+      <para>This can be translated to the following &app; entry.
       </para>
 
       <screenshot id="loans_PrivateLoanSecondPayment">
@@ -837,10 +944,10 @@ Equity:Opening Balances:USD</screen>
         </mediaobject>
       </screenshot>
 
-      <para>The balance on Peter’s loan is now $1,892.77 - $107.67 = $1,785.10
+      <para>The balance on Peter’s loan is now $1,892.77 - $107.67 = $1,785.10.
       </para>
 
-      <para>The Chart of accounts looks now like this
+      <para>The Chart of accounts looks now like this:
       </para>
 
       <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
@@ -855,8 +962,7 @@ Equity:Opening Balances:USD</screen>
           </textobject>
 
           <caption>
-            <para>Chart of Accounts after second payment
-            </para>
+            Chart of Accounts after second payment
           </caption>
         </mediaobject>
       </screenshot>
@@ -867,39 +973,12 @@ Equity:Opening Balances:USD</screen>
 
       <para>The interest amount will be less and less for every payment (since it is calculated on a smaller
         loan amount all the time), until the last payment where it is more or less 0. Please review
-        the Figure of Detailed view over private loan to Peter for more details
+        <link linkend="loans_OpenOfficePrivateLoanDetails" endterm="loans_OpenOfficePrivateLoanDetails.caption" />
+        for more details.
       </para>
     </sect2>
   </sect1>
 
-  <sect1 id="loans_CarLoan">
-    <title>Automobile Loan (How-To)</title>
-
-    <para>The Automobile Loan, or in common terms, Car Loan, is treated more or less exactly as the House
-      loan. The only difference is different accounts, and different interest rates.
-    </para>
-
-    <para><screen>Basic Car Loan Account Structure
-
--Asset
-    -Current Assets
-        -Savings Account
-    -Fixed Assets
-        -Car
--Liability
-   -Loans
-       -Car Loan
--Expenses
-   -Interest
-       -Car Loan Interest
-   -Car Loan Adm Fees</screen>
-    </para>
-
-    <para>For more information, please check <xref
-    linkend="loans_mortgage1" />
-    </para>
-  </sect1>
-
   <sect1 id="loans_Reconciling">
     <title>Reconciling with the Loan Statements (How-To)</title>
 
@@ -909,7 +988,7 @@ Equity:Opening Balances:USD</screen>
     <para>During the period you should have recorded all the various loan related transactions, and every one
       of them are touching the <guilabel>Liability:Loans:<replaceable>Loan</replaceable></guilabel>
       account. For instance, paying off a bit of the loan decreases your <emphasis>Bank
-      Account,</emphasis> and increases the <emphasis>Loan account</emphasis>, <emphasis>Loan
+      Account</emphasis> and <emphasis>Loan account</emphasis>, and increases the <emphasis>Loan
       Interest</emphasis> as well as perhaps <emphasis>Loan administration fee</emphasis>.
     </para>
 
@@ -921,7 +1000,7 @@ Equity:Opening Balances:USD</screen>
     </para>
 
     <para>For more information on how to Reconcile, please check <xref
-    linkend="txns-reconcile1" />
+    linkend="txns-reconcile1" />.
     </para>
   </sect1>
 
@@ -934,8 +1013,6 @@ Equity:Opening Balances:USD</screen>
       registered various Unrealized gains over the time.
     </para>
 
-    <para></para>
-
     <sect2>
       <title>Simple Transaction</title>
 
@@ -963,12 +1040,13 @@ Equity:Opening Balances:USD</screen>
             you record this?
           </para>
 
-          <para>To record this you need to increase our bank account with the $600k, and decrease some other
-            accounts with $600k. The house account only contains $300k which is what you bought it
-            for, so you move this amount to your bank account. That means you are lacking $300k.
-            This amount you fetch from the <emphasis>Income:Captial Gains Long:House</emphasis>
-            account. The split transaction you enter into your <emphasis>bank</emphasis> account
-            (<emphasis>Assets:Current Assets:Saving</emphasis>) should look like this.
+          <para>To record this you need to increase your Saving account with the $600,000, and decrease some other
+            accounts with $600,000. The house account only contains $300,000 which is what you
+            bought it for, so you move this amount to your Saving account. That means you are
+            lacking $300,000. This amount you fetch from the <emphasis>Income:Captial Gains
+            Long:House</emphasis> account. The split transaction you enter into your
+            <emphasis>Saving</emphasis> account (<emphasis>Assets:Current Assets:Saving</emphasis>)
+            should look like this.
           </para>
 
           <para><table>
@@ -1036,11 +1114,11 @@ Equity:Opening Balances:USD</screen>
             sell it for $230,000. How do you record this?
           </para>
 
-          <para>To record this you need to increase your bank account with the $230k, and decrease some other
-            accounts with $230k. The house account contains $300k which is more than what you sold
-            it for. So let’s move $230k of it to your bank account. After this you have $70k
-            remaining in your house account which needs to be removed. You move it to our
-            <emphasis>Income:Capital Gains Long:House</emphasis> account, which will indicate a
+          <para>To record this you need to increase your Saving account with the $230,000, and decrease some other
+            accounts with $230,000. The house account contains $300,000 which is more than what you
+            sold it for. So let’s move $230,000 of it to your Saving account. After this you
+            have $70,000 remaining in your house account which needs to be removed. You move it to
+            our <emphasis>Income:Capital Gains Long:House</emphasis> account, which will indicate a
             loss. The split transaction you enter into your <emphasis>house</emphasis> account
             (<emphasis>Assets:Fixed Assets:House</emphasis>) should look like this.
           </para>
@@ -1111,7 +1189,7 @@ Equity:Opening Balances:USD</screen>
       <title>A More Complex Transaction</title>
 
       <para>In this example, we will touch a little on some more complicated accounting principles. For more
-        details on this subject, please check <xref linkend="chapter_capgain"></xref>
+        details on this subject, please check <xref linkend="chapter_capgain"></xref>.
       </para>
 
       <para>Here we will only touch on the case when you have accurately estimated the current value of your
@@ -1147,14 +1225,14 @@ Equity:Opening Balances:USD</screen>
       <para>How do you record this sell transaction?
       </para>
 
-      <para>To record this you need to increase your bank account with the $600k, and decrease some other
-        accounts with $600k. You must first change from unrealized gain to realized gain for your
+      <para>To record this you need to increase your Saving account with the $600,000, and decrease some other
+        accounts with $600,000. You must first change from unrealized gain to realized gain for your
         <emphasis>Income</emphasis> accounts. Lastly you need to transfer the full amounts from the
         <emphasis>Assets:Fixed Assets:House</emphasis> sub-accounts.
       </para>
 
-      <para>The transaction you enter into your <emphasis>Income:Realized Gain:House</emphasis> account account
-        should look like this.
+      <para>The transaction you enter into your <emphasis>Income:Realized Gain:House</emphasis> account should
+        look like this.
       </para>
 
       <para><table>
@@ -1268,7 +1346,7 @@ Equity:Opening Balances:USD</screen>
       </para>
 
       <para>After having recorded these transactions you see that your House Asset have a value of 0, your
-        Savings account have increased with $600,000, and lastly, the <emphasis>Income:Realized
+        Saving account have increased with $600,000, and lastly, the <emphasis>Income:Realized
         Gain</emphasis> have increased to $300,000.
       </para>
     </sect2>

commit 4998ad75da4d5da54500e4268d1421b795636000
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jul 16 03:39:48 2021 +0200

    Move Overview before Basics

diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 7114677d..7fee4aba 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -602,11 +602,11 @@
 -->
   </preface>
 
+    <xi:include href="ch_oview.xml" />
+
   <part id="part.getting_started">
     <title>The Basic Knowledge</title>
 
-    <xi:include href="ch_oview.xml" />
-
     <xi:include href="ch_basics.xml" />
 
     <xi:include href="ch_importing.xml" />

commit 2a6f04b195d6f57a86706133bf243e741c22c9d2
Merge: d33a0610 4d8cdea7
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jul 16 02:43:13 2021 +0200

    Merge PR #186 into maint


commit 4d8cdea7ef7fb514ab90271ccc63b26387d30a80
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Thu Jul 15 10:27:17 2021 +0900

    Change parts name (Bug 788912 - "Part III. Managing Business Finances"
    is misleading)

diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index c627d9c5..7114677d 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -603,7 +603,7 @@
   </preface>
 
   <part id="part.getting_started">
-    <title>Getting Started</title>
+    <title>The Basic Knowledge</title>
 
     <xi:include href="ch_oview.xml" />
 
@@ -615,7 +615,7 @@
   </part>
 
   <part id="part.managing_personal">
-    <title>Managing Personal Finances</title>
+    <title>The Common Usage</title>
 
     <xi:include href="ch_cbook.xml" />
 
@@ -635,7 +635,7 @@
   </part>
 
   <part id="part.managing_business">
-    <title>Managing Business Finances</title>
+    <title>The Advanced Features</title>
 
     <xi:include href="ch_bus_features.xml" />
 

commit d33a0610eedea32cb9cc7dac8608701014d41206
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jul 12 04:55:40 2021 +0200

    Python Bindings: link examples in API docs
    
    One step for Bug 585901 - Integration with other systems.
    Translation got tags updated, but no new text.

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 3f5a934b..bfec6d2d 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -49,6 +49,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY appname "GnuCash">  <!-- This should be used, where no further markup is desired, e.g. in GUI elements, URLs -->
 <!ENTITY app "<application>GnuCash</application>">  <!-- This should be used in normal text -->
 <!ENTITY app-fq "<application>Finance::Quote</application>">
+<!ENTITY app-py "<application>Python</application>">
 
   <!-- Operating Systems (3 letters), Bundles: -->
 <!ENTITY lin "<systemitem class='osname'>Linux</systemitem>">
@@ -77,7 +78,15 @@ own entity definitions to use across all of our DocBook pages. -->
   a) Own URLs:
 -->
 <!ENTITY url-www "https://www.gnucash.org/">
+
+<!ENTITY url-bug-wiki "https://wiki.gnucash.org/wiki/Bugzilla">  <!-- The wiki page explaining the usage of bugzilla -->
+<!ENTITY url-bug-start "https://bugs.gnucash.org/">
+<!ENTITY url-bug-search "https://bugs.gnucash.org/query.cgi">
+<!ENTITY url-bug-browse "https://bugs.gnucash.org/describecomponents.cgi">
+
 <!ENTITY url-docs "https://www.gnucash.org/docs/">
+<!ENTITY url-doc-api-main "https://code.gnucash.org/docs/MAINT/">
+<!ENTITY url-doc-api-mast "https://code.gnucash.org/docs/MASTER/">
 <!-- Fixme: a dirty hack to reference the other document
             Replace them after olink setup
      append {guide|help}/<html-page>                      -->
@@ -87,21 +96,18 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY url-docs-build-ja "https://code.gnucash.org/docs/ja/gnucash-">
 <!ENTITY url-docs-build-pt "https://code.gnucash.org/docs/pt/gnucash-">
 <!ENTITY url-docs-build-ru "https://code.gnucash.org/docs/ru/gnucash-">
-<!ENTITY url-doc-api-main "https://code.gnucash.org/docs/MAINT/">
-<!ENTITY url-doc-api-mast "https://code.gnucash.org/docs/MASTER/">
 
-<!ENTITY url-bug-wiki "https://wiki.gnucash.org/wiki/Bugzilla">  <!-- The wiki page explaining the usage of bugzilla -->
-<!ENTITY url-bug-start "https://bugs.gnucash.org/">
-<!ENTITY url-bug-search "https://bugs.gnucash.org/query.cgi">
-<!ENTITY url-bug-browse "https://bugs.gnucash.org/describecomponents.cgi">
 <!ENTITY url-irc "irc://irc.gnome.org/gnucash">
 <!ENTITY url-logs-irc "https://lists.gnucash.org/logs/">  <!-- for IRC. If someone needs build logs, scan https://code.gnucash.org/builds/ -->
+
 <!ENTITY url-mail-ar "https://lists.gnucash.org/pipermail/">  <!-- Append <list>/<Year>-<Monthname>/<Number>.html -->
 <!ENTITY url-mail-li "https://lists.gnucash.org/mailman/listinfo/">  <!-- Append the desired list -->
 <!ENTITY url-mail-nabble "http://gnucash.1415818.n4.nabble.com/GnuCash-f1415818.subapps.html">
 <!ENTITY url-mail-gmane "nntp://news.gmane.org/gmane.comp.gnome.apps.gnucash.user">
+
 <!ENTITY url-src "https://github.com/Gnucash/gnucash/">
 <!ENTITY url-src-maint "https://github.com/Gnucash/gnucash/tree/maint/"> <!-- Append the desired topic -->
+
 <!ENTITY url-wiki "https://wiki.gnucash.org/wiki/">  <!-- You could append the desired topic, but better create a separate entity. -->
 <!ENTITY url-wiki-de "https://wiki.gnucash.org/wiki/De/">  <!-- German root -->
 <!ENTITY url-wiki-api-custom "https://wiki.gnucash.org/wiki/Custom_Reports#The_GnuCash_API">
@@ -124,6 +130,7 @@ own entity definitions to use across all of our DocBook pages. -->
   <!-- wiki Special: translation is done by mediawiki: -->
 <!ENTITY url-wiki-category "https://wiki.gnucash.org/wiki/Special:Categories">
 <!ENTITY url-wiki-search "https://wiki.gnucash.org/wiki/Special:Search">
+
 <!-- b) Third party URLs: -->
 <!ENTITY url-av "https://www.alphavantage.co/"> <!-- A F::Q source, which requires registration -->
 <!ENTITY url-gh "https://github.com/"> <!-- we want to reference our libs, too.  -->
@@ -140,6 +147,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY url-wp-ru "https://ru.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-yh-fin "https://finance.yahoo.com/">  <!-- Append the desired topic -->
 <!ENTITY url-yh-hlp "https://help.yahoo.com/">  <!-- Append the desired topic -->
+
 <!-- c) URLs of Authors -->
 <!ENTITY url-selinger "https://www.mathstat.dal.ca/~selinger/">
 <!ENTITY tit-sel-tut "Tutorial on multiple currency accounting">
diff --git a/guide/C/ch_python_bindings.xml b/guide/C/ch_python_bindings.xml
index c7ffec99..34d8ddfe 100644
--- a/guide/C/ch_python_bindings.xml
+++ b/guide/C/ch_python_bindings.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
 <!-- (Do not remove this comment block.)
-
 Version: 2.4.0
 Last modified: 2011-01-01
-
 Maintainers:
-
 Author:
-  Mike Evans <mikee at saxicola.co.uk>
-
-    Translators:
-    (translators put your name and email here)
+Mike Evans <mikee at saxicola.co.uk>
+Translators:
+(translators put your name and email here)
 -->
+<!-- Todo: Database backends offer read access;
+           Guile is also a sripting language perhaps its stand alone use should be explained here, too? -->
+<!-- Todo: after adding a procedure convert this page into a https://tdg.docbook.org/tdg/4.5/task.html -->
 <chapter id="ch_python_bindings">
   <title>Python Bindings</title>
 
@@ -28,25 +27,31 @@ Author:
     the other scripting language.
   </para>
 
-  <para>Starting with &app; version 2.4 you can write <application>Python</application> scripts to
-    manipulate your financial data.
+  <para>Starting with &app; version 2.4 you can write
+    <ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink> scripts to manipulate
+    your financial data.
   </para>
 
-  <note>
-    <para>The <application>Python</application> extensions are an optional feature in the source code. To be
-      able to use <application>Python</application> scripts, &app; must have been compiled with this
-      option enabled, otherwise all what follows won’t work. At present this option is not
-      enabled by default, so if you need this, you may have to compile &app; from source yourself.
+  <important>
+    <para>The &app-py; extensions are an optional feature which creates additional dependencies. To be able to
+      use &app-py; scripts, &app; must have been built with the <code language="sh">cmake
+      -DWITH_PYTHON=ON …</code> option enabled, otherwise all what follows won’t work. At
+      present this option is not enabled by default, so if you need this, you may have to compile
+      &app; from source yourself. But some distributions offer it also as a separate package with a
+      name like<package>
+        python[<replaceable>version</replaceable>]-&appname;
+      </package>
     </para>
-  </note>
+  </important>
 
-  <para>The <application>Python</application> extensions come with a couple of ready to use scripts. This
-    chapter will show you how to use some of these.
+  <para>The &app-py; extensions come with a couple of ready to use scripts. This chapter will show you how
+    to <emphasis>use</emphasis> some of them.
   </para>
 
-  <note>
-    <para>This chapter is not about how to write your own <application>Python</application> scripts. Refer to
-      the developer documentation for that instead.
+  <tip>
+    <para>This chapter is not about how to write your own &app-py; scripts. Refer to the
+      <ulink url="&url-doc-api-main;python_bindings_page.html">developer documentation</ulink> for
+      that instead.
     </para>
-  </note>
+  </tip>
 </chapter>
diff --git a/guide/de/ch_python_bindings.xml b/guide/de/ch_python_bindings.xml
index 6b13b6a6..eb2417ab 100644
--- a/guide/de/ch_python_bindings.xml
+++ b/guide/de/ch_python_bindings.xml
@@ -1,58 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
 <!-- (Do not remove this comment block.)
-
 Version: 2.4.0
 Last modified: 2011-01-01
-
 Maintainers:
-
 Author:
-  Mike Evans <mikee at saxicola.co.uk>
-
-    Translators:
-    (translators put your name and email here)
+Mike Evans <mikee at saxicola.co.uk>
+Translators:
+(translators put your name and email here)
 -->
+<!-- Todo: Database backends offer read access;
+           Guile is also a sripting language perhaps its stand alone use should be explained here, too? -->
+<!-- Todo: after adding a procedure convert this page into a https://tdg.docbook.org/tdg/4.5/task.html -->
 <chapter id="ch_python_bindings">
   <title>Python Bindings</title>
 
   <para>&untranslated-de;
   </para>
 <!--
-  <para>
-    &app; historically has always been a
-    traditional application in the sense that you open it, use it to
-    manipulate your financial data via the windows it presents, save your
-    data and close the windows again. This has the inherent limitation that
-    you can only do whatever the windows, menus and toolbars allow you to do.
+  <para>&app; historically has always been a traditional application in the sense that you open it, use it
+    to manipulate your financial data via the windows it presents, save your data and close the
+    windows again. This has the inherent limitation that you can only do whatever the windows, menus
+    and toolbars allow you to do.
   </para>
-  <para>
-    Sometimes you might need a little more flexibility. For example, you
-    need a report with just a little different information than what the
-    built-in reports provide, or you want to automate a frequently recurring
-    action. Such custom manipulations are ideal candidates to write in one
-    or the other scripting language.
+
+  <para>Sometimes you might need a little more flexibility. For example, you need a report with just a
+    little different information than what the built-in reports provide, or you want to automate a
+    frequently recurring action. Such custom manipulations are ideal candidates to write in one or
+    the other scripting language.
   </para>
-  <para>
-    Starting with &app; version 2.4 you can
-    write <application>Python</application> scripts to manipulate your financial data.
+
+  <para>Starting with &app; version 2.4 you can write
+    <ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink> scripts to manipulate
+    your financial data.
   </para>
-  <note>
-    <para>The <application>Python</application> extensions are an optional feature in the source code.
-      To be able to use <application>Python</application> scripts, &app; must
-      have been compiled with this option enabled, otherwise all what follows
-      won’t work. At present this option is not enabled by default, so if you
-      need this, you may have to compile &app; from
-      source yourself.
+
+  <important>
+    <para>The &app-py; extensions are an optional feature which creates additional dependencies. To be able to
+      use &app-py; scripts, &app; must have been built with the <code language="sh">cmake
+      -DWITH_PYTHON=ON …</code> option enabled, otherwise all what follows won’t work. At
+      present this option is not enabled by default, so if you need this, you may have to compile
+      &app; from source yourself. But some distributions offer it also as a separate package with a
+      name like<package>
+        python[<replaceable>version</replaceable>]-&appname;
+      </package>
     </para>
-  </note>
-  <para>The <application>Python</application> extensions come with a couple of ready to use scripts. This
-    chapter will show you how to use some of these.
+  </important>
+
+  <para>The &app-py; extensions come with a couple of ready to use scripts. This chapter will show you how
+    to <emphasis>use</emphasis> some of them.
   </para>
-  <note>
-    <para>This chapter is not about how to write your own <application>Python</application> scripts.
-      Refer to the developer documentation for that instead.
+
+  <tip>
+    <para>This chapter is not about how to write your own &app-py; scripts. Refer to the
+      <ulink url="&url-doc-api-main;python_bindings_page.html">developer documentation</ulink> for
+      that instead.
     </para>
-  </note>
+  </tip>
   -->
 </chapter>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index afb0ca63..bb636fae 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -17935,18 +17935,18 @@ Translators:
       </sect1>
     </chapter>
 <!-- (Do not remove this comment block.)
-
 Version: 2.4.0
 Last modified: 2011-01-01
-
 Maintainers:
-
 Author:
-  Mike Evans <mikee at saxicola.co.uk>
+Mike Evans <mikee at saxicola.co.uk>
 
-    Translators:
-    (translators put your name and email here)
+Translators:
+(translators put your name and email here)
 -->
+<!-- Todo: Database backends offer read access;
+           Guile is also a sripting language perhaps its stand alone use should be explained here, too? -->
+<!-- Todo: after adding a procedure convert this page into a https://tdg.docbook.org/tdg/4.5/task.html -->
     <chapter id="ch_python_bindings">
       <title>Python Bindings</title>
 
@@ -17964,27 +17964,27 @@ Author:
       </para>
 
       <para>A partire dalla versione 2.4 di &app; è possibile utilizzare degli script di
-        <application>Python</application> per manipolare i propri dati finanziari.
+        &app-py; per manipolare i propri dati finanziari.
       </para>
 
-      <note>
-        <para>Le estensioni di <application>Python</application> sono una caratteristica opzionale del codice
-          sorgente. Per poter utilizzare gli script di <application>Python</application>, &app; deve
-          essere stato compilato con questa opzione abilitata. Al momento questa opzione non è
+      <important>
+        <para>Le estensioni di &app-py; sono una caratteristica opzionale del codice
+          sorgente. Per poter utilizzare gli script di &app-py;, &app; deve essere stato
+          compilato con questa <code language="sh">cmake-DWITH_PYTHON=ON …</code> opzione abilitata. Al momento questa opzione non è
           abilitata di default, quindi per poter utilizzare questa funzionalità, è necessario
           compilare &app; da sorgente.
         </para>
-      </note>
+      </important>
 
-      <para>Le estensioni <application>Python</application> sono fornite con un paio di script già pronti per
-        l’utilizzo. Questo capitolo illustra come utilizzarli.
+      <para>Le estensioni &app-py; sono fornite con un paio di script già pronti per
+        l’utilizzo. Questo capitolo illustra come <emphasis>utilizzarli</emphasis>.
       </para>
 
-      <note>
-        <para>Questo capitolo non spiega come scrivere il proprio script di <application>Python</application>. Per
-          questo fare riferimento alla documentazione per gli sviluppatori.
+      <tip>
+        <para>Questo capitolo non spiega come scrivere il proprio script di &app-py;. Per
+          questo fare riferimento alla <ulink url="&url-doc-api-main;python_bindings_page.html">documentazione per gli sviluppatori</ulink>.
         </para>
-      </note>
+      </tip>
     </chapter>
 <!-- (Do not remove this comment block.)
 
@@ -18022,7 +18022,7 @@ Author:
         </para>
 
         <para>Perchè l’importatore funzioni correttamente, i dati devono essere in formato a lunghezza
-          fissa di campo, o separati da virgole. Uno script di <application>Python</application> è
+          fissa di campo, o separati da virgole. Uno script di &app-py; è
           fornito di seguito come esempio.
         </para>
 
@@ -18068,7 +18068,7 @@ line number,product code,quantity,availability,product description,unit price,di
       </programlisting>
         </para>
 
-        <para>Un file simile dopo essere stato processato con lo script di <application>Python</application>.
+        <para>Un file simile dopo essere stato processato con lo script di &app-py;.
         </para>
 
         <para><programlisting language="python">
@@ -18159,17 +18159,17 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
         </para>
 
         <note>
-          <para>Se non si ha dimestichezza con <application>Python</application> (esistono altri linguaggi), è
+          <para>Se non si ha dimestichezza con &app-py; (esistono altri linguaggi), è
             possibile inviare una richiesta alla
             <ulink url="&url-mail-li;gnucash-user"><citetitle>lista dell’utente di
             &appname;</citetitle>, con un esempio del proprio file <acronym>CSV</acronym> scaricato,
             e probabilmente qualcuno si preoccuperà di scrivere uno script di
-            <application>Python</application> per la sua traduzione.</ulink>
+            &app-py; per la sua traduzione.</ulink>
           </para>
         </note>
 
         <sect2 id="python-author-notes">
-          <title>Note per gli autori <application>Python</application></title>
+          <title>Note per gli autori &app-py;</title>
 
           <para>Per poter completare con successo il processo di importazione, il numero di campi deve essere
             rispettato, quindi le virgole sono importanti.
diff --git a/guide/ja/ch_python_bindings.xml b/guide/ja/ch_python_bindings.xml
index 4f04acd0..3a2c8358 100644
--- a/guide/ja/ch_python_bindings.xml
+++ b/guide/ja/ch_python_bindings.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
 <!-- (Do not remove this comment block.)
-
 Version: 2.4.0
 Last modified: 2011-01-01
-
 Maintainers:
-
 Author:
-  Mike Evans <mikee at saxicola.co.uk>
-
-
-    Translators:
-    (translators put your name and email here)
+Mike Evans <mikee at saxicola.co.uk>
+Translators:
+(translators put your name and email here)
 -->
+<!-- Todo: Database backends offer read access;
+           Guile is also a sripting language perhaps its stand alone use should be explained here, too? -->
+<!-- Todo: after adding a procedure convert this page into a https://tdg.docbook.org/tdg/4.5/task.html -->
 <chapter id="ch_python_bindigs">
   <title>Pythonæ‹¡å¼µ</title>
 
@@ -27,31 +25,31 @@ Author:
   </para>
 
   <para>&app;バージョン2.4
-    からは財務データを操作するために<application>Python</application>スクリプトを書くことができるようになりました。
+    からは財務データを操作するために<ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink>スクリプトを書くことができるようになりました。
   </para>
 
-  <note>
-    <para><application>Python</application>拡張はソースコードでのオプション機能です。
-      <application>Python</application>スクリプトを有効にするためには、<application>Python</application>拡張を有効にして&app;をコンパイルしなければいけません。そうでない場合は動作しません。
+  <important>
+    <para>&app-py;拡張はソースコードでのオプション機能です。
+      &app-py;スクリプトを有効にするためには、&app-py;拡張を有効にして&app;をコンパイルしなければいけません。そうでない場合は動作しません。
       現在のところこのオプションはデフォルトで無効です。必要な場合は&app;を自力でコンパイルしなければいけないかもしれません。
     </para>
-  </note>
+  </important>
 
-  <para><application>Python</application>拡張を使用するためには二つの準備ができていなければいけません。
+  <para>&app-py;拡張を使用するためには二つの準備ができていなければいけません。
     本章ではどのように使用するかについて説明します。
   </para>
 
-  <note>
-    <para>本章ではどのように<application>Python</application>スクリプトを書くかに関しては説明しません。
+  <tip>
+    <para>本章ではどのように&app-py;スクリプトを書くかに関しては説明しません。
       代わりに開発者向け文書を参照してください。
     </para>
-  </note>
+  </tip>
 
   <sect1 id="python-import-invoices">
     <title>得意先請求書または仕入先請求書のインポート</title>
 
     <para>インポートを動作させるには、データが固定フィールド、コンマ区切りのデータでなければいけません。
-      ダウンロードした注文を変換する<application>Python</application>スクリプト例を次に示します。
+      ダウンロードした注文を変換する&app-py;スクリプト例を次に示します。
     </para>
 
     <para><programlisting language="python" linenumbering="unnumbered">
@@ -96,7 +94,7 @@ line number,product code,quantity,availability,product description,unit price,di
       </programlisting>
     </para>
 
-    <para><application>Python</application>スクリプトで処理した後の同じファイルは次のようになります。
+    <para>&app-py;スクリプトで処理した後の同じファイルは次のようになります。
     </para>
 
     <para><programlisting language="python">
@@ -179,14 +177,14 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,,
     </para>
 
     <note>
-      <para><application>Python</application> (または他の利用可能な言語)
+      <para>&app-py; (または他の利用可能な言語)
         が分からない場合、<ulink
-url="&url-mail-li;gnucash-user"><citetitle>&appname;利用者メーリングリスト</citetitle></ulink>にダウンロードした<acronym>CSV</acronym>の例と併せて要望を投稿してください。誰かが変換用の<application>Python</application>スクリプトを書いてくれるかもしれません。
+url="&url-mail-li;gnucash-user"><citetitle>&appname;利用者メーリングリスト</citetitle></ulink>にダウンロードした<acronym>CSV</acronym>の例と併せて要望を投稿してください。誰かが変換用の&app-py;スクリプトを書いてくれるかもしれません。
       </para>
     </note>
 
     <sect2 id="python-author-notes">
-      <title><application>Python</application>作者への備考</title>
+      <title>&app-py;作者への備考</title>
 
       <para>インポートを成功させるには、フィールド数を守らなければいけません。よって行末にあるコンマの数も重要です。
       </para>
diff --git a/guide/pt/ch_python_bindings.xml b/guide/pt/ch_python_bindings.xml
index c7ffec99..2c0f2836 100644
--- a/guide/pt/ch_python_bindings.xml
+++ b/guide/pt/ch_python_bindings.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
 <!-- (Do not remove this comment block.)
-
 Version: 2.4.0
 Last modified: 2011-01-01
-
 Maintainers:
-
 Author:
-  Mike Evans <mikee at saxicola.co.uk>
-
-    Translators:
-    (translators put your name and email here)
+Mike Evans <mikee at saxicola.co.uk>
+Translators:
+(translators put your name and email here)
 -->
+<!-- Todo: Database backends offer read access;
+           Guile is also a sripting language perhaps its stand alone use should be explained here, too? -->
+<!-- Todo: after adding a procedure convert this page into a https://tdg.docbook.org/tdg/4.5/task.html -->
 <chapter id="ch_python_bindings">
   <title>Python Bindings</title>
 
@@ -28,20 +27,25 @@ Author:
     the other scripting language.
   </para>
 
-  <para>Starting with &app; version 2.4 you can write <application>Python</application> scripts to
-    manipulate your financial data.
+  <para>Starting with &app; version 2.4 you can write
+    <ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink> scripts to manipulate
+    your financial data.
   </para>
 
-  <note>
-    <para>The <application>Python</application> extensions are an optional feature in the source code. To be
-      able to use <application>Python</application> scripts, &app; must have been compiled with this
-      option enabled, otherwise all what follows won’t work. At present this option is not
-      enabled by default, so if you need this, you may have to compile &app; from source yourself.
+  <important>
+    <para>The &app-py; extensions are an optional feature which creates additional dependencies. To be able to
+      use &app-py; scripts, &app; must have been built with the <code language="sh">cmake
+      -DWITH_PYTHON=ON …</code> option enabled, otherwise all what follows won’t work. At
+      present this option is not enabled by default, so if you need this, you may have to compile
+      &app; from source yourself. But some distributions offer it also as a separate package with a
+      name like<package>
+        python[<replaceable>version</replaceable>]-&appname;
+      </package>
     </para>
-  </note>
+  </important>
 
-  <para>The <application>Python</application> extensions come with a couple of ready to use scripts. This
-    chapter will show you how to use some of these.
+  <para>The &app-py; extensions come with a couple of ready to use scripts. This chapter will show you how
+    to <emphasis>use</emphasis> some of them.
   </para>
 
   <note>
diff --git a/guide/ru/ch_python_bindings.xml b/guide/ru/ch_python_bindings.xml
index c7ffec99..34d8ddfe 100644
--- a/guide/ru/ch_python_bindings.xml
+++ b/guide/ru/ch_python_bindings.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
 <!-- (Do not remove this comment block.)
-
 Version: 2.4.0
 Last modified: 2011-01-01
-
 Maintainers:
-
 Author:
-  Mike Evans <mikee at saxicola.co.uk>
-
-    Translators:
-    (translators put your name and email here)
+Mike Evans <mikee at saxicola.co.uk>
+Translators:
+(translators put your name and email here)
 -->
+<!-- Todo: Database backends offer read access;
+           Guile is also a sripting language perhaps its stand alone use should be explained here, too? -->
+<!-- Todo: after adding a procedure convert this page into a https://tdg.docbook.org/tdg/4.5/task.html -->
 <chapter id="ch_python_bindings">
   <title>Python Bindings</title>
 
@@ -28,25 +27,31 @@ Author:
     the other scripting language.
   </para>
 
-  <para>Starting with &app; version 2.4 you can write <application>Python</application> scripts to
-    manipulate your financial data.
+  <para>Starting with &app; version 2.4 you can write
+    <ulink url="&url-wp-en;Python_(programming_language)">&app-py;</ulink> scripts to manipulate
+    your financial data.
   </para>
 
-  <note>
-    <para>The <application>Python</application> extensions are an optional feature in the source code. To be
-      able to use <application>Python</application> scripts, &app; must have been compiled with this
-      option enabled, otherwise all what follows won’t work. At present this option is not
-      enabled by default, so if you need this, you may have to compile &app; from source yourself.
+  <important>
+    <para>The &app-py; extensions are an optional feature which creates additional dependencies. To be able to
+      use &app-py; scripts, &app; must have been built with the <code language="sh">cmake
+      -DWITH_PYTHON=ON …</code> option enabled, otherwise all what follows won’t work. At
+      present this option is not enabled by default, so if you need this, you may have to compile
+      &app; from source yourself. But some distributions offer it also as a separate package with a
+      name like<package>
+        python[<replaceable>version</replaceable>]-&appname;
+      </package>
     </para>
-  </note>
+  </important>
 
-  <para>The <application>Python</application> extensions come with a couple of ready to use scripts. This
-    chapter will show you how to use some of these.
+  <para>The &app-py; extensions come with a couple of ready to use scripts. This chapter will show you how
+    to <emphasis>use</emphasis> some of them.
   </para>
 
-  <note>
-    <para>This chapter is not about how to write your own <application>Python</application> scripts. Refer to
-      the developer documentation for that instead.
+  <tip>
+    <para>This chapter is not about how to write your own &app-py; scripts. Refer to the
+      <ulink url="&url-doc-api-main;python_bindings_page.html">developer documentation</ulink> for
+      that instead.
     </para>
-  </note>
+  </tip>
 </chapter>

commit 6094099d095004ea150089f60cddef0e3dcca508
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Jul 14 20:04:47 2021 +0200

    Mark guides import chapter as outdated
    
    2 Davids had worked simultanous on the same file

diff --git a/guide/C/ch_importing.xml b/guide/C/ch_importing.xml
index be4d9a4b..d94b0386 100644
--- a/guide/C/ch_importing.xml
+++ b/guide/C/ch_importing.xml
@@ -20,6 +20,16 @@
   <sect1 id="importing-from-files">
     <title>Importing Transactions from Files</title>
 
+  <important>
+    <title>Outdated</title>
+
+    <para>This is an older version of
+      <ulink url="&url-docs-build-C;help/trans-import.html"><quote>Common Transaction
+      Operations</quote> in Help</ulink>. Better continue there until this update anomalie is
+      resolved.
+    </para>
+  </important>
+
     <para>Imported transactions will generally be to a specific account in your account tree. In the following
       this will be referred to as the <emphasis role="bold">import</emphasis> or
       <emphasis role="bold">base</emphasis> account. It may or may not be specified in the data

commit 43819db4e1d7a057b66f16ed1eef787965a278a0
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Jul 14 20:45:28 2021 +0900

    Replace hardcoded part names with xlinks.

diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index dd611604..c2e71cc6 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -357,24 +357,21 @@
 
     <para>This manual is organized into 3 main parts:<itemizedlist>
         <listitem>
-          <para><emphasis>Getting Started</emphasis>
-          </para>
+          <simpara><xref linkend="part.getting_started"/></simpara>
         </listitem>
 
         <listitem>
-          <para><emphasis>Managing Personal Finances</emphasis>
-          </para>
+          <simpara><xref linkend="part.managing_personal"/></simpara>
         </listitem>
 
         <listitem>
-          <para><emphasis>Managing Business Finances</emphasis>
-          </para>
+          <simpara><xref linkend="part.managing_business"/></simpara>
         </listitem>
       </itemizedlist>
     </para>
 
-    <para><emphasis>Getting Started</emphasis> provides you with the most basic information needed to begin
-      using &app;. The chapters in this section explain concepts that are fundamental to using
+    <para><xref linkend="part.getting_started"/> provides you with the most basic information needed to begin
+      using &app;. The chapters in this part explain concepts that are fundamental to using
       &app;. New users of &app; should familiarize themselves with the information in these chapters
       to get you up and running:<itemizedlist>
         <listitem>
@@ -404,7 +401,7 @@
       </itemizedlist>
     </para>
 
-    <para><emphasis>Managing Personal Finances</emphasis> addresses common applications and features of &app;
+    <para><xref linkend="part.managing_personal"/> addresses common applications and features of &app;
       in greater detail. You will see more specific cases, based on frequently asked questions about
       applying &app; to everyday situations. Here are the applications and features covered in this
       part:<itemizedlist>
@@ -440,7 +437,7 @@
       </itemizedlist>
     </para>
 
-    <para><emphasis>Managing Business Finances</emphasis> discusses the use of &app; in business accounting:<itemizedlist>
+    <para><xref linkend="part.managing_business"/> discusses the use of &app; in business accounting:<itemizedlist>
         <listitem>
           <para><xref linkend="chapter_bus_features"></xref>
           </para>
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 90f33e19..c627d9c5 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -602,7 +602,7 @@
 -->
   </preface>
 
-  <part>
+  <part id="part.getting_started">
     <title>Getting Started</title>
 
     <xi:include href="ch_oview.xml" />
@@ -614,7 +614,7 @@
     <xi:include href="ch_configuring.xml" />
   </part>
 
-  <part>
+  <part id="part.managing_personal">
     <title>Managing Personal Finances</title>
 
     <xi:include href="ch_cbook.xml" />
@@ -634,7 +634,7 @@
     <xi:include href="ch_currency.xml" />
   </part>
 
-  <part>
+  <part id="part.managing_business">
     <title>Managing Business Finances</title>
 
     <xi:include href="ch_bus_features.xml" />
@@ -650,7 +650,7 @@
     <xi:include href="ch_import_business_data.xml" />
   </part>
 
-  <part>
+  <part id="part.appendices">
     <title>Appendices</title>
 
     <xi:include href="gnc-glossary.xml" />

commit 913549d7ad5a0f1897ca6b6c79c16e7aeee59511
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Wed Jul 14 20:29:10 2021 +0900

    Replace starting balance with opening balance.
    Add comma to the numbers over 1000.

diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 547b2dd3..1d049d15 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -547,7 +547,7 @@
 
       <para>In the first transaction row, enter a date (e.g.: March, 1, 2006), a description (e.g.:
         <quote>Opening Balance</quote>), click on the <guilabel>Transfer</guilabel> pop-up menu and
-        select <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1000, and press
+        select <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1,000, and press
         the <keycap function="enter">Enter</keycap> key. The account register should now appear
         similar to this figure:
       </para>
@@ -564,14 +564,14 @@
           </textobject>
 
           <caption>
-            <para>This image shows <emphasis>Assets:Checking</emphasis> - Register after inserting a starting value
+            <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening balance
               transaction.
             </para>
           </caption>
         </mediaobject>
       </screenshot>
 
-      <para>Setting the starting balances of an account is an example of a simple two account transaction. In
+      <para>Setting the opening balances of an account is an example of a simple two account transaction. In
         this case, affecting the <emphasis>Assets:Checking</emphasis> and the
         <emphasis>Equity:Opening Balances</emphasis> accounts.
       </para>
@@ -1540,8 +1540,8 @@
       <para>As shown earlier in <xref linkend="txns-registers-twoaccount2"/> with the
         <emphasis>Assets:Checking</emphasis> account, the starting balances in an account are
         typically assigned to a special account called <emphasis>Equity:Opening Balance</emphasis>.
-        To start filling in this chart of account, begin by setting the starting balances for the
-        accounts. Assume that there is $1000 in the savings account and $500 charged on the credit
+        To start filling in this chart of accounts, begin by setting the opening balances for the
+        accounts. Assume that there is $1,000 in the savings account and $500 charged on the credit
         card.
       </para>
 
@@ -1556,7 +1556,7 @@
 
         <listitem>
           <para>From the <emphasis>Assets:Savings</emphasis> account register window, enter a basic 2 account
-            transaction to set your starting balance to $1000, transferred from
+            transaction to set your opening balance to $1,000, transferred from
             <emphasis>Equity:Opening Balance</emphasis>. Remember, basic transactions transfer money
             from a source account to a destination account. Record the transaction (press the
             <keycap function="enter">Enter</keycap> key, or click on the
@@ -1566,14 +1566,14 @@
 
         <listitem>
           <para>From the <emphasis>Assets:Checking</emphasis> account register window, enter a basic 2 account
-            transaction to set your starting balance to $1000, transferred from
+            transaction to set your opening balance to $1,000, transferred from
             <emphasis>Equity:Opening Balance</emphasis>.
           </para>
         </listitem>
 
         <listitem>
           <para>From the <emphasis>Liabilities:Visa</emphasis> account register window, enter a basic 2 account
-            transaction to set your starting balance to $500, transferred from
+            transaction to set your opening balance to $500, transferred from
             <emphasis>Equity:Opening Balance</emphasis>. This is done by entering the $500 as a
             <guilabel>charge</guilabel> in the <emphasis>Visa</emphasis> account (or
             <guilabel>decrease</guilabel> in the <emphasis>Opening Balance</emphasis> account),
@@ -1693,11 +1693,10 @@
             the description of this transaction on the first line (e.g.: <quote>Employers R
             Us</quote>), as well as the date (14 March). In the <quote>split</quote> line below
             this, enter the deposit into <emphasis>Assets:Checking</emphasis> (e.g.:$670). Follow
-            this with the various tax deposits (<emphasis>Assets:Checking</emphasis> (e.g.: $670),
-            <emphasis>Expenses:Taxes:Federal</emphasis> account (e.g.: $180),
+            this with the various tax deposits (<emphasis>Expenses:Taxes:Federal</emphasis> account (e.g.: $180),
             <emphasis>Expenses:Taxes:Medicare</emphasis> account (e.g.: $90), and
             <emphasis>Expenses:Taxes:Social Security</emphasis> account (e.g.: $60)) and lastly the
-            gross total of your paycheck (e.g.: $1000) as a withdrawal transfer from
+            gross total of your paycheck (e.g.: $1,000) as a withdrawal transfer from
             <emphasis>Income:Salary</emphasis>.
           </para>
         </listitem>

commit d989dc0d8c6eedda0eacc997ebd2dbab180f9813
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Jul 11 19:17:09 2021 +0200

    Bug 798236 - Remove comment about swapped A/P & A/R terminology
    
    for all languages except de, where it was already fixed in the recent
    translation process

diff --git a/help/C/Help_ch_Account-Actions.xml b/help/C/Help_ch_Account-Actions.xml
index 6a665872..857fd7e6 100644
--- a/help/C/Help_ch_Account-Actions.xml
+++ b/help/C/Help_ch_Account-Actions.xml
@@ -82,11 +82,6 @@
               <para>Accounts Payable are used by businesses to record amounts that must be paid. Example: The business
                 has bought something, but the business has not paid the bill until later.
               </para>
-
-              <note>
-                <para>Previous versions of this help defined A/P and A/R the other way round.
-                </para>
-              </note>
             </entry>
           </row>
 
@@ -100,11 +95,6 @@
               <para>Accounts Receivable records amounts for which money has not yet been received. Example: A business
                 has sold something and issued a bill, but the client has not payed until later.
               </para>
-
-              <note>
-                <para>Previous versions of this help defined A/P and A/R the other way round.
-                </para>
-              </note>
             </entry>
           </row>
 
diff --git a/help/it/gnucash-help.xml b/help/it/gnucash-help.xml
index d5089760..0296decc 100644
--- a/help/it/gnucash-help.xml
+++ b/help/it/gnucash-help.xml
@@ -9329,11 +9329,6 @@
                   registrare gli importi che devono essere pagati. Esempio: l’impresa ha
                   comprato un bene, ma non ha pagato la ricevuta fino a ora.
                 </para>
-
-                <note>
-                  <para>Le versioni precedenti di questo aiuto definivano D/C e C/C al contrario.
-                  </para>
-                </note>
               </entry>
             </row>
 
@@ -9348,11 +9343,6 @@
                   ricevuto. Esempio: un’impresa ha venduto un bene ed ha emesso una fattura ma
                   il cliente non ha pagato fino a ora.
                 </para>
-
-                <note>
-                  <para>Le versioni precedenti di questo aiuto definivano D/C e C/C al contrario.
-                  </para>
-                </note>
               </entry>
             </row>
 
diff --git a/help/pt/Help_ch_Account-Actions.xml b/help/pt/Help_ch_Account-Actions.xml
index deb2e273..e24647e8 100644
--- a/help/pt/Help_ch_Account-Actions.xml
+++ b/help/pt/Help_ch_Account-Actions.xml
@@ -82,11 +82,6 @@
               <para>Contas pagáveis são usadas por empresas para registar montantes que têm de ser pagos. Exemplo: a
                 empresa comprou algo que só vai ser pago mais tarde.
               </para>
-
-              <note>
-                <para>Versões anteriores desta ajuda definiam C/P e C/R de forma inversa.
-                </para>
-              </note>
             </entry>
           </row>
 
@@ -100,11 +95,6 @@
               <para>Contas cobráveis registam montantes para os quais o dinheiro ainda não foi recebido. Exemplo: a
                 empresa vendeu algo que o cliente ainda não pagou.
               </para>
-
-              <note>
-                <para>Versões anteriores desta ajuda definiam C/P e C/R de forma inversa.
-                </para>
-              </note>
             </entry>
           </row>
 

commit 389b357e8fa208dacec89da85ceeffca017be25a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 5 21:21:40 2021 +0200

    Minor improvements in C and de Help Tips on alphavantage

diff --git a/help/C/Help_tips-appendix.xml b/help/C/Help_tips-appendix.xml
index 37700ced..0bb0ab55 100644
--- a/help/C/Help_tips-appendix.xml
+++ b/help/C/Help_tips-appendix.xml
@@ -136,6 +136,10 @@
                   <orderedlist spacing="compact">
                     <listitem>
                       <para>register at <ulink url="&url-av;"/> and
+                        <important>
+                          <para>Watch the restrictions of the Free API Key in their FAQ!
+                          </para>
+                        </important>
                       </para>
                     </listitem>
 
@@ -157,7 +161,7 @@
                         command shell.
                         <example>
                           <title>Environment variable in <filename>.bashrc</filename></title>
-<screen>export ALPHAVANTAGE_API_KEY=<replaceable>##############</replaceable></screen>
+<programlisting language="bash">export ALPHAVANTAGE_API_KEY=<replaceable>##############</replaceable></programlisting>
                         </example>
                       </para>
                     </listitem>
diff --git a/help/de/Help_tips-appendix.xml b/help/de/Help_tips-appendix.xml
index f8def797..358a934a 100644
--- a/help/de/Help_tips-appendix.xml
+++ b/help/de/Help_tips-appendix.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE appendix SYSTEM "gnc-docbookx.dtd">
-<!--
-      (Do not remove this comment block.)
+<!-- (Do not remove this comment block.)
   Version: 2.6.20
    Last modified: see <releaseinfo>
         modified: September 21th 2012
@@ -30,7 +29,7 @@
     </releaseinfo>
   </appendixinfo>
 
-  <title>&app;Tips und Tricks</title>
+  <title>&app; Tips Und Tricks</title>
 
   <abstract>
     <para>Dieses Kapiel enthält einige Hintergrundinformation zu <application>Finance::Quote</application>.
@@ -136,7 +135,11 @@
                 <para>Sie müssen
                   <orderedlist spacing="compact">
                     <listitem>
-                      <para>sich auf<ulink url="&url-av;"/>registrieren und
+                      <para>sich auf <ulink url="&url-av;"/> registrieren und
+                        <important>
+                          <para>Beachten Sie die Einschränkungen des kostenlosen Schlüssels in der dortigen FAQ.
+                          </para>
+                        </important>
                       </para>
                     </listitem>
 
@@ -157,10 +160,11 @@
                       <para>Um ihn auch mit <command>gnc-fq-<replaceable>*</replaceable></command> Befehlen zu verwenden,
                         müssen Sie ihn auch in einer <emphasis>Umgebungsvariable</emphasis>
                         <envar>ALPHAVANTAGE_API_KEY</envar> setzen. Ziehen Sie dazu die
-                        Dokumentation Ihres Betriebssystems oder Befehlszeileninterpreters zu Rate.
+                        Dokumentation Ihres Betriebssystems oder Befehlszeileninterpreters zu Rate,
+                        wie Sie das dauerhaft erreichen.
                         <example>
                           <title>Umgebungsvariable in <filename>.bashrc</filename></title>
-<screen>export ALPHAVANTAGE_API_KEY=<replaceable>##############</replaceable></screen>
+<programlisting language="bash">export ALPHAVANTAGE_API_KEY=<replaceable>##############</replaceable></programlisting>
                         </example>
                       </para>
                     </listitem>

commit e02cf7fc40c48d7306cecf7900afd7f5b03a72a3
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Jul 8 00:19:53 2021 +0200

    L10N:de:Help: Image optimization (again)

diff --git a/help/de/figures/Help_AccountTreeCreate.png b/help/de/figures/Help_AccountTreeCreate.png
index 8a5ff157..65cc0fe0 100644
Binary files a/help/de/figures/Help_AccountTreeCreate.png and b/help/de/figures/Help_AccountTreeCreate.png differ
diff --git a/help/de/figures/Help_Book_Options_Accounts.png b/help/de/figures/Help_Book_Options_Accounts.png
index 001ea423..a30ad4b6 100644
Binary files a/help/de/figures/Help_Book_Options_Accounts.png and b/help/de/figures/Help_Book_Options_Accounts.png differ
diff --git a/help/de/figures/Help_Book_Options_Budgeting.png b/help/de/figures/Help_Book_Options_Budgeting.png
index 7cdeab00..713ca0b7 100644
Binary files a/help/de/figures/Help_Book_Options_Budgeting.png and b/help/de/figures/Help_Book_Options_Budgeting.png differ
diff --git a/help/de/figures/Help_Book_Options_Business.png b/help/de/figures/Help_Book_Options_Business.png
index 59b5dd18..44c08fd6 100644
Binary files a/help/de/figures/Help_Book_Options_Business.png and b/help/de/figures/Help_Book_Options_Business.png differ
diff --git a/help/de/figures/Help_Book_Options_Counters.png b/help/de/figures/Help_Book_Options_Counters.png
index 15c4bf90..c7d1ddf4 100644
Binary files a/help/de/figures/Help_Book_Options_Counters.png and b/help/de/figures/Help_Book_Options_Counters.png differ
diff --git a/help/de/figures/Help_Book_Options_Tax.png b/help/de/figures/Help_Book_Options_Tax.png
index 1ddd4f24..16709ac2 100644
Binary files a/help/de/figures/Help_Book_Options_Tax.png and b/help/de/figures/Help_Book_Options_Tax.png differ
diff --git a/help/de/figures/Help_CSV_Import_transactions_Preview.png b/help/de/figures/Help_CSV_Import_transactions_Preview.png
index d31a4e45..60d1b67f 100644
Binary files a/help/de/figures/Help_CSV_Import_transactions_Preview.png and b/help/de/figures/Help_CSV_Import_transactions_Preview.png differ
diff --git a/help/de/figures/Help_CSV_Transaction_Import_Assistant.png b/help/de/figures/Help_CSV_Transaction_Import_Assistant.png
index 66559dff..045b9625 100644
Binary files a/help/de/figures/Help_CSV_Transaction_Import_Assistant.png and b/help/de/figures/Help_CSV_Transaction_Import_Assistant.png differ
diff --git a/help/de/figures/Help_Choose_Export_Settings.png b/help/de/figures/Help_Choose_Export_Settings.png
index dfb14fb2..6b80809c 100644
Binary files a/help/de/figures/Help_Choose_Export_Settings.png and b/help/de/figures/Help_Choose_Export_Settings.png differ
diff --git a/help/de/figures/Help_Import_Map_Editor.png b/help/de/figures/Help_Import_Map_Editor.png
index efc408a3..1930093e 100644
Binary files a/help/de/figures/Help_Import_Map_Editor.png and b/help/de/figures/Help_Import_Map_Editor.png differ
diff --git a/help/de/figures/Help_Import_MatchPicker.png b/help/de/figures/Help_Import_MatchPicker.png
index 3c0563ef..a6335964 100644
Binary files a/help/de/figures/Help_Import_MatchPicker.png and b/help/de/figures/Help_Import_MatchPicker.png differ
diff --git a/help/de/figures/Help_Pref_AccntPeriod.png b/help/de/figures/Help_Pref_AccntPeriod.png
index 5d2576ce..4be423b3 100644
Binary files a/help/de/figures/Help_Pref_AccntPeriod.png and b/help/de/figures/Help_Pref_AccntPeriod.png differ
diff --git a/help/de/figures/Help_Pref_Accnts.png b/help/de/figures/Help_Pref_Accnts.png
index a927ad69..e38fe510 100644
Binary files a/help/de/figures/Help_Pref_Accnts.png and b/help/de/figures/Help_Pref_Accnts.png differ
diff --git a/help/de/figures/Help_Pref_Business.png b/help/de/figures/Help_Pref_Business.png
index 0ddaf875..d7cc0f67 100644
Binary files a/help/de/figures/Help_Pref_Business.png and b/help/de/figures/Help_Pref_Business.png differ
diff --git a/help/de/figures/Help_Pref_DateTime.png b/help/de/figures/Help_Pref_DateTime.png
index 338c05be..a585f3a8 100644
Binary files a/help/de/figures/Help_Pref_DateTime.png and b/help/de/figures/Help_Pref_DateTime.png differ
diff --git a/help/de/figures/Help_Pref_General.png b/help/de/figures/Help_Pref_General.png
index ddf7f986..b8e29a1c 100644
Binary files a/help/de/figures/Help_Pref_General.png and b/help/de/figures/Help_Pref_General.png differ
diff --git a/help/de/figures/Help_Pref_Import.png b/help/de/figures/Help_Pref_Import.png
index 1cf370ff..17c5eeb9 100644
Binary files a/help/de/figures/Help_Pref_Import.png and b/help/de/figures/Help_Pref_Import.png differ
diff --git a/help/de/figures/Help_Pref_OnlineBanking.png b/help/de/figures/Help_Pref_OnlineBanking.png
index 551f9c81..905267d3 100644
Binary files a/help/de/figures/Help_Pref_OnlineBanking.png and b/help/de/figures/Help_Pref_OnlineBanking.png differ
diff --git a/help/de/figures/Help_Pref_Printing.png b/help/de/figures/Help_Pref_Printing.png
index 7cfb0a2d..f87d6e66 100644
Binary files a/help/de/figures/Help_Pref_Printing.png and b/help/de/figures/Help_Pref_Printing.png differ
diff --git a/help/de/figures/Help_Pref_Quotes.png b/help/de/figures/Help_Pref_Quotes.png
index 483b794a..71d7d7a0 100644
Binary files a/help/de/figures/Help_Pref_Quotes.png and b/help/de/figures/Help_Pref_Quotes.png differ
diff --git a/help/de/figures/Help_Pref_Register.png b/help/de/figures/Help_Pref_Register.png
index 4e5bd1fc..9b1a58be 100644
Binary files a/help/de/figures/Help_Pref_Register.png and b/help/de/figures/Help_Pref_Register.png differ
diff --git a/help/de/figures/Help_Pref_RegisterDefaults.png b/help/de/figures/Help_Pref_RegisterDefaults.png
index c7eb3c22..7e56a867 100644
Binary files a/help/de/figures/Help_Pref_RegisterDefaults.png and b/help/de/figures/Help_Pref_RegisterDefaults.png differ
diff --git a/help/de/figures/Help_Pref_Reports.png b/help/de/figures/Help_Pref_Reports.png
index 6d7d673f..de07d9d8 100644
Binary files a/help/de/figures/Help_Pref_Reports.png and b/help/de/figures/Help_Pref_Reports.png differ
diff --git a/help/de/figures/Help_Pref_Sched.png b/help/de/figures/Help_Pref_Sched.png
index 63585e6b..f97809a9 100644
Binary files a/help/de/figures/Help_Pref_Sched.png and b/help/de/figures/Help_Pref_Sched.png differ
diff --git a/help/de/figures/Help_Pref_Windows.png b/help/de/figures/Help_Pref_Windows.png
index 17b80c21..f5cd63b6 100644
Binary files a/help/de/figures/Help_Pref_Windows.png and b/help/de/figures/Help_Pref_Windows.png differ
diff --git a/help/de/figures/Help_Trans_Assoc_Dialog.png b/help/de/figures/Help_Trans_Assoc_Dialog.png
index b9e7fe13..16c07b1f 100644
Binary files a/help/de/figures/Help_Trans_Assoc_Dialog.png and b/help/de/figures/Help_Trans_Assoc_Dialog.png differ
diff --git a/help/de/figures/main-window-small.png b/help/de/figures/main-window-small.png
index 201b0f37..c38899e6 100644
Binary files a/help/de/figures/main-window-small.png and b/help/de/figures/main-window-small.png differ

commit 3f49e6c1fb5248e47c8c6fee6a63585e30078187
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Jul 8 00:18:15 2021 +0200

    L10N:de:Help: Main-window-callouts.png Registerkarte -> Reiter

diff --git a/help/de/figures/Main-window-callouts.png b/help/de/figures/Main-window-callouts.png
index a0eb4a81..4c05574e 100644
Binary files a/help/de/figures/Main-window-callouts.png and b/help/de/figures/Main-window-callouts.png differ
diff --git a/help/de/figures/Main-window-callouts.xcf b/help/de/figures/Main-window-callouts.xcf
index f7c9e238..59786adc 100644
Binary files a/help/de/figures/Main-window-callouts.xcf and b/help/de/figures/Main-window-callouts.xcf differ

commit 8e69f7c895a87d09314460668eccf8f01d9e2509
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Jul 6 20:29:19 2021 +0200

    L10N:de:Help: Verbessere Titel von GUI-Menus

diff --git a/help/de/Help_ch_GUIMenus.xml b/help/de/Help_ch_GUIMenus.xml
index 7401fea3..bddbcd4c 100644
--- a/help/de/Help_ch_GUIMenus.xml
+++ b/help/de/Help_ch_GUIMenus.xml
@@ -3263,8 +3263,9 @@
   </sect1>
 
   <sect1 id="gui-acct-reg">
-    <title>Kontobuch/ Journal</title>
-
+    <title>Ansicht von Konten und Journal</title>
+<!-- Fixme: 1. Journal noch nicht eingeführt,
+            2. wäre nicht Kontenblatt angemessener als Kontobuch? -->
     <figure>
       <title>Das <emphasis>Kontobuch</emphasis> Fenster.</title><screenshot id="AccountReg_Screen">
         <mediaobject>

commit 6dfa95a73ecdd46801eb7d1a34c1b49749fe51d2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jul 5 22:00:48 2021 +0200

    Bug 798226 postprocessing: xmlformat

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 97ba1273..fd6486b9 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -274,8 +274,7 @@ Translators:
           </para>
 
           <para>Transactions involving an Accounts Payable account should not be added, changed or deleted in any
-            way other than by using
-            <itemizedlist>
+            way other than by using<itemizedlist>
               <listitem>
                 <para>post/unpost bill/invoice/voucher or
                 </para>
@@ -373,11 +372,9 @@ Translators:
 
       <para>Below are the standard <guilabel>Income</guilabel> and <guilabel>Expense</guilabel> accounts after
         selecting <guilabel>Common Accounts</guilabel> in the assistant for creating a new Account
-        Hierarchy (
-        <menuchoice>
+        Hierarchy (<menuchoice>
           <guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</guimenuitem>
-        </menuchoice>
-        ).
+        </menuchoice>).
       </para>
 
       <screenshot id="accts-DefaultIncomeAccounts">
@@ -475,22 +472,16 @@ Translators:
         highly recommended that you always begin this way.
       </para>
 
-      <para>Start with a clean &app; file by selecting
-        <menuchoice>
+      <para>Start with a clean &app; file by selecting <menuchoice>
           <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
-        </menuchoice>
-        from the menu. The <guilabel>New Account Hierarchy Setup</guilabel> assistant will start.
-        Press <guibutton>Cancel</guibutton> to close the assistant as we don’t want to use one
-        of the predefined accounts structure; instead we will build a basic starting account
-        structure from scratch. In the empty &app; window select
-        <menuchoice>
+        </menuchoice> from the menu. The <guilabel>New Account Hierarchy Setup</guilabel> assistant will start.
+        Press <guibutton>Cancel</guibutton> to close the assistant as we don’t want to use one of
+        the predefined accounts structure; instead we will build a basic starting account structure
+        from scratch. In the empty &app; window select <menuchoice>
           <guimenu>View</guimenu><guimenuitem>New Accounts Page</guimenuitem>
-        </menuchoice>
-        from the menu: the <guilabel>Accounts</guilabel> tab will open. Finally select
-        <menuchoice>
+        </menuchoice> from the menu: the <guilabel>Accounts</guilabel> tab will open. Finally select <menuchoice>
           <guimenu>Actions</guimenu><guimenuitem>New Account...</guimenuitem>
-        </menuchoice>
-        .
+        </menuchoice>.
       </para>
 
       <para>Now you are ready to build this basic starting account structure
@@ -578,13 +569,11 @@ Translators:
       </para>
 
       <tip>
-        <para>Instead of selecting
-          <menuchoice>
+        <para>Instead of selecting <menuchoice>
             <guimenu>Actions</guimenu><guimenuitem>New Account...</guimenuitem>
-          </menuchoice>
-          from the menu, you can alternatively create a new sub-account of an account by right
-          clicking on the main account’s name and selecting the <guilabel>New
-          Account...</guilabel> entry. This will open a dialog similar to the one depicted in
+          </menuchoice> from the menu, you can alternatively create a new sub-account of an account by right clicking on the
+          main account’s name and selecting the <guilabel>New Account...</guilabel> entry.
+          This will open a dialog similar to the one depicted in
           <xref linkend="accts-examples-toplevel2" /> where the new sub-account will be already set
           as a child of the main account.
         </para>
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 7fbeb9a1..336cd867 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -480,7 +480,7 @@ Translators:
 
       <para>The <emphasis>New Account Hierarchy Setup</emphasis> assistant helps you to create a set of &app;
         accounts. It will appear if you choose <guibutton>Create a new set of accounts</guibutton>
-        in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select<menuchoice>
+        in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select <menuchoice>
           <shortcut>
           <keycombo>
             <keycap>Strg</keycap><keycap>N</keycap>
@@ -488,7 +488,7 @@ Translators:
           </shortcut> <guimenu><accel>F</accel>ile</guimenu><guimenuitem><accel>N</accel>ew
           File</guimenuitem>
         </menuchoice>. You may also use it to add a section of accounts to an existing book from the
-        <guilabel>Accounts</guilabel> page by selecting<menuchoice>
+        <guilabel>Accounts</guilabel> page by selecting <menuchoice>
           <guimenu><accel>A</accel>ction</guimenu><guimenuitem>New Account
           Hierarchy…</guimenuitem>
         </menuchoice>.
@@ -507,7 +507,7 @@ Translators:
         <listitem>
           <para><guilabel>New Book Options</guilabel> appears only when creating a new book. Here you set various
             book attributes. This page has four tabs: Accounts, Budgeting, Business, and Counters.
-            These items are explained elsewhere in the Guide, and can be changed at any time from<menuchoice>
+            These items are explained elsewhere in the Guide, and can be changed at any time from <menuchoice>
               <shortcut>
               <keycombo>
                 <keycap>Strg</keycap><keycap>Enter</keycap>
@@ -581,8 +581,8 @@ Translators:
                   opening balance.<note>
                     <para><guilabel>Opening Balance</guilabel> entry isn't obvious until you click in it. You must move out of
                       the entry by clicking somewhere or by pressing <keycap>Tab</keycap> or
-                      <keycap>Enter</keycap> before clicking <guibutton>Next</guibutton> or your entry
-                      will be discarded.
+                      <keycap>Enter</keycap> before clicking <guibutton>Next</guibutton> or your
+                      entry will be discarded.
                     </para>
                   </note>
                 </para>
@@ -652,9 +652,9 @@ Translators:
       <title>Account Tree Window</title>
 
       <para>You should now see the <guilabel>Accounts</guilabel> window, which appears as shown below. The exact
-        layout of the account tree will depend on which default accounts you selected during the <guilabel>New
-        Account Hierarchy Setup</guilabel>. In this example, the <guilabel>Common Accounts</guilabel> are
-        shown.
+        layout of the account tree will depend on which default accounts you selected during the
+        <guilabel>New Account Hierarchy Setup</guilabel>. In this example, the <guilabel>Common
+        Accounts</guilabel> are shown.
       </para>
 
       <screenshot id="basics-Accounts">
@@ -890,17 +890,17 @@ Translators:
 
       <para>&app; offers several formats for storing your financial data. The default file storage format is
         <acronym>XML</acronym>, while <acronym>SQL</acronym> storage is available in SQLite, MySQL,
-        and PostgreSQL formats. Users can choose a file format for new files from<menuchoice>
+        and PostgreSQL formats. Users can choose a file format for new files from <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save</guimenuitem>
-        </menuchoice>and for existing files from<menuchoice>
+        </menuchoice> and for existing files from <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
-        </menuchoice>dialogs.
+        </menuchoice> dialogs.
       </para>
 
       <para>The <acronym>XML</acronym> storage format is a text file that by default is compressed, which is a
-        preference that is set at<menuchoice>
+        preference that is set at <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-        </menuchoice><guilabel>General</guilabel> <guilabel>Compress files</guilabel>. SQLite storage is also available,
+        </menuchoice> <guilabel>General</guilabel> <guilabel>Compress files</guilabel>. SQLite storage is also available,
         and stores your data in a single file on your system, like the <acronym>XML</acronym>
         format. However, internally, an SQLite file is managed as a database. The MySQL and
         PostgreSQL storage options require access to a MySQL or PostgreSQL database server and the
@@ -908,7 +908,7 @@ Translators:
       </para>
 
       <tip>
-        <para>Users can change the format at any time by using<menuchoice>
+        <para>Users can change the format at any time by using <menuchoice>
             <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
           </menuchoice>. This will create a copy of the data file in the selected format.
         </para>
@@ -1118,7 +1118,7 @@ Translators:
 
       <orderedlist>
         <listitem>
-          <para>From the &app; <emphasis>Menubar</emphasis>, choose<menuchoice>
+          <para>From the &app; <emphasis>Menubar</emphasis>, choose <menuchoice>
               <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
             </menuchoice>. The <guilabel>New Account Hierarchy setup</guilabel> assistant will start.
           </para>
@@ -1147,9 +1147,9 @@ Translators:
 
       <orderedlist>
         <listitem>
-          <para>Choose<menuchoice>
+          <para>Choose <menuchoice>
               <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
-            </menuchoice>from the <emphasis>Menubar</emphasis> or select the <guibutton>Save</guibutton>
+            </menuchoice> from the <emphasis>Menubar</emphasis> or select the <guibutton>Save</guibutton>
             <emphasis>Toolbar</emphasis> button. &app; will bring up the save window.
           </para>
         </listitem>
@@ -1284,16 +1284,16 @@ Translators:
         need more than one file.
       </para>
 
-      <para>Before ending each &app; session, be sure to save your data changes using<menuchoice>
+      <para>Before ending each &app; session, be sure to save your data changes using <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save</guimenuitem>
-        </menuchoice>or the <guibutton>Save</guibutton> <emphasis>Toolbar</emphasis> button.<note>
+        </menuchoice> or the <guibutton>Save</guibutton> <emphasis>Toolbar</emphasis> button.<note>
           <para>As it is very important to save your data frequently to avoid losing them for whatever reason, &app;
             is able to automatically save the opened file every a certain amount of time. This
-            interval can be set in the <guilabel>General</guilabel> tab under<menuchoice>
+            interval can be set in the <guilabel>General</guilabel> tab under <menuchoice>
               <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-            </menuchoice>(<menuchoice>
+            </menuchoice> (<menuchoice>
               <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
-            </menuchoice>on &mac;). Keep in mind that this option is relevant only if you are saving in
+            </menuchoice> on &mac;). Keep in mind that this option is relevant only if you are saving in
             <acronym>XML</acronym> format. If you are working with a database, the
             <guibutton>Save</guibutton> button and the <guimenuitem>Save</guimenuitem> menu entry
             will be grayed out because changes are stored right away.
@@ -1305,9 +1305,9 @@ Translators:
     <sect2 id="basics-open-data">
       <title>Opening data</title>
 
-      <para>To open an existing file or database, select<menuchoice>
+      <para>To open an existing file or database, select <menuchoice>
           <guimenu>File</guimenu><guimenuitem>Open</guimenuitem>
-        </menuchoice>from the menu. In the window that will open, select the <guilabel>Data Format</guilabel>. If you
+        </menuchoice> from the menu. In the window that will open, select the <guilabel>Data Format</guilabel>. If you
         selected <guilabel>File</guilabel> choose the file you want to open by browsing the folders
         in the lower panes. Else, enter the required <guilabel>Database Connection</guilabel>
         information.
@@ -1330,7 +1330,7 @@ Translators:
         to close your books at the end of the year and begin each year with a fresh set of books.
       </para>
 
-      <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting<menuchoice>
+      <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting <menuchoice>
           <guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export
           Accounts</guimenuitem>
         </menuchoice>. When you select this command, you are asked to provide the name for the new empty file, and &app;
@@ -1413,10 +1413,10 @@ Translators:
         </listitem>
 
         <listitem>
-          <para>Go to<menuchoice>
+          <para>Go to <menuchoice>
               <guimenu>File</guimenu><guisubmenu>Import</guisubmenu><guimenuitem>Replay &appname;
               .log file</guimenuitem>
-            </menuchoice>and select the one .log file with the same date as the saved file you just opened. Make sure that
+            </menuchoice> and select the one .log file with the same date as the saved file you just opened. Make sure that
             you picked the right .log file, or you will possibly wreak havoc in your accounts.
           </para>
         </listitem>
@@ -1485,11 +1485,11 @@ Translators:
         <para>By default &app; will automatically delete any <filename>.log</filename> and
           <filename>.YYYYMMDDHHMMSS.gnucash</filename> backup files that are older than 30 days. You
           can change this behavior in the &app; preferences in the <guilabel>General</guilabel> tab
-          under<menuchoice>
+          under <menuchoice>
             <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-          </menuchoice>(<menuchoice>
+          </menuchoice> (<menuchoice>
             <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
-          </menuchoice>on &mac;).
+          </menuchoice> on &mac;).
         </para>
       </note>
     </sect2>
@@ -1723,9 +1723,9 @@ Translators:
 
     <orderedlist>
       <listitem>
-        <para>First, let’s create a file to store your real data. Open &app; and select<menuchoice>
+        <para>First, let’s create a file to store your real data. Open &app; and select <menuchoice>
             <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
-          </menuchoice>from the <emphasis>Menubar</emphasis>. This will start the <guilabel>New Account Hierarchy
+          </menuchoice> from the <emphasis>Menubar</emphasis>. This will start the <guilabel>New Account Hierarchy
           Setup</guilabel> assistant that allows you to create several accounts at once.
         </para>
 
@@ -1764,7 +1764,7 @@ Translators:
       <listitem>
         <para>In the second screen, set the <guilabel>New Book Options</guilabel> on the different tabs, then
           press the <guibutton>Forward</guibutton> button. You can also update these options later
-          using<menuchoice>
+          using <menuchoice>
             <guimenu>File </guimenu><guimenuitem>Properties</guimenuitem>
           </menuchoice>. For details of these options, see the &app; Help manual, chapter Customizing GnuCash, Book
           Options.
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 0b0d23fe..547b2dd3 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -84,39 +84,33 @@
       <para>&app; offers several options for viewing your registers. The default style is <guilabel>Basic
         Ledger</guilabel> mode, which displays only the summary of splits affecting the current
         account. This is the style that most closely resembles other popular personal financial
-        packages. You can choose a different register style from the
-        <menuchoice>
+        packages. You can choose a different register style from the <menuchoice>
           <guimenu>View</guimenu>
-        </menuchoice>
-        menu. There are two other view modes:
+        </menuchoice> menu. There are two other view modes:
       </para>
 
       <itemizedlist>
         <listitem>
           <para><menuchoice>
               <guimenu>View</guimenu><guimenuitem>Auto-Split Ledger</guimenuitem>
-            </menuchoice>
-            style expands the current transaction automatically. As you highlight a new transaction
-            in the register, the transaction automatically expands to show all splits.
+            </menuchoice> style expands the current transaction automatically. As you highlight a new transaction in the
+            register, the transaction automatically expands to show all splits.
           </para>
         </listitem>
 
         <listitem>
           <para><menuchoice>
               <guimenu>View</guimenu><guimenuitem>Transaction Journal</guimenuitem>
-            </menuchoice>
-            style shows all splits for all transactions in the register, which is more like an
-            accounting journal.
+            </menuchoice> style shows all splits for all transactions in the register, which is more like an accounting
+            journal.
           </para>
         </listitem>
       </itemizedlist>
 
-      <para>All styles permit you to view your data in either single-line or double-line format. Select
-        <menuchoice>
+      <para>All styles permit you to view your data in either single-line or double-line format. Select <menuchoice>
           <guimenu>View</guimenu> <guimenuitem>Double Line</guimenuitem>
-        </menuchoice>
-        , and you will see your transaction line expand to two register lines. Double-line mode will
-        also display the transaction-level Notes field.
+        </menuchoice>, and you will see your transaction line expand to two register lines. Double-line mode will also
+        display the transaction-level Notes field.
       </para>
 
       <para>Below are screenshots that demonstrate how the Basic Ledger and Transaction Journal views differ.
@@ -204,8 +198,8 @@
       <title>Setting Column Widths</title>
 
       <para>As with most spreadsheet-like displays the columns in the register can be resized by left-clicking
-        and dragging the dividers in the header. The divider to the <emphasis>right</emphasis> of the
-        column header controls the width of that column. In &app; the
+        and dragging the dividers in the header. The divider to the <emphasis>right</emphasis> of
+        the column header controls the width of that column. In &app; the
         <guilabel>Description</guilabel> and <guilabel>Memo</guilabel> columns autosize to fit the
         register into the window so dragging those columns' dividers to the left will shrink the
         column but it will snap back when you release it. Dragging them to the right will widen the
@@ -294,13 +288,11 @@
               automatically append the year. The default this to take such a date in a sliding
               window starting 11 months before the current month. This means that if you enter 1/5
               (January 5th) as date while the current date is in December 2015, the date will be
-              completed as 1/5/16. This default can be changed via
-              <menuchoice>
+              completed as 1/5/16. This default can be changed via <menuchoice>
                 <guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu><guisubmenu>Date/Time</guisubmenu>
                 <guilabel>Date Completion</guilabel>
-              </menuchoice>
-              . You can change it to either always evaluate a date in the current calendar year or
-              change the start of the sliding window.
+              </menuchoice>. You can change it to either always evaluate a date in the current calendar year or change the
+              start of the sliding window.
             </para>
           </tip>
         </listitem>
@@ -322,15 +314,12 @@
             completions. When you <keycap>Tab</keycap> with the offered completion text shown &app;
             will copy that previous transaction and focus the <guilabel>Debit</guilabel> or
             <guilabel>Credit</guilabel> value used, selected and ready for you to overwrite it with
-            a new value.
-            <note>
+            a new value.<note>
               <para>This copies the <emphasis>whole transaction</emphasis> including parts that may not be visible like
                 <guilabel>Notes</guilabel> and <guilabel>Price</guilabel>. Unless you intend to
                 exactly duplicate the transaction be sure to edit all fields that should differ.
               </para>
-            </note>
-
-            <tip>
+            </note><tip>
               <para>You can use this feature to fill in the transaction then go back to the
                 <guilabel>Description</guilabel> field and change the description.
               </para>
@@ -364,14 +353,11 @@
         <listitem>
           <para>All of the menu items have access keys defined, and these are marked by underlined characters in the
             menu names. Press <keycap>Alt</keycap> + [underlined character] to bring up the menu,
-            then select an item by typing its underlined character. For example, typing
-            <keycombo>
+            then select an item by typing its underlined character. For example, typing<keycombo>
               <keycap>Alt</keycap> <keycap>A</keycap>
-            </keycombo>
-            brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A
-            few of the menu items also have shortcut keys that immediately invoke the command
-            (typically using the <keycap>Ctrl</keycap> key). These shortcuts are listed next to the
-            item.
+            </keycombo>brings up the Actions menu, then typing <keycap>P</keycap> will split the transaction. A few of the
+            menu items also have shortcut keys that immediately invoke the command (typically using
+            the <keycap>Ctrl</keycap> key). These shortcuts are listed next to the item.
           </para>
         </listitem>
 
@@ -381,11 +367,9 @@
 
           <itemizedlist>
             <listitem>
-              <para><keycap>Tab</keycap> to move to the next field,
-                <keycombo>
+              <para><keycap>Tab</keycap> to move to the next field,<keycombo>
                   <keycap>Shift</keycap> <keycap>Tab</keycap>
-                </keycombo>
-                to move to the previous field
+                </keycombo>to move to the previous field
               </para>
             </listitem>
 
@@ -409,12 +393,9 @@
             <listitem>
               <para><keycombo>
                   <keycap>Shift</keycap> <keycap>Page Up</keycap>
-                </keycombo>
-                to go to the first transaction,
-                <keycombo>
+                </keycombo>to go to the first transaction,<keycombo>
                   <keycap>Shift</keycap> <keycap>Page Down</keycap>
-                </keycombo>
-                to go to the last transaction
+                </keycombo>to go to the last transaction
               </para>
             </listitem>
           </itemizedlist>
@@ -426,11 +407,9 @@
 
       <itemizedlist>
         <listitem>
-          <para><keycap>Tab</keycap> moves to the next box and
-            <keycombo>
+          <para><keycap>Tab</keycap> moves to the next box and<keycombo>
               <keycap>Shift</keycap><keycap>Tab</keycap>
-            </keycombo>
-            moves to the previous box
+            </keycombo>moves to the previous box
           </para>
         </listitem>
 
@@ -566,11 +545,11 @@
         your accounts in &app;, it is common to start them off with an initial balance.
       </para>
 
-      <para>In the first transaction row, enter a date (e.g.: March, 1, 2006), a description (e.g.: <quote>Opening
-        Balance</quote>), click on the <guilabel>Transfer</guilabel> pop-up menu and select
-        <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1000, and press the
-        <keycap function="enter">Enter</keycap> key. The account register should now appear similar
-        to this figure:
+      <para>In the first transaction row, enter a date (e.g.: March, 1, 2006), a description (e.g.:
+        <quote>Opening Balance</quote>), click on the <guilabel>Transfer</guilabel> pop-up menu and
+        select <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1000, and press
+        the <keycap function="enter">Enter</keycap> key. The account register should now appear
+        similar to this figure:
       </para>
 
       <screenshot id="txns-register-2account">
@@ -759,11 +738,9 @@
         transactions, e.g. uncashed checks.
       </para>
 
-      <para>To use the reconciliation windows, select an account from the account tree and click on
-        <menuchoice>
+      <para>To use the reconciliation windows, select an account from the account tree and click on <menuchoice>
           <guimenu>Actions</guimenu> <guimenuitem>Reconcile</guimenuitem>
-        </menuchoice>
-        . A window like the one below will appear in which you can enter the reconcile information.
+        </menuchoice>. A window like the one below will appear in which you can enter the reconcile information.
       </para>
 
       <screenshot id="txns-reconcile-window-1">
@@ -816,8 +793,8 @@
             </para>
 
             <warning>
-              <para>Sometimes, the starting balance in &app; does not match that found on your statement. This can happen
-                the first time you reconcile your account or when a previously-reconciled
+              <para>Sometimes, the starting balance in &app; does not match that found on your statement. This can
+                happen the first time you reconcile your account or when a previously-reconciled
                 transaction is de-reconciled or deleted.
               </para>
             </warning>
@@ -941,23 +918,19 @@
 
       <para>If you cannot find a transaction, then perhaps you forgot to enter it, or did not know that the
         transaction had happened. You can use the <guibutton>New</guibutton> button on the
-        <emphasis>Toolbar</emphasis>, or the
-        <menuchoice>
+        <emphasis>Toolbar</emphasis>, or the <menuchoice>
           <guimenu>Transaction</guimenu><guimenuitem>New</guimenuitem>
-        </menuchoice>
-        menu item in the menu, to open a register window and enter the missing transaction. The new
-        item will appear in the <guilabel>Reconcile</guilabel> window when you press the
+        </menuchoice> menu item in the menu, to open a register window and enter the missing transaction. The new item
+        will appear in the <guilabel>Reconcile</guilabel> window when you press the
         <guibutton>Enter</guibutton> button in the register after entering the transaction.
       </para>
 
       <para>When you find the item in the <guilabel>Reconcile</guilabel> window, compare the amount in the item
         to the amount on the statement. If they disagree, you may have made an error when you
         entered the transaction in &app;. You can use the <guibutton>Edit</guibutton> button on the
-        <emphasis>Toolbar</emphasis>, or the
-        <menuchoice>
+        <emphasis>Toolbar</emphasis>, or the <menuchoice>
           <guimenu>Transaction</guimenu><guimenuitem>Edit</guimenuitem>
-        </menuchoice>
-        item, to open a register window and correct the transaction.
+        </menuchoice> item, to open a register window and correct the transaction.
       </para>
 
       <para>If the amounts agree, click on the item in the <guilabel>Reconcile</guilabel> window. A check mark
@@ -1010,12 +983,10 @@
       </note>
 
       <para>When you have marked off all the items on the bank statement and the difference is 0.00, press the
-        <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or select
-        <menuchoice>
+        <guibutton>Finish</guibutton> button on the <emphasis>Toolbar</emphasis> or select <menuchoice>
           <guimenu>Reconcile</guimenu><guimenuitem>Finish</guimenuitem>
-        </menuchoice>
-        from the menu. The <guilabel>Reconcile</guilabel> window will close. In the register window,
-        the <guilabel>R</guilabel> field of the reconciled transactions will change to
+        </menuchoice> from the menu. The <guilabel>Reconcile</guilabel> window will close. In the register window, the
+        <guilabel>R</guilabel> field of the reconciled transactions will change to
         <emphasis>y</emphasis>.
       </para>
 
@@ -1177,13 +1148,11 @@
         once.
       </para>
 
-      <para>From the main accounts windows, select
-        <menuchoice>
+      <para>From the main accounts windows, select <menuchoice>
           <guimenu>Actions</guimenu><guisubmenu>Scheduled Transactions</guisubmenu>
           <guimenuitem>Scheduled Transaction Editor</guimenuitem>
-        </menuchoice>
-        from the <emphasis>Menubar</emphasis>. A new <guilabel>Scheduled Transactions</guilabel> tab
-        will be opened in the current &app; window as shown below:
+        </menuchoice> from the <emphasis>Menubar</emphasis>. A new <guilabel>Scheduled Transactions</guilabel> tab will be
+        opened in the current &app; window as shown below:
       </para>
 
       <screenshot id="txns-sxn-editor-2">
@@ -1521,11 +1490,9 @@
 
       <note>
         <para>If you entered the transaction for 28 of April at this stage, then please <emphasis>revert
-          back</emphasis> to the last saved &app; file by selecting
-          <menuchoice>
+          back</emphasis> to the last saved &app; file by selecting <menuchoice>
             <guimenu>File</guimenu><guimenuitem>Open</guimenuitem>
-          </menuchoice>
-          and choosing the previously saved <filename>gcashdata_3</filename> &app; file.
+          </menuchoice> and choosing the previously saved <filename>gcashdata_3</filename> &app; file.
         </para>
       </note>
     </sect3>
@@ -1653,16 +1620,17 @@
         <listitem>
           <para>Open the <emphasis>Expenses:Electricity</emphasis> account register and enter a simple 2 account
             transaction to pay the $78 electrical bill at the end of the current month (e.g.: March
-            28, 2006). Enter a description (e.g.: Light Company) and the check number (e.g.: 102). The
-            <guilabel>Transfer</guilabel> account should be <emphasis>Assets:Checking</emphasis>.
+            28, 2006). Enter a description (e.g.: Light Company) and the check number (e.g.: 102).
+            The <guilabel>Transfer</guilabel> account should be
+            <emphasis>Assets:Checking</emphasis>.
           </para>
         </listitem>
 
         <listitem>
           <para>Open the <emphasis>Assets:Checking</emphasis> account register and enter a simple 2 account
             transaction to pay the $45 phone bill at the end of the current month (e.g.: March 28,
-            2006). Enter a description (e.g.: Phone Company Name) and the check number (e.g.: 103). The
-            <guilabel>Transfer</guilabel> account should be <emphasis>Expenses:Phone</emphasis>.
+            2006). Enter a description (e.g.: Phone Company Name) and the check number (e.g.: 103).
+            The <guilabel>Transfer</guilabel> account should be <emphasis>Expenses:Phone</emphasis>.
             Notice that you can enter expense transactions from either the credit side (the expense
             accounts) or the debit side (the asset account).
           </para>
@@ -1686,8 +1654,7 @@
           </para>
 
           <para>You could also set up a scheduled transaction to pay your rent, since the value of the rent is
-            likely to be constant for the foreseeable future.
-            <itemizedlist>
+            likely to be constant for the foreseeable future.<itemizedlist>
               <listitem>
                 <para>Start by clicking on the current (April 28) rent transaction, and click on the
                   <guilabel>Schedule</guilabel> icon
@@ -1725,8 +1692,8 @@
             click on a new transaction line, and click on <guilabel>Split</guilabel>. First enter
             the description of this transaction on the first line (e.g.: <quote>Employers R
             Us</quote>), as well as the date (14 March). In the <quote>split</quote> line below
-            this, enter the deposit into <emphasis>Assets:Checking</emphasis> (e.g.:$670). Follow this
-            with the various tax deposits (<emphasis>Assets:Checking</emphasis> (e.g.: $670),
+            this, enter the deposit into <emphasis>Assets:Checking</emphasis> (e.g.:$670). Follow
+            this with the various tax deposits (<emphasis>Assets:Checking</emphasis> (e.g.: $670),
             <emphasis>Expenses:Taxes:Federal</emphasis> account (e.g.: $180),
             <emphasis>Expenses:Taxes:Medicare</emphasis> account (e.g.: $90), and
             <emphasis>Expenses:Taxes:Social Security</emphasis> account (e.g.: $60)) and lastly the
@@ -1789,12 +1756,10 @@
           <para>First let’s have a look at the <guilabel>Cash Flow</guilabel> report for the month of March.
           </para>
 
-          <para>Select the cash flow report from
-            <menuchoice>
+          <para>Select the cash flow report from <menuchoice>
               <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
               <guimenuitem>Cash Flow</guimenuitem>
-            </menuchoice>
-            .
+            </menuchoice>.
           </para>
 
           <screenshot id="txns-puttoget2-Cash">
@@ -1826,11 +1791,9 @@
           <para>Now let’s have a look at corresponding transaction report for the Checking account.
           </para>
 
-          <para>Select the transaction report from
-            <menuchoice>
+          <para>Select the transaction report from <menuchoice>
               <guimenu>Reports</guimenu> <guimenuitem>Transaction Report</guimenuitem>
-            </menuchoice>
-            .
+            </menuchoice>.
           </para>
 
           <screenshot id="txns-puttoget2-TransactionRptChecking">

commit 15219e34e198c16ab5fa18e759e3ec9039fefa83
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Mon Jul 5 20:08:38 2021 +0200

    Bug 798226 - minor mistakes in Tutorial and Concepts guide 2

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index fb0085e0..97ba1273 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -35,7 +35,7 @@ Translators:
       accounts. As the name says the balance sheet accounts can be summarized in the balance of what
       you own and owe <emphasis>at a point in the time</emphasis>, while the income and expense
       accounts can be summarized in the Profit & Loss report, which shows the <emphasis>change
-      of values in a period of time</emphasis> like the economic year
+      of values in a period of time</emphasis> like the economic year.
     </para>
 
     <para>Let’s have a quick look at the Accounting Equation (<emphasis>Assets - Liabilities = Equity +
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index b15709db..7fbeb9a1 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -480,7 +480,7 @@ Translators:
 
       <para>The <emphasis>New Account Hierarchy Setup</emphasis> assistant helps you to create a set of &app;
         accounts. It will appear if you choose <guibutton>Create a new set of accounts</guibutton>
-        in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select <menuchoice>
+        in the <guilabel>Welcome to &appname;!</guilabel> menu, or when you select<menuchoice>
           <shortcut>
           <keycombo>
             <keycap>Strg</keycap><keycap>N</keycap>
@@ -488,7 +488,7 @@ Translators:
           </shortcut> <guimenu><accel>F</accel>ile</guimenu><guimenuitem><accel>N</accel>ew
           File</guimenuitem>
         </menuchoice>. You may also use it to add a section of accounts to an existing book from the
-        <guilabel>Accounts</guilabel> page by selecting <menuchoice>
+        <guilabel>Accounts</guilabel> page by selecting<menuchoice>
           <guimenu><accel>A</accel>ction</guimenu><guimenuitem>New Account
           Hierarchy…</guimenuitem>
         </menuchoice>.
@@ -507,7 +507,7 @@ Translators:
         <listitem>
           <para><guilabel>New Book Options</guilabel> appears only when creating a new book. Here you set various
             book attributes. This page has four tabs: Accounts, Budgeting, Business, and Counters.
-            These items are explained elsewhere in the Guide, and can be changed at any time from <menuchoice>
+            These items are explained elsewhere in the Guide, and can be changed at any time from<menuchoice>
               <shortcut>
               <keycombo>
                 <keycap>Strg</keycap><keycap>Enter</keycap>
@@ -581,7 +581,7 @@ Translators:
                   opening balance.<note>
                     <para><guilabel>Opening Balance</guilabel> entry isn't obvious until you click in it. You must move out of
                       the entry by clicking somewhere or by pressing <keycap>Tab</keycap> or
-                      <keycap>Enter</keycap> before clicking <guilabel>Next</guilabel> or your entry
+                      <keycap>Enter</keycap> before clicking <guibutton>Next</guibutton> or your entry
                       will be discarded.
                     </para>
                   </note>
@@ -652,8 +652,8 @@ Translators:
       <title>Account Tree Window</title>
 
       <para>You should now see the <guilabel>Accounts</guilabel> window, which appears as shown below. The exact
-        layout of the account tree will depend on which default accounts you selected during the New
-        Account Hierarchy Setup. In this example, the <guilabel>Common Accounts</guilabel> are
+        layout of the account tree will depend on which default accounts you selected during the <guilabel>New
+        Account Hierarchy Setup</guilabel>. In this example, the <guilabel>Common Accounts</guilabel> are
         shown.
       </para>
 
@@ -870,7 +870,7 @@ Translators:
         bring up the menu items for that heading. Once the menu items are displayed, type the
         underlined character in the menu item to activate it. For example, typing<keycombo>
           <keycap>Alt</keycap><keycap>F</keycap>
-        </keycombo> in the main window brings up the <guimenu>File</guimenu> menu, then typing <keycap>S</keycap> will
+        </keycombo>in the main window brings up the <guimenu>File</guimenu> menu, then typing <keycap>S</keycap> will
         save the file. Access keys are fixed and cannot be changed by users.
       </para>
 
@@ -890,17 +890,17 @@ Translators:
 
       <para>&app; offers several formats for storing your financial data. The default file storage format is
         <acronym>XML</acronym>, while <acronym>SQL</acronym> storage is available in SQLite, MySQL,
-        and PostgreSQL formats. Users can choose a file format for new files from <menuchoice>
+        and PostgreSQL formats. Users can choose a file format for new files from<menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save</guimenuitem>
-        </menuchoice>and for existing files from <menuchoice>
+        </menuchoice>and for existing files from<menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
         </menuchoice>dialogs.
       </para>
 
       <para>The <acronym>XML</acronym> storage format is a text file that by default is compressed, which is a
-        preference that is set at <menuchoice>
+        preference that is set at<menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-        </menuchoice> <guilabel>General</guilabel> <guilabel>Compress files</guilabel>. SQLite storage is also available,
+        </menuchoice><guilabel>General</guilabel> <guilabel>Compress files</guilabel>. SQLite storage is also available,
         and stores your data in a single file on your system, like the <acronym>XML</acronym>
         format. However, internally, an SQLite file is managed as a database. The MySQL and
         PostgreSQL storage options require access to a MySQL or PostgreSQL database server and the
@@ -908,7 +908,7 @@ Translators:
       </para>
 
       <tip>
-        <para>Users can change the format at any time by using <menuchoice>
+        <para>Users can change the format at any time by using<menuchoice>
             <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
           </menuchoice>. This will create a copy of the data file in the selected format.
         </para>
@@ -1118,7 +1118,7 @@ Translators:
 
       <orderedlist>
         <listitem>
-          <para>From the &app; <emphasis>Menubar</emphasis>, choose <menuchoice>
+          <para>From the &app; <emphasis>Menubar</emphasis>, choose<menuchoice>
               <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
             </menuchoice>. The <guilabel>New Account Hierarchy setup</guilabel> assistant will start.
           </para>
@@ -1147,9 +1147,9 @@ Translators:
 
       <orderedlist>
         <listitem>
-          <para>Choose <menuchoice>
+          <para>Choose<menuchoice>
               <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem>
-            </menuchoice> from the <emphasis>Menubar</emphasis> or select the <guibutton>Save</guibutton>
+            </menuchoice>from the <emphasis>Menubar</emphasis> or select the <guibutton>Save</guibutton>
             <emphasis>Toolbar</emphasis> button. &app; will bring up the save window.
           </para>
         </listitem>
@@ -1284,14 +1284,14 @@ Translators:
         need more than one file.
       </para>
 
-      <para>Before ending each &app; session, be sure to save your data changes using <menuchoice>
+      <para>Before ending each &app; session, be sure to save your data changes using<menuchoice>
           <guimenu>File</guimenu><guimenuitem>Save</guimenuitem>
         </menuchoice>or the <guibutton>Save</guibutton> <emphasis>Toolbar</emphasis> button.<note>
           <para>As it is very important to save your data frequently to avoid losing them for whatever reason, &app;
             is able to automatically save the opened file every a certain amount of time. This
-            interval can be set in the <guilabel>General</guilabel> tab under <menuchoice>
+            interval can be set in the <guilabel>General</guilabel> tab under<menuchoice>
               <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-            </menuchoice> (<menuchoice>
+            </menuchoice>(<menuchoice>
               <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
             </menuchoice>on &mac;). Keep in mind that this option is relevant only if you are saving in
             <acronym>XML</acronym> format. If you are working with a database, the
@@ -1305,7 +1305,7 @@ Translators:
     <sect2 id="basics-open-data">
       <title>Opening data</title>
 
-      <para>To open an existing file or database, select <menuchoice>
+      <para>To open an existing file or database, select<menuchoice>
           <guimenu>File</guimenu><guimenuitem>Open</guimenuitem>
         </menuchoice>from the menu. In the window that will open, select the <guilabel>Data Format</guilabel>. If you
         selected <guilabel>File</guilabel> choose the file you want to open by browsing the folders
@@ -1330,7 +1330,7 @@ Translators:
         to close your books at the end of the year and begin each year with a fresh set of books.
       </para>
 
-      <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting <menuchoice>
+      <para>&app; allows you to create an empty copy of your Chart of Accounts simply by selecting<menuchoice>
           <guimenu>File</guimenu><guisubmenu>Export</guisubmenu><guimenuitem>Export
           Accounts</guimenuitem>
         </menuchoice>. When you select this command, you are asked to provide the name for the new empty file, and &app;
@@ -1413,7 +1413,7 @@ Translators:
         </listitem>
 
         <listitem>
-          <para>Go to <menuchoice>
+          <para>Go to<menuchoice>
               <guimenu>File</guimenu><guisubmenu>Import</guisubmenu><guimenuitem>Replay &appname;
               .log file</guimenuitem>
             </menuchoice>and select the one .log file with the same date as the saved file you just opened. Make sure that
@@ -1485,9 +1485,9 @@ Translators:
         <para>By default &app; will automatically delete any <filename>.log</filename> and
           <filename>.YYYYMMDDHHMMSS.gnucash</filename> backup files that are older than 30 days. You
           can change this behavior in the &app; preferences in the <guilabel>General</guilabel> tab
-          under <menuchoice>
+          under<menuchoice>
             <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-          </menuchoice> (<menuchoice>
+          </menuchoice>(<menuchoice>
             <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
           </menuchoice>on &mac;).
         </para>
@@ -1723,7 +1723,7 @@ Translators:
 
     <orderedlist>
       <listitem>
-        <para>First, let’s create a file to store your real data. Open &app; and select <menuchoice>
+        <para>First, let’s create a file to store your real data. Open &app; and select<menuchoice>
             <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
           </menuchoice>from the <emphasis>Menubar</emphasis>. This will start the <guilabel>New Account Hierarchy
           Setup</guilabel> assistant that allows you to create several accounts at once.
@@ -1764,7 +1764,7 @@ Translators:
       <listitem>
         <para>In the second screen, set the <guilabel>New Book Options</guilabel> on the different tabs, then
           press the <guibutton>Forward</guibutton> button. You can also update these options later
-          using <menuchoice>
+          using<menuchoice>
             <guimenu>File </guimenu><guimenuitem>Properties</guimenuitem>
           </menuchoice>. For details of these options, see the &app; Help manual, chapter Customizing GnuCash, Book
           Options.
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 2966e983..0b0d23fe 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -204,7 +204,7 @@
       <title>Setting Column Widths</title>
 
       <para>As with most spreadsheet-like displays the columns in the register can be resized by left-clicking
-        and dragging the dividers in the header. The divider to the <emphasis>right</emphasis>of the
+        and dragging the dividers in the header. The divider to the <emphasis>right</emphasis> of the
         column header controls the width of that column. In &app; the
         <guilabel>Description</guilabel> and <guilabel>Memo</guilabel> columns autosize to fit the
         register into the window so dragging those columns' dividers to the left will shrink the
@@ -566,7 +566,7 @@
         your accounts in &app;, it is common to start them off with an initial balance.
       </para>
 
-      <para>In the first transaction row, enter a date (eg: March, 1, 2006), a description (eg: <quote>Opening
+      <para>In the first transaction row, enter a date (e.g.: March, 1, 2006), a description (e.g.: <quote>Opening
         Balance</quote>), click on the <guilabel>Transfer</guilabel> pop-up menu and select
         <emphasis>Equity:Opening Balances</emphasis>, add a deposit value of $1000, and press the
         <keycap function="enter">Enter</keycap> key. The account register should now appear similar
@@ -816,7 +816,7 @@
             </para>
 
             <warning>
-              <para>Sometimes, the opening balance in &app; does not match that found on your statement. This can happen
+              <para>Sometimes, the starting balance in &app; does not match that found on your statement. This can happen
                 the first time you reconcile your account or when a previously-reconciled
                 transaction is de-reconciled or deleted.
               </para>
@@ -961,7 +961,7 @@
       </para>
 
       <para>If the amounts agree, click on the item in the <guilabel>Reconcile</guilabel> window. A check mark
-        wil appear in the <guilabel>R</guilabel> column aside the selected transaction. &app; will
+        will appear in the <guilabel>R</guilabel> column aside the selected transaction. &app; will
         automatically update the amounts in the lower right summary pane.
       </para>
 
@@ -1183,7 +1183,7 @@
           <guimenuitem>Scheduled Transaction Editor</guimenuitem>
         </menuchoice>
         from the <emphasis>Menubar</emphasis>. A new <guilabel>Scheduled Transactions</guilabel> tab
-        will be opened in the current &app; window as shown above:
+        will be opened in the current &app; window as shown below:
       </para>
 
       <screenshot id="txns-sxn-editor-2">
@@ -1652,16 +1652,16 @@
       <orderedlist>
         <listitem>
           <para>Open the <emphasis>Expenses:Electricity</emphasis> account register and enter a simple 2 account
-            transaction to pay the $78 electrical bill at the end of the current month (eg: March
-            28, 2006). Enter a description (eg: Light Company) and the check number (eg: 102). The
+            transaction to pay the $78 electrical bill at the end of the current month (e.g.: March
+            28, 2006). Enter a description (e.g.: Light Company) and the check number (e.g.: 102). The
             <guilabel>Transfer</guilabel> account should be <emphasis>Assets:Checking</emphasis>.
           </para>
         </listitem>
 
         <listitem>
           <para>Open the <emphasis>Assets:Checking</emphasis> account register and enter a simple 2 account
-            transaction to pay the $45 phone bill at the end of the current month (eg: March 28,
-            2006). Enter a description (eg: Phone Company Name) and the check number (eg: 103). The
+            transaction to pay the $45 phone bill at the end of the current month (e.g.: March 28,
+            2006). Enter a description (e.g.: Phone Company Name) and the check number (e.g.: 103). The
             <guilabel>Transfer</guilabel> account should be <emphasis>Expenses:Phone</emphasis>.
             Notice that you can enter expense transactions from either the credit side (the expense
             accounts) or the debit side (the asset account).
@@ -1670,8 +1670,8 @@
 
         <listitem>
           <para>Open the <emphasis>Expenses:Rent</emphasis> account register and enter a simple 2 account
-            transaction to pay the $350 in rent at the end of the current month (eg: March 28,
-            2006). Enter a description (eg: April Rent) and the check number (eg: 104). The
+            transaction to pay the $350 in rent at the end of the current month (e.g.: March 28,
+            2006). Enter a description (e.g.: April Rent) and the check number (e.g.: 104). The
             <guilabel>Transfer</guilabel> account should be <emphasis>Assets:Checking</emphasis>.
           </para>
         </listitem>
@@ -1680,7 +1680,7 @@
           <para>Duplicate this transaction using the <guibutton>Duplicate</guibutton> button in the
             <emphasis>Toolbar</emphasis>. Start by clicking on the current rent transaction, and
             click on the <guilabel>Duplicate</guilabel> icon. Enter the transaction date a month out
-            in the future (eg: April 28, 2006), and notice the blue line separator that &app; uses
+            in the future (e.g.: April 28, 2006), and notice the blue line separator that &app; uses
             to separate future transactions from current ones. In this way, you can enter
             transactions before they occur.
           </para>
@@ -1723,14 +1723,14 @@
         <listitem>
           <para>To add a paycheck transaction from the <emphasis>Assets:Checking</emphasis> account register window,
             click on a new transaction line, and click on <guilabel>Split</guilabel>. First enter
-            the description of this transaction on the first line (eg: <quote>Employers R
+            the description of this transaction on the first line (e.g.: <quote>Employers R
             Us</quote>), as well as the date (14 March). In the <quote>split</quote> line below
-            this, enter the deposit into <emphasis>Assets:Checking</emphasis> (eg:$670). Follow this
-            with the various tax deposits (<emphasis>Assets:Checking</emphasis> (eg: $670),
-            <emphasis>Expenses:Taxes:Federal</emphasis> account (eg: $180),
-            <emphasis>Expenses:Taxes:Medicare</emphasis> account (eg: $90), and
-            <emphasis>Expenses:Taxes:Social Security</emphasis> account (eg: $60)) and lastly the
-            gross total of your paycheck (eg: $1000) as a withdrawal transfer from
+            this, enter the deposit into <emphasis>Assets:Checking</emphasis> (e.g.:$670). Follow this
+            with the various tax deposits (<emphasis>Assets:Checking</emphasis> (e.g.: $670),
+            <emphasis>Expenses:Taxes:Federal</emphasis> account (e.g.: $180),
+            <emphasis>Expenses:Taxes:Medicare</emphasis> account (e.g.: $90), and
+            <emphasis>Expenses:Taxes:Social Security</emphasis> account (e.g.: $60)) and lastly the
+            gross total of your paycheck (e.g.: $1000) as a withdrawal transfer from
             <emphasis>Income:Salary</emphasis>.
           </para>
         </listitem>

commit ee5f0f05290452e6beb0b702a3576b033e499a81
Author: Christian Wehling <christian.wehling at web.de>
Date:   Thu Jul 1 17:06:25 2021 +0200

    L10n:de: Optimize the pic

diff --git a/help/de/figures/Help_AccountTreeCreate.png b/help/de/figures/Help_AccountTreeCreate.png
index 9286c2bd..8a5ff157 100644
Binary files a/help/de/figures/Help_AccountTreeCreate.png and b/help/de/figures/Help_AccountTreeCreate.png differ

commit 311d491593afd166c310a393727c78ed75db51b4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Jun 30 18:06:59 2021 +0200

    L10N:de: Tip des Tages: Gleiche Reihenfolge in Bild und Beschreibung

diff --git a/help/de/Help_ch_GettingStarted.xml b/help/de/Help_ch_GettingStarted.xml
index 06f0b1a6..5d888414 100644
--- a/help/de/Help_ch_GettingStarted.xml
+++ b/help/de/Help_ch_GettingStarted.xml
@@ -193,28 +193,28 @@ Translators:
 
     <variablelist>
       <varlistentry>
-        <term><guibutton>Schließen</guibutton></term>
+        <term><guibutton>Vorheriger</guibutton></term>
 
         <listitem>
-          <para>Verlässt diese Darstellung mit den hilfreichen <guilabel>Tipps des Tages</guilabel>.
+          <para>Zeigt den vorherigen Tipp an.
           </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><guibutton>Vorheriger</guibutton></term>
+        <term><guibutton>Nächster</guibutton></term>
 
         <listitem>
-          <para>Zeigt den vorherigen Tipp an.
+          <para>Geht zum nächsten Tipp weiter.
           </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><guibutton>Nächster</guibutton></term>
+        <term><guibutton>Schließen</guibutton></term>
 
         <listitem>
-          <para>Geht zum nächsten Tipp weiter.
+          <para>Verlässt diese Darstellung mit den hilfreichen <guilabel>Tipps des Tages</guilabel>.
           </para>
         </listitem>
       </varlistentry>

commit 5f43c7839e2d9b6ff52a743d643b30a6369ffa9d
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Jun 29 16:50:08 2021 +0200

    L10N:de: de/Help_ch_Customize.xml Bildschirmfotos...
    
    * ... GnuCash-Einstellungen (Prefs) für alle Registerseiten
    * ... Eigenschaften der GnuCash-Datei
    * Tags "imageobject" für PDF-Erstellung ergänzt
    * Tags "srccredits" aktualisiert
    * Bild CSV Export mit korrekter Ãœbersetzung (Kurse benutzen =>
    Anführungszeichen verwenden)

diff --git a/help/de/Help_ch_Account-Actions.xml b/help/de/Help_ch_Account-Actions.xml
index be26136f..c9165458 100644
--- a/help/de/Help_ch_Account-Actions.xml
+++ b/help/de/Help_ch_Account-Actions.xml
@@ -600,7 +600,11 @@
     <figure pgwide="1">
       <title>Der Assistent <quote>Neuen Kontoplan erstellen</quote></title><screenshot>
         <mediaobject>
-          <imageobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Help_AccountTreeCreate.png" format="PNG"
+                   srccredit="Christian Wehling" width="510px" />
+          </imageobject>
+          <imageobject role="fo">
             <imagedata fileref="figures/Help_AccountTreeCreate.png" format="PNG"
                    srccredit="Christian Wehling" />
           </imageobject>
diff --git a/help/de/Help_ch_Customize.xml b/help/de/Help_ch_Customize.xml
index 3f5833b8..9ef4ce0c 100644
--- a/help/de/Help_ch_Customize.xml
+++ b/help/de/Help_ch_Customize.xml
@@ -109,12 +109,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
-                         srccredit="Cristian Marchi" width="510px"></imagedata>
+                         srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -194,12 +194,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
-                         srccredit="Cristian Marchi" width="510px"></imagedata>
+                         srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -302,12 +302,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
-                         srccredit="Cristian Marchi" width="510px"></imagedata>
+                         srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -427,12 +427,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
-                         srccredit="Cristian Marchi" width="510px"></imagedata>
+                         srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -520,12 +520,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
-                         srccredit="Cristian Marchi" width="510px"></imagedata>
+                         srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -711,12 +711,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -874,12 +874,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Quotes.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Quotes.png" format="PNG"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -927,12 +927,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Printing.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -976,12 +976,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Register.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1096,12 +1096,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1189,12 +1189,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Reports.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1249,12 +1249,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Sched.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1326,12 +1326,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Windows.png" format="PNG"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Christian Wehling"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1455,9 +1455,13 @@
       <figure id="book-opt-acc-fig">
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Book_Options_Accounts">
           <mediaobject>
-            <imageobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         format="PNG" srccredit="Christian Wehling"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1583,9 +1587,13 @@
       <figure id="book-opt-bud-fig">
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Budgeting</guilabel> tab</title><screenshot id="Book_Options_Budgeting">
           <mediaobject>
-            <imageobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         format="PNG" srccredit="Christian Wehling"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1602,9 +1610,13 @@
       <figure id="book-opt-bus-fig">
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Book_Options_Business">
           <mediaobject>
-            <imageobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Business.png"
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         format="PNG" srccredit="Christian Wehling"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1710,9 +1722,13 @@
       <figure id="book-opt-count-fig">
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Counters</guilabel> tab</title><screenshot id="Book_Options_Counters">
           <mediaobject>
-            <imageobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+                         format="PNG" srccredit="Christian Wehling" width="510px"></imagedata>
+            </imageobject>
+            <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         format="PNG" srccredit="Christian Wehling" ></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
diff --git a/help/de/Help_ch_Transactions.xml b/help/de/Help_ch_Transactions.xml
index da11aea2..4f99bbda 100644
--- a/help/de/Help_ch_Transactions.xml
+++ b/help/de/Help_ch_Transactions.xml
@@ -2083,11 +2083,11 @@ Translators:
         <title>Der CSV-Buchungsimport-Assistent - Einführung</title><screenshot id="CSV_Transaction_Import_Assistant">
           <mediaobject>
             <imageobject role="html">
-              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="Christian Wehling" width="515px" />
+              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="Christian Wehling" width="510px" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="Christian Wehling" />
+              <imagedata fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2179,7 +2179,7 @@ Translators:
               <title>Der CSV Import Vorschau Bereich</title><screenshot id="CSV_Import_Preview">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="Christian Wehling" width="515px" />
+                    <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="Christian Wehling" width="510px" />
                   </imageobject>
 
                   <imageobject role="fo">
diff --git a/help/de/figures/Help_Book_Options_Accounts.png b/help/de/figures/Help_Book_Options_Accounts.png
new file mode 100644
index 00000000..001ea423
Binary files /dev/null and b/help/de/figures/Help_Book_Options_Accounts.png differ
diff --git a/help/de/figures/Help_Book_Options_Budgeting.png b/help/de/figures/Help_Book_Options_Budgeting.png
new file mode 100644
index 00000000..7cdeab00
Binary files /dev/null and b/help/de/figures/Help_Book_Options_Budgeting.png differ
diff --git a/help/de/figures/Help_Book_Options_Business.png b/help/de/figures/Help_Book_Options_Business.png
new file mode 100644
index 00000000..59b5dd18
Binary files /dev/null and b/help/de/figures/Help_Book_Options_Business.png differ
diff --git a/help/de/figures/Help_Book_Options_Counters.png b/help/de/figures/Help_Book_Options_Counters.png
new file mode 100644
index 00000000..15c4bf90
Binary files /dev/null and b/help/de/figures/Help_Book_Options_Counters.png differ
diff --git a/help/de/figures/Help_Book_Options_Tax.png b/help/de/figures/Help_Book_Options_Tax.png
new file mode 100644
index 00000000..1ddd4f24
Binary files /dev/null and b/help/de/figures/Help_Book_Options_Tax.png differ
diff --git a/help/de/figures/Help_Choose_Export_Settings.png b/help/de/figures/Help_Choose_Export_Settings.png
index 31153f97..dfb14fb2 100644
Binary files a/help/de/figures/Help_Choose_Export_Settings.png and b/help/de/figures/Help_Choose_Export_Settings.png differ
diff --git a/help/de/figures/Help_Pref_AccntPeriod.png b/help/de/figures/Help_Pref_AccntPeriod.png
new file mode 100644
index 00000000..5d2576ce
Binary files /dev/null and b/help/de/figures/Help_Pref_AccntPeriod.png differ
diff --git a/help/de/figures/Help_Pref_Accnts.png b/help/de/figures/Help_Pref_Accnts.png
new file mode 100644
index 00000000..a927ad69
Binary files /dev/null and b/help/de/figures/Help_Pref_Accnts.png differ
diff --git a/help/de/figures/Help_Pref_Business.png b/help/de/figures/Help_Pref_Business.png
new file mode 100644
index 00000000..0ddaf875
Binary files /dev/null and b/help/de/figures/Help_Pref_Business.png differ
diff --git a/help/de/figures/Help_Pref_DateTime.png b/help/de/figures/Help_Pref_DateTime.png
new file mode 100644
index 00000000..338c05be
Binary files /dev/null and b/help/de/figures/Help_Pref_DateTime.png differ
diff --git a/help/de/figures/Help_Pref_General.png b/help/de/figures/Help_Pref_General.png
new file mode 100644
index 00000000..ddf7f986
Binary files /dev/null and b/help/de/figures/Help_Pref_General.png differ
diff --git a/help/de/figures/Help_Pref_Import.png b/help/de/figures/Help_Pref_Import.png
new file mode 100644
index 00000000..1cf370ff
Binary files /dev/null and b/help/de/figures/Help_Pref_Import.png differ
diff --git a/help/de/figures/Help_Pref_OnlineBanking.png b/help/de/figures/Help_Pref_OnlineBanking.png
new file mode 100644
index 00000000..551f9c81
Binary files /dev/null and b/help/de/figures/Help_Pref_OnlineBanking.png differ
diff --git a/help/de/figures/Help_Pref_Printing.png b/help/de/figures/Help_Pref_Printing.png
new file mode 100644
index 00000000..7cfb0a2d
Binary files /dev/null and b/help/de/figures/Help_Pref_Printing.png differ
diff --git a/help/de/figures/Help_Pref_Quotes.png b/help/de/figures/Help_Pref_Quotes.png
new file mode 100644
index 00000000..483b794a
Binary files /dev/null and b/help/de/figures/Help_Pref_Quotes.png differ
diff --git a/help/de/figures/Help_Pref_Register.png b/help/de/figures/Help_Pref_Register.png
new file mode 100644
index 00000000..4e5bd1fc
Binary files /dev/null and b/help/de/figures/Help_Pref_Register.png differ
diff --git a/help/de/figures/Help_Pref_RegisterDefaults.png b/help/de/figures/Help_Pref_RegisterDefaults.png
new file mode 100644
index 00000000..c7eb3c22
Binary files /dev/null and b/help/de/figures/Help_Pref_RegisterDefaults.png differ
diff --git a/help/de/figures/Help_Pref_Reports.png b/help/de/figures/Help_Pref_Reports.png
new file mode 100644
index 00000000..6d7d673f
Binary files /dev/null and b/help/de/figures/Help_Pref_Reports.png differ
diff --git a/help/de/figures/Help_Pref_Sched.png b/help/de/figures/Help_Pref_Sched.png
new file mode 100644
index 00000000..63585e6b
Binary files /dev/null and b/help/de/figures/Help_Pref_Sched.png differ
diff --git a/help/de/figures/Help_Pref_Windows.png b/help/de/figures/Help_Pref_Windows.png
new file mode 100644
index 00000000..17b80c21
Binary files /dev/null and b/help/de/figures/Help_Pref_Windows.png differ
diff --git a/help/de/figures/Help_Trans_Assoc_Symbols.png b/help/de/figures/Help_Trans_Assoc_Symbols.png
new file mode 100644
index 00000000..2e42ceb6
Binary files /dev/null and b/help/de/figures/Help_Trans_Assoc_Symbols.png differ



Summary of changes:
 .gitignore                                         |   83 +-
 .travis.yml                                        |   15 -
 AUTHORS                                            |    3 +-
 CMakeLists.txt                                     |    8 +-
 COPYING                                            |  339 ++
 ChangeLog                                          |  308 ++
 NEWS                                               |   31 +
 README                                             |   62 +-
 cmake/AddGHelpTarget.cmake                         |   10 +-
 docbook/README                                     |   43 +
 docbook/gnc-docbookx.dtd                           |   76 +-
 docbook/gnc-locale-C.dtd                           |   80 +
 docbook/gnc-locale-de.dtd                          |   39 +
 docbook/gnc-locale-it.dtd                          |   11 +
 docbook/gnc-locale-ja.dtd                          |   16 +
 docbook/gnc-locale-pt.dtd                          |   20 +
 docbook/gnc-locale-ru.dtd                          |   22 +
 gnucash-docs.spec.in                               |    2 +-
 guide/C/.gitignore                                 |    3 -
 guide/C/CMakeLists.txt                             |    2 -
 guide/C/Makefile.am                                |    2 -
 guide/C/appendixa.xml                              |    4 +-
 guide/C/appendixb.xml                              |  408 --
 guide/C/appendixc.xml                              |  173 -
 guide/C/appendixd.xml                              |    2 +-
 guide/C/ch_accts.xml                               |   45 +-
 guide/C/ch_basics.xml                              |   59 +-
 guide/C/ch_budgets.xml                             |    2 +-
 guide/C/ch_bus_features.xml                        |    6 +-
 guide/C/ch_capgain.xml                             |   89 +-
 guide/C/ch_cbook.xml                               |    2 +-
 guide/C/ch_cc.xml                                  |    2 +-
 guide/C/ch_configuring.xml                         |    2 +-
 guide/C/ch_currency.xml                            |  556 ++-
 guide/C/ch_dep.xml                                 |    2 +-
 guide/C/ch_expenses.xml                            |    2 +-
 guide/C/ch_import_business_data.xml                |    2 +-
 guide/C/ch_importing.xml                           |   12 +-
 guide/C/ch_invest.xml                              | 2754 ++++++------
 guide/C/ch_loans.xml                               |  500 ++-
 guide/C/ch_oth_assets.xml                          |    2 +-
 guide/C/ch_oview.xml                               |   57 +-
 guide/C/ch_python_bindings.xml                     |   49 +-
 guide/C/ch_reports.xml                             |   71 +-
 guide/C/ch_txns.xml                                |  201 +-
 guide/C/fdl-appendix.xml                           |    2 +-
 guide/C/figures/currency_AfterGetOnlineQuotes.png  |  Bin 72932 -> 48062 bytes
 guide/C/figures/currency_BeforeGetOnlineQuotes.png |  Bin 52904 -> 38338 bytes
 guide/C/figures/currency_addcurr.png               |  Bin 19428 -> 35411 bytes
 guide/C/figures/currency_main1.png                 |  Bin 52722 -> 69994 bytes
 guide/C/figures/currency_main2.png                 |  Bin 53167 -> 70131 bytes
 guide/C/figures/currency_main3.png                 |  Bin 57474 -> 74032 bytes
 guide/C/figures/currency_peditor.png               |  Bin 63651 -> 24004 bytes
 guide/C/gnc-glossary.xml                           |    2 +-
 guide/C/gnucash-guide.xml                          |   37 +-
 guide/C/legal.xml                                  |    2 +-
 guide/CMakeLists.txt                               |    1 -
 guide/de/.gitignore                                |    3 -
 guide/de/CMakeLists.txt                            |    2 -
 guide/de/Makefile.am                               |    2 -
 guide/de/appendixa.xml                             |    2 +-
 guide/de/appendixb.xml                             |  163 -
 guide/de/appendixc.xml                             |  176 -
 guide/de/appendixd.xml                             |    2 +-
 guide/de/appendixe.xml                             |    2 +-
 guide/de/ch_accts.xml                              |    2 +-
 guide/de/ch_basics.xml                             |    2 +-
 guide/de/ch_budgets.xml                            |    2 +-
 guide/de/ch_bus_ap.xml                             |    2 +-
 guide/de/ch_bus_ar.xml                             |    2 +-
 guide/de/ch_bus_intro.xml                          |    2 +-
 guide/de/ch_bus_pay.xml                            |    2 +-
 guide/de/ch_bus_setup.xml                          |    2 +-
 guide/de/ch_capgain.xml                            |    2 +-
 guide/de/ch_cbook.xml                              |    2 +-
 guide/de/ch_cc.xml                                 |    2 +-
 guide/de/ch_currency.xml                           |    2 +-
 guide/de/ch_dep.xml                                |    2 +-
 guide/de/ch_expenses.xml                           |    2 +-
 guide/de/ch_import_business_data.xml               |    2 +-
 guide/de/ch_invest.xml                             |    2 +-
 guide/de/ch_loans.xml                              |    2 +-
 guide/de/ch_oth_assets.xml                         |    2 +-
 guide/de/ch_oview.xml                              |    2 +-
 guide/de/ch_python_bindings.xml                    |   77 +-
 guide/de/ch_reports.xml                            |    2 +-
 guide/de/ch_txns.xml                               |    2 +-
 guide/de/fdl-appendix.xml                          |    2 +-
 guide/de/glossary.xml                              |    2 +-
 guide/de/gnucash-guide.xml                         |   17 +-
 guide/it/.gitignore                                |    3 -
 guide/it/CMakeLists.txt                            |    2 -
 guide/it/Makefile.am                               |    2 -
 guide/it/gnucash-guide.xml                         |  531 +--
 guide/ja/.gitignore                                |    3 -
 guide/ja/CMakeLists.txt                            |    2 -
 guide/ja/Makefile.am                               |    2 -
 guide/ja/appendixa.xml                             |    2 +-
 guide/ja/appendixb.xml                             |  335 --
 guide/ja/appendixc.xml                             |  161 -
 guide/ja/appendixd.xml                             |    2 +-
 guide/ja/ch_accts.xml                              |    2 +-
 guide/ja/ch_basics.xml                             |    2 +-
 guide/ja/ch_budgets.xml                            |    2 +-
 guide/ja/ch_bus_ap.xml                             |    2 +-
 guide/ja/ch_bus_ar.xml                             |    2 +-
 guide/ja/ch_bus_pay.xml                            |    2 +-
 guide/ja/ch_capgain.xml                            |    2 +-
 guide/ja/ch_cbook.xml                              |    2 +-
 guide/ja/ch_cc.xml                                 |    2 +-
 guide/ja/ch_currency.xml                           |    2 +-
 guide/ja/ch_dep.xml                                |    2 +-
 guide/ja/ch_invest.xml                             |    2 +-
 guide/ja/ch_loans.xml                              |    2 +-
 guide/ja/ch_oth_assets.xml                         |    2 +-
 guide/ja/ch_oview.xml                              |   12 +-
 guide/ja/ch_python_bindings.xml                    |   44 +-
 guide/ja/ch_reports.xml                            |    2 +-
 guide/ja/ch_txns.xml                               |    2 +-
 guide/ja/fdl-appendix.xml                          |    2 +-
 guide/ja/gnucash-guide.sgml                        |    0
 guide/ja/gnucash-guide.xml                         |   17 +-
 guide/ja/legal.xml                                 |    2 +-
 guide/pt/.gitignore                                |    3 -
 guide/pt/CMakeLists.txt                            |    2 -
 guide/pt/Makefile.am                               |    2 -
 guide/pt/appendixa.xml                             |    2 +-
 guide/pt/appendixb.xml                             |  400 --
 guide/pt/appendixc.xml                             |  170 -
 guide/pt/appendixd.xml                             |    2 +-
 guide/pt/ch_accts.xml                              |    2 +-
 guide/pt/ch_basics.xml                             |    2 +-
 guide/pt/ch_budgets.xml                            |    2 +-
 guide/pt/ch_bus_ap.xml                             |    2 +-
 guide/pt/ch_bus_ar.xml                             |    2 +-
 guide/pt/ch_bus_intro.xml                          |    2 +-
 guide/pt/ch_bus_pay.xml                            |    2 +-
 guide/pt/ch_bus_setup.xml                          |    2 +-
 guide/pt/ch_capgain.xml                            |    2 +-
 guide/pt/ch_cbook.xml                              |    2 +-
 guide/pt/ch_cc.xml                                 |    2 +-
 guide/pt/ch_currency.xml                           |    2 +-
 guide/pt/ch_dep.xml                                |    2 +-
 guide/pt/ch_import_business_data.xml               |    2 +-
 guide/pt/ch_invest.xml                             |    2 +-
 guide/pt/ch_loans.xml                              |    2 +-
 guide/pt/ch_oth_assets.xml                         |    2 +-
 guide/pt/ch_oview.xml                              |   12 +-
 guide/pt/ch_python_bindings.xml                    |   40 +-
 guide/pt/ch_reports.xml                            |    2 +-
 guide/pt/ch_txns.xml                               |    2 +-
 guide/pt/fdl-appendix.xml                          |    2 +-
 guide/pt/gnucash-guide.xml                         |   14 +-
 guide/pt/legal.xml                                 |    2 +-
 guide/ru/CMakeLists.txt                            |    2 -
 guide/ru/Makefile.am                               |    2 -
 guide/ru/appendixa.xml                             |    2 +-
 guide/ru/appendixb.xml                             |  408 --
 guide/ru/appendixc.xml                             |  173 -
 guide/ru/appendixd.xml                             |    2 +-
 guide/ru/ch_accts.xml                              |    2 +-
 guide/ru/ch_basics.xml                             |    2 +-
 guide/ru/ch_budgets.xml                            |    2 +-
 guide/ru/ch_bus_features.xml                       |    2 +-
 guide/ru/ch_capgain.xml                            |    2 +-
 guide/ru/ch_cbook.xml                              |    2 +-
 guide/ru/ch_cc.xml                                 |    2 +-
 guide/ru/ch_currency.xml                           |    2 +-
 guide/ru/ch_dep.xml                                |    2 +-
 guide/ru/ch_expenses.xml                           |    2 +-
 guide/ru/ch_import_business_data.xml               |    2 +-
 guide/ru/ch_invest.xml                             |    2 +-
 guide/ru/ch_loans.xml                              |    2 +-
 guide/ru/ch_oth_assets.xml                         |    2 +-
 guide/ru/ch_oview.xml                              |   12 +-
 guide/ru/ch_python_bindings.xml                    |   49 +-
 guide/ru/ch_reports.xml                            |    2 +-
 guide/ru/ch_txns.xml                               |    2 +-
 guide/ru/fdl-appendix.xml                          |    2 +-
 guide/ru/gnc-glossary.xml                          |    2 +-
 guide/ru/gnucash-guide.xml                         |    6 +-
 guide/ru/legal.xml                                 |    2 +-
 help/C/.gitignore                                  |    3 -
 help/C/Help_ch_Account-Actions.xml                 |   12 +-
 help/C/Help_ch_Business.xml                        |    2 +-
 help/C/Help_ch_Customize.xml                       |    2 +-
 help/C/Help_ch_GUIMenus.xml                        |    4 +-
 help/C/Help_ch_GettingHelp.xml                     |    4 +-
 help/C/Help_ch_GettingStarted.xml                  |    2 +-
 help/C/Help_ch_Intro.xml                           |    2 +-
 help/C/Help_ch_Reports.xml                         |    2 +-
 help/C/Help_ch_Tools_Assistants.xml                |    2 +-
 help/C/Help_ch_Transactions.xml                    |    8 +-
 help/C/Help_chartofaccts.xml                       |    2 +-
 help/C/Help_chtacctseg.xml                         |    2 +-
 help/C/Help_fdl-appendix.xml                       |    2 +-
 help/C/Help_legal.xml                              |    2 +-
 help/C/Help_tips-appendix.xml                      |    8 +-
 help/C/Help_txf-categories.xml                     |    2 +-
 help/C/gnucash-help.xml                            |   10 +-
 help/de/.gitignore                                 |    3 -
 help/de/CMakeLists.txt                             |    2 +
 help/de/Help_ch_Account-Actions.xml                |  960 ++--
 help/de/Help_ch_Business.xml                       |    2 +-
 help/de/Help_ch_Customize.xml                      | 4709 ++++++++++++--------
 help/de/Help_ch_GUIMenus.xml                       |  445 +-
 help/de/Help_ch_GettingHelp.xml                    |    4 +-
 help/de/Help_ch_GettingStarted.xml                 |   14 +-
 help/de/Help_ch_Intro.xml                          |    2 +-
 help/de/Help_ch_Reports.xml                        |    2 +-
 help/de/Help_ch_Tools_Assistants.xml               |    2 +-
 help/de/Help_ch_Transactions.xml                   |    8 +-
 help/de/Help_chartofaccts.xml                      |    2 +-
 help/de/Help_chtacctseg.xml                        |    2 +-
 help/de/Help_fdl-appendix.xml                      |    2 +-
 help/de/Help_legal.xml                             |    2 +-
 help/de/Help_para-assist-intro.xml                 |   62 +
 help/de/Help_tips-appendix.xml                     |   18 +-
 help/de/Help_txf-categories.xml                    |    2 +-
 help/de/Makefile.am                                |    2 +
 help/de/figures/AccountTreeCreate.png              |  Bin 0 -> 54132 bytes
 help/de/figures/AccountTree_Export_CSV.png         |  Bin 0 -> 45481 bytes
 help/de/figures/AccountTree_Export_dbms.png        |  Bin 0 -> 33564 bytes
 help/de/figures/AccountTree_Export_file.png        |  Bin 0 -> 53608 bytes
 help/de/figures/AccountTree_Import_CSV.png         |  Bin 0 -> 54600 bytes
 help/de/figures/AccountTree_Import_CSV_Preview.png |  Bin 0 -> 69861 bytes
 help/de/figures/AcctViewOptions-0.png              |  Bin 0 -> 35676 bytes
 help/de/figures/AcctViewOptions-1.png              |  Bin 0 -> 16447 bytes
 help/de/figures/Help_AccountTreeCreate.png         |  Bin 58123 -> 0 bytes
 help/de/figures/Help_Book_Options_Accounts.png     |  Bin 0 -> 24507 bytes
 help/de/figures/Help_Book_Options_Budgeting.png    |  Bin 0 -> 18125 bytes
 help/de/figures/Help_Book_Options_Business.png     |  Bin 0 -> 50517 bytes
 help/de/figures/Help_Book_Options_Counters.png     |  Bin 0 -> 51249 bytes
 help/de/figures/Help_Book_Options_Tax.png          |  Bin 0 -> 15831 bytes
 .../Help_CSV_Import_transactions_Preview.png       |  Bin 124442 -> 123827 bytes
 .../Help_CSV_Transaction_Import_Assistant.png      |  Bin 82648 -> 82648 bytes
 help/de/figures/Help_Choose_Export_Settings.png    |  Bin 75138 -> 75685 bytes
 help/de/figures/Help_Import_Map_Editor.png         |  Bin 140284 -> 140284 bytes
 help/de/figures/Help_Import_MatchPicker.png        |  Bin 40059 -> 39858 bytes
 help/de/figures/Help_Pref_AccntPeriod.png          |  Bin 0 -> 51830 bytes
 help/de/figures/Help_Pref_Accnts.png               |  Bin 0 -> 64419 bytes
 help/de/figures/Help_Pref_Business.png             |  Bin 0 -> 61908 bytes
 help/de/figures/Help_Pref_DateTime.png             |  Bin 0 -> 64509 bytes
 help/de/figures/Help_Pref_General.png              |  Bin 0 -> 89116 bytes
 help/de/figures/Help_Pref_Import.png               |  Bin 0 -> 80356 bytes
 help/de/figures/Help_Pref_OnlineBanking.png        |  Bin 0 -> 42978 bytes
 help/de/figures/Help_Pref_Printing.png             |  Bin 0 -> 40740 bytes
 help/de/figures/Help_Pref_Quotes.png               |  Bin 0 -> 35457 bytes
 help/de/figures/Help_Pref_Register.png             |  Bin 0 -> 68794 bytes
 help/de/figures/Help_Pref_RegisterDefaults.png     |  Bin 0 -> 49820 bytes
 help/de/figures/Help_Pref_Reports.png              |  Bin 0 -> 47736 bytes
 help/de/figures/Help_Pref_Sched.png                |  Bin 0 -> 54217 bytes
 help/de/figures/Help_Pref_Windows.png              |  Bin 0 -> 57348 bytes
 help/de/figures/Help_Reset_Warnings.png            |  Bin 0 -> 23333 bytes
 help/de/figures/Help_Style_Choose.png              |  Bin 0 -> 16822 bytes
 help/de/figures/Help_Style_New.png                 |  Bin 0 -> 9695 bytes
 help/de/figures/Help_Trans_Assoc_Dialog.png        |  Bin 16321 -> 16230 bytes
 .../{C => de}/figures/Help_Trans_Assoc_Symbols.png |  Bin
 help/de/figures/Main-window-callouts.png           |  Bin 53214 -> 47797 bytes
 help/de/figures/Main-window-callouts.xcf           |  Bin 128704 -> 128116 bytes
 help/de/figures/main-window-small.png              |  Bin 48625 -> 45598 bytes
 help/de/figures/summarybar-selector-1.png          |  Bin 0 -> 64103 bytes
 help/de/figures/summarybar-selector-2.png          |  Bin 0 -> 13069 bytes
 help/de/figures/summarybar-selector.png            |  Bin 0 -> 54170 bytes
 help/de/gnucash-help.xml                           |   10 +-
 help/de/para-assist-buttons.xml                    |   56 +
 help/it/.gitignore                                 |    3 -
 help/it/gnucash-help.xml                           |   24 +-
 help/pt/Help_ch_Account-Actions.xml                |   12 +-
 help/pt/Help_ch_Business.xml                       |    2 +-
 help/pt/Help_ch_Customize.xml                      |    2 +-
 help/pt/Help_ch_GUIMenus.xml                       |    4 +-
 help/pt/Help_ch_GettingHelp.xml                    |    4 +-
 help/pt/Help_ch_GettingStarted.xml                 |    2 +-
 help/pt/Help_ch_Intro.xml                          |    2 +-
 help/pt/Help_ch_Reports.xml                        |    2 +-
 help/pt/Help_ch_Tools_Assistants.xml               |    2 +-
 help/pt/Help_ch_Transactions.xml                   |    2 +-
 help/pt/Help_chartofaccts.xml                      |    2 +-
 help/pt/Help_chtacctseg.xml                        |    2 +-
 help/pt/Help_fdl-appendix.xml                      |    2 +-
 help/pt/Help_legal.xml                             |    2 +-
 help/pt/Help_tips-appendix.xml                     |    2 +-
 help/pt/Help_txf-categories.xml                    |    2 +-
 help/pt/gnucash-help.xml                           |   10 +-
 xmldocs.make                                       |    2 +-
 286 files changed, 7682 insertions(+), 8035 deletions(-)
 delete mode 100644 .travis.yml
 create mode 100644 COPYING
 create mode 100644 docbook/README
 create mode 100644 docbook/gnc-locale-C.dtd
 create mode 100644 docbook/gnc-locale-de.dtd
 create mode 100644 docbook/gnc-locale-it.dtd
 create mode 100644 docbook/gnc-locale-ja.dtd
 create mode 100644 docbook/gnc-locale-pt.dtd
 create mode 100644 docbook/gnc-locale-ru.dtd
 delete mode 100644 guide/C/.gitignore
 delete mode 100644 guide/C/appendixb.xml
 delete mode 100644 guide/C/appendixc.xml
 delete mode 100644 guide/de/.gitignore
 delete mode 100644 guide/de/appendixb.xml
 delete mode 100644 guide/de/appendixc.xml
 delete mode 100644 guide/it/.gitignore
 delete mode 100644 guide/ja/.gitignore
 delete mode 100644 guide/ja/appendixb.xml
 delete mode 100644 guide/ja/appendixc.xml
 delete mode 100644 guide/ja/gnucash-guide.sgml
 delete mode 100644 guide/pt/.gitignore
 delete mode 100644 guide/pt/appendixb.xml
 delete mode 100644 guide/pt/appendixc.xml
 delete mode 100644 guide/ru/appendixb.xml
 delete mode 100644 guide/ru/appendixc.xml
 delete mode 100644 help/C/.gitignore
 delete mode 100644 help/de/.gitignore
 create mode 100644 help/de/Help_para-assist-intro.xml
 create mode 100644 help/de/figures/AccountTreeCreate.png
 create mode 100644 help/de/figures/AccountTree_Export_CSV.png
 create mode 100644 help/de/figures/AccountTree_Export_dbms.png
 create mode 100644 help/de/figures/AccountTree_Export_file.png
 create mode 100644 help/de/figures/AccountTree_Import_CSV.png
 create mode 100644 help/de/figures/AccountTree_Import_CSV_Preview.png
 create mode 100644 help/de/figures/AcctViewOptions-0.png
 create mode 100644 help/de/figures/AcctViewOptions-1.png
 delete mode 100644 help/de/figures/Help_AccountTreeCreate.png
 create mode 100644 help/de/figures/Help_Book_Options_Accounts.png
 create mode 100644 help/de/figures/Help_Book_Options_Budgeting.png
 create mode 100644 help/de/figures/Help_Book_Options_Business.png
 create mode 100644 help/de/figures/Help_Book_Options_Counters.png
 create mode 100644 help/de/figures/Help_Book_Options_Tax.png
 create mode 100644 help/de/figures/Help_Pref_AccntPeriod.png
 create mode 100644 help/de/figures/Help_Pref_Accnts.png
 create mode 100644 help/de/figures/Help_Pref_Business.png
 create mode 100644 help/de/figures/Help_Pref_DateTime.png
 create mode 100644 help/de/figures/Help_Pref_General.png
 create mode 100644 help/de/figures/Help_Pref_Import.png
 create mode 100644 help/de/figures/Help_Pref_OnlineBanking.png
 create mode 100644 help/de/figures/Help_Pref_Printing.png
 create mode 100644 help/de/figures/Help_Pref_Quotes.png
 create mode 100644 help/de/figures/Help_Pref_Register.png
 create mode 100644 help/de/figures/Help_Pref_RegisterDefaults.png
 create mode 100644 help/de/figures/Help_Pref_Reports.png
 create mode 100644 help/de/figures/Help_Pref_Sched.png
 create mode 100644 help/de/figures/Help_Pref_Windows.png
 create mode 100644 help/de/figures/Help_Reset_Warnings.png
 create mode 100644 help/de/figures/Help_Style_Choose.png
 create mode 100644 help/de/figures/Help_Style_New.png
 copy help/{C => de}/figures/Help_Trans_Assoc_Symbols.png (100%)
 create mode 100644 help/de/figures/summarybar-selector-1.png
 create mode 100644 help/de/figures/summarybar-selector-2.png
 create mode 100644 help/de/figures/summarybar-selector.png
 create mode 100644 help/de/para-assist-buttons.xml
 delete mode 100644 help/it/.gitignore



More information about the gnucash-changes mailing list