gnucash-docs master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sat Jun 25 17:06:03 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/8218b3e9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/49ac05a4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f09c6534 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7b67d23c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/a2e28367 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fbe2abe3 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5471a74e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1553a77c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c4702cdf (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/8da6b5dd (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d1c9c794 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/210c08ab (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/140296ef (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/912b0d15 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3a45a8fb (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3f2c6f4c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/f15b1864 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b5d36e66 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/56bc8a23 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/275b1067 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6bc43edc (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/8509f27f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6ddeb5db (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/067bbf08 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5397c292 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/494b151d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/36a6010f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6047427d (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/40e3f995 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/72f4a99e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/9e7bef50 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c2fab792 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/99239030 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5744accd (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b96e4952 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/dc208d56 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/27a39cf8 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4f07fe77 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/99d2c0a9 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/d229bacd (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/cc468294 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/937e8a81 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4751e484 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/87a10840 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/180d159b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/87b77b8f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/654ff3cf (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/924164ff (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/31c20b76 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fa1e356a (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/5d7d3556 (commit)



commit 8218b3e9a8a1c7cea356dc54a4c1dc804d9a5461
Merge: 5d7d3556 49ac05a4
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 25 14:05:39 2022 -0700

    Merge branch 'maint'


commit 49ac05a4b30d9569008a1cb043f2ccb21c8526d8
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 25 13:42:50 2022 -0700

    Release Documentation for GnuCash 4.11

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c43b6450..9784defd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.10)
 # We don't actually use C, but GNUInstallDirs doesn't work if we don't
 # specify a language.
 project (gnucash-docs
-    VERSION 4.10.1
+    VERSION 4.11
     LANGUAGES C)
 
 set (PACKAGE_NAME GnuCash Docs)
diff --git a/ChangeLog b/ChangeLog
index 5692d25f..40d43fad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,187 @@
+2022-06-25 Frank H. Ellenberger 
+
+	* L10N:de:Manual: Review imagesize (partial) (HEAD -> maint, origin/maint)
+
+2022-06-25 Frank H. Ellenberger 
+
+	* Simplify '></imagedata>' to '/>'
+
+2022-06-25 Frank H. Ellenberger 
+
+	* Drop redundant attribute format="PNG"
+
+2022-06-25 Frank H. Ellenberger 
+
+	* L10N:de:Manuual: Tools fix image size
+
+2022-06-25 Frank H. Ellenberger 
+
+	* Merge PR #253 into maint
+
+2022-06-25 Frank H. Ellenberger 
+
+	* Merge remote-tracking branch 'cwehli/de_help_FQ' into maint
+
+2022-06-25 Frank H. Ellenberger 
+
+	* L10N:de: Security Editor, Layout hotfix: disable table
+
+2022-06-25 Frank H. Ellenberger 
+
+	* Merge PR #260 into maint
+
+2022-06-25 Frank H. Ellenberger 
+
+	* Minor improvements on PR #264
+
+2022-02-13 Christian Wehling 
+
+	* L10N:de: manual ch_Tools_Assistant: The "Security Editor"
+
+2022-04-30 Christian Wehling 
+
+	* L10n:de: manual ch_Tools_Assistant: The "Close Book"
+
+2022-06-24 Frank H. Ellenberger 
+
+	* Postprocessing of PR #250: Replace hardcoded URLs by entities
+
+2022-06-24 Frank H. Ellenberger 
+
+	* Merge PR #250 into maint
+
+2022-06-24 Frank H. Ellenberger 
+
+	* Allow crosslinking the released or draft version
+
+2022-06-23 Christian Wehling 
+
+	* manual ch_Finance_Quote: fix typo
+
+2022-01-24 Christian Wehling 
+
+	* [Bug 798414] How do I resize my register columns?
+
+2022-06-23 Frank H. Ellenberger 
+
+	* Merge remote-tracking branch 'cwehli/de_help_Tools_Intro' into maint
+
+2022-02-09 Christian Wehling 
+
+	* L10n:de: help_ch_Tools_Assistant: The "Price Editor"
+
+2022-05-25 Christian Wehling 
+
+	* L10n:de: manual ch_Tools_Assistant: Intro
+
+2022-01-11 Christian Wehling 
+
+	* F::Q Description of installing Perl
+
+2022-06-13 Frank H. Ellenberger 
+
+	* Merge PR #243 into maint
+
+2021-09-28 Christian Wehling 
+
+	* L10n:de ch_Account-Actions: Weiterentwicklung mit neuen Abschnitten
+
+2022-06-13 Christian Wehling 
+
+	* L10N:de: dtd-docbook: gnc-gui-de.dtd, menu items
+
+2022-06-12 Christian Wehling 
+
+	* Change gnc-local-$LANG into gnc-gui-$LANG in all files.
+
+2022-06-09 Christian Wehling 
+
+	* dtd-docbook: Separation of the declaration of entities of the GUI
+
+2022-06-09 Frank H. Ellenberger 
+
+	* Merge PR #268 into maint
+
+2022-06-08 Geert Janssens 
+
+	* Add tests related to images and figures
+
+2022-06-08 Geert Janssens 
+
+	* Require same cmake version as gnucash program
+
+2022-06-06 Christian Wehling 
+
+	* L10N:de: Optimize some pictures and adjust the dpi
+
+2022-06-02 Frank H. Ellenberger 
+
+	* L10N:Pt:Guide:Fix image declarations: use figure & title, fix width
+
+2022-05-29 Frank H. Ellenberger 
+
+	* L10N:pt: Guide figures cleanup
+
+2022-05-30 Christian Wehling 
+
+	* FO formatting, Added parameter to PdfTarget...
+
+2022-05-30 John Ralls 
+
+	* [SQL Backends] Clarify footnote about required additional packages.
+
+2022-05-28 Geert Janssens 
+
+	* Fix path to find svg files
+
+2022-05-27 Frank H. Ellenberger 
+
+	* Merge PR #246 into maint
+
+2022-05-22 Christian Wehling 
+
+	* dtd-docbook: bugfixing
+
+2022-04-24 Christian Wehling 
+
+	* dtd-docbook: Added an explanation of the syntax and corrected some previous entries.
+
+2022-04-18 Christian Wehling 
+
+	* dtd-docbook: further work to simplify the translation of menu items
+
+2022-05-02 Frank H. Ellenberger 
+
+	* Merge PR #249 into maint
+
+2022-04-17 Frank H. Ellenberger 
+
+	* Merge PR #258
+
+2022-04-11 Frank H. Ellenberger 
+
+	* Merge remote-tracking branch 'cwehli/maint' into maint
+
+2022-04-02 Christian Wehling 
+
+	* gitignore: Cleanup
+
+2022-03-29 Christian Wehling 
+
+	* gnc-docbookx.dtd, Optimize links to Selinger's docs
+
+2021-12-18 Christian Wehling 
+
+	* dtd-docbook: add more translatable GUI elements (menuitems)
+
+2022-01-21 Moritz Münch 
+
+	* minor typos, phrasing issues
+
+2022-01-09 Christian Wehling 
+
+	* FO formatting, Added parameter to PdfTarget...
+
 2022-03-28 Frank H. Ellenberger 
 
 	* Reenable other languages than pt in Guide (HEAD -> maint, origin/maint)
diff --git a/NEWS b/NEWS
index f2cfad04..85da5641 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,28 @@
 Version History
 ---------------
+ 4.11  - 26 June 2022
+        o Bug 798414 -No way to get whole of account column displayed
+        o Fix crosslinking between Help and the Guide so that nightlies link
+          to nightly builds and releases link to release documents on
+          https://www.gnucash.org/
+        o Add Description of installing Perl for Finance::Quote
+        o Change gnc-local-$LANG into gnc-gui-$LANG in all files.
+        o dtd-docbook: Separation of the declaration of entities of the GUI
+          from their translatable part.
+        o Add tests related to images and figures
+          * Warn if document references images that don't exist
+          * inform if images exist that are not referenced
+        o Require same cmake version as gnucash program
+        o FO formatting, Added parameter to PdfTarget to improve the
+          presentation of 'glosslist' elements.
+        o [SQL Backends] Clarify footnote about required additional packages.
+        o Fix path to find svg files
+        o dtd-docbook: Added an explanation of the syntax and corrected some
+          previous entries.
+        o dtd-docbook: further work to simplify the translation of menu items
+        o dtd-docbook: add more translatable GUI elements (menuitems)
+        o gnc-docbookx.dtd, Optimize links to Selinger's docs
+New and Updated Translations: German, Portuguese
  4.10.1- 28 March 2022
         o Re-release 4.10 because a CMakeLists.txt error included only the
 	  Portuguese version of the Tutorial and Concepts Guide.
diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 6c6ed436..7705a7e1 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -33,18 +33,18 @@ own entity definitions to use across all of our DocBook pages. -->
   1. a) Publication - should only be changed by the release manager!
 -->
 <!ENTITY series-stable "4">
-<!ENTITY vers-stable "&series-stable;.10">
+<!ENTITY vers-stable "&series-stable;.11">
 <!ENTITY series-unstable "master">
 <!ENTITY vers-unstable "">
 
 <!ENTITY manrevision "&vers-stable;">
-<!ENTITY date "27 March 2022">
+<!ENTITY date "26 June 2022">
 <!-- Fixme: a dirty hack to reference the other document
             Replace them after olink setup               -->
 <!ENTITY url-docs-top "https://www.gnucash.org/docs/">  <!-- also used for API -->
 <!ENTITY url-docs-draft "https://code.gnucash.org/docs/">  <!-- used while developing -->
 <!ENTITY url-docs-release "&url-docs-top;v&series-stable;/">  <!-- used on release -->
-<!ENTITY url-docs "&url-docs-draft;">
+<!ENTITY url-docs "&url-docs-release;">
 
 <!--
   1. b) Publication - Translators can add transliterations
diff --git a/guide/C/gnucash-guide.xml b/guide/C/gnucash-guide.xml
index 2f249975..67dad6b7 100644
--- a/guide/C/gnucash-guide.xml
+++ b/guide/C/gnucash-guide.xml
@@ -78,6 +78,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.11</revnumber>
+        <date>26 June 2022</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.10</revnumber>
         <date>27 March 2022</date>
diff --git a/guide/de/gnucash-guide.xml b/guide/de/gnucash-guide.xml
index 80440bca..164da5ea 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.11</revnumber>
+        <date>26 June 2022</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.10</revnumber>
         <date>27 March 2022</date>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 431680c2..014e3957 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.11</revnumber>
+        <date>26 June 2022</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.10</revnumber>
         <date>27 March 2022</date>
diff --git a/guide/ja/gnucash-guide.xml b/guide/ja/gnucash-guide.xml
index 7c4f2a39..88911a00 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.11</revnumber>
+        <date>26 June 2022</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.10</revnumber>
         <date>27 March 2022</date>
diff --git a/guide/pt/gnucash-guide.xml b/guide/pt/gnucash-guide.xml
index 36b14150..b01e323d 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.11</revnumber>
+        <date>26 de junho de 2022</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.10</revnumber>
         <date>27 de Março de 2022</date>
diff --git a/manual/C/gnucash-help.xml b/manual/C/gnucash-help.xml
index 50e14860..ed208d7f 100644
--- a/manual/C/gnucash-help.xml
+++ b/manual/C/gnucash-help.xml
@@ -41,6 +41,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.11</revnumber>
+        <date>26 June 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.10</revnumber>
         <date>27 March 2022</date>
diff --git a/manual/de/gnucash-help.xml b/manual/de/gnucash-help.xml
index 75b9bcb5..8b86a5f2 100644
--- a/manual/de/gnucash-help.xml
+++ b/manual/de/gnucash-help.xml
@@ -59,6 +59,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.11</revnumber>
+        <date>26 June 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.10</revnumber>
         <date>27 March 2022</date>
diff --git a/manual/it/gnucash-help.xml b/manual/it/gnucash-help.xml
index 99dc561c..316482f2 100644
--- a/manual/it/gnucash-help.xml
+++ b/manual/it/gnucash-help.xml
@@ -209,6 +209,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.11</revnumber>
+        <date>26 June 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.10</revnumber>
         <date>27 March 2022</date>
diff --git a/manual/pt/gnucash-help.xml b/manual/pt/gnucash-help.xml
index 87810a3c..37262833 100644
--- a/manual/pt/gnucash-help.xml
+++ b/manual/pt/gnucash-help.xml
@@ -46,6 +46,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.11</revnumber>
+        <date>26 de junho de 2022</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.10</revnumber>
         <date>27 de Marcha de 2022</date>

commit f09c65344503d2cbc8d6875ec32d6ff1dcaad179
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 13:57:08 2022 +0200

    L10N:de:Manual: Review imagesize (partial)
    
    Tables of images behave different for each output format and need more
    testing

diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/Help_ch_Account-Actions.xml
index a3fbddd6..c9ffb51a 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/Help_ch_Account-Actions.xml
@@ -1726,7 +1726,11 @@
     <figure pgwide="1">
       <title>Kontoeigenschaften vererben</title><screenshot>
         <mediaobject>
-          <imageobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/AccountTreeCascade.png" 
+                         srccredit="Christian Wehling" width="&img-w;"/>
+          </imageobject>
+          <imageobject role="fo">
             <imagedata fileref="figures/AccountTreeCascade.png" 
                          srccredit="Christian Wehling"/>
           </imageobject>
diff --git a/manual/de/Help_ch_Reports.xml b/manual/de/Help_ch_Reports.xml
index 0797df1f..bf4cde4c 100644
--- a/manual/de/Help_ch_Reports.xml
+++ b/manual/de/Help_ch_Reports.xml
@@ -419,20 +419,10 @@
           <figure>
             <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
               <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Geert Janssens" width="510px"/>
-                </imageobject>
-
-                <imageobject role="fo">
+                <imageobject>
                   <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Geert Janssens"/>
                 </imageobject>
-
-                <textobject>
-                  <phrase>Transaction Report, Report Options screen</phrase>
-                </textobject>
-
                 <caption>
                   <para>This is an image of the <emphasis>Transaction Report, Report Options, Display tab.</emphasis>
                   </para>
diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index df4a88b3..aef368a7 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5120,7 +5120,8 @@
         <title>Der Kurs-Editor</title><screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/Tools_PriceEditor_add.png" srccredit="Christian Wehling" />
+              <imagedata fileref="figures/Tools_PriceEditor_add.png"
+                         srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
         </screenshot>

commit 7b67d23c06ff4f26062ea386a020b4248cbb66df
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 11:04:19 2022 +0200

    Simplify '></imagedata>' to '/>'

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 242f1aa2..7f45e20e 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -47,13 +47,13 @@ Translators:
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/basics_AccountRelationships.png"
-                     srccredit="Geert Janssens"></imagedata>
+                     srccredit="Geert Janssens"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/basics_AccountRelationships.svg"
                      format="SVG" srccredit="Geert Janssens"
-                     contentwidth="4in"></imagedata>
+                     contentwidth="4in"/>
         </imageobject>
 
         <textobject>
@@ -381,7 +381,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -399,7 +399,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -497,7 +497,7 @@ Translators:
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-                             srccredit="Cristian Marchi"></imagedata>
+                             srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -544,7 +544,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_toplevel.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -672,7 +672,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_tree.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index aded1c23..cf3a4a0b 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -133,13 +133,13 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
-                         srccredit="Geert Janssens"></imagedata>
+                         srccredit="Geert Janssens"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_AccountRelationships.svg"
                          format="SVG" srccredit="Geert Janssens"
-                         contentwidth="4in"></imagedata>
+                         contentwidth="4in"/>
             </imageobject>
 
             <textobject>
@@ -626,7 +626,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_TipOfDay.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -661,7 +661,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Accounts.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -723,12 +723,12 @@ Translators:
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree" width="510"></imagedata>
+                       srccredit="Bengt Thuree" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -1176,12 +1176,12 @@ Translators:
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Cristian Marchi" width="510px"></imagedata>
+                         srccredit="Cristian Marchi" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
                     </imageobject>
 
                     <textobject>
@@ -1233,12 +1233,12 @@ Translators:
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Marchi Cristian" width="510px"></imagedata>
+                             srccredit="Marchi Cristian" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Cristian Marchi"></imagedata>
+                             srccredit="Cristian Marchi"/>
                     </imageobject>
 
                     <textobject>
@@ -1738,12 +1738,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1773,12 +1773,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1807,12 +1807,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1842,12 +1842,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1872,12 +1872,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1900,12 +1900,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1933,12 +1933,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                           srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           srccredit="Frank H. Ellenberger"></imagedata>
+                           srccredit="Frank H. Ellenberger"/>
               </imageobject>
             </mediaobject>
           </screenshot>
diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index 16786747..5fa893f5 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -236,7 +236,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -258,7 +258,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -303,7 +303,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_accounts.png"
-                     srccredit="Bengt Thuree"></imagedata>
+                     srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -339,7 +339,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_purchases.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -370,7 +370,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_refund.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -398,7 +398,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_interest.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -432,7 +432,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile_init.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -456,7 +456,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -491,7 +491,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_payment.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -513,7 +513,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_final.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index e1c98adf..dd96300b 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -331,12 +331,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -504,12 +504,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -534,12 +534,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -557,12 +557,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -583,12 +583,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -686,12 +686,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -769,12 +769,12 @@ Income
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"></imagedata>
+                                srccredit="Cristian Marchi"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"></imagedata>
+                                srccredit="Cristian Marchi"/>
                   </imageobject>
 
                   <textobject>
@@ -851,12 +851,12 @@ Income
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi" width="510px"></imagedata>
+                                     srccredit="Cristian Marchi" width="510px"/>
                         </imageobject>
 
                         <imageobject role="fo">
                           <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi"></imagedata>
+                                     srccredit="Cristian Marchi"/>
                         </imageobject>
 
                         <textobject>
@@ -939,12 +939,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1001,12 +1001,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1104,12 +1104,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1160,12 +1160,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1277,12 +1277,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1325,12 +1325,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1523,12 +1523,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1568,7 +1568,7 @@ Income
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       srccredit="John Ralls"></imagedata>
+                       srccredit="John Ralls"/>
             </imageobject>
 
             <textobject>
@@ -1643,7 +1643,7 @@ Income
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -2098,12 +2098,12 @@ Income
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/invest_sellstock.png"
-                           srccredit="Chris Good" width="510px"></imagedata>
+                           srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/invest_sellstock.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
     
               <textobject><phrase>Selling Shares,Gain Combined, Gross Pricing</phrase></textobject>
@@ -2129,12 +2129,12 @@ Income
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest_sellstock2.png"
-                             srccredit="Chris Good" width="510px"></imagedata>
+                             srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest_sellstock2.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject><phrase>Selling Shares Example</phrase></textobject>
@@ -2406,12 +2406,12 @@ Income
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                              srccredit="Chris Good" width="510px"></imagedata>
+                              srccredit="Chris Good" width="510px"/>
                 </imageobject>
     
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                              srccredit="Chris Good"></imagedata>
+                              srccredit="Chris Good"/>
                 </imageobject>
     
                 <textobject><phrase>Selling Shares Example</phrase></textobject>
@@ -2803,12 +2803,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject><phrase>Selling Shares Example</phrase></textobject>
@@ -3163,12 +3163,12 @@ Income
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
-                              srccredit="Chris Good" width="510px"></imagedata>
+                              srccredit="Chris Good" width="510px"/>
                 </imageobject>
     
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                              srccredit="Chris Good"></imagedata>
+                              srccredit="Chris Good"/>
                 </imageobject>
     
                 <textobject><phrase>Selling Shares Example</phrase>
@@ -3269,12 +3269,12 @@ Income
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -3634,12 +3634,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3673,12 +3673,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3737,12 +3737,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3776,12 +3776,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3875,12 +3875,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                  srccredit="Chris Good" width="510px"></imagedata>
+                  srccredit="Chris Good" width="510px"/>
                 </imageobject>
   
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                             srccredit="Chris Good"></imagedata>
+                             srccredit="Chris Good"/>
                 </imageobject>
   
                 <textobject>
@@ -3908,12 +3908,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3937,12 +3937,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3973,12 +3973,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -4022,12 +4022,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -4047,12 +4047,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -4072,12 +4072,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -4130,12 +4130,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -4200,12 +4200,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Daniel Dodson" width="510px"></imagedata>
+                       srccredit="Daniel Dodson" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Daniel Dodson"></imagedata>
+                       srccredit="Daniel Dodson"/>
           </imageobject>
 
           <textobject>
@@ -4252,12 +4252,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -4328,12 +4328,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good" width="510px"></imagedata>
+                      srccredit="Chris Good" width="510px"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good"></imagedata>
+                      srccredit="Chris Good"/>
         </imageobject>
 
         <textobject>
@@ -4390,7 +4390,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4413,7 +4413,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4473,7 +4473,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4494,7 +4494,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4517,7 +4517,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4561,7 +4561,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4623,7 +4623,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4649,7 +4649,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 39fc7012..0b06e5ba 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -39,12 +39,12 @@
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree" width="510"></imagedata>
+                     srccredit="Bengt Thuree" width="510"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree"></imagedata>
+                     srccredit="Bengt Thuree"/>
         </imageobject>
 
         <textobject>
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 52f6dfc7..4641a2c3 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -755,12 +755,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -896,12 +896,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi" width="510"></imagedata>
+                         srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_accts.xml b/guide/de/ch_accts.xml
index f22560fc..ddf05265 100644
--- a/guide/de/ch_accts.xml
+++ b/guide/de/ch_accts.xml
@@ -52,12 +52,12 @@
         <imageobject>
           <imagedata fileref="figures/basics_AccountRelationships.png"
                      srccredit="Frank H. Ellenberger"
-                    ></imagedata>
+                    />
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/basics_AccountRelationships.svg"
-                     format="SVG" srccredit="Frank H. Ellenberger" contentwidth="4in"></imagedata>
+                     format="SVG" srccredit="Frank H. Ellenberger" contentwidth="4in"/>
         </imageobject>
 
         <textobject>
@@ -378,7 +378,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -396,7 +396,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-                         srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -504,7 +504,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-                             srccredit="Mechtilde Stehmann"></imagedata>
+                             srccredit="Mechtilde Stehmann"/>
               </imageobject>
 
               <textobject>
@@ -552,7 +552,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_toplevel.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -685,7 +685,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_tree.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index 9b323c0d..70c41925 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -138,13 +138,13 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_AccountRelationships.svg"
                          format="SVG" srccredit="Frank H. Ellenberger"
-                         contentwidth="4in"></imagedata>
+                         contentwidth="4in"/>
             </imageobject>
 
             <textobject>
@@ -353,7 +353,7 @@
           <imageobject>
             <imagedata fileref="figures/gnc_welcome.png"
                          srccredit="JH"
-                        ></imagedata>
+                        />
           </imageobject>
 
           <textobject>
@@ -388,7 +388,7 @@
             <imageobject>
               <imagedata fileref="figures/basics_TipOfDay.png"
                          srccredit="Chris Lyttle"
-                        ></imagedata>
+                        />
             </imageobject>
 
             <textobject>
@@ -436,7 +436,7 @@
             <imageobject>
               <imagedata fileref="figures/basics_Accounts.png"
                          srccredit="Chris Lyttle"
-                        ></imagedata>
+                        />
             </imageobject>
 
             <textobject>
@@ -512,7 +512,7 @@
             <imageobject>
               <imagedata fileref="figures/basics_CheckAccount.png"
                          srccredit="Chris Lyttle"
-                        ></imagedata>
+                        />
             </imageobject>
 
             <textobject>
@@ -911,12 +911,12 @@
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                         srccredit="Mechtilde Stehmann" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"/>
                     </imageobject>
 
                     <textobject>
@@ -970,12 +970,12 @@
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                             srccredit="Mechtilde Stehmann" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Mechtilde Stehmann"></imagedata>
+                             srccredit="Mechtilde Stehmann"/>
                     </imageobject>
 
                     <textobject>
@@ -1259,7 +1259,7 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_lock.png"
-            srccredit="J.H."></imagedata>
+            srccredit="J.H."/>
           </imageobject>
 
           <textobject>
@@ -1587,12 +1587,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1628,12 +1628,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1662,12 +1662,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1698,12 +1698,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1730,12 +1730,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1758,12 +1758,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <caption>
@@ -1793,12 +1793,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           srccredit="Frank H. Ellenberger"></imagedata>
+                           srccredit="Frank H. Ellenberger"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           srccredit="Frank H. Ellenberger"></imagedata>
+                           srccredit="Frank H. Ellenberger"/>
               </imageobject>
             </mediaobject>
           </screenshot>
diff --git a/guide/de/ch_cc.xml b/guide/de/ch_cc.xml
index 97cf5739..1f4ba95d 100644
--- a/guide/de/ch_cc.xml
+++ b/guide/de/ch_cc.xml
@@ -250,7 +250,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           srccredit="Mechtilde Stehmann"></imagedata>
+                           srccredit="Mechtilde Stehmann"/>
             </imageobject>
 
             <textobject>
@@ -272,7 +272,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           srccredit="Mechtilde Stehmann"></imagedata>
+                           srccredit="Mechtilde Stehmann"/>
             </imageobject>
 
             <textobject>
@@ -317,7 +317,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_accounts.png"
-                     srccredit="Mechtilde Stehmann"></imagedata>
+                     srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -354,7 +354,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_purchases.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -387,7 +387,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_refund.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -415,7 +415,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_interest.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -450,7 +450,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile_init.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -474,7 +474,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -511,7 +511,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_payment.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -533,7 +533,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_final.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index 3c9b30da..f672b6af 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -349,12 +349,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -532,12 +532,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -563,12 +563,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -586,12 +586,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -612,12 +612,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -717,12 +717,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -804,12 +804,12 @@ Einnahmen
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Mechtilde Stehmann"></imagedata>
+                                srccredit="Mechtilde Stehmann"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Mechtilde Stehmann"></imagedata>
+                                srccredit="Mechtilde Stehmann"/>
                   </imageobject>
 
                   <textobject>
@@ -889,12 +889,12 @@ Einnahmen
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                                     srccredit="Mechtilde Stehmann" width="510px"/>
                         </imageobject>
 
                         <imageobject role="fo">
                           <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Mechtilde Stehmann"></imagedata>
+                                     srccredit="Mechtilde Stehmann"/>
                         </imageobject>
 
                         <textobject>
@@ -981,12 +981,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1029,12 +1029,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1085,12 +1085,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1204,12 +1204,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1253,12 +1253,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1430,12 +1430,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1478,7 +1478,7 @@ Einnahmen
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1520,7 +1520,7 @@ Einnahmen
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1855,12 +1855,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_sellstock.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_sellstock.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -1879,12 +1879,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_sellstock2.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_sellstock2.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -2051,12 +2051,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_sellstockLoss.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_sellstockLoss.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -2075,12 +2075,12 @@ Einnahmen
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_sellstockLoss2.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_sellstockLoss2.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -2181,12 +2181,12 @@ Einnahmen
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -2493,11 +2493,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -2536,11 +2536,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -2607,11 +2607,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -2732,11 +2732,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -2767,11 +2767,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -2798,11 +2798,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -2839,11 +2839,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -2892,11 +2892,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/investLotsSplitReg.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -2918,11 +2918,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/investLotsSplitLot0.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -2944,11 +2944,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/investLotsSplitLot1.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -3010,11 +3010,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3080,12 +3080,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                       srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3134,12 +3134,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                        srccredit="Mechtilde Stehmann" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Mechtilde Stehmann"></imagedata>
+                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3211,12 +3211,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good" width="510px"></imagedata>
+                      srccredit="Chris Good" width="510px"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good"></imagedata>
+                      srccredit="Chris Good"/>
         </imageobject>
 
         <textobject>
@@ -3278,7 +3278,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3301,7 +3301,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3365,7 +3365,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3388,7 +3388,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3413,7 +3413,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3458,7 +3458,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3526,7 +3526,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -3554,7 +3554,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-                       srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index 55f3034d..2faf063f 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -759,12 +759,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -903,12 +903,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Mechtilde Stehmann" width="510"></imagedata>
+                         srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ja/ch_accts.xml b/guide/ja/ch_accts.xml
index 66eaed4b..476dbad6 100644
--- a/guide/ja/ch_accts.xml
+++ b/guide/ja/ch_accts.xml
@@ -41,7 +41,7 @@ Translators:
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/basics_AccountRelationships.png"
-srccredit="Geert Janssens"></imagedata>
+srccredit="Geert Janssens"/>
         </imageobject>
 
         <textobject>
@@ -290,7 +290,7 @@ linkend="basics-accounting1"></xref>で説明しているように、貸方は
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -308,7 +308,7 @@ srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -389,7 +389,7 @@ srccredit="Cristian Marchi"></imagedata>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -432,7 +432,7 @@ srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_toplevel.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -541,7 +541,7 @@ srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_tree.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ja/ch_basics.xml b/guide/ja/ch_basics.xml
index 83a8896b..fc1ebfbb 100644
--- a/guide/ja/ch_basics.xml
+++ b/guide/ja/ch_basics.xml
@@ -102,7 +102,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_AccountRelationships.png"
-srccredit="Geert Janssens"></imagedata>
+srccredit="Geert Janssens"/>
             </imageobject>
 
             <textobject>
@@ -251,7 +251,7 @@ linkend="basics-files1"/>を参照してください。
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_TipOfDay.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -284,7 +284,7 @@ srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Accounts.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -338,12 +338,12 @@ srccredit="Cristian Marchi"></imagedata>
           <imageobject role="html">
             <imagedata
 fileref="figures/basics_CheckAccount.png" srccredit="Bengt
-Thuree" width="510"></imagedata>
+Thuree" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/basics_CheckAccount.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -587,13 +587,13 @@ linkend="basics-open-data">開いて</link>修正するために、ファイル
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
-srccredit="Cristian Marchi" width="510px"></imagedata>
+srccredit="Cristian Marchi" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata
 fileref="figures/basics_SaveXML.png" srccredit="Cristian
-Marchi"></imagedata>
+Marchi"/>
                     </imageobject>
 
                     <textobject>
@@ -639,13 +639,13 @@ Marchi"></imagedata>
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-srccredit="Marchi Cristian" width="510px"></imagedata>
+srccredit="Marchi Cristian" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata
 fileref="figures/basics_SaveSQL.png" srccredit="Cristian
-Marchi"></imagedata>
+Marchi"/>
                     </imageobject>
 
                     <textobject>
@@ -897,13 +897,13 @@ Marchi"></imagedata>
             <imageobject role="html">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup.png"
-srccredit="Cristian Marchi" width="510"></imagedata>
+srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -936,13 +936,13 @@ srccredit="Cristian Marchi"></imagedata>
             <imageobject role="html">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-srccredit="Cristian Marchi" width="510"></imagedata>
+srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -974,13 +974,13 @@ srccredit="Cristian Marchi"></imagedata>
             <imageobject role="html">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-srccredit="Cristian Marchi" width="510"></imagedata>
+srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -1006,13 +1006,13 @@ srccredit="Cristian Marchi"></imagedata>
             <imageobject role="html">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-srccredit="Cristian Marchi" width="510"></imagedata>
+srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -1037,13 +1037,13 @@ srccredit="Cristian Marchi"></imagedata>
             <imageobject role="html">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-srccredit="Cristian Marchi" width="510"></imagedata>
+srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
 fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -1068,12 +1068,12 @@ srccredit="Cristian Marchi"></imagedata>
             <imageobject role="html">
               <imagedata
 fileref="figures/basics_EmptyAccounts.png" srccredit="Cristian
-Marchi" width="510"></imagedata>
+Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_EmptyAccounts.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
diff --git a/guide/ja/ch_cc.xml b/guide/ja/ch_cc.xml
index be042ecd..bcd1a36f 100644
--- a/guide/ja/ch_cc.xml
+++ b/guide/ja/ch_cc.xml
@@ -204,7 +204,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -225,7 +225,7 @@ srccredit="Bengt Thuree"></imagedata>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -265,7 +265,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_accounts.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -300,7 +300,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_purchases.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -331,7 +331,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_refund.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -358,7 +358,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_interest.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -392,7 +392,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile_init.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -414,7 +414,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -447,7 +447,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_payment.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -469,7 +469,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_final.png"
-srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ja/ch_invest.xml b/guide/ja/ch_invest.xml
index e31db061..751ac387 100644
--- a/guide/ja/ch_invest.xml
+++ b/guide/ja/ch_invest.xml
@@ -239,7 +239,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_AccountsPredef.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -362,7 +362,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_int1.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -386,7 +386,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_int2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -407,7 +407,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_int3.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -499,7 +499,7 @@ linkend="invest-buy-new2"><emphasis>新規株式の購入</emphasis>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_newaccount.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -574,7 +574,7 @@ srccredit="Dave Herman"></imagedata>
                 <mediaobject>
                   <imageobject>
                     <imagedata fileref="figures/invest_selectsecurity.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
                   </imageobject>
 
                   <textobject>
@@ -641,7 +641,7 @@ srccredit="Dave Herman"></imagedata>
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/invest_newsecurity.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
                         </imageobject>
 
                         <textobject>
@@ -725,7 +725,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_setup_current.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -768,7 +768,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -815,7 +815,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_SetupPortfolio2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -898,7 +898,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_peditor.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -928,7 +928,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_peditor2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1074,7 +1074,7 @@ class="directory">$HOME/gnucash-filename</filename>はデータファイルの
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1113,7 +1113,7 @@ role="strong">平均残高</emphasis>帳票のカスタマイズ画面です。
           <imageobject>
             <imagedata
 fileref="figures/invest_stockvalue_report_options.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1154,7 +1154,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1455,7 +1455,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstock.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1474,7 +1474,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstock2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1628,7 +1628,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstockLoss.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1647,7 +1647,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstockLoss2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1685,7 +1685,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_dividendcash.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1727,7 +1727,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1745,7 +1745,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_dividendreinvest2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1789,7 +1789,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1811,7 +1811,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1872,7 +1872,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1894,7 +1894,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1917,7 +1917,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -1956,7 +1956,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -2020,7 +2020,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -2046,7 +2046,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ja/ch_oview.xml b/guide/ja/ch_oview.xml
index e6b39f09..2655ae2e 100644
--- a/guide/ja/ch_oview.xml
+++ b/guide/ja/ch_oview.xml
@@ -41,13 +41,13 @@
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/oview_intro.png"
-srccredit="Bengt Thuree" width="510"></imagedata>
+srccredit="Bengt Thuree" width="510"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata
 fileref="figures/oview_intro.png" srccredit="Bengt
-Thuree"></imagedata>
+Thuree"/>
         </imageobject>
 
         <textobject>
diff --git a/guide/ja/ch_txns.xml b/guide/ja/ch_txns.xml
index affc79fc..1735a116 100644
--- a/guide/ja/ch_txns.xml
+++ b/guide/ja/ch_txns.xml
@@ -563,13 +563,13 @@ linkend="rec-start-blnc"><guilabel>期首残高</guilabel></link>を壊さず変
           <imageobject role="html">
             <imagedata
 fileref="figures/txns_reconcile_window1.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <imageobject
 role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -677,13 +677,13 @@ srccredit="Cristian Marchi"></imagedata>
           <imageobject role="html">
             <imagedata
 fileref="figures/txns_reconcile_window2.png"
-srccredit="Cristian Marchi" width="510"></imagedata>
+srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata
 fileref="figures/txns_reconcile_window2.png"
-srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/pt/ch_accts.xml b/guide/pt/ch_accts.xml
index 36abd834..1bea946c 100644
--- a/guide/pt/ch_accts.xml
+++ b/guide/pt/ch_accts.xml
@@ -57,7 +57,7 @@ Translators:
           <imageobject role="fo">
             <imagedata fileref="figures/basics_AccountRelationships.svg"
                        srccredit="Pedro Albuquerque"
-                       contentwidth="4in"></imagedata>
+                       contentwidth="4in"/>
           </imageobject>
           <caption>
             <para>Uma visão gráfica da relação entre as 5 contas básicas. O valor líquido (capital próprio)
diff --git a/guide/ru/ch_accts.xml b/guide/ru/ch_accts.xml
index fa526c04..4403c842 100644
--- a/guide/ru/ch_accts.xml
+++ b/guide/ru/ch_accts.xml
@@ -60,13 +60,13 @@
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/basics_AccountRelationships.png"
-                     srccredit="DiMan"></imagedata>
+                     srccredit="DiMan"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/basics_AccountRelationships.svg"
                      format="SVG" srccredit="DiMan"
-                     contentwidth="4in"></imagedata>
+                     contentwidth="4in"/>
         </imageobject>
 
         <textobject>
@@ -504,7 +504,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         srccredit="DiMan"></imagedata>
+                         srccredit="DiMan"/>
           </imageobject>
 
           <textobject>
@@ -523,7 +523,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-                         srccredit="DiMan"></imagedata>
+                         srccredit="DiMan"/>
           </imageobject>
 
           <textobject>
@@ -701,7 +701,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-                             srccredit="DiMan"></imagedata>
+                             srccredit="DiMan"/>
               </imageobject>
 
               <textobject>
@@ -756,7 +756,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_toplevel.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
           </imageobject>
 
           <textobject>
@@ -914,7 +914,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_tree.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ru/ch_basics.xml b/guide/ru/ch_basics.xml
index 90ae9bf1..d6deeab2 100644
--- a/guide/ru/ch_basics.xml
+++ b/guide/ru/ch_basics.xml
@@ -150,13 +150,13 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
-                         srccredit="Geert Janssens"></imagedata>
+                         srccredit="Geert Janssens"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_AccountRelationships.svg"
                          format="SVG" srccredit="Geert Janssens"
-                         contentwidth="4in"></imagedata>
+                         contentwidth="4in"/>
             </imageobject>
 
             <textobject>
@@ -449,7 +449,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_TipOfDay.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
           </imageobject>
 
           <textobject>
@@ -491,7 +491,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_Accounts.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -571,12 +571,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree" width="510"></imagedata>
+                       srccredit="Bengt Thuree" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -957,12 +957,12 @@
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="DiMan" width="510px"></imagedata>
+                         srccredit="DiMan" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="DiMan"></imagedata>
+                         srccredit="DiMan"/>
                     </imageobject>
 
                     <textobject>
@@ -1023,12 +1023,12 @@
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Marchi Cristian" width="510px"></imagedata>
+                             srccredit="Marchi Cristian" width="510px"/>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Cristian Marchi"></imagedata>
+                             srccredit="Cristian Marchi"/>
                     </imageobject>
 
                     <textobject>
@@ -1637,12 +1637,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
@@ -1681,12 +1681,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Currency.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Currency.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
@@ -1722,12 +1722,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_NewBookOpts.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_NewBookOpts.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
@@ -1765,12 +1765,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
@@ -1802,12 +1802,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
@@ -1836,12 +1836,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
@@ -1878,12 +1878,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_EmptyAccounts.png"
-                       srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_EmptyAccounts.png"
-                       srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"/>
             </imageobject>
 
             <textobject>
diff --git a/guide/ru/ch_cc.xml b/guide/ru/ch_cc.xml
index d8a5b19e..9c1acd72 100644
--- a/guide/ru/ch_cc.xml
+++ b/guide/ru/ch_cc.xml
@@ -236,7 +236,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -258,7 +258,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -303,7 +303,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_accounts.png"
-                     srccredit="Bengt Thuree"></imagedata>
+                     srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -339,7 +339,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_purchases.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -370,7 +370,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_refund.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -398,7 +398,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_interest.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -432,7 +432,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile_init.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -456,7 +456,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -491,7 +491,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_payment.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
@@ -513,7 +513,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_final.png"
-                       srccredit="Bengt Thuree"></imagedata>
+                       srccredit="Bengt Thuree"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index 63b6d10d..a6d39fe4 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -332,12 +332,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -507,12 +507,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -537,12 +537,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -560,12 +560,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -586,12 +586,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -689,12 +689,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -772,12 +772,12 @@ Income
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"></imagedata>
+                                srccredit="Cristian Marchi"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"></imagedata>
+                                srccredit="Cristian Marchi"/>
                   </imageobject>
 
                   <textobject>
@@ -854,12 +854,12 @@ Income
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi" width="510px"></imagedata>
+                                     srccredit="Cristian Marchi" width="510px"/>
                         </imageobject>
 
                         <imageobject role="fo">
                           <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi"></imagedata>
+                                     srccredit="Cristian Marchi"/>
                         </imageobject>
 
                         <textobject>
@@ -942,12 +942,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1004,12 +1004,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1111,12 +1111,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1167,12 +1167,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1284,12 +1284,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1333,12 +1333,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1502,12 +1502,12 @@ Income
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -1546,7 +1546,7 @@ Income
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       srccredit="John Ralls"></imagedata>
+                       srccredit="John Ralls"/>
             </imageobject>
 
             <textobject>
@@ -1622,7 +1622,7 @@ Income
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -2523,12 +2523,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstock.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstock.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -2560,12 +2560,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstock2.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstock2.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -2708,12 +2708,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -2914,12 +2914,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -3103,12 +3103,12 @@ Income
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
-                          srccredit="Chris Good" width="510px"></imagedata>
+                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good"></imagedata>
+                          srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -3211,12 +3211,12 @@ Income
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -3579,12 +3579,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3621,12 +3621,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3693,12 +3693,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3735,12 +3735,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3842,12 +3842,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -3877,12 +3877,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3908,12 +3908,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3946,12 +3946,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -3996,12 +3996,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -4021,12 +4021,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -4046,12 +4046,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -4109,12 +4109,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -4175,12 +4175,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Daniel Dodson" width="510px"></imagedata>
+                       srccredit="Daniel Dodson" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Daniel Dodson"></imagedata>
+                       srccredit="Daniel Dodson"/>
           </imageobject>
 
           <textobject>
@@ -4227,12 +4227,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi" width="510px"></imagedata>
+                        srccredit="Cristian Marchi" width="510px"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi"></imagedata>
+                        srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -4303,12 +4303,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good" width="510px"></imagedata>
+                      srccredit="Chris Good" width="510px"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good"></imagedata>
+                      srccredit="Chris Good"/>
         </imageobject>
 
         <textobject>
@@ -4366,7 +4366,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4389,7 +4389,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4452,7 +4452,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4473,7 +4473,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4496,7 +4496,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4540,7 +4540,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4606,7 +4606,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
@@ -4632,7 +4632,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-                       srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index 40b4b3c7..82feb784 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -55,12 +55,12 @@
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree" width="510"></imagedata>
+                     srccredit="Bengt Thuree" width="510"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree"></imagedata>
+                     srccredit="Bengt Thuree"/>
         </imageobject>
 
         <textobject>
diff --git a/guide/ru/ch_txns.xml b/guide/ru/ch_txns.xml
index 12bc9f15..db691010 100644
--- a/guide/ru/ch_txns.xml
+++ b/guide/ru/ch_txns.xml
@@ -722,12 +722,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -863,12 +863,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi" width="510"></imagedata>
+                         srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
diff --git a/manual/C/Help_ch_Customize.xml b/manual/C/Help_ch_Customize.xml
index 7b423a3e..35d7948b 100755
--- a/manual/C/Help_ch_Customize.xml
+++ b/manual/C/Help_ch_Customize.xml
@@ -99,12 +99,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -181,12 +181,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Accnts.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Accnts.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -276,12 +276,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Business.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Business.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -394,12 +394,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_General.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_General.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -530,12 +530,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Import.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Import.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -657,12 +657,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_DateTime.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_DateTime.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -779,12 +779,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -832,12 +832,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Quotes.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Quotes.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -882,12 +882,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -926,12 +926,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1025,12 +1025,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1113,12 +1113,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1172,12 +1172,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1249,12 +1249,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -1369,7 +1369,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1466,7 +1466,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1484,7 +1484,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1590,7 +1590,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
         </screenshot>
diff --git a/manual/C/Help_ch_GUIMenus.xml b/manual/C/Help_ch_GUIMenus.xml
index 62b6bff9..e6b3f1af 100644
--- a/manual/C/Help_ch_GUIMenus.xml
+++ b/manual/C/Help_ch_GUIMenus.xml
@@ -174,12 +174,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Help_AccountTree_Screen.png"
-                       srccredit="Cristian Marchi" width="510"></imagedata>
+                       srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/Help_AccountTree_Screen.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -3240,12 +3240,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_AccountReg_Screen.png"
-                       srccredit="Cristian Marchi" width="510"></imagedata>
+                       srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_AccountReg_Screen.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -4353,12 +4353,12 @@ url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Report_Screen.png"
-                       srccredit="Cristian Marchi" width="510"></imagedata>
+                       srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Report_Screen.png"
-                       srccredit="Cristian Marchi"></imagedata>
+                       srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
diff --git a/manual/C/Help_ch_Reports.xml b/manual/C/Help_ch_Reports.xml
index 6ce7ef6f..5047eed9 100644
--- a/manual/C/Help_ch_Reports.xml
+++ b/manual/C/Help_ch_Reports.xml
@@ -418,12 +418,12 @@
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Geert Janssens" width="510px"></imagedata>
+                     srccredit="Geert Janssens" width="510px"/>
                 </imageobject>
 
                 <imageobject role="fo">
                   <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Geert Janssens"></imagedata>
+                     srccredit="Geert Janssens"/>
                 </imageobject>
 
                 <textobject>
diff --git a/manual/C/Help_ch_Tools_Assistants.xml b/manual/C/Help_ch_Tools_Assistants.xml
index b387fb5b..c11cf952 100644
--- a/manual/C/Help_ch_Tools_Assistants.xml
+++ b/manual/C/Help_ch_Tools_Assistants.xml
@@ -5743,12 +5743,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-              srccredit="Chris Good" width="510px"></imagedata>
+              srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -6187,12 +6187,12 @@ url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                           srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
diff --git a/manual/C/Help_ch_Transactions.xml b/manual/C/Help_ch_Transactions.xml
index e877a87d..89d5a8f0 100644
--- a/manual/C/Help_ch_Transactions.xml
+++ b/manual/C/Help_ch_Transactions.xml
@@ -1363,11 +1363,11 @@ Translators:
           <title>The Import QIF Files Assistent</title><screenshot id="ImportQIFDruid">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Import_QIF_Druid.png" srccredit="David Cousens" width="510"></imagedata>
+                <imagedata fileref="figures/Help_Import_QIF_Druid.png" srccredit="David Cousens" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Import_QIF_Druid.png" srccredit="David Cousens"></imagedata>
+                <imagedata fileref="figures/Help_Import_QIF_Druid.png" srccredit="David Cousens"/>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -1607,11 +1607,11 @@ Translators:
         <title>The CSV Transaction Import Assistant - Introduction</title><screenshot id="CSV_Transaction_Import_Assistant">
           <mediaobject>
             <imageobject role="html">
-              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" srccredit="David Cousens" width="515px"></imagedata>
+              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" srccredit="David Cousens" width="515px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" srccredit="David Cousens"></imagedata>
+              <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" srccredit="David Cousens"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1678,11 +1678,11 @@ Translators:
                   <title>The CSV Import Preview Pane</title><screenshot id="CSV_Import_Preview">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" srccredit="David Cousens" width="515px"></imagedata>
+                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" srccredit="David Cousens" width="515px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" srccredit="David Cousens"></imagedata>
+                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" srccredit="David Cousens"/>
                       </imageobject>
 
                       <caption>
@@ -2104,11 +2104,11 @@ Translators:
           <title>The Generic Transaction Import Matcher Window</title><screenshot id="ImportMatcherScreenShot">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" srccredit="David Cousens" width="510"></imagedata>
+                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" srccredit="David Cousens" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" srccredit="David Cousens"></imagedata>
+                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" srccredit="David Cousens"/>
               </imageobject>
 
               <caption>
@@ -2738,11 +2738,11 @@ Translators:
         <title>The Match Picker Dialog</title><screenshot id="ImportMatcherPicker">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens" width="510"></imagedata>
+              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens"></imagedata>
+              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens"/>
             </imageobject>
 
             <caption>
@@ -2876,11 +2876,11 @@ Translators:
         <title>The Import Map Editor</title><screenshot>
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_Map_Editor.png" srccredit="David Cousens" width="510"></imagedata>
+              <imagedata fileref="figures/Help_Import_Map_Editor.png" srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_Map_Editor.png" srccredit="David Cousens"></imagedata>
+              <imagedata fileref="figures/Help_Import_Map_Editor.png" srccredit="David Cousens"/>
             </imageobject>
 
             <caption>
@@ -3052,11 +3052,11 @@ Translators:
       <title>The Export Transactions Wizard.</title><screenshot id="export-transactions-wizard">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Choose_Export_Settings.png" srccredit="David Cousens" width="510"></imagedata>
+            <imagedata fileref="figures/Help_Choose_Export_Settings.png" srccredit="David Cousens" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Choose_Export_Settings.png" srccredit="David Cousens"></imagedata>
+            <imagedata fileref="figures/Help_Choose_Export_Settings.png" srccredit="David Cousens"/>
           </imageobject>
         </mediaobject>
       </screenshot>
diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/Help_ch_Account-Actions.xml
index 0c77058d..a3fbddd6 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/Help_ch_Account-Actions.xml
@@ -999,7 +999,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/AcctCreate_General.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1299,7 +1299,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/AcctCreate_OpenBal.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1728,7 +1728,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/AccountTreeCascade.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -1844,7 +1844,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/chart_acct_delete_msg.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -1873,7 +1873,7 @@
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/chart_acct_delete_01.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                         srccredit="Christian Wehling" width="100%"/>
                       </imageobject>
                     </mediaobject>
                   </screenshot>
@@ -1887,7 +1887,7 @@
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/chart_acct_delete_02.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                         srccredit="Christian Wehling" width="100%"/>
                       </imageobject>
                     </mediaobject>
                   </screenshot>
@@ -1901,7 +1901,7 @@
                     <mediaobject>
                       <imageobject>
                         <imagedata fileref="figures/chart_acct_delete_03.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                         srccredit="Christian Wehling" width="100%"/>
                       </imageobject>
                     </mediaobject>
                   </screenshot>
@@ -2676,7 +2676,7 @@
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/AccountTree_Export_file.png" 
-                         srccredit="Frank H. Ellenberger" width="100%"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="100%"/>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
@@ -2690,7 +2690,7 @@
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/AccountTree_Export_dbms.png" 
-                         srccredit="Frank H. Ellenberger" width="100%"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="100%"/>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
diff --git a/manual/de/Help_ch_Customize.xml b/manual/de/Help_ch_Customize.xml
index 757dfc23..3ec7da1d 100644
--- a/manual/de/Help_ch_Customize.xml
+++ b/manual/de/Help_ch_Customize.xml
@@ -98,12 +98,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png" 
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -226,12 +226,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Accnts.png" 
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Accnts.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -396,12 +396,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Business.png" 
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Business.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -563,12 +563,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_DateTime.png" 
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_DateTime.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -748,12 +748,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_General.png" 
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_General.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1026,12 +1026,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Import.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Import.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1238,12 +1238,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1327,12 +1327,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Quotes.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Quotes.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1378,12 +1378,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Printing.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1446,12 +1446,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Register.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1664,12 +1664,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1792,12 +1792,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Reports.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -1885,12 +1885,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Sched.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -2004,12 +2004,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Windows.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
 
             <caption>
@@ -2194,12 +2194,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2385,12 +2385,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2409,12 +2409,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2531,12 +2531,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         srccredit="Christian Wehling" ></imagedata>
+                         srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2611,12 +2611,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Book_Options_Tax.png"
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Book_Options_Tax.png"
-                         srccredit="Christian Wehling" ></imagedata>
+                         srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2673,7 +2673,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Style_Choose.png"
-                         srccredit="Christian Wehling" ></imagedata>
+                         srccredit="Christian Wehling" />
             </imageobject>
 
             <caption>
@@ -2722,7 +2722,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
                   <mediaobject>
                     <imageobject>
                       <imagedata fileref="figures/Help_Style_New.png"
-                         srccredit="Christian Wehling" ></imagedata>
+                         srccredit="Christian Wehling" />
                     </imageobject>
                   </mediaobject>
                 </screenshot>
@@ -3771,12 +3771,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Help_Reset_Warnings.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/Help_Reset_Warnings.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
           </imageobject>
         </mediaobject>
       </screenshot>
diff --git a/manual/de/Help_ch_GUIMenus.xml b/manual/de/Help_ch_GUIMenus.xml
index 0a2f656f..8b1e8a4d 100644
--- a/manual/de/Help_ch_GUIMenus.xml
+++ b/manual/de/Help_ch_GUIMenus.xml
@@ -2933,12 +2933,12 @@
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/AcctViewOptions-0.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
                         </imageobject>
 
                         <imageobject role="fo">
                           <imagedata fileref="figures/AcctViewOptions-0.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                         srccredit="Christian Wehling" width="100%"/>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
@@ -2952,12 +2952,12 @@
                       <mediaobject>
                         <imageobject role="html">
                           <imagedata fileref="figures/AcctViewOptions-1.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
                         </imageobject>
 
                         <imageobject role="fo">
                           <imagedata fileref="figures/AcctViewOptions-1.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                         srccredit="Christian Wehling" width="100%"/>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
diff --git a/manual/de/Help_ch_Reports.xml b/manual/de/Help_ch_Reports.xml
index 6704508e..0797df1f 100644
--- a/manual/de/Help_ch_Reports.xml
+++ b/manual/de/Help_ch_Reports.xml
@@ -421,12 +421,12 @@
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Geert Janssens" width="510px"></imagedata>
+                     srccredit="Geert Janssens" width="510px"/>
                 </imageobject>
 
                 <imageobject role="fo">
                   <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Geert Janssens"></imagedata>
+                     srccredit="Geert Janssens"/>
                 </imageobject>
 
                 <textobject>
diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index 6c1eb111..df4a88b3 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5487,11 +5487,11 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Tools_SecurityEditor.png" 
-                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+                         srccredit="Christian Wehling" width="&img-w;"/>
           </imageobject>
           <imageobject role="fo">
             <imagedata fileref="figures/Tools_SecurityEditor.png" 
-                         srccredit="Christian Wehling"></imagedata>
+                         srccredit="Christian Wehling"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -5628,7 +5628,7 @@
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
-                            srccredit="Christian Wehling"></imagedata>
+                            srccredit="Christian Wehling"/>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
@@ -5642,7 +5642,7 @@
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Tools_SecurityEditor_edit.png" 
-                            srccredit="Christian Wehling"></imagedata>
+                            srccredit="Christian Wehling"/>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
@@ -6254,11 +6254,11 @@ and update the appendix. -->
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-              srccredit="Chris Good" width="&img-w;"></imagedata>
+              srccredit="Chris Good" width="&img-w;"/>
             </imageobject>
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-                         srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"/>
             </imageobject>
             <caption>
               <para>An image of the <emphasis>Lots in Account </emphasis> window for a security account.
@@ -6691,11 +6691,11 @@ and update the appendix. -->
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                  srccredit="Chris Good" width="&img-w;"></imagedata>
+                  srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                           srccredit="Chris Good" ></imagedata>
+                           srccredit="Chris Good" />
               </imageobject>
               <caption>
                 <para>An image of the <guilabel>Lots in Account</guilabel> window for an Accounts Receivable account.
diff --git a/manual/pt/Help_ch_Customize.xml b/manual/pt/Help_ch_Customize.xml
index 87676a4d..eba5ee5c 100644
--- a/manual/pt/Help_ch_Customize.xml
+++ b/manual/pt/Help_ch_Customize.xml
@@ -101,12 +101,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Accnts.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Accnts.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -212,12 +212,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_DateTime.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_DateTime.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -305,12 +305,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -428,12 +428,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_General.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_General.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -617,12 +617,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -666,12 +666,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -754,12 +754,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Business.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Business.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -883,12 +883,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -1049,12 +1049,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -1135,12 +1135,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -1231,12 +1231,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -1294,12 +1294,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         srccredit="Pedro Albuquerque"></imagedata>
+                         srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
diff --git a/manual/pt/Help_ch_GUIMenus.xml b/manual/pt/Help_ch_GUIMenus.xml
index d66ebe12..3a483e6a 100644
--- a/manual/pt/Help_ch_GUIMenus.xml
+++ b/manual/pt/Help_ch_GUIMenus.xml
@@ -45,12 +45,12 @@
         <title>A janela principal do &app;</title><mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Main-window-callouts.png"
-                       srccredit="Pedro Albuquerque" width="510"></imagedata>
+                       srccredit="Pedro Albuquerque" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/Main-window-callouts.png"
-                       srccredit="Pedro Albuquerque"></imagedata>
+                       srccredit="Pedro Albuquerque"/>
           </imageobject>
 
           <textobject>
@@ -180,12 +180,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Help_AccountTree_Screen.png"
-                       srccredit="Pedro Albuquerque" width="510"></imagedata>
+                       srccredit="Pedro Albuquerque" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/Help_AccountTree_Screen.png"
-                       srccredit="Pedro Albuquerque"></imagedata>
+                       srccredit="Pedro Albuquerque"/>
           </imageobject>
 
           <textobject>
@@ -2899,12 +2899,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_AccountReg_Screen.png"
-                       srccredit="Pedro Albuquerque" width="510"></imagedata>
+                       srccredit="Pedro Albuquerque" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_AccountReg_Screen.png"
-                       srccredit="Pedro Albuquerque"></imagedata>
+                       srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
@@ -4758,12 +4758,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Report_Screen.png"
-                       srccredit="Pedro Albuquerque" width="510"></imagedata>
+                       srccredit="Pedro Albuquerque" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Report_Screen.png"
-                       srccredit="Pedro Albuquerque"></imagedata>
+                       srccredit="Pedro Albuquerque"/>
             </imageobject>
 
             <textobject>
diff --git a/manual/pt/Help_ch_Reports.xml b/manual/pt/Help_ch_Reports.xml
index f31cd233..ac19c77f 100644
--- a/manual/pt/Help_ch_Reports.xml
+++ b/manual/pt/Help_ch_Reports.xml
@@ -108,12 +108,12 @@
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                     srccredit="Pedro Albuquerque" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
-                     srccredit="Pedro Albuquerque"></imagedata>
+                     srccredit="Pedro Albuquerque"/>
               </imageobject>
 
               <textobject>
diff --git a/manual/pt/Help_ch_Transactions.xml b/manual/pt/Help_ch_Transactions.xml
index 4c12066c..4ba7cad5 100644
--- a/manual/pt/Help_ch_Transactions.xml
+++ b/manual/pt/Help_ch_Transactions.xml
@@ -81,12 +81,12 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/icons/split_transaction.png"
-                       srccredit="Pedro Albuquerque" width="47"></imagedata>
+                       srccredit="Pedro Albuquerque" width="47"/>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/split_transaction.png"
-                       srccredit="Pedro Albuquerque"></imagedata>
+                       srccredit="Pedro Albuquerque"/>
             </imageobject>
           </mediaobject>
           e o item de menu

commit a2e28367add16437ca375cb760c0ff1e3634f420
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 10:10:42 2022 +0200

    Drop redundant attribute format="PNG"

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 76dc25ae..242f1aa2 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -47,7 +47,7 @@ Translators:
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/basics_AccountRelationships.png"
-                     format="PNG" srccredit="Geert Janssens"></imagedata>
+                     srccredit="Geert Janssens"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
@@ -381,7 +381,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -399,7 +399,7 @@ Translators:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -497,7 +497,7 @@ Translators:
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-                             format="PNG" srccredit="Cristian Marchi"></imagedata>
+                             srccredit="Cristian Marchi"></imagedata>
               </imageobject>
 
               <textobject>
@@ -543,7 +543,7 @@ Translators:
       <screenshot id="accts-toplevel">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_toplevel.png" format="PNG"
+            <imagedata fileref="figures/accts_toplevel.png"
                        srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -671,7 +671,7 @@ Translators:
       <screenshot id="accts-tree">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_tree.png" format="PNG"
+            <imagedata fileref="figures/accts_tree.png"
                        srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 1cc201f1..aded1c23 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -133,7 +133,7 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
-                         format="PNG" srccredit="Geert Janssens"></imagedata>
+                         srccredit="Geert Janssens"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
@@ -625,7 +625,7 @@ Translators:
       <screenshot id="basics-TipOfDay">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_TipOfDay.png" format="PNG"
+            <imagedata fileref="figures/basics_TipOfDay.png"
                        srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -660,7 +660,7 @@ Translators:
       <screenshot id="basics-Accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Accounts.png" format="PNG"
+            <imagedata fileref="figures/basics_Accounts.png"
                        srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -722,12 +722,12 @@ Translators:
       <screenshot id="basics-CheckAccount">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/basics_CheckAccount.png" format="PNG"
+            <imagedata fileref="figures/basics_CheckAccount.png"
                        srccredit="Bengt Thuree" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/basics_CheckAccount.png" format="PNG"
+            <imagedata fileref="figures/basics_CheckAccount.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -1175,12 +1175,12 @@ Translators:
                 <screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveXML.png"
                          srccredit="Cristian Marchi" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
-                      <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveXML.png"
                          srccredit="Cristian Marchi"></imagedata>
                     </imageobject>
 
@@ -1232,12 +1232,12 @@ Translators:
                 <screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveSQL.png"
                              srccredit="Marchi Cristian" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
-                      <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveSQL.png"
                              srccredit="Cristian Marchi"></imagedata>
                     </imageobject>
 
@@ -1738,12 +1738,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         format="PNG" srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         format="PNG" srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"></imagedata>
               </imageobject>
 
               <caption>
@@ -1773,12 +1773,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1807,12 +1807,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         format="PNG" srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         format="PNG" srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"></imagedata>
               </imageobject>
 
               <caption>
@@ -1842,12 +1842,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         format="PNG" srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         format="PNG" srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"></imagedata>
               </imageobject>
 
               <caption>
@@ -1872,12 +1872,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         format="PNG" srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         format="PNG" srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"></imagedata>
               </imageobject>
 
               <caption>
@@ -1900,12 +1900,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         format="PNG" srccredit="John Ralls" width="510"></imagedata>
+                         srccredit="John Ralls" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         format="PNG" srccredit="John Ralls"></imagedata>
+                         srccredit="John Ralls"></imagedata>
               </imageobject>
 
               <caption>
@@ -1933,12 +1933,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                           srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                           srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
             </mediaobject>
           </screenshot>
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index a7756384..263fa4ab 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -178,12 +178,12 @@
         <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+              <imagedata fileref="figures/bus_tax_main.png"
                          srccredit="Chris Good" width="510px" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+              <imagedata fileref="figures/bus_tax_main.png"
                         srccredit="Chris Good" />
             </imageobject>
 
@@ -198,7 +198,7 @@
         <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_tax_new.png" format="PNG"
+              <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Chris Good" />
             </imageobject>
 
@@ -544,7 +544,7 @@
         <title>Entering Company Information</title><screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_co_reg.png" format="PNG"
+              <imagedata fileref="figures/bus_co_reg.png"
                         srccredit="Chris Good" />
             </imageobject>
 
@@ -641,7 +641,7 @@
         <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_terms_main.png" format="PNG"
+              <imagedata fileref="figures/bus_terms_main.png"
                         srccredit="Chris Good" />
             </imageobject>
 
@@ -656,7 +656,7 @@
         <title>New Billing Term</title><screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_terms_new.png" format="PNG"
+              <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Chris Good" />
             </imageobject>
 
@@ -819,7 +819,7 @@
           <title>New Customer Registration Window</title><screenshot id="bus-ar-custnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_custnew.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_custnew.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -848,7 +848,7 @@
           <title>Find Customer Window</title><screenshot id="bus-ar-custfind">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_custfind.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_custfind.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -917,7 +917,7 @@
           <title>Creating a New Invoice</title><screenshot id="bus-ar-invoicenew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicenew.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoicenew.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -945,7 +945,7 @@
           <title>Edit Invoice Window</title><screenshot id="bus-ar-invoiceedit">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoiceedit.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoiceedit.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -974,7 +974,7 @@
           <title>Post Invoice Window</title><screenshot id="bus-ar-invoicepost">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicepost.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoicepost.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -1039,7 +1039,7 @@
           <title>Invoice Print Output</title><screenshot id="bus-ar-invoiceprint">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoiceprint.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoiceprint.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -1130,7 +1130,7 @@
         <title>New Customer Job</title><screenshot id="bus-ar-jobnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ar_jobnew.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_jobnew.png"
                         srccredit="Patrick Schweiger" />
             </imageobject>
 
@@ -1186,12 +1186,12 @@
         <title>Process Customer Payment</title><screenshot id="bus-ar-payment">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_payment.png"
                         srccredit="Patrick Schweiger" width="510px" scalefit="0" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_payment.png"
                         srccredit="Patrick Schweiger" />
             </imageobject>
 
@@ -1240,7 +1240,7 @@
         <title>The New Style Sheet Window</title><screenshot id="bus-ar-invoicechange1">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ar_invoicechange1.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange1.png"
                         srccredit="Cristian Marchi" />
             </imageobject>
 
@@ -1280,12 +1280,12 @@
         <title>HTML Style Sheets Example Window</title><screenshot id="bus-ar-invoicechange2">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange2.png"
                         srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange2.png"
                         srccredit="Cristian Marchi"/>
             </imageobject>
 
@@ -1322,7 +1322,7 @@
         <title>HTML Style Sheets Example Output</title><screenshot id="bus-ar-invoicechange3">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ar_invoicechange3.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange3.png"
                         srccredit="Patrick Schweiger" />
             </imageobject>
 
@@ -1424,7 +1424,7 @@
           <title>New Vendor Registration Window</title><screenshot id="bus-ap-vendornew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1452,7 +1452,7 @@
           <title>Find Vendor Window</title><screenshot id="bus-ar-vendorfind">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1522,7 +1522,7 @@
           <title>New Bill Registration Window</title><screenshot id="bus-ap-billnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1548,7 +1548,7 @@
           <title>Edit Bill Window</title><screenshot id="bus-ap-billedit">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1575,7 +1575,7 @@
           <title>Post Bill Window</title><screenshot id="bus-ap-billpost">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1631,7 +1631,7 @@
         <title>New Vendor Job</title><screenshot id="bus-ap-jobnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham" format="PNG"/>
+              <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham"/>
             </imageobject>
 
             <textobject>
@@ -1680,11 +1680,11 @@
         <title>Process Vendor Payment</title><screenshot id="bus-ap-payment">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG" width="510"/>
+              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG"/>
+              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2049,7 +2049,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex1.png"
-                 srccredit="Patrick Schweiger" format="PNG"/>
+                 srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2222,7 +2222,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex2.png"
-                    srccredit="Patrick Schweiger" format="PNG"/>
+                    srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2254,7 +2254,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png"
-                    srccredit="Patrick Schweiger" format="PNG"/>
+                    srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2276,7 +2276,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex4.png"
-                    srccredit="Patrick Schweiger" format="PNG"/>
+                    srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index 34876bf6..0806c95e 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -179,7 +179,7 @@
     <screenshot id="capgain_appmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/capgain_appmain.png" format="PNG"
+          <imagedata fileref="figures/capgain_appmain.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -206,7 +206,7 @@
       <screenshot id="capgain_app2main">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/capgain_app2main.png" format="PNG"
+            <imagedata fileref="figures/capgain_app2main.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -345,7 +345,7 @@
           <screenshot id="capgain_app3main">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/capgain_app3main.png" format="PNG"
+                <imagedata fileref="figures/capgain_app3main.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
diff --git a/guide/C/ch_cbook.xml b/guide/C/ch_cbook.xml
index e0af951b..2abdffdf 100644
--- a/guide/C/ch_cbook.xml
+++ b/guide/C/ch_cbook.xml
@@ -203,7 +203,7 @@
       <screenshot id="cbook-gcashdata4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_gcashdata4.png" format="PNG"
+            <imagedata fileref="figures/cbook_gcashdata4.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -237,7 +237,7 @@
           <screenshot id="cbook-transferin">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_transferin.png" format="PNG"
+                <imagedata fileref="figures/cbook_transferin.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -266,7 +266,7 @@
           <screenshot id="cbook-checkexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_checkexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_checkexamp.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -294,7 +294,7 @@
           <screenshot id="cbook-atm">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_atm.png" format="PNG"
+                <imagedata fileref="figures/cbook_atm.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -322,7 +322,7 @@
       <screenshot id="cbook-bankstmt">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_bankstmt.png" format="PNG"
+            <imagedata fileref="figures/cbook_bankstmt.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -352,7 +352,7 @@
           <screenshot id="cbook-reconexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_reconexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_reconexamp.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -387,7 +387,7 @@
           <screenshot id="cbook-servch">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_servch.png" format="PNG"
+                <imagedata fileref="figures/cbook_servch.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -417,7 +417,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_reconciledCheckAct.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -444,7 +444,7 @@
       <screenshot id="cbook-chartaccts5">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_chartaccts5.png" format="PNG"
+            <imagedata fileref="figures/cbook_chartaccts5.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -483,7 +483,7 @@
           <screenshot id="cbook-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cbook_CashFlow.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -514,7 +514,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptAssets.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -538,7 +538,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index f461613e..16786747 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -236,7 +236,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           format="PNG" srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"></imagedata>
             </imageobject>
 
             <textobject>
@@ -258,7 +258,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           format="PNG" srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"></imagedata>
             </imageobject>
 
             <textobject>
@@ -302,7 +302,7 @@
       <screenshot id="cc-accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_accounts.png" format="PNG"
+            <imagedata fileref="figures/cc_accounts.png"
                      srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -338,7 +338,7 @@
       <screenshot id="cc-purchases">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_purchases.png" format="PNG"
+            <imagedata fileref="figures/cc_purchases.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -369,7 +369,7 @@
       <screenshot id="cc-refund">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_refund.png" format="PNG"
+            <imagedata fileref="figures/cc_refund.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -397,7 +397,7 @@
       <screenshot id="cc-interest">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_interest.png" format="PNG"
+            <imagedata fileref="figures/cc_interest.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -431,7 +431,7 @@
       <screenshot id="cc-reconcile-init">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile_init.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile_init.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -455,7 +455,7 @@
       <screenshot id="cc-reconcile">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -490,7 +490,7 @@
       <screenshot id="cc-payment">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_payment.png" format="PNG"
+            <imagedata fileref="figures/cc_payment.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -512,7 +512,7 @@
       <screenshot id="cc-final">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_final.png" format="PNG"
+            <imagedata fileref="figures/cc_final.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -559,7 +559,7 @@
           <screenshot id="cc-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cc_CashFlow.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -590,7 +590,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptVisa.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -613,7 +613,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/C/ch_dep.xml b/guide/C/ch_dep.xml
index 0f5ec85f..30617a1a 100644
--- a/guide/C/ch_dep.xml
+++ b/guide/C/ch_dep.xml
@@ -651,7 +651,7 @@
     <screenshot id="dep_example">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_example.png" format="PNG"
+          <imagedata fileref="figures/dep_example.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -684,7 +684,7 @@
     <screenshot id="dep_assetreg">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetreg.png" format="PNG"
+          <imagedata fileref="figures/dep_assetreg.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -702,7 +702,7 @@
     <screenshot id="dep_assetmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetmain.png" format="PNG"
+          <imagedata fileref="figures/dep_assetmain.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 2fd799c8..e1c98adf 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -330,12 +330,12 @@
       <screenshot id="invest_accountspredef">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG"
+            <imagedata fileref="figures/invest_AccountsPredef.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG"
+            <imagedata fileref="figures/invest_AccountsPredef.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -503,12 +503,12 @@ Income
       <screenshot id="invest-int">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -533,12 +533,12 @@ Income
       <screenshot id="invest-int2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -556,12 +556,12 @@ Income
       <screenshot id="invest-int2-1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int2-1.png" format="PNG"
+            <imagedata fileref="figures/invest_int2-1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2-1.png" format="PNG"
+            <imagedata fileref="figures/invest_int2-1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -582,12 +582,12 @@ Income
       <screenshot id="invest-int3">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -685,12 +685,12 @@ Income
       <screenshot id="invest-newaccount">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_newaccount.png" format="PNG"
+            <imagedata fileref="figures/invest_newaccount.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_newaccount.png" format="PNG"
+            <imagedata fileref="figures/invest_newaccount.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -768,12 +768,12 @@ Income
               <screenshot id="invest-selectsecurity">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/invest_selectsecurity.png" format="PNG"
+                    <imagedata fileref="figures/invest_selectsecurity.png"
                                 srccredit="Cristian Marchi"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest_selectsecurity.png" format="PNG"
+                    <imagedata fileref="figures/invest_selectsecurity.png"
                                 srccredit="Cristian Marchi"></imagedata>
                   </imageobject>
 
@@ -850,12 +850,12 @@ Income
                     <screenshot id="invest-newsecurity">
                       <mediaobject>
                         <imageobject role="html">
-                          <imagedata fileref="figures/invest_newsecurity.png" format="PNG"
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                      srccredit="Cristian Marchi" width="510px"></imagedata>
                         </imageobject>
 
                         <imageobject role="fo">
-                          <imagedata fileref="figures/invest_newsecurity.png" format="PNG"
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                      srccredit="Cristian Marchi"></imagedata>
                         </imageobject>
 
@@ -938,12 +938,12 @@ Income
       <screenshot id="invest-setup-current">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_current.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_current.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_current.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_current.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1000,12 +1000,12 @@ Income
       <screenshot id="invest-setup-portfolio1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_portfolio1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_portfolio1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1103,12 +1103,12 @@ Income
         <screenshot id="invest-setup-portfolio2">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio2.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio2.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1159,12 +1159,12 @@ Income
         <screenshot id="invest-setup-portfolio3">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio3.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio3.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1276,12 +1276,12 @@ Income
       <screenshot id="invest-peditor">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1324,12 +1324,12 @@ Income
       <screenshot id="invest-peditor2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1522,12 +1522,12 @@ Income
       <screenshot id="invest-stockvalue">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_stockvalue.png" format="PNG"
+            <imagedata fileref="figures/invest_stockvalue.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_stockvalue.png" format="PNG"
+            <imagedata fileref="figures/invest_stockvalue.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1568,7 +1568,7 @@ Income
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       format="PNG" srccredit="John Ralls"></imagedata>
+                       srccredit="John Ralls"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1643,7 +1643,7 @@ Income
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -2097,12 +2097,12 @@ Income
           <screenshot id="invest-sellstockManProfComb">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+                <imagedata fileref="figures/invest_sellstock.png"
                            srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+                <imagedata fileref="figures/invest_sellstock.png"
                            srccredit="Chris Good"></imagedata>
               </imageobject>
     
@@ -2128,12 +2128,12 @@ Income
             <screenshot id="invest-sellstockManProfComb2">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+                  <imagedata fileref="figures/invest_sellstock2.png"
                              srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+                    <imagedata fileref="figures/invest_sellstock2.png"
                                srccredit="Chris Good"></imagedata>
                   </imageobject>
 
@@ -2405,12 +2405,12 @@ Income
             <screenshot id="invest-sellstockManProfCombNet">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
+                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
                               srccredit="Chris Good" width="510px"></imagedata>
                 </imageobject>
     
                 <imageobject role="fo">
-                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
+                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
                               srccredit="Chris Good"></imagedata>
                 </imageobject>
     
@@ -2802,12 +2802,12 @@ Income
         <screenshot id="invest-sellstockManProfSep">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfSep.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfSep.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -3162,12 +3162,12 @@ Income
             <screenshot id="invest-sellstockManProfSepNet">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstockManProfSepNet.png" format="PNG"
+                  <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
                               srccredit="Chris Good" width="510px"></imagedata>
                 </imageobject>
     
                 <imageobject role="fo">
-                  <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+                  <imagedata fileref="figures/invest_sellstockManProfSep.png"
                               srccredit="Chris Good"></imagedata>
                 </imageobject>
     
@@ -3269,12 +3269,12 @@ Income
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -3634,12 +3634,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3673,12 +3673,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3737,12 +3737,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3776,12 +3776,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3875,12 +3875,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                  format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                  srccredit="Chris Good" width="510px"></imagedata>
                 </imageobject>
   
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                             format="PNG" srccredit="Chris Good"></imagedata>
+                             srccredit="Chris Good"></imagedata>
                 </imageobject>
   
                 <textobject>
@@ -3908,12 +3908,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3937,12 +3937,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3973,12 +3973,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -4022,12 +4022,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -4047,12 +4047,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -4072,12 +4072,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -4130,12 +4130,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -4200,12 +4200,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       format="PNG" srccredit="Daniel Dodson" width="510px"></imagedata>
+                       srccredit="Daniel Dodson" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       format="PNG" srccredit="Daniel Dodson"></imagedata>
+                       srccredit="Daniel Dodson"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4251,12 +4251,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <screenshot id="invest-dividendreinvest1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG"
+            <imagedata fileref="figures/invest_dividendreinvest1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG"
+            <imagedata fileref="figures/invest_dividendreinvest1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -4327,12 +4327,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
     <screenshot id="invest-ret-of-cap">
       <mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG"
+          <imagedata fileref="figures/invest_ret_of_cap.png"
                       srccredit="Chris Good" width="510px"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG"
+          <imagedata fileref="figures/invest_ret_of_cap.png"
                       srccredit="Chris Good"></imagedata>
         </imageobject>
 
@@ -4390,7 +4390,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4413,7 +4413,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4473,7 +4473,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4494,7 +4494,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4517,7 +4517,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4561,7 +4561,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4623,7 +4623,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4649,7 +4649,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 248906b2..03384651 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -202,7 +202,7 @@
     <screenshot id="loans_fcalc">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_fcalc.png" format="PNG"
+          <imagedata fileref="figures/loans_fcalc.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -478,7 +478,7 @@ The simple case for when  PMT == 0 gives the solution:
     <screenshot id="loans_mortgage">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage1.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage1.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -576,7 +576,7 @@ The simple case for when  PMT == 0 gives the solution:
     <screenshot id="loans_mortgage2.png">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage2.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage2.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -597,7 +597,7 @@ The simple case for when  PMT == 0 gives the solution:
     <screenshot id="loans_mortgage3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage3.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage3.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -710,7 +710,7 @@ The simple case for when  PMT == 0 gives the solution:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -815,7 +815,7 @@ The simple case for when  PMT == 0 gives the solution:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanInitial.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -871,7 +871,7 @@ The simple case for when  PMT == 0 gives the solution:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -930,7 +930,7 @@ The simple case for when  PMT == 0 gives the solution:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -954,7 +954,7 @@ The simple case for when  PMT == 0 gives the solution:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 3a8daa45..39fc7012 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -38,12 +38,12 @@
     <screenshot id="oview-intro">
       <mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/oview_intro.png" format="PNG"
+          <imagedata fileref="figures/oview_intro.png"
                      srccredit="Bengt Thuree" width="510"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/oview_intro.png" format="PNG"
+          <imagedata fileref="figures/oview_intro.png"
                      srccredit="Bengt Thuree"></imagedata>
         </imageobject>
 
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 4e3511ea..52f6dfc7 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -129,7 +129,7 @@
       <screenshot id="txns-registersplit4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit4.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit4.png"
                 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -151,7 +151,7 @@
       <screenshot id="txns-registersplit5">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit5.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit5.png"
                 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -178,7 +178,7 @@
       <screenshot id="txns-registersplit6">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit6.png"
                 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -480,7 +480,7 @@
     <screenshot id="txns-registersplit2">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/txns_registersplit2.png" format="PNG"
+          <imagedata fileref="figures/txns_registersplit2.png"
             srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -522,7 +522,7 @@
     <screenshot id="txns-registersplit3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/txns_registersplit3.png" format="PNG"
+          <imagedata fileref="figures/txns_registersplit3.png"
             srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -564,7 +564,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account.png"
-                       format="PNG" srccredit="Bengt  Thuree" />
+                       srccredit="Bengt  Thuree" />
           </imageobject>
 
           <textobject>
@@ -594,7 +594,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account2.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -668,7 +668,7 @@
         <title>Entering a split transaction</title><mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -755,12 +755,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -896,12 +896,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510"></imagedata>
+                         srccredit="Cristian Marchi" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1011,7 +1011,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_reconcile_window3.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1057,7 +1057,7 @@
       <screenshot id="txns-sxn-ledger-1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger1.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger1.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1084,7 +1084,7 @@
       <screenshot id="txns-sxn-ledger-2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger2.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1105,7 +1105,7 @@
       <screenshot id="txns-sxn-ledger-3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger3.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger3.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1127,7 +1127,7 @@
       <screenshot id="txns-sxn-ledger-4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger4.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1166,12 +1166,12 @@
       <screenshot id="txns-sxn-editor-2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-2.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-2.png"
                        srccredit="Cristian Marchi"/>
           </imageobject>
 
@@ -1194,12 +1194,12 @@
       <screenshot id="txns-sxn-editor-3-overview">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1282,12 +1282,12 @@
       <screenshot id="txns-sxn-editor-3-frequency">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1379,12 +1379,12 @@
       <screenshot id="txns-sxn-editor-3-template">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1411,12 +1411,12 @@
       <screenshot id="txns-sxn-editor-4">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-4.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-4.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1458,12 +1458,12 @@
       <screenshot id="txns-sxn-editor-slr">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor_slr.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor_slr.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1526,7 +1526,7 @@
       <screenshot id="txns-puttoget1-Charts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts.png" format="PNG"
+            <imagedata fileref="figures/txns_puttoget_Charts.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1600,7 +1600,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts1.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1719,7 +1719,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts2.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1772,7 +1772,7 @@
           <screenshot id="txns-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/txns_CashFlow.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -1807,7 +1807,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptChecking.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -1830,7 +1830,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/de/ch_accts.xml b/guide/de/ch_accts.xml
index 4641ec5d..f22560fc 100644
--- a/guide/de/ch_accts.xml
+++ b/guide/de/ch_accts.xml
@@ -52,7 +52,7 @@
         <imageobject>
           <imagedata fileref="figures/basics_AccountRelationships.png"
                      srccredit="Frank H. Ellenberger"
-                     format="PNG"></imagedata>
+                    ></imagedata>
         </imageobject>
 
         <imageobject role="fo">
@@ -378,7 +378,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -396,7 +396,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-                         format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -504,7 +504,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-                             format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                             srccredit="Mechtilde Stehmann"></imagedata>
               </imageobject>
 
               <textobject>
@@ -551,7 +551,7 @@
       <screenshot id="accts-toplevel">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_toplevel.png" format="PNG"
+            <imagedata fileref="figures/accts_toplevel.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -684,7 +684,7 @@
       <screenshot id="accts-tree">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_tree.png" format="PNG"
+            <imagedata fileref="figures/accts_tree.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index 8470ae85..9b323c0d 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -138,7 +138,7 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
@@ -353,7 +353,7 @@
           <imageobject>
             <imagedata fileref="figures/gnc_welcome.png"
                          srccredit="JH"
-                         format="PNG"></imagedata>
+                        ></imagedata>
           </imageobject>
 
           <textobject>
@@ -388,7 +388,7 @@
             <imageobject>
               <imagedata fileref="figures/basics_TipOfDay.png"
                          srccredit="Chris Lyttle"
-                         format="PNG"></imagedata>
+                        ></imagedata>
             </imageobject>
 
             <textobject>
@@ -436,7 +436,7 @@
             <imageobject>
               <imagedata fileref="figures/basics_Accounts.png"
                          srccredit="Chris Lyttle"
-                         format="PNG"></imagedata>
+                        ></imagedata>
             </imageobject>
 
             <textobject>
@@ -512,7 +512,7 @@
             <imageobject>
               <imagedata fileref="figures/basics_CheckAccount.png"
                          srccredit="Chris Lyttle"
-                         format="PNG"></imagedata>
+                        ></imagedata>
             </imageobject>
 
             <textobject>
@@ -910,12 +910,12 @@
                 <title>Speichern, wenn <acronym>XML</acronym> oder <acronym>sqlite3</acronym> ausgewählt ist.</title><screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveXML.png"
                          srccredit="Mechtilde Stehmann" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
-                      <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveXML.png"
                          srccredit="Mechtilde Stehmann"></imagedata>
                     </imageobject>
 
@@ -969,12 +969,12 @@
                 <title>Speicherdialog, wenn <acronym>mysql</acronym> oder <acronym>postgres</acronym> ausgewählt ist.</title><screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveSQL.png"
                              srccredit="Mechtilde Stehmann" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
-                      <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveSQL.png"
                              srccredit="Mechtilde Stehmann"></imagedata>
                     </imageobject>
 
@@ -1259,7 +1259,7 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/basics_lock.png"
-            srccredit="J.H." format="PNG"></imagedata>
+            srccredit="J.H."></imagedata>
           </imageobject>
 
           <textobject>
@@ -1587,12 +1587,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1628,12 +1628,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1662,12 +1662,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1698,12 +1698,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1730,12 +1730,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1758,12 +1758,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         format="PNG" srccredit="Frank H. Ellenberger" width="510"></imagedata>
+                         srccredit="Frank H. Ellenberger" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <caption>
@@ -1793,12 +1793,12 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                           srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                           srccredit="Frank H. Ellenberger"></imagedata>
               </imageobject>
             </mediaobject>
           </screenshot>
diff --git a/guide/de/ch_bus_ap.xml b/guide/de/ch_bus_ap.xml
index 56577fb2..d32a49d8 100644
--- a/guide/de/ch_bus_ap.xml
+++ b/guide/de/ch_bus_ap.xml
@@ -111,7 +111,7 @@ corrected to be less describing of the interface and more tutorial oriented
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_vendornew.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -143,7 +143,7 @@ corrected to be less describing of the interface and more tutorial oriented
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_vendorfind.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -220,7 +220,7 @@ corrected to be less describing of the interface and more tutorial oriented
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_billnew.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -252,7 +252,7 @@ corrected to be less describing of the interface and more tutorial oriented
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_billedit.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -286,7 +286,7 @@ corrected to be less describing of the interface and more tutorial oriented
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_billpost.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
           <textobject>
@@ -349,7 +349,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_ap_jobnew.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
         </imageobject>
 
         <textobject>
@@ -404,7 +404,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_ap_payment.png" 
-            srccredit="Mechtilde Stehmann" format="PNG"/>
+            srccredit="Mechtilde Stehmann"/>
         </imageobject>
 
         <textobject>
diff --git a/guide/de/ch_bus_ar.xml b/guide/de/ch_bus_ar.xml
index 61f5ac54..0e36823b 100644
--- a/guide/de/ch_bus_ar.xml
+++ b/guide/de/ch_bus_ar.xml
@@ -103,7 +103,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <screenshot id="bus-ar-custnew">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_custnew.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_custnew.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -135,7 +135,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <screenshot id="bus-ar-custfind">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_custfind.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_custfind.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -211,7 +211,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <screenshot id="bus-ar-invoicenew">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_invoicenew.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_invoicenew.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -243,7 +243,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <screenshot id="bus-ar-invoiceedit">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_invoiceedit.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_invoiceedit.png"
                        srccredit="Mechtilde stehmann" />
           </imageobject>
 
@@ -275,7 +275,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <screenshot id="bus-ar-invoicepost">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_invoicepost.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_invoicepost.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -346,7 +346,7 @@ corrected to be less describing of the interface and more tutorial oriented
       <screenshot id="bus-ar-invoiceprint">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_invoiceprint.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_invoiceprint.png"
                        srccredit="Mechtilde Stehmann " />
           </imageobject>
 
@@ -444,7 +444,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <screenshot id="bus-ar-jobnew">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/bus_ar_jobnew.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_jobnew.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -505,7 +505,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <screenshot id="bus-ar-payment">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_payment.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -552,7 +552,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <screenshot id="bus-ar-invoicechange1">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/bus_ar_invoicechange1.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_invoicechange1.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -597,12 +597,12 @@ corrected to be less describing of the interface and more tutorial oriented
     <screenshot id="bus-ar-invoicechange2">
       <mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_invoicechange2.png"
                      srccredit="Mechtilde Stehmann" width="510"/>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_invoicechange2.png"
                      srccredit="Mechtilde Stehmann"/>
         </imageobject>
 
@@ -637,7 +637,7 @@ corrected to be less describing of the interface and more tutorial oriented
     <screenshot id="bus-ar-invoicechange3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/bus_ar_invoicechange3.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_invoicechange3.png"
                      srccredit="Patrick Schweiger" />
         </imageobject>
 
diff --git a/guide/de/ch_bus_pay.xml b/guide/de/ch_bus_pay.xml
index 4a2a4d5f..92c271bf 100644
--- a/guide/de/ch_bus_pay.xml
+++ b/guide/de/ch_bus_pay.xml
@@ -326,7 +326,7 @@
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_pay_ex1.png" 
-	      srccredit="Patrick Schweiger" format="PNG"/>
+	      srccredit="Patrick Schweiger"/>
         </imageobject>
 
         <textobject>
@@ -492,7 +492,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex2.png" 
-	      srccredit="Patrick Schweiger" format="PNG"/>
+	      srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -522,7 +522,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex3.png" 
-	      srccredit="Patrick Schweiger" format="PNG"/>
+	      srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -551,7 +551,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex4.png" 
-	      srccredit="Patrick Schweiger" format="PNG"/>
+	      srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_bus_setup.xml b/guide/de/ch_bus_setup.xml
index 5353dacb..5f329458 100644
--- a/guide/de/ch_bus_setup.xml
+++ b/guide/de/ch_bus_setup.xml
@@ -163,12 +163,12 @@
       <title>Steuertabellen</title><screenshot id="bus-taxmain">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+            <imagedata fileref="figures/bus_tax_main.png"
                          srccredit="Mechtilde Stehmann" width="510px" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+            <imagedata fileref="figures/bus_tax_main.png"
                         srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -183,12 +183,12 @@
       <title>Neue Steuertabellen</title><screenshot id="bus-taxnew">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/bus_tax_new.png" format="PNG"
+            <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/bus_tax_new.png" format="PNG"
+            <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -255,12 +255,12 @@
       <title>Unternehmensregistrierung</title><screenshot id="bus-co-reg">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/bus_co_reg.png" format="PNG"
+            <imagedata fileref="figures/bus_co_reg.png"
                          srccredit="Mechtilde Stehmann" width="510px" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/bus_co_reg.png" format="PNG"
+            <imagedata fileref="figures/bus_co_reg.png"
                         srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -365,12 +365,12 @@
       <title>Zahlungsbedingungen-Editor</title><screenshot id="bus-termsmain">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/bus_terms_main.png" format="PNG"
+            <imagedata fileref="figures/bus_terms_main.png"
                          srccredit="Mechtilde Stehmann" width="510px" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/bus_terms_main.png" format="PNG"
+            <imagedata fileref="figures/bus_terms_main.png"
                         srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -385,12 +385,12 @@
       <title>Neue Zahlungsbedingungen</title><screenshot id="bus-termsnew">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/bus_terms_new.png" format="PNG"
+            <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/bus_terms_new.png" format="PNG"
+            <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Mechtilde Stehmann" />
           </imageobject>
 
diff --git a/guide/de/ch_capgain.xml b/guide/de/ch_capgain.xml
index 0d408b18..746b41e1 100644
--- a/guide/de/ch_capgain.xml
+++ b/guide/de/ch_capgain.xml
@@ -182,7 +182,7 @@
     <screenshot id="capgain_appmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/capgain_appmain.png" format="PNG"
+          <imagedata fileref="figures/capgain_appmain.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -212,7 +212,7 @@
       <screenshot id="capgain_app2main">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/capgain_app2main.png" format="PNG"
+            <imagedata fileref="figures/capgain_app2main.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -354,7 +354,7 @@
           <screenshot id="capgain_app3main">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/capgain_app3main.png" format="PNG"
+                <imagedata fileref="figures/capgain_app3main.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
diff --git a/guide/de/ch_cbook.xml b/guide/de/ch_cbook.xml
index 34a3e80c..2cb1addc 100644
--- a/guide/de/ch_cbook.xml
+++ b/guide/de/ch_cbook.xml
@@ -216,7 +216,7 @@
       <screenshot id="cbook-gcashdata4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_gcashdata4.png" format="PNG"
+            <imagedata fileref="figures/cbook_gcashdata4.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -251,7 +251,7 @@
           <screenshot id="cbook-transferin">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_transferin.png" format="PNG"
+                <imagedata fileref="figures/cbook_transferin.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -282,7 +282,7 @@
           <screenshot id="cbook-checkexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_checkexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_checkexamp.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -310,7 +310,7 @@
           <screenshot id="cbook-atm">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_atm.png" format="PNG"
+                <imagedata fileref="figures/cbook_atm.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -338,7 +338,7 @@
       <screenshot id="cbook-bankstmt">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_bankstmt.png" format="PNG"
+            <imagedata fileref="figures/cbook_bankstmt.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -368,7 +368,7 @@
           <screenshot id="cbook-reconexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_reconexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_reconexamp.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -404,7 +404,7 @@
           <screenshot id="cbook-servch">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_servch.png" format="PNG"
+                <imagedata fileref="figures/cbook_servch.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -435,7 +435,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_reconciledCheckAct.png"  
-                           format="PNG" srccredit="Mechtilde Stehmann" />
+                           srccredit="Mechtilde Stehmann" />
               </imageobject>
 
               <textobject>
@@ -463,7 +463,7 @@
       <screenshot id="cbook-chartaccts5">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_chartaccts5.png" format="PNG"
+            <imagedata fileref="figures/cbook_chartaccts5.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -502,7 +502,7 @@
           <screenshot id="cbook-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cbook_CashFlow.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -533,7 +533,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptAssets.png" 
-                           format="PNG" srccredit="Mechtilde Stehmann" />
+                           srccredit="Mechtilde Stehmann" />
               </imageobject>
 
               <textobject>
@@ -557,7 +557,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptExpenses.png" 
-                           format="PNG" srccredit="Mechtilde Stehmann" />
+                           srccredit="Mechtilde Stehmann" />
               </imageobject>
 
               <textobject>
diff --git a/guide/de/ch_cc.xml b/guide/de/ch_cc.xml
index 65d6ab08..97cf5739 100644
--- a/guide/de/ch_cc.xml
+++ b/guide/de/ch_cc.xml
@@ -250,7 +250,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                           srccredit="Mechtilde Stehmann"></imagedata>
             </imageobject>
 
             <textobject>
@@ -272,7 +272,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                           srccredit="Mechtilde Stehmann"></imagedata>
             </imageobject>
 
             <textobject>
@@ -316,7 +316,7 @@
       <screenshot id="cc-accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_accounts.png" format="PNG"
+            <imagedata fileref="figures/cc_accounts.png"
                      srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -353,7 +353,7 @@
       <screenshot id="cc-purchases">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_purchases.png" format="PNG"
+            <imagedata fileref="figures/cc_purchases.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -386,7 +386,7 @@
       <screenshot id="cc-refund">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_refund.png" format="PNG"
+            <imagedata fileref="figures/cc_refund.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -414,7 +414,7 @@
       <screenshot id="cc-interest">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_interest.png" format="PNG"
+            <imagedata fileref="figures/cc_interest.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -449,7 +449,7 @@
       <screenshot id="cc-reconcile-init">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile_init.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile_init.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -473,7 +473,7 @@
       <screenshot id="cc-reconcile">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -510,7 +510,7 @@
       <screenshot id="cc-payment">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_payment.png" format="PNG"
+            <imagedata fileref="figures/cc_payment.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -532,7 +532,7 @@
       <screenshot id="cc-final">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_final.png" format="PNG"
+            <imagedata fileref="figures/cc_final.png"
                        srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -579,7 +579,7 @@
           <screenshot id="cc-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cc_CashFlow.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -610,7 +610,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptVisa.png" 
-                           format="PNG" srccredit="Mechtilde Stehmann" />
+                           srccredit="Mechtilde Stehmann" />
               </imageobject>
 
               <textobject>
@@ -634,7 +634,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptExpenses.png" 
-                           format="PNG" srccredit="Mechtilde Stehmann" />
+                           srccredit="Mechtilde Stehmann" />
               </imageobject>
 
               <textobject>
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index baca8f27..7e823938 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -133,7 +133,7 @@
     <screenshot id="currency_main1">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/currency_main1.png" format="PNG"
+          <imagedata fileref="figures/currency_main1.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -221,7 +221,7 @@
     <screenshot id="currency_main1a">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/currency_main1.png" format="PNG"
+          <imagedata fileref="figures/currency_main1.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -254,7 +254,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_peditor.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -276,7 +276,7 @@
       <screenshot id="currency_addcurr">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_addcurr.png" format="PNG"
+            <imagedata fileref="figures/currency_addcurr.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -302,7 +302,7 @@
       <screenshot id="currency_manualpriceadded">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+            <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -320,7 +320,7 @@
       <screenshot id="currency_main2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main2.png" format="PNG"
+            <imagedata fileref="figures/currency_main2.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -357,7 +357,7 @@
       <screenshot id="currency_BeforeGetOnline">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+            <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -388,7 +388,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
-                         format="PNG" srccredit="Mechtilde Stehmann" />
+                         srccredit="Mechtilde Stehmann" />
             </imageobject>
 
             <textobject>
@@ -420,7 +420,7 @@
       <screenshot id="currency_main3.png">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main3.png" format="PNG"
+            <imagedata fileref="figures/currency_main3.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -541,7 +541,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -563,7 +563,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -586,7 +586,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -610,7 +610,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -662,7 +662,7 @@ Erträge:Investments:Dividende:Boom:0694.HK      (HKD)</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -687,7 +687,7 @@ Erträge:Investments:Dividende:Boom:0694.HK      (HKD)</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_Commodities.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -731,7 +731,7 @@ Aktienkauf
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_ToAmount.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -753,7 +753,7 @@ Aktienkauf
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1175,7 +1175,7 @@ Eigenkapital:Erbschaft        (AUD)</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_PutTogether_AfterMoney.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1253,7 +1253,7 @@ Eigenkapital:Anfangsbestand                 (AUD) 50.000,- $</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_PutTogether_AussieHouse.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1420,7 +1420,7 @@ Aufwand:Investments:Devisentransfer                       (AUD)</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_PutTogether_AfterStocks.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_dep.xml b/guide/de/ch_dep.xml
index 32611b6e..75e2392b 100644
--- a/guide/de/ch_dep.xml
+++ b/guide/de/ch_dep.xml
@@ -639,7 +639,7 @@
     <screenshot id="dep_example">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_example.png" format="PNG"
+          <imagedata fileref="figures/dep_example.png"
                      srccredit="Thomas Kriegel" />
         </imageobject>
 
@@ -670,7 +670,7 @@
     <screenshot id="dep_assetreg">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetreg.png" format="PNG"
+          <imagedata fileref="figures/dep_assetreg.png"
                      srccredit="Thomas Kriegel" />
         </imageobject>
 
@@ -688,7 +688,7 @@
     <screenshot id="dep_assetmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetmain.png" format="PNG"
+          <imagedata fileref="figures/dep_assetmain.png"
                      srccredit="Thomas Kriegel" />
         </imageobject>
 
diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index e598c93d..3c9b30da 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -348,12 +348,12 @@
       <screenshot id="invest_accountspredef">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG"
+            <imagedata fileref="figures/invest_AccountsPredef.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG"
+            <imagedata fileref="figures/invest_AccountsPredef.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -531,12 +531,12 @@ Einnahmen
       <screenshot id="invest-int">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -562,12 +562,12 @@ Einnahmen
       <screenshot id="invest-int2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -585,12 +585,12 @@ Einnahmen
       <screenshot id="invest-int2-1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int2-1.png" format="PNG"
+            <imagedata fileref="figures/invest_int2-1.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2-1.png" format="PNG"
+            <imagedata fileref="figures/invest_int2-1.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -611,12 +611,12 @@ Einnahmen
       <screenshot id="invest-int3">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -716,12 +716,12 @@ Einnahmen
       <screenshot id="invest-newaccount">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_newaccount.png" format="PNG"
+            <imagedata fileref="figures/invest_newaccount.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_newaccount.png" format="PNG"
+            <imagedata fileref="figures/invest_newaccount.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -803,12 +803,12 @@ Einnahmen
               <screenshot id="invest-selectsecurity">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/invest_selectsecurity.png" format="PNG"
+                    <imagedata fileref="figures/invest_selectsecurity.png"
                                 srccredit="Mechtilde Stehmann"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest_selectsecurity.png" format="PNG"
+                    <imagedata fileref="figures/invest_selectsecurity.png"
                                 srccredit="Mechtilde Stehmann"></imagedata>
                   </imageobject>
 
@@ -888,12 +888,12 @@ Einnahmen
                     <screenshot id="invest-newsecurity">
                       <mediaobject>
                         <imageobject role="html">
-                          <imagedata fileref="figures/invest_newsecurity.png" format="PNG"
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                      srccredit="Mechtilde Stehmann" width="510px"></imagedata>
                         </imageobject>
 
                         <imageobject role="fo">
-                          <imagedata fileref="figures/invest_newsecurity.png" format="PNG"
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                      srccredit="Mechtilde Stehmann"></imagedata>
                         </imageobject>
 
@@ -980,12 +980,12 @@ Einnahmen
       <screenshot id="invest-setup-current">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_current.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_current.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_current.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_current.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1028,12 +1028,12 @@ Einnahmen
       <screenshot id="invest-setup-portfolio1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_portfolio1.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_portfolio1.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1084,12 +1084,12 @@ Einnahmen
       <screenshot id="invest-setup-portfolio2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG"
+            <imagedata fileref="figures/invest_SetupPortfolio2.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG"
+            <imagedata fileref="figures/invest_SetupPortfolio2.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1203,12 +1203,12 @@ Einnahmen
       <screenshot id="invest-peditor">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1252,12 +1252,12 @@ Einnahmen
       <screenshot id="invest-peditor2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1429,12 +1429,12 @@ Einnahmen
       <screenshot id="invest-stockvalue">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_stockvalue.png" format="PNG"
+            <imagedata fileref="figures/invest_stockvalue.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_stockvalue.png" format="PNG"
+            <imagedata fileref="figures/invest_stockvalue.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1478,7 +1478,7 @@ Einnahmen
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1520,7 +1520,7 @@ Einnahmen
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1854,12 +1854,12 @@ Einnahmen
       <screenshot id="invest-sellstock">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstock.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstock.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -1878,12 +1878,12 @@ Einnahmen
       <screenshot id="invest-sellstock2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstock2.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstock2.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -2050,12 +2050,12 @@ Einnahmen
       <screenshot id="invest-sellstockLoss">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_sellstockLoss.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstockLoss.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_sellstockLoss.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstockLoss.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -2074,12 +2074,12 @@ Einnahmen
       <screenshot id="invest-sellstockLoss2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_sellstockLoss2.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstockLoss2.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_sellstockLoss2.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstockLoss2.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -2181,12 +2181,12 @@ Einnahmen
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -2493,11 +2493,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -2536,11 +2536,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -2607,11 +2607,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -2732,11 +2732,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -2767,11 +2767,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -2798,11 +2798,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -2839,11 +2839,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -2892,11 +2892,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/investLotsSplitReg.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -2918,11 +2918,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/investLotsSplitLot0.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -2944,11 +2944,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
               <imagedata fileref="figures/investLotsSplitLot1.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -3010,11 +3010,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                   <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3080,12 +3080,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" width="510px"></imagedata>
+                       srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3133,12 +3133,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <screenshot id="invest-dividendreinvest1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG"
+            <imagedata fileref="figures/invest_dividendreinvest1.png"
                         srccredit="Mechtilde Stehmann" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG"
+            <imagedata fileref="figures/invest_dividendreinvest1.png"
                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
@@ -3210,12 +3210,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
     <screenshot id="invest-ret-of-cap">
       <mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG"
+          <imagedata fileref="figures/invest_ret_of_cap.png"
                       srccredit="Chris Good" width="510px"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG"
+          <imagedata fileref="figures/invest_ret_of_cap.png"
                       srccredit="Chris Good"></imagedata>
         </imageobject>
 
@@ -3278,7 +3278,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3301,7 +3301,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3365,7 +3365,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3388,7 +3388,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3413,7 +3413,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3458,7 +3458,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3526,7 +3526,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -3554,7 +3554,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-                       format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                       srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_loans.xml b/guide/de/ch_loans.xml
index ef1e080e..27940465 100644
--- a/guide/de/ch_loans.xml
+++ b/guide/de/ch_loans.xml
@@ -169,7 +169,7 @@
     <screenshot id="loans_fcalc">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_fcalc.png" format="PNG"
+          <imagedata fileref="figures/loans_fcalc.png"
                         srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -425,7 +425,7 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
     <screenshot id="loans_mortgage">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage1.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage1.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -524,7 +524,7 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
     <screenshot id="loans_mortgage2.png">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage2.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage2.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -545,7 +545,7 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
     <screenshot id="loans_mortgage3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage3.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage3.png"
                      srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -636,7 +636,7 @@ Der einfache Fall mit PMT == 0 ergibt die Gleichung:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
-                format="PNG" srccredit="Mechtilde Stehmann" />
+                srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -724,7 +724,7 @@ Vermögen:Anfangskontostand:EUR</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanInitial.png"
-            format="PNG" srccredit="Mechtilde Stehmann" />
+            srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -780,7 +780,7 @@ Vermögen:Anfangskontostand:EUR</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
-            format="PNG" srccredit="Mechtilde Stehmann" />
+            srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -839,7 +839,7 @@ Vermögen:Anfangskontostand:EUR</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -863,7 +863,7 @@ Vermögen:Anfangskontostand:EUR</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
diff --git a/guide/de/ch_oview.xml b/guide/de/ch_oview.xml
index f059ca8a..f5eaed4b 100644
--- a/guide/de/ch_oview.xml
+++ b/guide/de/ch_oview.xml
@@ -49,7 +49,7 @@
     <screenshot id="oview-intro">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/oview_intro.png" format="PNG"
+          <imagedata fileref="figures/oview_intro.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
diff --git a/guide/de/ch_txns.xml b/guide/de/ch_txns.xml
index 4862f1bc..55f3034d 100644
--- a/guide/de/ch_txns.xml
+++ b/guide/de/ch_txns.xml
@@ -138,7 +138,7 @@
       <screenshot id="txns-registersplit4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit4.png" format="PNG" srccredit="Mechtilde Stehmann" />
+            <imagedata fileref="figures/txns_registersplit4.png" srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -159,7 +159,7 @@
       <screenshot id="txns-registersplit5">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit5.png" format="PNG" srccredit="Mechtilde Stehmann" />
+            <imagedata fileref="figures/txns_registersplit5.png" srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -186,7 +186,7 @@
       <screenshot id="txns-registersplit6">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit6.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -462,7 +462,7 @@
     <screenshot id="txns-registersplit2">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/txns_registersplit2.png" format="PNG" srccredit="Mechtilde Stehmann" />
+          <imagedata fileref="figures/txns_registersplit2.png" srccredit="Mechtilde Stehmann" />
         </imageobject>
 
         <textobject>
@@ -508,7 +508,7 @@
     <screenshot id="txns-registersplit3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/txns_registersplit3.png" format="PNG"
+          <imagedata fileref="figures/txns_registersplit3.png"
                        srccredit="Mechtilde Stehmann" />
         </imageobject>
 
@@ -552,7 +552,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -584,7 +584,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account2.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -660,7 +660,7 @@
         <title>Eingabe einer mehrteiligen Buchung</title><mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -759,12 +759,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -903,12 +903,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         format="PNG" srccredit="Mechtilde Stehmann" width="510"></imagedata>
+                         srccredit="Mechtilde Stehmann" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         format="PNG" srccredit="Mechtilde Stehmann"></imagedata>
+                         srccredit="Mechtilde Stehmann"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1005,7 +1005,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_reconcile_window3.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1052,7 +1052,7 @@
       <screenshot id="txns-sxn-ledger-1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger1.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger1.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1081,7 +1081,7 @@
       <screenshot id="txns-sxn-ledger-2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger2.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1103,7 +1103,7 @@
       <screenshot id="txns-sxn-ledger-3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger3.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger3.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1127,7 +1127,7 @@
       <screenshot id="txns-sxn-ledger-4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger4.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1169,12 +1169,12 @@
       <screenshot id="txns-sxn-editor-2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-2.png"
                        srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-2.png"
                        srccredit="Mechtilde Stehmann"/>
           </imageobject>
 
@@ -1197,12 +1197,12 @@
       <screenshot id="txns-sxn-editor-3-overview">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                        srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1293,12 +1293,12 @@
       <screenshot id="txns-sxn-editor-3-frequency">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                        srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1398,12 +1398,12 @@
       <screenshot id="txns-sxn-editor-3-template">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                        srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1432,12 +1432,12 @@
       <screenshot id="txns-sxn-editor-4">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-4.png"
                        srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-4.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1479,12 +1479,12 @@
       <screenshot id="txns-sxn-editor-slr">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor_slr.png"
                        srccredit="Mechtilde Stehmann" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor_slr.png"
                        srccredit="Mechtilde Stehmann" />
           </imageobject>
 
@@ -1551,7 +1551,7 @@
       <screenshot id="txns-puttoget1-Charts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts.png" format="PNG" srccredit="Mechtilde Stehmann" />
+            <imagedata fileref="figures/txns_puttoget_Charts.png" srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1623,7 +1623,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts1.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1748,7 +1748,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts2.png"
-                       format="PNG" srccredit="Mechtilde Stehmann" />
+                       srccredit="Mechtilde Stehmann" />
           </imageobject>
 
           <textobject>
@@ -1801,7 +1801,7 @@
           <screenshot id="txns-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/txns_CashFlow.png"
                            srccredit="Mechtilde Stehmann" />
               </imageobject>
 
@@ -1841,7 +1841,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptChecking.png"
-                           format="PNG" srccredit="Mechtilde Stehmann" />
+                           srccredit="Mechtilde Stehmann" />
               </imageobject>
 
               <textobject>
@@ -1865,7 +1865,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/it/gnucash-guide.xml b/guide/it/gnucash-guide.xml
index 37b2c21b..431680c2 100644
--- a/guide/it/gnucash-guide.xml
+++ b/guide/it/gnucash-guide.xml
@@ -630,11 +630,11 @@
         <screenshot id="oview-intro">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/oview_intro.png" format="PNG" srccredit="Bengt Thuree" width="510"/>
+              <imagedata fileref="figures/oview_intro.png" srccredit="Bengt Thuree" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/oview_intro.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/oview_intro.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -1275,7 +1275,7 @@
             <title>La relazione fondamentale della contabilità</title><screenshot id="basics-AccountRelationships">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_AccountRelationships.png" format="PNG" srccredit="Geert Janssens"/>
+                  <imagedata fileref="figures/basics_AccountRelationships.png" srccredit="Geert Janssens"/>
                 </imageobject>
 
                 <imageobject role="fo">
@@ -1479,7 +1479,7 @@
           <screenshot id="basics-TipOfDay">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/basics_TipOfDay.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/basics_TipOfDay.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -1515,7 +1515,7 @@
           <screenshot id="basics-Accounts">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/basics_Accounts.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/basics_Accounts.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -1577,11 +1577,11 @@
           <screenshot id="basics-CheckAccount">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/basics_CheckAccount.png" format="PNG" srccredit="Bengt Thuree" width="510"/>
+                <imagedata fileref="figures/basics_CheckAccount.png" srccredit="Bengt Thuree" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/basics_CheckAccount.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/basics_CheckAccount.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -1905,11 +1905,11 @@
                       <acronym>sqlite3</acronym></title><screenshot id="basics-SaveXML">
                       <mediaobject>
                         <imageobject role="html">
-                          <imagedata fileref="figures/basics_SaveXML.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                          <imagedata fileref="figures/basics_SaveXML.png" srccredit="Cristian Marchi" width="510px"/>
                         </imageobject>
 
                         <imageobject role="fo">
-                          <imagedata fileref="figures/basics_SaveXML.png" format="PNG" srccredit="Cristian Marchi"/>
+                          <imagedata fileref="figures/basics_SaveXML.png" srccredit="Cristian Marchi"/>
                         </imageobject>
 
                         <textobject>
@@ -1963,11 +1963,11 @@
                       <acronym>postgres</acronym>.</title><screenshot id="basics-SaveSQL">
                       <mediaobject>
                         <imageobject role="html">
-                          <imagedata fileref="figures/basics_SaveSQL.png" format="PNG" srccredit="Marchi Cristian" width="510px"/>
+                          <imagedata fileref="figures/basics_SaveSQL.png" srccredit="Marchi Cristian" width="510px"/>
                         </imageobject>
 
                         <imageobject role="fo">
-                          <imagedata fileref="figures/basics_SaveSQL.png" format="PNG" srccredit="Cristian Marchi"/>
+                          <imagedata fileref="figures/basics_SaveSQL.png" srccredit="Cristian Marchi"/>
                         </imageobject>
 
                         <textobject>
@@ -2505,11 +2505,11 @@
             <screenshot id="basics-NewAccountHierarchySetup">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup.png" srccredit="Cristian Marchi" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup.png" format="PNG" srccredit="Cristian Marchi"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup.png" srccredit="Cristian Marchi"/>
                 </imageobject>
 
                 <textobject>
@@ -2544,11 +2544,11 @@
             <screenshot id="basics-NewAccountHierarchySetup-currency">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png" srccredit="Cristian Marchi" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png" format="PNG" srccredit="Cristian Marchi"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png" srccredit="Cristian Marchi"/>
                 </imageobject>
 
                 <textobject>
@@ -2579,11 +2579,11 @@
             <screenshot id="basics-NewBookOptions">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_NewBookOpts.png" format="PNG" srccredit="Chris Good" width="510"/>
+                  <imagedata fileref="figures/basics_NewBookOpts.png" srccredit="Chris Good" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_NewBookOpts.png" format="PNG" srccredit="Chris Good"/>
+                  <imagedata fileref="figures/basics_NewBookOpts.png" srccredit="Chris Good"/>
                 </imageobject>
 
                 <textobject>
@@ -2614,11 +2614,11 @@
             <screenshot id="basics-NewAccountHierarchySetup-Accounts">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png" srccredit="Cristian Marchi" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png" format="PNG" srccredit="Cristian Marchi"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png" srccredit="Cristian Marchi"/>
                 </imageobject>
 
                 <textobject>
@@ -2646,11 +2646,11 @@
             <screenshot id="basics-NewAccountHierarchySetup-Setup.png">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png" srccredit="Cristian Marchi" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png" format="PNG" srccredit="Cristian Marchi"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png" srccredit="Cristian Marchi"/>
                 </imageobject>
 
                 <textobject>
@@ -2675,11 +2675,11 @@
             <screenshot id="basics-NewAccountHierarchySetup-Finish">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png" srccredit="Cristian Marchi" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png" format="PNG" srccredit="Cristian Marchi"/>
+                  <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png" srccredit="Cristian Marchi"/>
                 </imageobject>
 
                 <textobject>
@@ -2711,11 +2711,11 @@
             <screenshot id="basics-EmptyAccounts">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/basics_EmptyAccounts.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                  <imagedata fileref="figures/basics_EmptyAccounts.png" srccredit="Cristian Marchi" width="510"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/basics_EmptyAccounts.png" format="PNG" srccredit="Cristian Marchi"/>
+                  <imagedata fileref="figures/basics_EmptyAccounts.png" srccredit="Cristian Marchi"/>
                 </imageobject>
 
                 <textobject>
@@ -2774,7 +2774,7 @@ Translators:
         <screenshot id="accts-AccountRelationships">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/basics_AccountRelationships.png" format="PNG" srccredit="Geert Janssens"/>
+              <imagedata fileref="figures/basics_AccountRelationships.png" srccredit="Geert Janssens"/>
             </imageobject>
 
             <imageobject role="fo">
@@ -3115,7 +3115,7 @@ Translators:
           <screenshot id="accts-DefaultIncomeAccounts">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/accts_DefaultIncomeAccounts.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/accts_DefaultIncomeAccounts.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -3132,7 +3132,7 @@ Translators:
           <screenshot id="accts-DefaultExpenseAccounts">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/accts_DefaultExpenseAccounts.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/accts_DefaultExpenseAccounts.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -3232,7 +3232,7 @@ Translators:
               <screenshot id="accts-CreateAssetsAccounts">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/accts_CreateAssetsAccount.png" format="PNG" srccredit="Cristian Marchi"/>
+                    <imagedata fileref="figures/accts_CreateAssetsAccount.png" srccredit="Cristian Marchi"/>
                   </imageobject>
 
                   <textobject>
@@ -3279,7 +3279,7 @@ Translators:
           <screenshot id="accts-toplevel">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/accts_toplevel.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/accts_toplevel.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -3411,7 +3411,7 @@ Translators:
           <screenshot id="accts-tree">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/accts_tree.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/accts_tree.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -3575,7 +3575,7 @@ Translators:
           <screenshot id="txns-registersplit4">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_registersplit4.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_registersplit4.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -3595,7 +3595,7 @@ Translators:
           <screenshot id="txns-registersplit5">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_registersplit5.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_registersplit5.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -3622,7 +3622,7 @@ Translators:
           <screenshot id="txns-registersplit6">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_registersplit6.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_registersplit6.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -3899,7 +3899,7 @@ Translators:
         <screenshot id="txns-registersplit2">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/txns_registersplit2.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/txns_registersplit2.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -3944,7 +3944,7 @@ Translators:
         <screenshot id="txns-registersplit3">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/txns_registersplit3.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/txns_registersplit3.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -3984,7 +3984,7 @@ Translators:
           <screenshot id="txns-register-2account">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_register_2account.png" format="PNG" srccredit="Bengt  Thuree"/>
+                <imagedata fileref="figures/txns_register_2account.png" srccredit="Bengt  Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4014,7 +4014,7 @@ Translators:
           <screenshot id="txns-register-2account2">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_register_2account2.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_register_2account2.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4088,7 +4088,7 @@ Translators:
           <figure id="txns-register-multiaccount">
             <title>Inserire una transazione suddivisa</title><mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_register_multiaccount.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_register_multiaccount.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4181,11 +4181,11 @@ Translators:
           <screenshot id="txns-reconcile-window-1">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_reconcile_window1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_reconcile_window1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_reconcile_window1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_reconcile_window1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4325,11 +4325,11 @@ Translators:
           <screenshot id="txns-reconcile-window-2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_reconcile_window2.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_reconcile_window2.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_reconcile_window2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_reconcile_window2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4447,7 +4447,7 @@ Translators:
           <screenshot id="txns-reconcile-window-3">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_reconcile_window3.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_reconcile_window3.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4494,7 +4494,7 @@ Translators:
           <screenshot id="txns-sxn-ledger-1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_sxn_ledger1.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_sxn_ledger1.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4520,7 +4520,7 @@ Translators:
           <screenshot id="txns-sxn-ledger-2">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_sxn_ledger2.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_sxn_ledger2.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4540,7 +4540,7 @@ Translators:
           <screenshot id="txns-sxn-ledger-3">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_sxn_ledger3.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_sxn_ledger3.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4562,7 +4562,7 @@ Translators:
           <screenshot id="txns-sxn-ledger-4">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_sxn_ledger4.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_sxn_ledger4.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -4604,11 +4604,11 @@ Translators:
           <screenshot id="txns-sxn-editor-2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_sxn_editor-2.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_sxn_editor-2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4630,11 +4630,11 @@ Translators:
           <screenshot id="txns-sxn-editor-3-overview">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_sxn_editor-3-overview.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_sxn_editor-3-overview.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4719,11 +4719,11 @@ Translators:
           <screenshot id="txns-sxn-editor-3-frequency">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4817,11 +4817,11 @@ Translators:
           <screenshot id="txns-sxn-editor-3-template">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_sxn_editor-3-template.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_sxn_editor-3-template.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4849,11 +4849,11 @@ Translators:
           <screenshot id="txns-sxn-editor-4">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_sxn_editor-4.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_sxn_editor-4.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4896,11 +4896,11 @@ Translators:
           <screenshot id="txns-sxn-editor-slr">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/txns_sxn_editor_slr.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/txns_sxn_editor_slr.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -4967,7 +4967,7 @@ Translators:
           <screenshot id="txns-puttoget1-Charts">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_puttoget_Charts.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_puttoget_Charts.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -5041,7 +5041,7 @@ Translators:
           <screenshot id="txns-puttoget1-Charts1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_puttoget_Charts1.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_puttoget_Charts1.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -5168,7 +5168,7 @@ Translators:
           <screenshot id="txns-puttoget2-Charts1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_puttoget_Charts2.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/txns_puttoget_Charts2.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -5224,7 +5224,7 @@ Translators:
               <screenshot id="txns-puttoget2-Cash">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/txns_CashFlow.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/txns_CashFlow.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5258,7 +5258,7 @@ Translators:
               <screenshot id="txns-puttoget2-TransactionRptChecking">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/txns_TransactionRptChecking.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/txns_TransactionRptChecking.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5281,7 +5281,7 @@ Translators:
               <screenshot id="txns-puttoget2-TransactionRptExpenses">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/txns_TransactionRptExpenses.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/txns_TransactionRptExpenses.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5533,7 +5533,7 @@ Translators:
           <screenshot id="cbook-gcashdata4">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_gcashdata4.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cbook_gcashdata4.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -5566,7 +5566,7 @@ Translators:
               <screenshot id="cbook-transferin">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_transferin.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_transferin.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5596,7 +5596,7 @@ Translators:
               <screenshot id="cbook-checkexamp">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_checkexamp.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_checkexamp.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5623,7 +5623,7 @@ Translators:
               <screenshot id="cbook-atm">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_atm.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_atm.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5650,7 +5650,7 @@ Translators:
           <screenshot id="cbook-bankstmt">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_bankstmt.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cbook_bankstmt.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -5679,7 +5679,7 @@ Translators:
               <screenshot id="cbook-reconexamp">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_reconexamp.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_reconexamp.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5713,7 +5713,7 @@ Translators:
               <screenshot id="cbook-servch">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_servch.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_servch.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5743,7 +5743,7 @@ Translators:
               <screenshot id="cbook-reconciledCheckAct">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_reconciledCheckAct.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_reconciledCheckAct.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5771,7 +5771,7 @@ Translators:
           <screenshot id="cbook-chartaccts5">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_chartaccts5.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cbook_chartaccts5.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -5810,7 +5810,7 @@ Translators:
               <screenshot id="cbook-puttoget2-Cash">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_CashFlow.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_CashFlow.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5839,7 +5839,7 @@ Translators:
               <screenshot id="cbook-puttoget2-TransactionRptChecking">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_TransactionRptAssets.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_TransactionRptAssets.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -5863,7 +5863,7 @@ Translators:
               <screenshot id="cbook-puttoget2-TransactionRptExpenses">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cbook_TransactionRptExpenses.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cbook_TransactionRptExpenses.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -6261,7 +6261,7 @@ Translators:
             <screenshot id="cc-Reversing-Transaction-1">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/cc_Reversing_Transaction_1.png" format="PNG" srccredit="Bengt  Thuree"/>
+                  <imagedata fileref="figures/cc_Reversing_Transaction_1.png" srccredit="Bengt  Thuree"/>
                 </imageobject>
 
                 <textobject>
@@ -6282,7 +6282,7 @@ Translators:
             <screenshot id="cc-Reversing-Transaction-2">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/cc_Reversing_Transaction_2.png" format="PNG" srccredit="Bengt  Thuree"/>
+                  <imagedata fileref="figures/cc_Reversing_Transaction_2.png" srccredit="Bengt  Thuree"/>
                 </imageobject>
 
                 <textobject>
@@ -6327,7 +6327,7 @@ Translators:
           <screenshot id="cc-accounts">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_accounts.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_accounts.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6362,7 +6362,7 @@ Translators:
           <screenshot id="cc-purchases">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_purchases.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_purchases.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6393,7 +6393,7 @@ Translators:
           <screenshot id="cc-refund">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_refund.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_refund.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6420,7 +6420,7 @@ Translators:
           <screenshot id="cc-interest">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_interest.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_interest.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6455,7 +6455,7 @@ Translators:
           <screenshot id="cc-reconcile-init">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_reconcile_init.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_reconcile_init.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6478,7 +6478,7 @@ Translators:
           <screenshot id="cc-reconcile">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_reconcile.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_reconcile.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6515,7 +6515,7 @@ Translators:
           <screenshot id="cc-payment">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_payment.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_payment.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6536,7 +6536,7 @@ Translators:
           <screenshot id="cc-final">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_final.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/cc_final.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -6582,7 +6582,7 @@ Translators:
               <screenshot id="cc-puttoget2-Cash">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cc_CashFlow.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cc_CashFlow.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -6611,7 +6611,7 @@ Translators:
               <screenshot id="cc-puttoget2-TransactionRptVisa">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cc_TransactionRptVisa.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cc_TransactionRptVisa.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -6634,7 +6634,7 @@ Translators:
               <screenshot id="cc-puttoget2-TransactionRptExpenses">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/cc_TransactionRptExpenses.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/cc_TransactionRptExpenses.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -6826,7 +6826,7 @@ Struttura di conti elementare per un prestito
         <screenshot id="loans_fcalc">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/loans_fcalc.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/loans_fcalc.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -7087,7 +7087,7 @@ The simple case for when  PMT == 0 gives the solution:
         <screenshot id="loans_mortgage">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/loans_mortgage1.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/loans_mortgage1.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -7185,7 +7185,7 @@ The simple case for when  PMT == 0 gives the solution:
         <screenshot id="loans_mortgage2.png">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/loans_mortgage2.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/loans_mortgage2.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -7205,7 +7205,7 @@ The simple case for when  PMT == 0 gives the solution:
         <screenshot id="loans_mortgage3">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/loans_mortgage3.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/loans_mortgage3.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -7295,7 +7295,7 @@ The simple case for when  PMT == 0 gives the solution:
           <screenshot id="loans_OpenOfficePrivateLoanDetails">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/loans_PrivateLoanCalculation.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/loans_PrivateLoanCalculation.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -7382,7 +7382,7 @@ Capitale:Bilanci di apertura:EUR
           <screenshot id="loans_PrivateLoanInitial">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/loans_PrivateLoanInitial.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/loans_PrivateLoanInitial.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -7437,7 +7437,7 @@ Capitale:Bilanci di apertura:EUR
           <screenshot id="loans_PrivateLoanFirstPayment">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -7495,7 +7495,7 @@ Capitale:Bilanci di apertura:EUR
           <screenshot id="loans_PrivateLoanSecondPayment">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -7518,7 +7518,7 @@ Capitale:Bilanci di apertura:EUR
           <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -8327,11 +8327,11 @@ Capitale:Bilanci di apertura:EUR
           <screenshot id="invest_accountspredef">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_AccountsPredef.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_AccountsPredef.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -8512,11 +8512,11 @@ Entrate
           <screenshot id="invest-int">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_int1.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_int1.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_int1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_int1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -8542,11 +8542,11 @@ Entrate
           <screenshot id="invest-int2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_int2.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_int2.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_int2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_int2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -8563,11 +8563,11 @@ Entrate
           <screenshot id="invest-int2-1">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_int2-1.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_int2-1.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_int2-1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_int2-1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -8587,11 +8587,11 @@ Entrate
           <screenshot id="invest-int3">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_int3.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_int3.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_int3.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_int3.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -8694,11 +8694,11 @@ Entrate
           <screenshot id="invest-newaccount">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_newaccount.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_newaccount.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_newaccount.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_newaccount.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -8779,11 +8779,11 @@ Entrate
                   <screenshot id="invest-selectsecurity">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/invest_selectsecurity.png" format="PNG" srccredit="Cristian Marchi"/>
+                        <imagedata fileref="figures/invest_selectsecurity.png" srccredit="Cristian Marchi"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/invest_selectsecurity.png" format="PNG" srccredit="Cristian Marchi"/>
+                        <imagedata fileref="figures/invest_selectsecurity.png" srccredit="Cristian Marchi"/>
                       </imageobject>
 
                       <textobject>
@@ -8862,11 +8862,11 @@ Entrate
                         <screenshot id="invest-newsecurity">
                           <mediaobject>
                             <imageobject role="html">
-                              <imagedata fileref="figures/invest_newsecurity.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                              <imagedata fileref="figures/invest_newsecurity.png" srccredit="Cristian Marchi" width="510px"/>
                             </imageobject>
 
                             <imageobject role="fo">
-                              <imagedata fileref="figures/invest_newsecurity.png" format="PNG" srccredit="Cristian Marchi"/>
+                              <imagedata fileref="figures/invest_newsecurity.png" srccredit="Cristian Marchi"/>
                             </imageobject>
 
                             <textobject>
@@ -8953,11 +8953,11 @@ Entrate
           <screenshot id="invest-setup-current">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_setup_current.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_setup_current.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_setup_current.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_setup_current.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9000,11 +9000,11 @@ Entrate
           <screenshot id="invest-setup-portfolio1">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_setup_portfolio1.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_setup_portfolio1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9055,11 +9055,11 @@ Entrate
           <screenshot id="invest-setup-portfolio2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_SetupPortfolio2.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_SetupPortfolio2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9171,11 +9171,11 @@ Entrate
           <screenshot id="invest-peditor">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_peditor.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_peditor.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_peditor.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_peditor.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9218,11 +9218,11 @@ Entrate
           <screenshot id="invest-peditor2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_peditor2.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_peditor2.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_peditor2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_peditor2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9399,11 +9399,11 @@ Entrate
           <screenshot id="invest-stockvalue">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_stockvalue.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_stockvalue.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_stockvalue.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_stockvalue.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9446,7 +9446,7 @@ Entrate
           <screenshot id="invest-stockvalue-report-options">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_stockvalue_report_options.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_stockvalue_report_options.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -9489,7 +9489,7 @@ Entrate
           <screenshot id="invest-stockvalue-report">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_stockvalue_report.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_stockvalue_report.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -9821,11 +9821,11 @@ Entrate
           <screenshot id="invest-sellstock">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstock.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_sellstock.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstock.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_sellstock.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -9843,11 +9843,11 @@ Entrate
           <screenshot id="invest-sellstock2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstock2.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_sellstock2.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstock2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_sellstock2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -10013,11 +10013,11 @@ Entrate
           <screenshot id="invest-sellstockLoss">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstockLoss.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_sellstockLoss.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstockLoss.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_sellstockLoss.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -10035,11 +10035,11 @@ Entrate
           <screenshot id="invest-sellstockLoss2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstockLoss2.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_sellstockLoss2.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstockLoss2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_sellstockLoss2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -10133,11 +10133,11 @@ Entrate
               <title>Selling Shares - Capital Gains - Lots in Account window</title><screenshot id="tool-lotsInAcct">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                    <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" format="PNG" srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -10504,11 +10504,11 @@ Entrate
                   <title>Selling Shares - Capital Gains - Security register before scrubbing a single lot</title><screenshot id="invest-lots0reg">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/investLots0_RegB4Scrub.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/investLots0_RegB4Scrub.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/investLots0_RegB4Scrub.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/investLots0_RegB4Scrub.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -10544,11 +10544,11 @@ Entrate
                   <title>Selling Shares - Capital Gains - Lots before scrubbing a single lot</title><screenshot id="invest-lots1B4CreateLot">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/investLots1_BeforeCreateLot.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/investLots1_BeforeCreateLot.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/investLots1_BeforeCreateLot.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/investLots1_BeforeCreateLot.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -10614,11 +10614,11 @@ Entrate
                   <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" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -10738,11 +10738,11 @@ Entrate
               <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 fileref="figures/invest2Lots0RegB4Scrub.png" srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest2Lots0RegB4Scrub.png" format="PNG" srccredit="Chris Good"/>
+                    <imagedata fileref="figures/invest2Lots0RegB4Scrub.png" srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -10771,11 +10771,11 @@ Entrate
                   <title>Selling Shares - Capital Gains - Lots before Scrub Account</title><screenshot id="invest2-lots1B4ScrubAcct">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/invest2Lots1B4Scrub.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/invest2Lots1B4Scrub.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/invest2Lots1B4Scrub.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/invest2Lots1B4Scrub.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -10800,11 +10800,11 @@ Entrate
                   <title>Selling Shares - Capital Gains - Lots after Scrub Account</title><screenshot id="invest2-lots2AftScrubAcct">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -10837,11 +10837,11 @@ Entrate
                   <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="invest2-lots3AftScrubAcct">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -10885,11 +10885,11 @@ Entrate
               <title>Selling Shares - Capital Gains - Register after Scrub Account</title><screenshot id="investLotsSplitReg">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/investLotsSplitReg.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                    <imagedata fileref="figures/investLotsSplitReg.png" srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/investLotsSplitReg.png" format="PNG" srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLotsSplitReg.png" srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -10908,11 +10908,11 @@ Entrate
               <title>Selling Shares - Capital Gains - Lot 0 after Scrub Account</title><screenshot id="investLotsSplitLot0">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/investLotsSplitLot0.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                    <imagedata fileref="figures/investLotsSplitLot0.png" srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/investLotsSplitLot0.png" format="PNG" srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLotsSplitLot0.png" srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -10931,11 +10931,11 @@ Entrate
               <title>Selling Shares - Capital Gains - Lot 1 after Scrub Account</title><screenshot id="investLotsSplitLot1">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/investLotsSplitLot1.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                    <imagedata fileref="figures/investLotsSplitLot1.png" srccredit="Chris Good" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/investLotsSplitLot1.png" format="PNG" srccredit="Chris Good"/>
+                    <imagedata fileref="figures/investLotsSplitLot1.png" srccredit="Chris Good"/>
                   </imageobject>
 
                   <textobject>
@@ -10992,11 +10992,11 @@ Entrate
                   <title>Selling Shares - Capital Gains - Register after scrubbing a single lot</title><screenshot id="invest-lots4AftScrub1LotReg">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                        <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png" srccredit="Chris Good" width="510px"/>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png" format="PNG" srccredit="Chris Good"/>
+                        <imagedata fileref="figures/investLots4_AfterScrub1LotReg.png" srccredit="Chris Good"/>
                       </imageobject>
 
                       <textobject>
@@ -11057,11 +11057,11 @@ Entrate
           <screenshot id="invest-dividendcash1">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_dividendcash.png" format="PNG" srccredit="Daniel Dodson" width="510px"/>
+                <imagedata fileref="figures/invest_dividendcash.png" srccredit="Daniel Dodson" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_dividendcash.png" format="PNG" srccredit="Daniel Dodson"/>
+                <imagedata fileref="figures/invest_dividendcash.png" srccredit="Daniel Dodson"/>
               </imageobject>
 
               <textobject>
@@ -11109,11 +11109,11 @@ Entrate
           <screenshot id="invest-dividendreinvest1">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/invest_dividendreinvest1.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/invest_dividendreinvest1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -11183,11 +11183,11 @@ Entrate
         <screenshot id="invest-ret-of-cap">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG" srccredit="Chris Good" width="510px"/>
+              <imagedata fileref="figures/invest_ret_of_cap.png" srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG" srccredit="Chris Good"/>
+              <imagedata fileref="figures/invest_ret_of_cap.png" srccredit="Chris Good"/>
             </imageobject>
 
             <textobject>
@@ -11247,7 +11247,7 @@ Entrate
           <screenshot id="invest-split1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_split1.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_split1.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11271,7 +11271,7 @@ Entrate
           <screenshot id="invest-split2">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_split2.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_split2.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11334,7 +11334,7 @@ Entrate
           <screenshot id="invest-split3">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_split3.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_split3.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11357,7 +11357,7 @@ Entrate
           <screenshot id="invest-split4">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_split4.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_split4.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11381,7 +11381,7 @@ Entrate
           <screenshot id="invest-simplesplit1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_simplesplit1.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_simplesplit1.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11429,7 +11429,7 @@ Entrate
           <screenshot id="invest-merge2">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_merge2.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_merge2.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11496,7 +11496,7 @@ Entrate
           <screenshot id="invest-merge3">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_merge3.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_merge3.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -11525,7 +11525,7 @@ Entrate
           <screenshot id="invest-stockmerge1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/invest_stockmerge1.png" format="PNG" srccredit="Dave Herman"/>
+                <imagedata fileref="figures/invest_stockmerge1.png" srccredit="Dave Herman"/>
               </imageobject>
 
               <textobject>
@@ -12662,7 +12662,7 @@ Entrate
         <screenshot id="capgain_appmain">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/capgain_appmain.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/capgain_appmain.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -12691,7 +12691,7 @@ Entrate
           <screenshot id="capgain_app2main">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/capgain_app2main.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/capgain_app2main.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -12833,7 +12833,7 @@ Entrate
               <screenshot id="capgain_app3main">
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="figures/capgain_app3main.png" format="PNG" srccredit="Bengt Thuree"/>
+                    <imagedata fileref="figures/capgain_app3main.png" srccredit="Bengt Thuree"/>
                   </imageobject>
 
                   <textobject>
@@ -13241,7 +13241,7 @@ Entrate
         <screenshot id="currency_main1">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_main1.png" format="PNG" srccredit="Geert Janssens"/>
+              <imagedata fileref="figures/currency_main1.png" srccredit="Geert Janssens"/>
             </imageobject>
 
             <textobject>
@@ -13325,7 +13325,7 @@ Entrate
         <screenshot id="currency_main1a">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_main1.png" format="PNG" srccredit="Geert Janssens"/>
+              <imagedata fileref="figures/currency_main1.png" srccredit="Geert Janssens"/>
             </imageobject>
 
             <textobject>
@@ -13356,7 +13356,7 @@ Entrate
           <screenshot id="currency_peditor">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_peditor.png" format="PNG" srccredit="Geert Janssens"/>
+                <imagedata fileref="figures/currency_peditor.png" srccredit="Geert Janssens"/>
               </imageobject>
 
               <textobject>
@@ -13377,7 +13377,7 @@ Entrate
           <screenshot id="currency_addcurr">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_addcurr.png" format="PNG" srccredit="Geert Janssens"/>
+                <imagedata fileref="figures/currency_addcurr.png" srccredit="Geert Janssens"/>
               </imageobject>
 
               <textobject>
@@ -13401,7 +13401,7 @@ Entrate
           <screenshot id="currency_manualpriceadded">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG" srccredit="Geert Janssens"/>
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" srccredit="Geert Janssens"/>
               </imageobject>
 
               <textobject>
@@ -13418,7 +13418,7 @@ Entrate
           <screenshot id="currency_main2">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_main2.png" format="PNG" srccredit="Geert Janssens"/>
+                <imagedata fileref="figures/currency_main2.png" srccredit="Geert Janssens"/>
               </imageobject>
 
               <textobject>
@@ -13454,7 +13454,7 @@ Entrate
           <screenshot id="currency_BeforeGetOnline">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG" srccredit="Geert Janssens"/>
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" srccredit="Geert Janssens"/>
               </imageobject>
 
               <textobject>
@@ -13483,7 +13483,7 @@ Entrate
           <para><screenshot id="currency_AfterGetOnlineQuotes">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png" format="PNG" srccredit="Geert Janssens"/>
+                  <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png" srccredit="Geert Janssens"/>
                 </imageobject>
 
                 <textobject>
@@ -13512,7 +13512,7 @@ Entrate
           <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="Geert Janssens"/>
               </imageobject>
 
               <textobject>
@@ -13626,7 +13626,7 @@ Entrate
           <screenshot id="currency_purchase_MoveMoney.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_MoveMoney.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_MoveMoney.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13647,7 +13647,7 @@ Entrate
           <screenshot id="currency_purchase_SetExchangeRate.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_SetExchangeRate.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_SetExchangeRate.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13669,7 +13669,7 @@ Entrate
           <screenshot id="currency_purchase_BeforeBoat.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_BeforeBoat.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_BeforeBoat.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13692,7 +13692,7 @@ Entrate
           <screenshot id="currency_purchase_AfterBoat.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_AfterBoat.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_AfterBoat.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13743,7 +13743,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
           <screenshot id="currency_purchase_BeforeStocks.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_BeforeStocks.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_BeforeStocks.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13767,7 +13767,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
           <screenshot id="currency_purchase_Commodities.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_Commodities.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_Commodities.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13864,7 +13864,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
           <screenshot id="currency_purchase_ToAmount.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_ToAmount.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_ToAmount.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -13885,7 +13885,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
           <screenshot id="currency_purchase_AfterStocks.png">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/currency_purchase_AfterStocks.png" format="PNG" srccredit="Bengt Thuree"/>
+                <imagedata fileref="figures/currency_purchase_AfterStocks.png" srccredit="Bengt Thuree"/>
               </imageobject>
 
               <textobject>
@@ -14346,12 +14346,12 @@ Basic A/R and A/P Account Hierarchy:
             <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+                  <imagedata fileref="figures/bus_tax_main.png"
                          srccredit="Chris Good" width="510px" />
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+                  <imagedata fileref="figures/bus_tax_main.png"
                         srccredit="Chris Good" />
                 </imageobject>
 
@@ -14366,7 +14366,7 @@ Basic A/R and A/P Account Hierarchy:
             <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_tax_new.png" format="PNG"
+                  <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Chris Good" />
                 </imageobject>
 
@@ -14712,7 +14712,7 @@ Basic A/R and A/P Account Hierarchy:
             <title>Entering Company Information</title><screenshot id="bus-co-reg">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_co_reg.png" format="PNG"
+                  <imagedata fileref="figures/bus_co_reg.png"
                         srccredit="Chris Good" />
                 </imageobject>
 
@@ -14810,7 +14810,7 @@ Basic A/R and A/P Account Hierarchy:
             <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_terms_main.png" format="PNG"
+                  <imagedata fileref="figures/bus_terms_main.png"
                         srccredit="Chris Good" />
                 </imageobject>
 
@@ -14825,7 +14825,7 @@ Basic A/R and A/P Account Hierarchy:
             <title>New Billing Term</title><screenshot id="bus-termsnew">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_terms_new.png" format="PNG"
+                  <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Chris Good" />
                 </imageobject>
 
@@ -14989,7 +14989,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-custnew">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ar_custnew.png" format="PNG" srccredit="Patrick Schweiger"/>
+                  <imagedata fileref="figures/bus_ar_custnew.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15021,7 +15021,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-custfind">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ar_custfind.png" format="PNG" srccredit="Patrick Schweiger"/>
+                  <imagedata fileref="figures/bus_ar_custfind.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15097,7 +15097,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-invoicenew">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ar_invoicenew.png" format="PNG" srccredit="Patrick Schweiger"/>
+                  <imagedata fileref="figures/bus_ar_invoicenew.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15127,7 +15127,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-invoiceedit">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ar_invoiceedit.png" format="PNG" srccredit="Patrick Schweiger"/>
+                  <imagedata fileref="figures/bus_ar_invoiceedit.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15159,7 +15159,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-invoicepost">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ar_invoicepost.png" format="PNG" srccredit="Patrick Schweiger"/>
+                  <imagedata fileref="figures/bus_ar_invoicepost.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15227,7 +15227,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-invoiceprint">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ar_invoiceprint.png" format="PNG" srccredit="Patrick Schweiger"/>
+                  <imagedata fileref="figures/bus_ar_invoiceprint.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15322,7 +15322,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ar-jobnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_jobnew.png" format="PNG" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ar_jobnew.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -15380,7 +15380,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ar-payment">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_payment.png" format="PNG" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ar_payment.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -15426,7 +15426,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ar-invoicechange1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicechange1.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/bus_ar_invoicechange1.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -15469,11 +15469,11 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ar-invoicechange2">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/bus_ar_invoicechange2.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/bus_ar_invoicechange2.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -15508,7 +15508,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ar-invoicechange3">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicechange3.png" format="PNG" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ar_invoicechange3.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -15610,7 +15610,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ap-vendornew">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                  <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15641,7 +15641,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ar-vendorfind">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger" format="PNG"/>
+                  <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15719,7 +15719,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ap-billnew">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                  <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15749,7 +15749,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ap-billedit">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger" format="PNG"/>
+                  <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15783,7 +15783,7 @@ Basic A/R and A/P Account Hierarchy:
             <screenshot id="bus-ap-billpost">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger" format="PNG"/>
+                  <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
                 </imageobject>
 
                 <textobject>
@@ -15843,7 +15843,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ap-jobnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham"/>
               </imageobject>
 
               <textobject>
@@ -15896,7 +15896,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-ap-payment">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -16286,7 +16286,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-pay-ex1">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_pay_ex1.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_pay_ex1.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -16462,7 +16462,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-pay-ex2">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_pay_ex2.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_pay_ex2.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -16493,7 +16493,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-pay-ex3">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_pay_ex3.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_pay_ex3.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -16517,7 +16517,7 @@ Basic A/R and A/P Account Hierarchy:
           <screenshot id="bus-pay-ex4">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_pay_ex4.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_pay_ex4.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -17892,7 +17892,7 @@ Translators:
         <screenshot id="dep_example">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/dep_example.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/dep_example.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -17926,7 +17926,7 @@ Translators:
         <screenshot id="dep_assetreg">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/dep_assetreg.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/dep_assetreg.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
@@ -17943,7 +17943,7 @@ Translators:
         <screenshot id="dep_assetmain">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/dep_assetmain.png" format="PNG" srccredit="Bengt Thuree"/>
+              <imagedata fileref="figures/dep_assetmain.png" srccredit="Bengt Thuree"/>
             </imageobject>
 
             <textobject>
diff --git a/guide/ja/ch_accts.xml b/guide/ja/ch_accts.xml
index 917b7f7d..66eaed4b 100644
--- a/guide/ja/ch_accts.xml
+++ b/guide/ja/ch_accts.xml
@@ -41,7 +41,7 @@ Translators:
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/basics_AccountRelationships.png"
-format="PNG" srccredit="Geert Janssens"></imagedata>
+srccredit="Geert Janssens"></imagedata>
         </imageobject>
 
         <textobject>
@@ -290,7 +290,7 @@ linkend="basics-accounting1"></xref>で説明しているように、貸方は
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-format="PNG" srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -308,7 +308,7 @@ format="PNG" srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-format="PNG" srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -389,7 +389,7 @@ format="PNG" srccredit="Cristian Marchi"></imagedata>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-format="PNG" srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"></imagedata>
               </imageobject>
 
               <textobject>
@@ -431,7 +431,7 @@ format="PNG" srccredit="Cristian Marchi"></imagedata>
       <screenshot id="accts-toplevel">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_toplevel.png" format="PNG"
+            <imagedata fileref="figures/accts_toplevel.png"
 srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -540,7 +540,7 @@ srccredit="Cristian Marchi"></imagedata>
       <screenshot id="accts-tree">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_tree.png" format="PNG"
+            <imagedata fileref="figures/accts_tree.png"
 srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
diff --git a/guide/ja/ch_basics.xml b/guide/ja/ch_basics.xml
index 08ad5bdd..83a8896b 100644
--- a/guide/ja/ch_basics.xml
+++ b/guide/ja/ch_basics.xml
@@ -102,7 +102,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/basics_AccountRelationships.png"
-format="PNG" srccredit="Geert Janssens"></imagedata>
+srccredit="Geert Janssens"></imagedata>
             </imageobject>
 
             <textobject>
@@ -250,7 +250,7 @@ linkend="basics-files1"/>を参照してください。
       <screenshot id="basics-TipOfDay">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_TipOfDay.png" format="PNG"
+            <imagedata fileref="figures/basics_TipOfDay.png"
 srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -283,7 +283,7 @@ srccredit="Cristian Marchi"></imagedata>
       <screenshot id="basics-Accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Accounts.png" format="PNG"
+            <imagedata fileref="figures/basics_Accounts.png"
 srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -337,12 +337,12 @@ srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/basics_CheckAccount.png" format="PNG" srccredit="Bengt
+fileref="figures/basics_CheckAccount.png" srccredit="Bengt
 Thuree" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/basics_CheckAccount.png" format="PNG"
+            <imagedata fileref="figures/basics_CheckAccount.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -587,12 +587,12 @@ linkend="basics-open-data">開いて</link>修正するために、ファイル
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveXML.png"
-format="PNG" srccredit="Cristian Marchi" width="510px"></imagedata>
+srccredit="Cristian Marchi" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata
-fileref="figures/basics_SaveXML.png" format="PNG" srccredit="Cristian
+fileref="figures/basics_SaveXML.png" srccredit="Cristian
 Marchi"></imagedata>
                     </imageobject>
 
@@ -639,12 +639,12 @@ Marchi"></imagedata>
                   <mediaobject>
                     <imageobject role="html">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-format="PNG" srccredit="Marchi Cristian" width="510px"></imagedata>
+srccredit="Marchi Cristian" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
                       <imagedata
-fileref="figures/basics_SaveSQL.png" format="PNG" srccredit="Cristian
+fileref="figures/basics_SaveSQL.png" srccredit="Cristian
 Marchi"></imagedata>
                     </imageobject>
 
@@ -896,13 +896,13 @@ Marchi"></imagedata>
           <mediaobject>
             <imageobject role="html">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup.png"
 srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup.png"
 srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
@@ -935,13 +935,13 @@ srccredit="Cristian Marchi"></imagedata>
           <mediaobject>
             <imageobject role="html">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_currency.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_currency.png"
 srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_currency.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_currency.png"
 srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
@@ -973,13 +973,13 @@ srccredit="Cristian Marchi"></imagedata>
           <mediaobject>
             <imageobject role="html">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_Accounts.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
 srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_Accounts.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
 srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
@@ -1005,13 +1005,13 @@ srccredit="Cristian Marchi"></imagedata>
           <mediaobject>
             <imageobject role="html">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_Setup.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
 srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_Setup.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
 srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
@@ -1036,13 +1036,13 @@ srccredit="Cristian Marchi"></imagedata>
           <mediaobject>
             <imageobject role="html">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_Finish.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
 srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata
-fileref="figures/basics_NewAccountHierarchySetup_Finish.png" format="PNG"
+fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
 srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
@@ -1067,12 +1067,12 @@ srccredit="Cristian Marchi"></imagedata>
           <mediaobject>
             <imageobject role="html">
               <imagedata
-fileref="figures/basics_EmptyAccounts.png" format="PNG" srccredit="Cristian
+fileref="figures/basics_EmptyAccounts.png" srccredit="Cristian
 Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/basics_EmptyAccounts.png" format="PNG"
+              <imagedata fileref="figures/basics_EmptyAccounts.png"
 srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
diff --git a/guide/ja/ch_bus_ap.xml b/guide/ja/ch_bus_ap.xml
index b6f98999..a7a5f8cc 100644
--- a/guide/ja/ch_bus_ap.xml
+++ b/guide/ja/ch_bus_ap.xml
@@ -248,7 +248,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_vendornew.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -279,7 +279,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_vendorfind.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -400,7 +400,7 @@ linkend="bus-ap-jobs1" />を参照)
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_billnew.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -428,7 +428,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_billedit.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -537,7 +537,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ap_billpost.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -694,7 +694,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon
-Lapham" format="PNG"/>
+Lapham"/>
         </imageobject>
 
         <textobject>
@@ -803,7 +803,7 @@ linkend="bus-ap-billfind2" />で説明した<guilabel>仕入先を検索</guilab
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_ap_payment.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
         </imageobject>
 
         <textobject>
diff --git a/guide/ja/ch_bus_ar.xml b/guide/ja/ch_bus_ar.xml
index f4a1de18..0aed0433 100644
--- a/guide/ja/ch_bus_ar.xml
+++ b/guide/ja/ch_bus_ar.xml
@@ -298,7 +298,7 @@
       <screenshot id="bus-ar-custnew">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_custnew.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_custnew.png"
 srccredit="Patrick Schweiger" />
           </imageobject>
 
@@ -330,7 +330,7 @@ srccredit="Patrick Schweiger" />
       <screenshot id="bus-ar-custfind">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/bus_ar_custfind.png" format="PNG"
+            <imagedata fileref="figures/bus_ar_custfind.png"
 srccredit="Patrick Schweiger" />
           </imageobject>
 
@@ -442,7 +442,7 @@ linkend="bus-ar-jobs1" />を参照)
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ar_invoicenew.png"
-format="PNG" srccredit="Patrick Schweiger" />
+srccredit="Patrick Schweiger" />
           </imageobject>
 
           <textobject>
@@ -470,7 +470,7 @@ format="PNG" srccredit="Patrick Schweiger" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ar_invoiceedit.png"
-format="PNG" srccredit="Patrick Schweiger" />
+srccredit="Patrick Schweiger" />
           </imageobject>
 
           <textobject>
@@ -652,7 +652,7 @@ format="PNG" srccredit="Patrick Schweiger" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ar_invoicepost.png"
-format="PNG" srccredit="Patrick Schweiger" />
+srccredit="Patrick Schweiger" />
           </imageobject>
 
           <textobject>
@@ -786,7 +786,7 @@ linkend="bus-ar-invoicenew2"/>を参照してください)。
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_ar_invoiceprint.png"
-format="PNG" srccredit="Patrick Schweiger" />
+srccredit="Patrick Schweiger" />
           </imageobject>
 
           <textobject>
@@ -943,7 +943,7 @@ linkend="bus-ar-custfind2" />で説明した<guilabel>得意先を検索</guilab
     <screenshot id="bus-ar-jobnew">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/bus_ar_jobnew.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_jobnew.png"
 srccredit="Patrick Schweiger" />
         </imageobject>
 
@@ -1054,7 +1054,7 @@ linkend="bus-ar-invoicefind2"
     <screenshot id="bus-ar-payment">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+          <imagedata fileref="figures/bus_ar_payment.png"
 srccredit="Patrick Schweiger" />
         </imageobject>
 
@@ -1099,7 +1099,7 @@ srccredit="Patrick Schweiger" />
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_ar_invoicechange1.png"
-format="PNG" srccredit="Cristian Marchi" />
+srccredit="Cristian Marchi" />
         </imageobject>
 
         <textobject>
@@ -1140,13 +1140,13 @@ format="PNG" srccredit="Cristian Marchi" />
       <mediaobject>
         <imageobject role="html">
           <imagedata
-fileref="figures/bus_ar_invoicechange2.png" format="PNG" srccredit="Cristian
+fileref="figures/bus_ar_invoicechange2.png" srccredit="Cristian
 Marchi" width="510"/>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata
-fileref="figures/bus_ar_invoicechange2.png" format="PNG" srccredit="Cristian
+fileref="figures/bus_ar_invoicechange2.png" srccredit="Cristian
 Marchi"/>
         </imageobject>
 
@@ -1177,7 +1177,7 @@ Marchi"/>
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_ar_invoicechange3.png"
-format="PNG" srccredit="Patrick Schweiger" />
+srccredit="Patrick Schweiger" />
         </imageobject>
 
         <textobject>
diff --git a/guide/ja/ch_bus_pay.xml b/guide/ja/ch_bus_pay.xml
index f44db905..7383ce35 100644
--- a/guide/ja/ch_bus_pay.xml
+++ b/guide/ja/ch_bus_pay.xml
@@ -338,7 +338,7 @@
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/bus_pay_ex1.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
         </imageobject>
 
         <textobject>
@@ -522,7 +522,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex2.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -550,7 +550,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex3.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
@@ -578,7 +578,7 @@ srccredit="Patrick Schweiger" format="PNG"/>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/bus_pay_ex4.png"
-srccredit="Patrick Schweiger" format="PNG"/>
+srccredit="Patrick Schweiger"/>
           </imageobject>
 
           <textobject>
diff --git a/guide/ja/ch_capgain.xml b/guide/ja/ch_capgain.xml
index da343141..6799a3a3 100644
--- a/guide/ja/ch_capgain.xml
+++ b/guide/ja/ch_capgain.xml
@@ -143,7 +143,7 @@
     <screenshot id="capgain_appmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/capgain_appmain.png" format="PNG"
+          <imagedata fileref="figures/capgain_appmain.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -173,7 +173,7 @@ srccredit="Bengt Thuree" />
       <screenshot id="capgain_app2main">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/capgain_app2main.png" format="PNG"
+            <imagedata fileref="figures/capgain_app2main.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -305,7 +305,7 @@ srccredit="Bengt Thuree" />
           <screenshot id="capgain_app3main">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/capgain_app3main.png" format="PNG"
+                <imagedata fileref="figures/capgain_app3main.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
diff --git a/guide/ja/ch_cbook.xml b/guide/ja/ch_cbook.xml
index ec30c87d..1113b633 100644
--- a/guide/ja/ch_cbook.xml
+++ b/guide/ja/ch_cbook.xml
@@ -188,7 +188,7 @@ linkend="chapter_cc"></xref>で説明します。よって&app;でクレジッ
       <screenshot id="cbook-gcashdata4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_gcashdata4.png" format="PNG"
+            <imagedata fileref="figures/cbook_gcashdata4.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -220,7 +220,7 @@ srccredit="Bengt Thuree" />
           <screenshot id="cbook-transferin">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_transferin.png" format="PNG"
+                <imagedata fileref="figures/cbook_transferin.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -249,7 +249,7 @@ srccredit="Bengt Thuree" />
           <screenshot id="cbook-checkexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_checkexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_checkexamp.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -275,7 +275,7 @@ srccredit="Bengt Thuree" />
           <screenshot id="cbook-atm">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_atm.png" format="PNG"
+                <imagedata fileref="figures/cbook_atm.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -302,7 +302,7 @@ srccredit="Bengt Thuree" />
       <screenshot id="cbook-bankstmt">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_bankstmt.png" format="PNG"
+            <imagedata fileref="figures/cbook_bankstmt.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -332,7 +332,7 @@ srccredit="Bengt Thuree" />
           <screenshot id="cbook-reconexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_reconexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_reconexamp.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -363,7 +363,7 @@ srccredit="Bengt Thuree" />
           <screenshot id="cbook-servch">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_servch.png" format="PNG"
+                <imagedata fileref="figures/cbook_servch.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -391,7 +391,7 @@ srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_reconciledCheckAct.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -419,7 +419,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cbook_chartaccts5.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -454,7 +454,7 @@ format="PNG" srccredit="Bengt Thuree" />
           <screenshot id="cbook-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cbook_CashFlow.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -484,7 +484,7 @@ srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptAssets.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -507,7 +507,7 @@ format="PNG" srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/ja/ch_cc.xml b/guide/ja/ch_cc.xml
index e4618672..be042ecd 100644
--- a/guide/ja/ch_cc.xml
+++ b/guide/ja/ch_cc.xml
@@ -204,7 +204,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-format="PNG" srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"></imagedata>
             </imageobject>
 
             <textobject>
@@ -225,7 +225,7 @@ format="PNG" srccredit="Bengt Thuree"></imagedata>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-format="PNG" srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"></imagedata>
             </imageobject>
 
             <textobject>
@@ -264,7 +264,7 @@ format="PNG" srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_accounts.png" format="PNG"
+            <imagedata fileref="figures/cc_accounts.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -299,7 +299,7 @@ srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-purchases">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_purchases.png" format="PNG"
+            <imagedata fileref="figures/cc_purchases.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -330,7 +330,7 @@ srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-refund">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_refund.png" format="PNG"
+            <imagedata fileref="figures/cc_refund.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -357,7 +357,7 @@ srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-interest">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_interest.png" format="PNG"
+            <imagedata fileref="figures/cc_interest.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -392,7 +392,7 @@ srccredit="Bengt Thuree"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/cc_reconcile_init.png"
-format="PNG" srccredit="Bengt Thuree"></imagedata>
+srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
           <textobject>
@@ -413,7 +413,7 @@ format="PNG" srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-reconcile">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -446,7 +446,7 @@ srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-payment">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_payment.png" format="PNG"
+            <imagedata fileref="figures/cc_payment.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -468,7 +468,7 @@ srccredit="Bengt Thuree"></imagedata>
       <screenshot id="cc-final">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_final.png" format="PNG"
+            <imagedata fileref="figures/cc_final.png"
 srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -511,7 +511,7 @@ srccredit="Bengt Thuree"></imagedata>
           <screenshot id="cc-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cc_CashFlow.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -541,7 +541,7 @@ srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptVisa.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -564,7 +564,7 @@ format="PNG" srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptExpenses.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/ja/ch_currency.xml b/guide/ja/ch_currency.xml
index d4a598ff..7565603e 100644
--- a/guide/ja/ch_currency.xml
+++ b/guide/ja/ch_currency.xml
@@ -116,7 +116,7 @@
     <screenshot id="currency_main1">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/currency_main1.png" format="PNG"
+          <imagedata fileref="figures/currency_main1.png"
 srccredit="Geert Janssens" />
         </imageobject>
 
@@ -186,7 +186,7 @@ url="&url-wp-ja;ISO_4217">ISO
     <screenshot id="currency_main1a">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/currency_main1.png" format="PNG"
+          <imagedata fileref="figures/currency_main1.png"
 srccredit="Geert Janssens" />
         </imageobject>
 
@@ -213,7 +213,7 @@ srccredit="Geert Janssens" />
       <screenshot id="currency_peditor">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_peditor.png" format="PNG"
+            <imagedata fileref="figures/currency_peditor.png"
 srccredit="Geert Janssens" />
           </imageobject>
 
@@ -236,7 +236,7 @@ srccredit="Geert Janssens" />
       <screenshot id="currency_addcurr">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_addcurr.png" format="PNG"
+            <imagedata fileref="figures/currency_addcurr.png"
 srccredit="Geert Janssens" />
           </imageobject>
 
@@ -260,7 +260,7 @@ srccredit="Geert Janssens" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+fileref="figures/currency_BeforeGetOnlineQuotes.png"
 srccredit="Geert Janssens" />
           </imageobject>
 
@@ -278,7 +278,7 @@ srccredit="Geert Janssens" />
       <screenshot id="currency_main2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main2.png" format="PNG"
+            <imagedata fileref="figures/currency_main2.png"
 srccredit="Geert Janssens" />
           </imageobject>
 
@@ -315,7 +315,7 @@ srccredit="Geert Janssens" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+fileref="figures/currency_BeforeGetOnlineQuotes.png"
 srccredit="Geert Janssens" />
           </imageobject>
 
@@ -343,7 +343,7 @@ srccredit="Geert Janssens" />
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
-format="PNG" srccredit="Geert Janssens" />
+srccredit="Geert Janssens" />
             </imageobject>
 
             <textobject>
@@ -371,7 +371,7 @@ linkend="invest-stockprice-auto2"
       <screenshot id="currency_main3.png">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main3.png" format="PNG"
+            <imagedata fileref="figures/currency_main3.png"
 srccredit="Geert Janssens" />
           </imageobject>
 
@@ -486,7 +486,7 @@ srccredit="Geert Janssens" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -508,7 +508,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_purchase_SetExchangeRate.png" format="PNG"
+fileref="figures/currency_purchase_SetExchangeRate.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -533,7 +533,7 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -555,7 +555,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -627,7 +627,7 @@ url="&url-yh-fin;lookup"><citetitle>Yahoo!
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_purchase_BeforeStocks.png" format="PNG"
+fileref="figures/currency_purchase_BeforeStocks.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -653,7 +653,7 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_Commodities.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -691,7 +691,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_ToAmount.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -712,7 +712,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1142,7 +1142,7 @@ linkend="invest-sell1" />と同様です)。
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_PutTogether_AfterMoney.png" format="PNG"
+fileref="figures/currency_PutTogether_AfterMoney.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1239,7 +1239,7 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_PutTogether_AussieHouse.png" format="PNG"
+fileref="figures/currency_PutTogether_AussieHouse.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1471,7 +1471,7 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/currency_PutTogether_AfterStocks.png" format="PNG"
+fileref="figures/currency_PutTogether_AfterStocks.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
diff --git a/guide/ja/ch_dep.xml b/guide/ja/ch_dep.xml
index 474b1234..2813d502 100644
--- a/guide/ja/ch_dep.xml
+++ b/guide/ja/ch_dep.xml
@@ -617,7 +617,7 @@ linkend="dep_example1" />を参照してください)。
     <screenshot id="dep_example">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_example.png" format="PNG"
+          <imagedata fileref="figures/dep_example.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -650,7 +650,7 @@ srccredit="Bengt Thuree" />
     <screenshot id="dep_assetreg">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetreg.png" format="PNG"
+          <imagedata fileref="figures/dep_assetreg.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -668,7 +668,7 @@ srccredit="Bengt Thuree" />
     <screenshot id="dep_assetmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetmain.png" format="PNG"
+          <imagedata fileref="figures/dep_assetmain.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
diff --git a/guide/ja/ch_invest.xml b/guide/ja/ch_invest.xml
index 75760f5f..e31db061 100644
--- a/guide/ja/ch_invest.xml
+++ b/guide/ja/ch_invest.xml
@@ -239,7 +239,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_AccountsPredef.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -361,7 +361,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-int">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -385,7 +385,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-int2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -406,7 +406,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-int3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -499,7 +499,7 @@ linkend="invest-buy-new2"><emphasis>新規株式の購入</emphasis>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_newaccount.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -574,7 +574,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
                 <mediaobject>
                   <imageobject>
                     <imagedata fileref="figures/invest_selectsecurity.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -641,7 +641,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/invest_newsecurity.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
                         </imageobject>
 
                         <textobject>
@@ -725,7 +725,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_setup_current.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -768,7 +768,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_setup_portfolio1.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -815,7 +815,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_SetupPortfolio2.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -897,7 +897,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-peditor">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -927,7 +927,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-peditor2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1074,7 +1074,7 @@ class="directory">$HOME/gnucash-filename</filename>はデータファイルの
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1112,7 +1112,7 @@ role="strong">平均残高</emphasis>帳票のカスタマイズ画面です。
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/invest_stockvalue_report_options.png" format="PNG"
+fileref="figures/invest_stockvalue_report_options.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1154,7 +1154,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1454,7 +1454,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-sellstock">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+            <imagedata fileref="figures/invest_sellstock.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1474,7 +1474,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstock2.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1628,7 +1628,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstockLoss.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1647,7 +1647,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_sellstockLoss2.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1685,7 +1685,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_dividendcash.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1727,7 +1727,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_dividendreinvest1.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1745,7 +1745,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_dividendreinvest2.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1788,7 +1788,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-split1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_split1.png" format="PNG"
+            <imagedata fileref="figures/invest_split1.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1810,7 +1810,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-split2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_split2.png" format="PNG"
+            <imagedata fileref="figures/invest_split2.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1871,7 +1871,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-split3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_split3.png" format="PNG"
+            <imagedata fileref="figures/invest_split3.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1893,7 +1893,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-split4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_split4.png" format="PNG"
+            <imagedata fileref="figures/invest_split4.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -1917,7 +1917,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -1955,7 +1955,7 @@ format="PNG" srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-merge2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_merge2.png" format="PNG"
+            <imagedata fileref="figures/invest_merge2.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -2019,7 +2019,7 @@ srccredit="Dave Herman"></imagedata>
       <screenshot id="invest-merge3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/invest_merge3.png" format="PNG"
+            <imagedata fileref="figures/invest_merge3.png"
 srccredit="Dave Herman"></imagedata>
           </imageobject>
 
@@ -2046,7 +2046,7 @@ srccredit="Dave Herman"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-format="PNG" srccredit="Dave Herman"></imagedata>
+srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
diff --git a/guide/ja/ch_loans.xml b/guide/ja/ch_loans.xml
index 2b804ea1..e0dc35a5 100644
--- a/guide/ja/ch_loans.xml
+++ b/guide/ja/ch_loans.xml
@@ -159,7 +159,7 @@
     <screenshot id="loans_fcalc">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_fcalc.png" format="PNG"
+          <imagedata fileref="figures/loans_fcalc.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -389,7 +389,7 @@ PMT===0 の場合は簡単で、解は次のようになります。
     <screenshot id="loans_mortgage">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage1.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage1.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -486,7 +486,7 @@ srccredit="Bengt Thuree" />
     <screenshot id="loans_mortgage2.png">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage2.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage2.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -507,7 +507,7 @@ srccredit="Bengt Thuree" />
     <screenshot id="loans_mortgage3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage3.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage3.png"
 srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -593,7 +593,7 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -681,7 +681,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanInitial.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -737,7 +737,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -797,7 +797,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/loans_PrivateLoanSecondPayment.png" format="PNG"
+fileref="figures/loans_PrivateLoanSecondPayment.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -823,7 +823,7 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata
-fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png" format="PNG"
+fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
diff --git a/guide/ja/ch_oview.xml b/guide/ja/ch_oview.xml
index c99cb412..e6b39f09 100644
--- a/guide/ja/ch_oview.xml
+++ b/guide/ja/ch_oview.xml
@@ -41,12 +41,12 @@
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/oview_intro.png"
-format="PNG" srccredit="Bengt Thuree" width="510"></imagedata>
+srccredit="Bengt Thuree" width="510"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
           <imagedata
-fileref="figures/oview_intro.png" format="PNG" srccredit="Bengt
+fileref="figures/oview_intro.png" srccredit="Bengt
 Thuree"></imagedata>
         </imageobject>
 
diff --git a/guide/ja/ch_txns.xml b/guide/ja/ch_txns.xml
index e9c247c5..affc79fc 100644
--- a/guide/ja/ch_txns.xml
+++ b/guide/ja/ch_txns.xml
@@ -68,7 +68,7 @@ function="enter">Enter</keycap>キーを押します。
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -95,7 +95,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account2.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -148,7 +148,7 @@ function="enter">Enter</keycap>を押すと、スプリット画面が<quote>折
         <title>スプリット取引の入力</title><mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -186,7 +186,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_registersplit2.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -224,7 +224,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_registersplit3.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -296,7 +296,7 @@ format="PNG" srccredit="Bengt Thuree" />
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/txns_registersplit4.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
         </imageobject>
 
         <textobject>
@@ -320,7 +320,7 @@ format="PNG" srccredit="Bengt Thuree" />
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/txns_registersplit5.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
         </imageobject>
 
         <textobject>
@@ -341,7 +341,7 @@ format="PNG" srccredit="Bengt Thuree" />
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/txns_registersplit6.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
         </imageobject>
 
         <textobject>
@@ -562,14 +562,14 @@ linkend="rec-start-blnc"><guilabel>期首残高</guilabel></link>を壊さず変
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/txns_reconcile_window1.png" format="PNG"
+fileref="figures/txns_reconcile_window1.png"
 srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <imageobject
 role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-format="PNG" srccredit="Cristian Marchi"></imagedata>
+srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -676,13 +676,13 @@ format="PNG" srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/txns_reconcile_window2.png" format="PNG"
+fileref="figures/txns_reconcile_window2.png"
 srccredit="Cristian Marchi" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata
-fileref="figures/txns_reconcile_window2.png" format="PNG"
+fileref="figures/txns_reconcile_window2.png"
 srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -759,7 +759,7 @@ srccredit="Cristian Marchi"></imagedata>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_reconcile_window3.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -800,7 +800,7 @@ linkend="txns-sxn-editor2">予定取引エディター</link>の2つの方法が
       <screenshot id="txns-sxn-ledger-1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger1.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger1.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -826,7 +826,7 @@ srccredit="Bengt Thuree" />
       <screenshot id="txns-sxn-ledger-2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger2.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -847,7 +847,7 @@ srccredit="Bengt Thuree" />
       <screenshot id="txns-sxn-ledger-3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger3.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger3.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -869,7 +869,7 @@ srccredit="Bengt Thuree" />
       <screenshot id="txns-sxn-ledger-4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger4.png"
 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -907,12 +907,12 @@ srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_sxn_editor-2.png"
-format="PNG" srccredit="Cristian Marchi" width="510"/>
+srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_sxn_editor-2.png"
-format="PNG" srccredit="Cristian Marchi"/>
+srccredit="Cristian Marchi"/>
           </imageobject>
 
           <textobject>
@@ -935,14 +935,14 @@ format="PNG" srccredit="Cristian Marchi"/>
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+fileref="figures/txns_sxn_editor-3-overview.png"
 srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject
 role="fo">
             <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
-format="PNG" srccredit="Cristian Marchi" />
+srccredit="Cristian Marchi" />
           </imageobject>
 
           <textobject>
@@ -1020,14 +1020,14 @@ format="PNG" srccredit="Cristian Marchi" />
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+fileref="figures/txns_sxn_editor-3-frequency.png"
 srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject
 role="fo">
             <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
-format="PNG" srccredit="Cristian Marchi" />
+srccredit="Cristian Marchi" />
           </imageobject>
 
           <textobject>
@@ -1105,14 +1105,14 @@ format="PNG" srccredit="Cristian Marchi" />
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+fileref="figures/txns_sxn_editor-3-template.png"
 srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject
 role="fo">
             <imagedata fileref="figures/txns_sxn_editor-3-template.png"
-format="PNG" srccredit="Cristian Marchi" />
+srccredit="Cristian Marchi" />
           </imageobject>
 
           <textobject>
@@ -1137,12 +1137,12 @@ format="PNG" srccredit="Cristian Marchi" />
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_sxn_editor-4.png"
-format="PNG" srccredit="Cristian Marchi" width="510"/>
+srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_sxn_editor-4.png"
-format="PNG" srccredit="Cristian Marchi" />
+srccredit="Cristian Marchi" />
           </imageobject>
 
           <textobject>
@@ -1179,13 +1179,13 @@ format="PNG" srccredit="Cristian Marchi" />
         <mediaobject>
           <imageobject role="html">
             <imagedata
-fileref="figures/txns_sxn_editor_slr.png" format="PNG" srccredit="Cristian
+fileref="figures/txns_sxn_editor_slr.png" srccredit="Cristian
 Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata
-fileref="figures/txns_sxn_editor_slr.png" format="PNG" srccredit="Cristian
+fileref="figures/txns_sxn_editor_slr.png" srccredit="Cristian
 Marchi" />
           </imageobject>
 
@@ -1243,7 +1243,7 @@ Marchi" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1304,7 +1304,7 @@ function="enter">Enter</keycap>キーを押すか、または<guibutton>入力</
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts1.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1405,7 +1405,7 @@ format="PNG" srccredit="Bengt Thuree" />
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts2.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1455,7 +1455,7 @@ format="PNG" srccredit="Bengt Thuree" />
           <screenshot id="txns-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/txns_CashFlow.png"
 srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -1489,7 +1489,7 @@ srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptChecking.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -1512,7 +1512,7 @@ format="PNG" srccredit="Bengt Thuree" />
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptExpenses.png"
-format="PNG" srccredit="Bengt Thuree" />
+srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/ru/ch_accts.xml b/guide/ru/ch_accts.xml
index 733a8c8b..fa526c04 100644
--- a/guide/ru/ch_accts.xml
+++ b/guide/ru/ch_accts.xml
@@ -60,7 +60,7 @@
       <mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/basics_AccountRelationships.png"
-                     format="PNG" srccredit="DiMan"></imagedata>
+                     srccredit="DiMan"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
@@ -504,7 +504,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         format="PNG" srccredit="DiMan"></imagedata>
+                         srccredit="DiMan"></imagedata>
           </imageobject>
 
           <textobject>
@@ -523,7 +523,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
-                         format="PNG" srccredit="DiMan"></imagedata>
+                         srccredit="DiMan"></imagedata>
           </imageobject>
 
           <textobject>
@@ -701,7 +701,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/accts_CreateAssetsAccount.png"
-                             format="PNG" srccredit="DiMan"></imagedata>
+                             srccredit="DiMan"></imagedata>
               </imageobject>
 
               <textobject>
@@ -755,7 +755,7 @@
       <screenshot id="accts-toplevel">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_toplevel.png" format="PNG"
+            <imagedata fileref="figures/accts_toplevel.png"
                        srccredit="DiMan"></imagedata>
           </imageobject>
 
@@ -913,7 +913,7 @@
       <screenshot id="accts-tree">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/accts_tree.png" format="PNG"
+            <imagedata fileref="figures/accts_tree.png"
                        srccredit="DiMan"></imagedata>
           </imageobject>
 
diff --git a/guide/ru/ch_basics.xml b/guide/ru/ch_basics.xml
index 339e9708..90ae9bf1 100644
--- a/guide/ru/ch_basics.xml
+++ b/guide/ru/ch_basics.xml
@@ -150,7 +150,7 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
-                         format="PNG" srccredit="Geert Janssens"></imagedata>
+                         srccredit="Geert Janssens"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
@@ -448,7 +448,7 @@
       <screenshot id="basics-TipOfDay">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_TipOfDay.png" format="PNG"
+            <imagedata fileref="figures/basics_TipOfDay.png"
                        srccredit="DiMan"></imagedata>
           </imageobject>
 
@@ -490,7 +490,7 @@
       <screenshot id="basics-Accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/basics_Accounts.png" format="PNG"
+            <imagedata fileref="figures/basics_Accounts.png"
                        srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -570,12 +570,12 @@
       <screenshot id="basics-CheckAccount">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/basics_CheckAccount.png" format="PNG"
+            <imagedata fileref="figures/basics_CheckAccount.png"
                        srccredit="Bengt Thuree" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/basics_CheckAccount.png" format="PNG"
+            <imagedata fileref="figures/basics_CheckAccount.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -956,12 +956,12 @@
                   <acronym>sqlite3</acronym>.</title><screenshot id="basics-SaveXML">
                   <mediaobject>
                     <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveXML.png"
                          srccredit="DiMan" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
-                      <imagedata fileref="figures/basics_SaveXML.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveXML.png"
                          srccredit="DiMan"></imagedata>
                     </imageobject>
 
@@ -1022,12 +1022,12 @@
                   <acronym>postgres</acronym>.</title><screenshot id="basics-SaveSQL">
                   <mediaobject>
                     <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveSQL.png"
                              srccredit="Marchi Cristian" width="510px"></imagedata>
                     </imageobject>
 
                     <imageobject role="fo">
-                      <imagedata fileref="figures/basics_SaveSQL.png" format="PNG"
+                      <imagedata fileref="figures/basics_SaveSQL.png"
                              srccredit="Cristian Marchi"></imagedata>
                     </imageobject>
 
@@ -1637,12 +1637,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1681,12 +1681,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Currency.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Currency.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1722,12 +1722,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_NewBookOpts.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_NewBookOpts.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1765,12 +1765,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1802,12 +1802,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1836,12 +1836,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1878,12 +1878,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_EmptyAccounts.png"
-                       format="PNG" srccredit="DiMan" width="510"></imagedata>
+                       srccredit="DiMan" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/basics_EmptyAccounts.png"
-                       format="PNG" srccredit="DiMan"></imagedata>
+                       srccredit="DiMan"></imagedata>
             </imageobject>
 
             <textobject>
diff --git a/guide/ru/ch_bus_features.xml b/guide/ru/ch_bus_features.xml
index a673ae43..6d419062 100644
--- a/guide/ru/ch_bus_features.xml
+++ b/guide/ru/ch_bus_features.xml
@@ -178,12 +178,12 @@
         <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+              <imagedata fileref="figures/bus_tax_main.png"
                          srccredit="Chris Good" width="510px" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_tax_main.png" format="PNG"
+              <imagedata fileref="figures/bus_tax_main.png"
                         srccredit="Chris Good" />
             </imageobject>
 
@@ -198,7 +198,7 @@
         <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_tax_new.png" format="PNG"
+              <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Chris Good" />
             </imageobject>
 
@@ -544,7 +544,7 @@
         <title>Entering Company Information</title><screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_co_reg.png" format="PNG"
+              <imagedata fileref="figures/bus_co_reg.png"
                         srccredit="Chris Good" />
             </imageobject>
 
@@ -641,7 +641,7 @@
         <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_terms_main.png" format="PNG"
+              <imagedata fileref="figures/bus_terms_main.png"
                         srccredit="Chris Good" />
             </imageobject>
 
@@ -656,7 +656,7 @@
         <title>New Billing Term</title><screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_terms_new.png" format="PNG"
+              <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Chris Good" />
             </imageobject>
 
@@ -819,7 +819,7 @@
           <title>New Customer Registration Window</title><screenshot id="bus-ar-custnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_custnew.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_custnew.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -848,7 +848,7 @@
           <title>Find Customer Window</title><screenshot id="bus-ar-custfind">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_custfind.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_custfind.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -917,7 +917,7 @@
           <title>Creating a New Invoice</title><screenshot id="bus-ar-invoicenew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicenew.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoicenew.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -945,7 +945,7 @@
           <title>Edit Invoice Window</title><screenshot id="bus-ar-invoiceedit">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoiceedit.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoiceedit.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -974,7 +974,7 @@
           <title>Post Invoice Window</title><screenshot id="bus-ar-invoicepost">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoicepost.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoicepost.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -1039,7 +1039,7 @@
           <title>Invoice Print Output</title><screenshot id="bus-ar-invoiceprint">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ar_invoiceprint.png" format="PNG"
+                <imagedata fileref="figures/bus_ar_invoiceprint.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
 
@@ -1130,7 +1130,7 @@
         <title>New Customer Job</title><screenshot id="bus-ar-jobnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ar_jobnew.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_jobnew.png"
                         srccredit="Patrick Schweiger" />
             </imageobject>
 
@@ -1186,12 +1186,12 @@
         <title>Process Customer Payment</title><screenshot id="bus-ar-payment">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_payment.png"
                         srccredit="Patrick Schweiger" width="510px" scalefit="0" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_ar_payment.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_payment.png"
                         srccredit="Patrick Schweiger" />
             </imageobject>
 
@@ -1240,7 +1240,7 @@
         <title>The New Style Sheet Window</title><screenshot id="bus-ar-invoicechange1">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ar_invoicechange1.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange1.png"
                         srccredit="Cristian Marchi" />
             </imageobject>
 
@@ -1280,12 +1280,12 @@
         <title>HTML Style Sheets Example Window</title><screenshot id="bus-ar-invoicechange2">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange2.png"
                         srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_ar_invoicechange2.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange2.png"
                         srccredit="Cristian Marchi"/>
             </imageobject>
 
@@ -1322,7 +1322,7 @@
         <title>HTML Style Sheets Example Output</title><screenshot id="bus-ar-invoicechange3">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ar_invoicechange3.png" format="PNG"
+              <imagedata fileref="figures/bus_ar_invoicechange3.png"
                         srccredit="Patrick Schweiger" />
             </imageobject>
 
@@ -1424,7 +1424,7 @@
           <title>New Vendor Registration Window</title><screenshot id="bus-ap-vendornew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1452,7 +1452,7 @@
           <title>Find Vendor Window</title><screenshot id="bus-ar-vendorfind">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1522,7 +1522,7 @@
           <title>New Bill Registration Window</title><screenshot id="bus-ap-billnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1548,7 +1548,7 @@
           <title>Edit Bill Window</title><screenshot id="bus-ap-billedit">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1575,7 +1575,7 @@
           <title>Post Bill Window</title><screenshot id="bus-ap-billpost">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger" format="PNG"/>
+                <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
               </imageobject>
 
               <textobject>
@@ -1631,7 +1631,7 @@
         <title>New Vendor Job</title><screenshot id="bus-ap-jobnew">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham" format="PNG"/>
+              <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham"/>
             </imageobject>
 
             <textobject>
@@ -1680,11 +1680,11 @@
         <title>Process Vendor Payment</title><screenshot id="bus-ap-payment">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG" width="510"/>
+              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" format="PNG"/>
+              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2049,7 +2049,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex1.png"
-                 srccredit="Patrick Schweiger" format="PNG"/>
+                 srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2222,7 +2222,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex2.png"
-                    srccredit="Patrick Schweiger" format="PNG"/>
+                    srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2254,7 +2254,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png"
-                    srccredit="Patrick Schweiger" format="PNG"/>
+                    srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
@@ -2276,7 +2276,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex4.png"
-                    srccredit="Patrick Schweiger" format="PNG"/>
+                    srccredit="Patrick Schweiger"/>
             </imageobject>
 
             <textobject>
diff --git a/guide/ru/ch_capgain.xml b/guide/ru/ch_capgain.xml
index 19d38319..94547ad9 100644
--- a/guide/ru/ch_capgain.xml
+++ b/guide/ru/ch_capgain.xml
@@ -169,7 +169,7 @@
     <screenshot id="capgain_appmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/capgain_appmain.png" format="PNG"
+          <imagedata fileref="figures/capgain_appmain.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -197,7 +197,7 @@
       <screenshot id="capgain_app2main">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/capgain_app2main.png" format="PNG"
+            <imagedata fileref="figures/capgain_app2main.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -336,7 +336,7 @@
           <screenshot id="capgain_app3main">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/capgain_app3main.png" format="PNG"
+                <imagedata fileref="figures/capgain_app3main.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
diff --git a/guide/ru/ch_cbook.xml b/guide/ru/ch_cbook.xml
index 1cc5da24..86c8e3b3 100644
--- a/guide/ru/ch_cbook.xml
+++ b/guide/ru/ch_cbook.xml
@@ -203,7 +203,7 @@
       <screenshot id="cbook-gcashdata4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_gcashdata4.png" format="PNG"
+            <imagedata fileref="figures/cbook_gcashdata4.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -237,7 +237,7 @@
           <screenshot id="cbook-transferin">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_transferin.png" format="PNG"
+                <imagedata fileref="figures/cbook_transferin.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -266,7 +266,7 @@
           <screenshot id="cbook-checkexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_checkexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_checkexamp.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -294,7 +294,7 @@
           <screenshot id="cbook-atm">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_atm.png" format="PNG"
+                <imagedata fileref="figures/cbook_atm.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -322,7 +322,7 @@
       <screenshot id="cbook-bankstmt">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_bankstmt.png" format="PNG"
+            <imagedata fileref="figures/cbook_bankstmt.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -352,7 +352,7 @@
           <screenshot id="cbook-reconexamp">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_reconexamp.png" format="PNG"
+                <imagedata fileref="figures/cbook_reconexamp.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -387,7 +387,7 @@
           <screenshot id="cbook-servch">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_servch.png" format="PNG"
+                <imagedata fileref="figures/cbook_servch.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -417,7 +417,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_reconciledCheckAct.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -444,7 +444,7 @@
       <screenshot id="cbook-chartaccts5">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cbook_chartaccts5.png" format="PNG"
+            <imagedata fileref="figures/cbook_chartaccts5.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -483,7 +483,7 @@
           <screenshot id="cbook-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cbook_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cbook_CashFlow.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -514,7 +514,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptAssets.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -538,7 +538,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/ru/ch_cc.xml b/guide/ru/ch_cc.xml
index f6559b4f..d8a5b19e 100644
--- a/guide/ru/ch_cc.xml
+++ b/guide/ru/ch_cc.xml
@@ -236,7 +236,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           format="PNG" srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"></imagedata>
             </imageobject>
 
             <textobject>
@@ -258,7 +258,7 @@
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           format="PNG" srccredit="Bengt Thuree"></imagedata>
+                           srccredit="Bengt Thuree"></imagedata>
             </imageobject>
 
             <textobject>
@@ -302,7 +302,7 @@
       <screenshot id="cc-accounts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_accounts.png" format="PNG"
+            <imagedata fileref="figures/cc_accounts.png"
                      srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -338,7 +338,7 @@
       <screenshot id="cc-purchases">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_purchases.png" format="PNG"
+            <imagedata fileref="figures/cc_purchases.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -369,7 +369,7 @@
       <screenshot id="cc-refund">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_refund.png" format="PNG"
+            <imagedata fileref="figures/cc_refund.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -397,7 +397,7 @@
       <screenshot id="cc-interest">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_interest.png" format="PNG"
+            <imagedata fileref="figures/cc_interest.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -431,7 +431,7 @@
       <screenshot id="cc-reconcile-init">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile_init.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile_init.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -455,7 +455,7 @@
       <screenshot id="cc-reconcile">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_reconcile.png" format="PNG"
+            <imagedata fileref="figures/cc_reconcile.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -490,7 +490,7 @@
       <screenshot id="cc-payment">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_payment.png" format="PNG"
+            <imagedata fileref="figures/cc_payment.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -512,7 +512,7 @@
       <screenshot id="cc-final">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/cc_final.png" format="PNG"
+            <imagedata fileref="figures/cc_final.png"
                        srccredit="Bengt Thuree"></imagedata>
           </imageobject>
 
@@ -559,7 +559,7 @@
           <screenshot id="cc-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/cc_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/cc_CashFlow.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -590,7 +590,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptVisa.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -613,7 +613,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/cc_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/guide/ru/ch_currency.xml b/guide/ru/ch_currency.xml
index 703d979b..b6e2bcfd 100644
--- a/guide/ru/ch_currency.xml
+++ b/guide/ru/ch_currency.xml
@@ -128,7 +128,7 @@ TODO -->
       <screenshot id="currency_main1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main1.png" format="PNG"
+            <imagedata fileref="figures/currency_main1.png"
                        srccredit="Geert Janssens" />
           </imageobject>
 
@@ -215,7 +215,7 @@ TODO -->
       <screenshot id="currency_main1a">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/currency_main1.png" format="PNG"
+            <imagedata fileref="figures/currency_main1.png"
                        srccredit="Geert Janssens" />
           </imageobject>
 
@@ -248,7 +248,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_peditor.png"
-                         format="PNG" srccredit="Geert Janssens" />
+                         srccredit="Geert Janssens" />
             </imageobject>
 
             <textobject>
@@ -269,7 +269,7 @@ TODO -->
         <screenshot id="currency_addcurr">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_addcurr.png" format="PNG"
+              <imagedata fileref="figures/currency_addcurr.png"
                          srccredit="Geert Janssens" />
             </imageobject>
 
@@ -294,7 +294,7 @@ TODO -->
         <screenshot id="currency_manualpriceadded">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                          srccredit="Geert Janssens" />
             </imageobject>
 
@@ -312,7 +312,7 @@ TODO -->
         <screenshot id="currency_main2">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_main2.png" format="PNG"
+              <imagedata fileref="figures/currency_main2.png"
                          srccredit="Geert Janssens" />
             </imageobject>
 
@@ -349,7 +349,7 @@ TODO -->
         <screenshot id="currency_BeforeGetOnline">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png" format="PNG"
+              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
                          srccredit="Geert Janssens" />
             </imageobject>
 
@@ -380,7 +380,7 @@ TODO -->
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
-                           format="PNG" srccredit="Geert Janssens" />
+                           srccredit="Geert Janssens" />
               </imageobject>
 
               <textobject>
@@ -409,7 +409,7 @@ TODO -->
         <screenshot id="currency_main3.png">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/currency_main3.png" format="PNG"
+              <imagedata fileref="figures/currency_main3.png"
                          srccredit="Geert Janssens" />
             </imageobject>
 
@@ -523,7 +523,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -545,7 +545,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -568,7 +568,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -592,7 +592,7 @@ TODO -->
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -643,7 +643,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -668,7 +668,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_Commodities.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -765,7 +765,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_ToAmount.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -787,7 +787,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)</screen>
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-                         format="PNG" srccredit="Bengt Thuree" />
+                         srccredit="Bengt Thuree" />
             </imageobject>
 
             <textobject>
@@ -1134,12 +1134,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>
@@ -1165,12 +1165,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>
@@ -1192,12 +1192,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>
@@ -1228,12 +1228,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>
@@ -1265,12 +1265,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>
@@ -1293,12 +1293,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>
@@ -1320,12 +1320,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>
@@ -1367,13 +1367,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>
@@ -1395,12 +1395,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>
@@ -1421,12 +1421,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>
@@ -1460,12 +1460,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/ru/ch_dep.xml b/guide/ru/ch_dep.xml
index abce03d7..83d2d05a 100644
--- a/guide/ru/ch_dep.xml
+++ b/guide/ru/ch_dep.xml
@@ -651,7 +651,7 @@
     <screenshot id="dep_example">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_example.png" format="PNG"
+          <imagedata fileref="figures/dep_example.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -684,7 +684,7 @@
     <screenshot id="dep_assetreg">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetreg.png" format="PNG"
+          <imagedata fileref="figures/dep_assetreg.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -702,7 +702,7 @@
     <screenshot id="dep_assetmain">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/dep_assetmain.png" format="PNG"
+          <imagedata fileref="figures/dep_assetmain.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index 5bd0caa3..63b6d10d 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -331,12 +331,12 @@
       <screenshot id="invest_accountspredef">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG"
+            <imagedata fileref="figures/invest_AccountsPredef.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_AccountsPredef.png" format="PNG"
+            <imagedata fileref="figures/invest_AccountsPredef.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -506,12 +506,12 @@ Income
       <screenshot id="invest-int">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int1.png" format="PNG"
+            <imagedata fileref="figures/invest_int1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -536,12 +536,12 @@ Income
       <screenshot id="invest-int2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2.png" format="PNG"
+            <imagedata fileref="figures/invest_int2.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -559,12 +559,12 @@ Income
       <screenshot id="invest-int2-1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int2-1.png" format="PNG"
+            <imagedata fileref="figures/invest_int2-1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2-1.png" format="PNG"
+            <imagedata fileref="figures/invest_int2-1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -585,12 +585,12 @@ Income
       <screenshot id="invest-int3">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_int3.png" format="PNG"
+            <imagedata fileref="figures/invest_int3.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -688,12 +688,12 @@ Income
       <screenshot id="invest-newaccount">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_newaccount.png" format="PNG"
+            <imagedata fileref="figures/invest_newaccount.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_newaccount.png" format="PNG"
+            <imagedata fileref="figures/invest_newaccount.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -771,12 +771,12 @@ Income
               <screenshot id="invest-selectsecurity">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/invest_selectsecurity.png" format="PNG"
+                    <imagedata fileref="figures/invest_selectsecurity.png"
                                 srccredit="Cristian Marchi"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/invest_selectsecurity.png" format="PNG"
+                    <imagedata fileref="figures/invest_selectsecurity.png"
                                 srccredit="Cristian Marchi"></imagedata>
                   </imageobject>
 
@@ -853,12 +853,12 @@ Income
                     <screenshot id="invest-newsecurity">
                       <mediaobject>
                         <imageobject role="html">
-                          <imagedata fileref="figures/invest_newsecurity.png" format="PNG"
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                      srccredit="Cristian Marchi" width="510px"></imagedata>
                         </imageobject>
 
                         <imageobject role="fo">
-                          <imagedata fileref="figures/invest_newsecurity.png" format="PNG"
+                          <imagedata fileref="figures/invest_newsecurity.png"
                                      srccredit="Cristian Marchi"></imagedata>
                         </imageobject>
 
@@ -941,12 +941,12 @@ Income
       <screenshot id="invest-setup-current">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_current.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_current.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_current.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_current.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1003,12 +1003,12 @@ Income
       <screenshot id="invest-setup-portfolio1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_portfolio1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_portfolio1.png" format="PNG"
+            <imagedata fileref="figures/invest_setup_portfolio1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1110,12 +1110,12 @@ Income
         <screenshot id="invest-setup-portfolio2">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio2.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio2.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1166,12 +1166,12 @@ Income
         <screenshot id="invest-setup-portfolio3">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio3.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png" format="PNG"
+              <imagedata fileref="figures/invest_SetupPortfolio3.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1283,12 +1283,12 @@ Income
       <screenshot id="invest-peditor">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1332,12 +1332,12 @@ Income
       <screenshot id="invest-peditor2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor2.png" format="PNG"
+            <imagedata fileref="figures/invest_peditor2.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1501,12 +1501,12 @@ Income
       <screenshot id="invest-stockvalue">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_stockvalue.png" format="PNG"
+            <imagedata fileref="figures/invest_stockvalue.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_stockvalue.png" format="PNG"
+            <imagedata fileref="figures/invest_stockvalue.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -1546,7 +1546,7 @@ Income
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       format="PNG" srccredit="John Ralls"></imagedata>
+                       srccredit="John Ralls"></imagedata>
             </imageobject>
 
             <textobject>
@@ -1622,7 +1622,7 @@ Income
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockvalue_report.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -2522,12 +2522,12 @@ Income
         <screenshot id="invest-sellstockManProfComb">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstock.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstock.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstock.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -2559,12 +2559,12 @@ Income
         <screenshot id="invest-sellstockManProfComb2">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstock2.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstock2.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstock2.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -2707,12 +2707,12 @@ Income
         <screenshot id="invest-sellstockManProfCombNet">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfCombNet.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -2913,12 +2913,12 @@ Income
         <screenshot id="invest-sellstockManProfSep">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfSep.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfSep.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -3102,12 +3102,12 @@ Income
         <screenshot id="invest-sellstockManProfSepNet">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfSepNet.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
                           srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png" format="PNG"
+              <imagedata fileref="figures/invest_sellstockManProfSep.png"
                           srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -3211,12 +3211,12 @@ Income
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -3579,12 +3579,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3621,12 +3621,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3693,12 +3693,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3735,12 +3735,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3842,12 +3842,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -3877,12 +3877,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3908,12 +3908,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3946,12 +3946,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -3996,12 +3996,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -4021,12 +4021,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -4046,12 +4046,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
@@ -4109,12 +4109,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                    srccredit="Chris Good" width="510px"></imagedata>
                   </imageobject>
 
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                               format="PNG" srccredit="Chris Good"></imagedata>
+                               srccredit="Chris Good"></imagedata>
                   </imageobject>
 
                   <textobject>
@@ -4175,12 +4175,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       format="PNG" srccredit="Daniel Dodson" width="510px"></imagedata>
+                       srccredit="Daniel Dodson" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/invest_dividendcash.png"
-                       format="PNG" srccredit="Daniel Dodson"></imagedata>
+                       srccredit="Daniel Dodson"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4226,12 +4226,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <screenshot id="invest-dividendreinvest1">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG"
+            <imagedata fileref="figures/invest_dividendreinvest1.png"
                         srccredit="Cristian Marchi" width="510px"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/invest_dividendreinvest1.png" format="PNG"
+            <imagedata fileref="figures/invest_dividendreinvest1.png"
                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -4302,12 +4302,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
     <screenshot id="invest-ret-of-cap">
       <mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG"
+          <imagedata fileref="figures/invest_ret_of_cap.png"
                       srccredit="Chris Good" width="510px"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/invest_ret_of_cap.png" format="PNG"
+          <imagedata fileref="figures/invest_ret_of_cap.png"
                       srccredit="Chris Good"></imagedata>
         </imageobject>
 
@@ -4366,7 +4366,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split1.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4389,7 +4389,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split2.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4452,7 +4452,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split3.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4473,7 +4473,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_split4.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4496,7 +4496,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_simplesplit1.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4540,7 +4540,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge2.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4606,7 +4606,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_merge3.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
@@ -4632,7 +4632,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/invest_stockmerge1.png"
-                       format="PNG" srccredit="Dave Herman"></imagedata>
+                       srccredit="Dave Herman"></imagedata>
           </imageobject>
 
           <textobject>
diff --git a/guide/ru/ch_loans.xml b/guide/ru/ch_loans.xml
index 458023a5..e14af83e 100644
--- a/guide/ru/ch_loans.xml
+++ b/guide/ru/ch_loans.xml
@@ -163,7 +163,7 @@
     <screenshot id="loans_fcalc">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_fcalc.png" format="PNG"
+          <imagedata fileref="figures/loans_fcalc.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -411,7 +411,7 @@ The simple case for when  PMT == 0 gives the solution:
     <screenshot id="loans_mortgage">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage1.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage1.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -509,7 +509,7 @@ The simple case for when  PMT == 0 gives the solution:
     <screenshot id="loans_mortgage2.png">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage2.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage2.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -530,7 +530,7 @@ The simple case for when  PMT == 0 gives the solution:
     <screenshot id="loans_mortgage3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/loans_mortgage3.png" format="PNG"
+          <imagedata fileref="figures/loans_mortgage3.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -620,7 +620,7 @@ The simple case for when  PMT == 0 gives the solution:
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -708,7 +708,7 @@ Equity:Opening Balances:USD</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanInitial.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -764,7 +764,7 @@ Equity:Opening Balances:USD</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -823,7 +823,7 @@ Equity:Opening Balances:USD</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -847,7 +847,7 @@ Equity:Opening Balances:USD</screen>
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index 263815d5..40b4b3c7 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -54,12 +54,12 @@
     <screenshot id="oview-intro">
       <mediaobject>
         <imageobject role="html">
-          <imagedata fileref="figures/oview_intro.png" format="PNG"
+          <imagedata fileref="figures/oview_intro.png"
                      srccredit="Bengt Thuree" width="510"></imagedata>
         </imageobject>
 
         <imageobject role="fo">
-          <imagedata fileref="figures/oview_intro.png" format="PNG"
+          <imagedata fileref="figures/oview_intro.png"
                      srccredit="Bengt Thuree"></imagedata>
         </imageobject>
 
diff --git a/guide/ru/ch_txns.xml b/guide/ru/ch_txns.xml
index 8e25a107..12bc9f15 100644
--- a/guide/ru/ch_txns.xml
+++ b/guide/ru/ch_txns.xml
@@ -135,7 +135,7 @@
       <screenshot id="txns-registersplit4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit4.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit4.png"
                 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -156,7 +156,7 @@
       <screenshot id="txns-registersplit5">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit5.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit5.png"
                 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -183,7 +183,7 @@
       <screenshot id="txns-registersplit6">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_registersplit6.png" format="PNG"
+            <imagedata fileref="figures/txns_registersplit6.png"
                 srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -445,7 +445,7 @@
     <screenshot id="txns-registersplit2">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/txns_registersplit2.png" format="PNG"
+          <imagedata fileref="figures/txns_registersplit2.png"
             srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -487,7 +487,7 @@
     <screenshot id="txns-registersplit3">
       <mediaobject>
         <imageobject>
-          <imagedata fileref="figures/txns_registersplit3.png" format="PNG"
+          <imagedata fileref="figures/txns_registersplit3.png"
             srccredit="Bengt Thuree" />
         </imageobject>
 
@@ -529,7 +529,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account.png"
-                       format="PNG" srccredit="Bengt  Thuree" />
+                       srccredit="Bengt  Thuree" />
           </imageobject>
 
           <textobject>
@@ -559,7 +559,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_2account2.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -633,7 +633,7 @@
         <title>Entering a split transaction</title><mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_register_multiaccount.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -722,12 +722,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window1.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -863,12 +863,12 @@
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         format="PNG" srccredit="Cristian Marchi" width="510"></imagedata>
+                         srccredit="Cristian Marchi" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
             <imagedata fileref="figures/txns_reconcile_window2.png"
-                         format="PNG" srccredit="Cristian Marchi"></imagedata>
+                         srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
           <textobject>
@@ -984,7 +984,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_reconcile_window3.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1030,7 +1030,7 @@
       <screenshot id="txns-sxn-ledger-1">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger1.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger1.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1057,7 +1057,7 @@
       <screenshot id="txns-sxn-ledger-2">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger2.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1078,7 +1078,7 @@
       <screenshot id="txns-sxn-ledger-3">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger3.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger3.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1100,7 +1100,7 @@
       <screenshot id="txns-sxn-ledger-4">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_ledger4.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1141,12 +1141,12 @@
       <screenshot id="txns-sxn-editor-2">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-2.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-2.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-2.png"
                        srccredit="Cristian Marchi"/>
           </imageobject>
 
@@ -1169,12 +1169,12 @@
       <screenshot id="txns-sxn-editor-3-overview">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1257,12 +1257,12 @@
       <screenshot id="txns-sxn-editor-3-frequency">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1354,12 +1354,12 @@
       <screenshot id="txns-sxn-editor-3-template">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1386,12 +1386,12 @@
       <screenshot id="txns-sxn-editor-4">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-4.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-4.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor-4.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1433,12 +1433,12 @@
       <screenshot id="txns-sxn-editor-slr">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor_slr.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png" format="PNG"
+            <imagedata fileref="figures/txns_sxn_editor_slr.png"
                        srccredit="Cristian Marchi" />
           </imageobject>
 
@@ -1503,7 +1503,7 @@
       <screenshot id="txns-puttoget1-Charts">
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts.png" format="PNG"
+            <imagedata fileref="figures/txns_puttoget_Charts.png"
                        srccredit="Bengt Thuree" />
           </imageobject>
 
@@ -1576,7 +1576,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts1.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1696,7 +1696,7 @@
         <mediaobject>
           <imageobject>
             <imagedata fileref="figures/txns_puttoget_Charts2.png"
-                       format="PNG" srccredit="Bengt Thuree" />
+                       srccredit="Bengt Thuree" />
           </imageobject>
 
           <textobject>
@@ -1751,7 +1751,7 @@
           <screenshot id="txns-puttoget2-Cash">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/txns_CashFlow.png" format="PNG"
+                <imagedata fileref="figures/txns_CashFlow.png"
                            srccredit="Bengt Thuree" />
               </imageobject>
 
@@ -1788,7 +1788,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptChecking.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
@@ -1811,7 +1811,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/txns_TransactionRptExpenses.png"
-                           format="PNG" srccredit="Bengt Thuree" />
+                           srccredit="Bengt Thuree" />
               </imageobject>
 
               <textobject>
diff --git a/manual/C/Help_ch_Customize.xml b/manual/C/Help_ch_Customize.xml
index 602ed63a..7b423a3e 100755
--- a/manual/C/Help_ch_Customize.xml
+++ b/manual/C/Help_ch_Customize.xml
@@ -98,12 +98,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title><screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
                          srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -180,12 +180,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Accnts.png"
                          srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Accnts.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -275,12 +275,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Business.png"
                          srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Business.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -393,12 +393,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title><screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_General.png"
                          srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_General.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -530,11 +530,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Import.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Import.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Import.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -656,12 +656,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Numbers, Date, Time</guilabel> tab</title><screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_DateTime.png"
                          srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_DateTime.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -779,11 +779,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -832,11 +832,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Quotes.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Quotes.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Quotes.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -882,11 +882,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Printing.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Printing.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -926,11 +926,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Register.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Register.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1025,11 +1025,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1113,11 +1113,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Reports.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Reports.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1172,11 +1172,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Sched.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Sched.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1249,11 +1249,11 @@ Translators:
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                         srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Windows.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Windows.png"
                          srccredit="Chris Good"></imagedata>
             </imageobject>
 
@@ -1369,7 +1369,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Accounts.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1466,7 +1466,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1484,7 +1484,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Business.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1590,7 +1590,7 @@ Translators:
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Book_Options_Counters.png"
-                         format="PNG" srccredit="Frank H. Ellenberger"></imagedata>
+                         srccredit="Frank H. Ellenberger"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
diff --git a/manual/C/Help_ch_GUIMenus.xml b/manual/C/Help_ch_GUIMenus.xml
index e4c8a0db..62b6bff9 100644
--- a/manual/C/Help_ch_GUIMenus.xml
+++ b/manual/C/Help_ch_GUIMenus.xml
@@ -45,12 +45,12 @@
       <figure id="Help_Main_WindowCallouts">
         <title>The Main &app; Window</title><mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Main-window-callouts.png" format="PNG"
+            <imagedata fileref="figures/Main-window-callouts.png"
                        srccredit="Frank H. Ellenberger" width="510" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Main-window-callouts.png" format="PNG"
+            <imagedata fileref="figures/Main-window-callouts.png"
                        srccredit="Frank H. Ellenberger" width="510" />
           </imageobject>
 
@@ -173,12 +173,12 @@
       <title>The <emphasis>Account Tree</emphasis> Display.</title><screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_AccountTree_Screen.png"
                        srccredit="Cristian Marchi" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_AccountTree_Screen.png"
                        srccredit="Cristian Marchi"></imagedata>
           </imageobject>
 
@@ -3239,12 +3239,12 @@
         <title>The <emphasis>Account Register</emphasis> Display.</title><screenshot id="AccountReg_Screen">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_AccountReg_Screen.png"
                        srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_AccountReg_Screen.png"
                        srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
@@ -4352,12 +4352,12 @@ url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting
         <title>The <emphasis>Report Window</emphasis></title><screenshot id="Report_Screen">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Report_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_Report_Screen.png"
                        srccredit="Cristian Marchi" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Report_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_Report_Screen.png"
                        srccredit="Cristian Marchi"></imagedata>
             </imageobject>
 
diff --git a/manual/C/Help_ch_GettingStarted.xml b/manual/C/Help_ch_GettingStarted.xml
index a4c907ec..8e7fe928 100644
--- a/manual/C/Help_ch_GettingStarted.xml
+++ b/manual/C/Help_ch_GettingStarted.xml
@@ -26,7 +26,7 @@ Translators:
       <title><quote>Welcome to &appname;!</quote> Screen</title><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/welcome.png" format="PNG"
+            <imagedata fileref="figures/welcome.png"
                    srccredit="Frank H. Ellenberger" />
           </imageobject>
         </mediaobject>
@@ -41,7 +41,7 @@ Translators:
       <title>Display Welcome Dialog Again?</title><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/welcome-cancel.png" format="PNG"
+            <imagedata fileref="figures/welcome-cancel.png"
                    srccredit="Frank H. Ellenberger" />
           </imageobject>
         </mediaobject>
@@ -62,7 +62,7 @@ Translators:
         <title>Minimal &app; main window</title><screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/window-main-empty.png" format="PNG"
+              <imagedata fileref="figures/window-main-empty.png"
                    srccredit="Frank H. Ellenberger" />
             </imageobject>
           </mediaobject>
@@ -439,7 +439,7 @@ Translators:
       <title><quote>Tip of The Day</quote> Screen</title><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/window-tip.png" format="PNG"
+            <imagedata fileref="figures/window-tip.png"
                    srccredit="Frank H. Ellenberger" />
           </imageobject>
         </mediaobject>
diff --git a/manual/C/Help_ch_Reports.xml b/manual/C/Help_ch_Reports.xml
index bf1febac..6ce7ef6f 100644
--- a/manual/C/Help_ch_Reports.xml
+++ b/manual/C/Help_ch_Reports.xml
@@ -417,12 +417,12 @@
             <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
+                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Geert Janssens" width="510px"></imagedata>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
+                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Geert Janssens"></imagedata>
                 </imageobject>
 
diff --git a/manual/C/Help_ch_Tools_Assistants.xml b/manual/C/Help_ch_Tools_Assistants.xml
index 30f6d08a..b387fb5b 100644
--- a/manual/C/Help_ch_Tools_Assistants.xml
+++ b/manual/C/Help_ch_Tools_Assistants.xml
@@ -5743,12 +5743,12 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-              format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+              srccredit="Chris Good" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-                         format="PNG" srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"></imagedata>
             </imageobject>
 
             <textobject>
@@ -5791,7 +5791,7 @@
         <para><inlinemediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png"
-                format="PNG" width="48px" />
+                width="48px" />
             </imageobject>
 
             <textobject>
@@ -5802,7 +5802,7 @@
           <inlinemediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png"
-                format="PNG" width="48px" />
+                width="48px" />
             </imageobject>
           </inlinemediaobject>
         </para>
@@ -6187,12 +6187,12 @@ url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                srccredit="Chris Good" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                           format="PNG" srccredit="Chris Good"></imagedata>
+                           srccredit="Chris Good"></imagedata>
               </imageobject>
 
               <textobject>
diff --git a/manual/C/Help_ch_Transactions.xml b/manual/C/Help_ch_Transactions.xml
index 0572e716..e877a87d 100644
--- a/manual/C/Help_ch_Transactions.xml
+++ b/manual/C/Help_ch_Transactions.xml
@@ -405,7 +405,7 @@ Translators:
       <title>Change a Transaction Association Dialog</title><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/Help_Trans_Assoc_Dialog.png" format="PNG"
+            <imagedata fileref="figures/Help_Trans_Assoc_Dialog.png"
                          srccredit="Frank H. Ellenberger" />
           </imageobject>
         </mediaobject>
@@ -446,7 +446,7 @@ Translators:
       <title>Chain and Paperclip</title><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/Help_Trans_Assoc_Symbols.png" format="PNG"
+            <imagedata fileref="figures/Help_Trans_Assoc_Symbols.png"
                        srccredit="Frank H. Ellenberger" />
           </imageobject>
         </mediaobject>
@@ -1363,11 +1363,11 @@ Translators:
           <title>The Import QIF Files Assistent</title><screenshot id="ImportQIFDruid">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+                <imagedata fileref="figures/Help_Import_QIF_Druid.png" srccredit="David Cousens" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Import_QIF_Druid.png" format="PNG" srccredit="David Cousens"></imagedata>
+                <imagedata fileref="figures/Help_Import_QIF_Druid.png" srccredit="David Cousens"></imagedata>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -1607,11 +1607,11 @@ Translators:
         <title>The CSV Transaction Import Assistant - Introduction</title><screenshot id="CSV_Transaction_Import_Assistant">
           <mediaobject>
             <imageobject role="html">
-              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens" width="515px"></imagedata>
+              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png" srccredit="David Cousens" width="515px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" format="PNG" srccredit="David Cousens"></imagedata>
+              <imagedata width="515px" fileref="figures/Help_CSV_Transaction_Import_Assistant.png" srccredit="David Cousens"></imagedata>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -1678,11 +1678,11 @@ Translators:
                   <title>The CSV Import Preview Pane</title><screenshot id="CSV_Import_Preview">
                     <mediaobject>
                       <imageobject role="html">
-                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="David Cousens" width="515px"></imagedata>
+                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" srccredit="David Cousens" width="515px"></imagedata>
                       </imageobject>
 
                       <imageobject role="fo">
-                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" format="PNG" srccredit="David Cousens"></imagedata>
+                        <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png" srccredit="David Cousens"></imagedata>
                       </imageobject>
 
                       <caption>
@@ -2104,11 +2104,11 @@ Translators:
           <title>The Generic Transaction Import Matcher Window</title><screenshot id="ImportMatcherScreenShot">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" srccredit="David Cousens" width="510"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" format="PNG" srccredit="David Cousens"></imagedata>
+                <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png" srccredit="David Cousens"></imagedata>
               </imageobject>
 
               <caption>
@@ -2738,11 +2738,11 @@ Translators:
         <title>The Match Picker Dialog</title><screenshot id="ImportMatcherPicker">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png" format="PNG" srccredit="David Cousens"></imagedata>
+              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens"></imagedata>
             </imageobject>
 
             <caption>
@@ -2876,11 +2876,11 @@ Translators:
         <title>The Import Map Editor</title><screenshot>
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+              <imagedata fileref="figures/Help_Import_Map_Editor.png" srccredit="David Cousens" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_Map_Editor.png" format="PNG" srccredit="David Cousens"></imagedata>
+              <imagedata fileref="figures/Help_Import_Map_Editor.png" srccredit="David Cousens"></imagedata>
             </imageobject>
 
             <caption>
@@ -3052,11 +3052,11 @@ Translators:
       <title>The Export Transactions Wizard.</title><screenshot id="export-transactions-wizard">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens" width="510"></imagedata>
+            <imagedata fileref="figures/Help_Choose_Export_Settings.png" srccredit="David Cousens" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Choose_Export_Settings.png" format="PNG" srccredit="David Cousens"></imagedata>
+            <imagedata fileref="figures/Help_Choose_Export_Settings.png" srccredit="David Cousens"></imagedata>
           </imageobject>
         </mediaobject>
       </screenshot>
diff --git a/manual/de/Help_ch_Reports.xml b/manual/de/Help_ch_Reports.xml
index 767c969d..6704508e 100644
--- a/manual/de/Help_ch_Reports.xml
+++ b/manual/de/Help_ch_Reports.xml
@@ -420,12 +420,12 @@
             <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
+                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Geert Janssens" width="510px"></imagedata>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
+                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Geert Janssens"></imagedata>
                 </imageobject>
 
diff --git a/manual/it/gnucash-help.xml b/manual/it/gnucash-help.xml
index 23585119..99dc561c 100644
--- a/manual/it/gnucash-help.xml
+++ b/manual/it/gnucash-help.xml
@@ -1539,11 +1539,11 @@
         <figure id="Help_Main_WindowCallouts">
           <title>La finestra principale di &app;</title><mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Main-window-callouts.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+              <imagedata fileref="figures/Main-window-callouts.png" srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Main-window-callouts.png" format="PNG" srccredit="Cristian Marchi"/>
+              <imagedata fileref="figures/Main-window-callouts.png" srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -1667,11 +1667,11 @@
         <title>Una visualizzazione della <emphasis>struttura ad albero dei conti</emphasis>.</title><screenshot id="AccTree_Screen">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+              <imagedata fileref="figures/Help_AccountTree_Screen.png" srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG" srccredit="Cristian Marchi"/>
+              <imagedata fileref="figures/Help_AccountTree_Screen.png" srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -4388,11 +4388,11 @@
           <title>La visualizzazione del <emphasis>registro del conto</emphasis>.</title><screenshot id="AccountReg_Screen">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/Help_AccountReg_Screen.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_AccountReg_Screen.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -6274,11 +6274,11 @@
           <title>La <emphasis>finestra del resoconto</emphasis></title><screenshot id="Report_Screen">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Report_Screen.png" format="PNG" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/Help_Report_Screen.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Report_Screen.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Report_Screen.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -19895,11 +19895,11 @@ ________________________________________________________________________________
           <title>Lots in Account window for Security Capital Gains</title><screenshot id="tool-lotsInAcctStk">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Tool_LotsStk.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                <imagedata fileref="figures/Help_Tool_LotsStk.png" srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Tool_LotsStk.png" format="PNG" srccredit="Chris Good"/>
+                <imagedata fileref="figures/Help_Tool_LotsStk.png" srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -19941,7 +19941,7 @@ ________________________________________________________________________________
 
           <para><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png" format="PNG" width="48px"/>
+                <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png" width="48px"/>
               </imageobject>
 
               <textobject>
@@ -19951,7 +19951,7 @@ ________________________________________________________________________________
 
             <inlinemediaobject>
               <imageobject>
-                <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png" format="PNG" width="48px"/>
+                <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png" width="48px"/>
               </imageobject>
             </inlinemediaobject>
           </para>
@@ -20336,11 +20336,11 @@ ________________________________________________________________________________
             <title>Lots in Account window for business features</title><screenshot id="tool-lotsInAcctBus">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/Help_Tool_LotsBus.png" format="PNG" srccredit="Chris Good" width="510px"/>
+                  <imagedata fileref="figures/Help_Tool_LotsBus.png" srccredit="Chris Good" width="510px"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/Help_Tool_LotsBus.png" format="PNG" srccredit="Chris Good"/>
+                  <imagedata fileref="figures/Help_Tool_LotsBus.png" srccredit="Chris Good"/>
                 </imageobject>
 
                 <textobject>
@@ -20808,11 +20808,11 @@ ________________________________________________________________________________
               <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG" srccredit="Geert Janssens" width="510px"/>
+                    <imagedata fileref="figures/Help_TxRptOpt_Screen.png" srccredit="Geert Janssens" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG" srccredit="Geert Janssens"/>
+                    <imagedata fileref="figures/Help_TxRptOpt_Screen.png" srccredit="Geert Janssens"/>
                   </imageobject>
 
                   <textobject>
@@ -23471,11 +23471,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounting Period</guilabel> tab</title><screenshot id="Prefer_Accounting-Period">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_AccntPeriod.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_AccntPeriod.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23555,11 +23555,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Prefer_Accounts">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Accnts.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Accnts.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23663,11 +23663,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Prefer_Business">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_Business.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Business.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Business.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Business.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23786,11 +23786,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Date/Time</guilabel> tab</title><screenshot id="Prefer_DateTime">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_DateTime.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_DateTime.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23877,11 +23877,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>General</guilabel> tab</title><screenshot id="Prefer_General">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_General.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_General.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_General.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_General.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24061,11 +24061,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Banking</guilabel> tab</title><screenshot id="Prefer_OnlineBanking">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_OnlineBanking.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_OnlineBanking.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_OnlineBanking.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_OnlineBanking.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24224,11 +24224,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Printing</guilabel> tab</title><screenshot id="Prefer_Printing">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_Printing.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Printing.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Printing.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Printing.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24271,11 +24271,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register</guilabel> tab</title><screenshot id="Prefer_Register">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_Register.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Register.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Register.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Register.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24390,11 +24390,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Register Defaults</guilabel> tab</title><screenshot id="Prefer_RegisterDefaults">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24481,11 +24481,11 @@ make doc
           <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="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Reports.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Reports.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Reports.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24540,11 +24540,11 @@ make doc
           <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="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Sched.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Sched.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Sched.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24610,11 +24610,11 @@ make doc
           <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Windows</guilabel> tab</title><screenshot id="Prefer_Windows">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Pref_Windows.png" format="PNG" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Help_Pref_Windows.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Windows.png" format="PNG" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Help_Pref_Windows.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
diff --git a/manual/pt/Help_ch_Customize.xml b/manual/pt/Help_ch_Customize.xml
index b6858bdb..87676a4d 100644
--- a/manual/pt/Help_ch_Customize.xml
+++ b/manual/pt/Help_ch_Customize.xml
@@ -100,12 +100,12 @@
         <title>O separador <guilabel>Preferências — Contas</guilabel></title><screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Accnts.png"
                          srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Accnts.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -211,12 +211,12 @@
         <title>O separador <guilabel>Preferências — Data/Hora</guilabel></title><screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_DateTime.png"
                          srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_DateTime.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -305,11 +305,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Register.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Register.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Register.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -427,12 +427,12 @@
         <title>O separador <guilabel>Preferências — Geral</guilabel></title><screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_General.png"
                          srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_General.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_General.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -617,11 +617,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Printing.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Printing.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Printing.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -666,11 +666,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Windows.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Windows.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Windows.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -753,12 +753,12 @@
         <title>O separador <guilabel>Preferências — Negócios</guilabel></title><screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Business.png"
                          srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Business.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Business.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -883,11 +883,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -1048,12 +1048,12 @@
         <title>O separador <guilabel>Preferências — Período contabilístico</guilabel></title><screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
                          srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -1135,11 +1135,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -1231,11 +1231,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Reports.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Reports.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Reports.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -1294,11 +1294,11 @@
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Pref_Sched.png"
-                         format="PNG" srccredit="Pedro Albuquerque" width="510px"></imagedata>
+                         srccredit="Pedro Albuquerque" width="510px"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Sched.png" format="PNG"
+              <imagedata fileref="figures/Help_Pref_Sched.png"
                          srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
diff --git a/manual/pt/Help_ch_GUIMenus.xml b/manual/pt/Help_ch_GUIMenus.xml
index 379d4b97..d66ebe12 100644
--- a/manual/pt/Help_ch_GUIMenus.xml
+++ b/manual/pt/Help_ch_GUIMenus.xml
@@ -44,12 +44,12 @@
       <figure id="Help_Main_WindowCallouts">
         <title>A janela principal do &app;</title><mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Main-window-callouts.png" format="PNG"
+            <imagedata fileref="figures/Main-window-callouts.png"
                        srccredit="Pedro Albuquerque" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Main-window-callouts.png" format="PNG"
+            <imagedata fileref="figures/Main-window-callouts.png"
                        srccredit="Pedro Albuquerque"></imagedata>
           </imageobject>
 
@@ -179,12 +179,12 @@
       <title>O separador <emphasis>Árvore de contas</emphasis>.</title><screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_AccountTree_Screen.png"
                        srccredit="Pedro Albuquerque" width="510"></imagedata>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png" format="PNG"
+            <imagedata fileref="figures/Help_AccountTree_Screen.png"
                        srccredit="Pedro Albuquerque"></imagedata>
           </imageobject>
 
@@ -2898,12 +2898,12 @@
         <title>O ecrã <emphasis>Diário de conta</emphasis>.</title><screenshot id="AccountReg_Screen">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_AccountReg_Screen.png"
                        srccredit="Pedro Albuquerque" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_AccountReg_Screen.png"
                        srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
@@ -4757,12 +4757,12 @@
         <title>A <emphasis>janela de relatórios</emphasis></title><screenshot id="Report_Screen">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Report_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_Report_Screen.png"
                        srccredit="Pedro Albuquerque" width="510"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Report_Screen.png" format="PNG"
+              <imagedata fileref="figures/Help_Report_Screen.png"
                        srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
 
diff --git a/manual/pt/Help_ch_Reports.xml b/manual/pt/Help_ch_Reports.xml
index e750a1ee..f31cd233 100644
--- a/manual/pt/Help_ch_Reports.xml
+++ b/manual/pt/Help_ch_Reports.xml
@@ -107,12 +107,12 @@
           <title><emphasis>Relatório de transacções — opções</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
+                <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Pedro Albuquerque" width="510px"></imagedata>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_TxRptOpt_Screen.png" format="PNG"
+                <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
                      srccredit="Pedro Albuquerque"></imagedata>
               </imageobject>
 
diff --git a/manual/pt/Help_ch_Transactions.xml b/manual/pt/Help_ch_Transactions.xml
index edda3f84..4c12066c 100644
--- a/manual/pt/Help_ch_Transactions.xml
+++ b/manual/pt/Help_ch_Transactions.xml
@@ -80,12 +80,12 @@ Translators:
           mostradas como sumário. O ícone
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/icons/split_transaction.png" format="PNG"
+              <imagedata fileref="figures/icons/split_transaction.png"
                        srccredit="Pedro Albuquerque" width="47"></imagedata>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/split_transaction.png" format="PNG"
+              <imagedata fileref="figures/split_transaction.png"
                        srccredit="Pedro Albuquerque"></imagedata>
             </imageobject>
           </mediaobject>

commit fbe2abe3d4826bc05c6b4727dc417f1e88e74906
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 09:40:51 2022 +0200

    L10N:de:Manuual: Tools fix image size

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index dc2dc392..6c1eb111 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5119,11 +5119,7 @@
       <figure pgwide="1">
         <title>Der Kurs-Editor</title><screenshot>
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/Tools_PriceEditor_add.png" srccredit="Christian Wehling" width="&img-w;" />
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/Tools_PriceEditor_add.png" srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
@@ -5489,7 +5485,11 @@
     <figure pgwide="1">
       <title>Der Wertpapier-Editor</title><screenshot>
         <mediaobject>
-          <imageobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/Tools_SecurityEditor.png" 
+                         srccredit="Christian Wehling" width="&img-w;"></imagedata>
+          </imageobject>
+          <imageobject role="fo">
             <imagedata fileref="figures/Tools_SecurityEditor.png" 
                          srccredit="Christian Wehling"></imagedata>
           </imageobject>
@@ -5628,7 +5628,7 @@
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
-                         srccredit="Christian Wehling" width="75%"></imagedata>
+                            srccredit="Christian Wehling"></imagedata>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
@@ -5642,7 +5642,7 @@
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Tools_SecurityEditor_edit.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                            srccredit="Christian Wehling"></imagedata>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
@@ -6254,18 +6254,12 @@ and update the appendix. -->
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-              format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+              srccredit="Chris Good" width="&img-w;"></imagedata>
             </imageobject>
-
             <imageobject role="fo">
               <imagedata fileref="figures/Help_Tool_LotsStk.png"
-                         format="PNG" srccredit="Chris Good"></imagedata>
+                         srccredit="Chris Good"></imagedata>
             </imageobject>
-
-            <textobject>
-              <phrase>Example of Lots in Account window for a security account </phrase>
-            </textobject>
-
             <caption>
               <para>An image of the <emphasis>Lots in Account </emphasis> window for a security account.
               </para>
@@ -6302,7 +6296,7 @@ and update the appendix. -->
         <para><inlinemediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png"
-                format="PNG" width="48px" />
+                width="48px" />
             </imageobject>
 
             <textobject>
@@ -6313,7 +6307,7 @@ and update the appendix. -->
           <inlinemediaobject>
             <imageobject>
               <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png"
-                format="PNG" width="48px" />
+                width="48px" />
             </imageobject>
           </inlinemediaobject>
         </para>
@@ -6634,8 +6628,7 @@ and update the appendix. -->
         </itemizedlist>
 
         <para>See Tutorial and Concepts Guide,
-          <ulink
-url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
+          <ulink url="&url-docs-C;guide/invest-sell1.html#invest-sellLots">Automatic
           Calculation of Capital Gain or Loss Using Lots</ulink> for more details.
         </para>
       </sect3>
@@ -6698,21 +6691,14 @@ url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                format="PNG" srccredit="Chris Good" width="510px"></imagedata>
+                  srccredit="Chris Good" width="&img-w;"></imagedata>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/Help_Tool_LotsBus.png"
-                           format="PNG" srccredit="Chris Good" ></imagedata>
+                           srccredit="Chris Good" ></imagedata>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of Lots in Account window for an Accounts Receivable account
-                </phrase>
-              </textobject>
-
               <caption>
-                <para>An image of the <guilabel>Lots in Account</guilabel>window for an Accounts Receivable account.
+                <para>An image of the <guilabel>Lots in Account</guilabel> window for an Accounts Receivable account.
                 </para>
               </caption>
             </mediaobject>

commit 5471a74e13bb7d660f246c092f44b9dc521c6690
Merge: 1553a77c 275b1067
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 07:29:55 2022 +0200

    Merge PR #253 into maint


commit 1553a77c12d4bdf479893453007875ff2ec681af
Merge: c4702cdf f15b1864
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 05:51:00 2022 +0200

    Merge remote-tracking branch 'cwehli/de_help_FQ' into maint


commit c4702cdf03bddf565a0a3e000394a08c7adf56f0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 05:32:01 2022 +0200

    L10N:de: Security Editor, Layout hotfix: disable table

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index 6c00a245..5f73cdcb 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5345,7 +5345,7 @@
         bearbeiten. Nachfolgend wird Ihnen die Möglichkeiten beschrieben, die der Editor Ihnen
         bietet.
       </para>
-
+<!--
       <table id="Tools-SecurityEditor-Dialog">
         <title>Wertpapier/ Währung anlegen oder bearbeiten</title>
 
@@ -5356,21 +5356,21 @@
 
           <tbody>
             <row valign="top">
-              <entry valign="bottom">
+              <entry valign="bottom"> -->
                 <para><figure>
                     <title>Wertpapier anlegen oder bearbeiten</title><screenshot>
                       <mediaobject>
                         <imageobject>
                           <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
-                         srccredit="Christian Wehling" width="100%"></imagedata>
+                         srccredit="Christian Wehling" width="75%"></imagedata>
                         </imageobject>
                       </mediaobject>
                     </screenshot>
                   </figure>
-                </para>
+                </para><!--
               </entry>
 
-              <entry valign="bottom">
+              <entry valign="bottom"> -->
                 <para><figure>
                     <title>Währung bearbeiten</title><screenshot>
                       <mediaobject>
@@ -5381,12 +5381,12 @@
                       </mediaobject>
                     </screenshot>
                   </figure>
-                </para>
+                </para><!--
               </entry>
             </row>
           </tbody>
         </tgroup>
-      </table>
+      </table> -->
 
       <variablelist>
         <varlistentry>

commit 8da6b5ddb1cbdb3eaf3d9a9646d64a75655e05a9
Merge: d1c9c794 210c08ab
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 04:43:32 2022 +0200

    Merge PR #260 into maint


commit d1c9c79437f4337e712e09c6a9668ccc85f093b2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jun 25 00:14:55 2022 +0200

    Minor improvements on PR #264

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 61844592..6c6ed436 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -159,6 +159,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY url-gh-gc-maint "https://github.com/Gnucash/gnucash/tree/maint/"> <!-- Append the desired path -->
 <!ENTITY url-gnome-dev "https://developer.gnome.org/">  <!-- Append the desired topic -->
 <!ENTITY url-gnu "https://www.gnu.org/"> <!-- Append the desired topic -->
+<!ENTITY url-laws-de "https://www.gesetze-im-internet.de/"> <!-- Append the desired law and § -->
 <!ENTITY url-repo "https://repology.org/project/"> <!-- The packaging hub, append the desired project -->
 <!ENTITY url-wp-de "https://de.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-wp-en "https://en.wikipedia.org/wiki/">  <!-- Append the desired topic -->
diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index e46b4d0a..18e5a9a5 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5421,8 +5421,8 @@
       </para>
 
       <para>In der betrieblichen Praxis erfolgt zuvor eine Gruppierung in den GuV-Konten nach
-        <ulink url="https://www.gesetze-im-internet.de/hgb/__275.html">§275 HGB</ulink>.
-        Siehe auch <ulink url="https://de.wikipedia.org/wiki/Gewinn-_und_Verlustrechnung">Gewinn- und Verlustrechnung</ulink>
+        <ulink url="&url-laws-de;hgb/__275.html">§275 HGB</ulink>.
+        Siehe auch <ulink url="&url-wp-de;Gewinn-_und_Verlustrechnung">Gewinn- und Verlustrechnung</ulink>
       </para>
     </abstract>
 
@@ -5467,20 +5467,15 @@
       </varlistentry>
     </variablelist>
 
-    <warning>
-      <para>Wenn Sie Ihre Bücher abschließen, müssen Sie mit Ungenauigkeiten in den Standardberichten
-        rechnen.
-      </para>
-    </warning>
-
-    <note>
+<!-- FIXME source: Join warning & note to important. -->
+    <important>
       <para>Ohne angepaßte Konfiguration, wie im Tip zum Abschlußdatum erläutert, verringert der
-        Abschluss der Bücher den Nutzen der Standardberichte, weil die Berichte derzeit keine
+        Abschluss der Bücher den Nutzen der Standardberichte, weil einige Berichte derzeit keine
         abschließenden Buchungen verstehen. Aus ihrer Sicht sieht es also so aus, als ob die
-        Nettoeinnahmen oder -ausgaben in jedem Konto für einen bestimmten Zeitraum einfach
+        Nettoeinnahmen oder -ausgaben in jedem Konto für frühere Buchungsperioden einfach
         null waren.
       </para>
-    </note>
+    </important>
 
     <sect2 id="tool-close-book-anatomy">
       <title>Beschreibung des Dialogs</title>
@@ -5533,7 +5528,7 @@
               <guibutton>Neu…</guibutton> anlegen.
               <tip>
                 <para>Die Konten für <guilabel>Ertrag</guilabel> und <guilabel>Aufwand</guilabel> können auch identisch
-                  sein.
+                  sein, etwa <userinput>Eigenkapital:<replaceable>Jahresabschluß</replaceable></userinput>.
                 </para>
               </tip>
             </para>

commit 210c08abf1a6b8da4061175d38ed8fa87c022070
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sun Feb 13 17:59:01 2022 +0100

    L10N:de: manual ch_Tools_Assistant: The "Security Editor"

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index 93a11ab0..2da3e062 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5190,121 +5190,491 @@
   </sect1>
 
   <sect1 id="tool-security-edit">
-    <title>Security Editor</title>
+    <title>Wertpapier-Editor</title>
 
-    <para>The Security Editor is used to create and edit commodities that are used by mutual fund and stock
-      type accounts. It also shows the details of National Currencies that are used by &app;.
+    <abstract>
+      <para>Der Wertpapier-Editor wird zum Anlegen und Bearbeiten von allen Handelsgütern genutzt, die keine
+        ISO-Währungen sind. Darunter fallen z.B.:
+        <itemizedlist>
+          <listitem>
+            <para>Aktien und andere Wertpapiere,
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Inventar und ähnliches, 
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>Stundensätze für Dienstleistungen oder auch den Preis für einen Liter Diesel. 
+            </para>
+          </listitem>
+        </itemizedlist>
+        Er zeigt auch die Definitionen der Währungen, die in &app; verfügbar sind.
+      </para>
+    </abstract>  
+      
+    <para>  
+      Aufgerufen wird der <guilabel>Wertpapier Editor</guilabel> mit dem
+      gleichnamigen Menüpunkt &mc.to.sec;.
     </para>
 
-    <para>To show the details for National Currencies click the <guilabel>Show National Currencies</guilabel>
-      check-box at the bottom of the screen.
+    <figure pgwide="1">
+      <title>Der Wertpapier-Editor</title><screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/Tools_SecurityEditor.png" 
+                         srccredit="Christian Wehling"></imagedata>
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
+
+    <para>Der Editor enthält einen großen tabellarischem Bereich, in dem für jede einzelne Währung oder
+      Wertpapier die verwendeten Details aufgelistet werden. Sie können die Anzeige mit weiteren
+      Spalten erweitern, indem Sie ganz rechts in der Ãœberschriftenzeile auf das kleine Dreieck
+      klicken und die gewünschte Information aus der Liste auswählen.
     </para>
 
-    <para>Each entry in the editor shows the details used by the security/currency:
+    <para>Die Bedeutung der einzelnen Spalten wird im <xref linkend="tool-commodity" /> beschrieben,
+      wohingegen zwei zusätzliche Spalten von &app; an Hand Ihrer Eingaben automatisch ausgefüllt
+      werden.
     </para>
 
-    <itemizedlist>
-      <listitem>
-        <para><emphasis role="bold">Type:</emphasis> Categories for organizing securities. &app; has the following
-          built in:
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>CURRENCY</guilabel> or <guilabel>ISO4317</guilabel>: These are used for national
-                currencies and are not editable with the <guilabel>Security Editor</guilabel>.
-              </para>
-            </listitem>
+    <glosslist>
+      <glossentry id="tool-ge-PrintName">
+        <glossterm>Gedruckter Name</glossterm>
+        <glossdef>
+          <para>Der <guilabel>Gedruckte Name</guilabel> ist eine Kombination aus dem <guilabel>Symbol</guilabel> und
+            dem <guilabel>Namen</guilabel>.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry id="tool-ge-UniqueName">
+        <glossterm>Eindeutiger Name</glossterm>
+        <glossdef>
+          <para>Der <guilabel>Eindeutige Name</guilabel> setzt sich aus dem <guilabel>Namensraum</guilabel> (Typ)
+            und dem <guilabel>Symbol</guilabel> zusammen.
+          </para>
+        </glossdef>
+      </glossentry>
+    </glosslist>
 
-            <listitem>
-              <para><guilabel>FUND</guilabel>: Ordinarily used for open-ended mutual funds, i.e., those that one
-                purchases from and sells to only the issuing company and that are priced daily at
-                their net asset value.
-              </para>
-            </listitem>
+    <para>Im unteren Bereich des Wertpapier-Editors befinden sich Steuerelemente, deren Funktionsweise
+      nachfolgend beschrieben ist:
+    </para>
 
-            <listitem>
-              <para><guilabel>AMEX</guilabel>, <guilabel>ASX</guilabel>, <guilabel>EUREX</guilabel>,
-                <guilabel>NASDAQ</guilabel>, and <guilabel>NYSE</guilabel>: These represent a few of
-                the exchanges on which stocks, closed-end mutual funds, and exchange-traded funds
-                are traded.
+    <glosslist>
+      <glossentry>
+        <glossterm>Nationale Währungen anzeigen</glossterm>
+
+        <glossdef>
+          <para>Mit Aktivieren dieses Kontrollkästchens werden die Währungseinträge zu Ihrer Information
+            eingeblendet.
+            <note>
+              <para>Die nationalen Währungen sind gemäß ISO 4217 bezeichnet, und können nur eingeschränkt
+                bearbeitet werden.
+              </para>          
+            </note>
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Hinzufügen</glossterm>
+
+        <glossdef>
+          <para>Öffnet den Dialog <guilabel>Neues Wertpapier</guilabel> in dem Sie ein neues Wertpapier (Aktie oder
+            Investmentfonds) anlegen können.
+            <note>
+              <para>Eine neue Währung kann nicht hinzugefügt werden, da diese fest in &app; eingetragen sind.
               </para>
-            </listitem>
+            </note>
+          </para>
+        </glossdef>
+      </glossentry>
 
-            <listitem>
-              <para><guilabel>Template</guilabel>: This is a reserved word. It will not normally appear in the
-                <guilabel>Security Editor</guilabel> unless you type it in, and if you do it will
-                cause problems. Don't use it.
+      <glossentry>
+        <glossterm>Entfernen</glossterm>
+
+        <glossdef>
+          <para>Hiermit löschen Sie das markierte Wertpapier aus der &app;-Datendatei.
+            <note>
+              <para>Wenn schon Kurse für das Wertpapier im <xref linkend="tool-price" /> enthalten sind oder das
+                Wertpapier in einen Konto verwendet wird, dann werden Sie mit einem Warnhinweis
+                darauf aufmerksam gemacht und müssen diese Einträge händisch entfernen.
               </para>
-            </listitem>
-          </itemizedlist>
-        </para>
+            </note>
 
-        <para>If your investment doesn't fit into one of these categories, for example if you trade stocks on
-          the DAX or LSE, you can easily create your own type simply by typing it into the field.
-          The type of security has no meaning to Gnucash (except <guilabel>Template</guilabel>,
-          don't use that!), it's there only to make it easier for you to find the security
-          from the selection lists.
-        </para>
-      </listitem>
+            <note>
+              <para>Eine Währung kann aus der Auflistung nicht gelöscht werden.
+              </para>
+            </note>
+          </para>
+        </glossdef>
+      </glossentry>
 
-      <listitem>
-        <para><emphasis role="bold">Symbol:</emphasis> Indicates the symbol or abbreviation for the commodity.
-          This is usually the ticker symbol (for stocks) or other unique abbreviation for the
-          commodity. If the commodity is traded on any public exchange, it is important to use the
-          same identifier used on that exchange. For national currencies the symbol is the ISO-4217
-          currency code.
-        </para>
-      </listitem>
+      <glossentry>
+        <glossterm>Bearbeiten</glossterm>
 
-      <listitem>
-        <para><emphasis role="bold">Name:</emphasis> The full name of the commodity is a recognizable name such as
-          <emphasis>US Dollars</emphasis> or <emphasis>IBM Common Stock</emphasis>.
-        </para>
-      </listitem>
+        <glossdef>
+          <para>Möchten Sie ein Wertpapier oder eine Währung bearbeiten, markieren Sie es in der Liste, und die
+            Daten werden in dem Dialog <guilabel>Wertpapier bearbeiten</guilabel> bzw.
+            <guilabel>Währung bearbeiten</guilabel> zur Änderungen angeboten.
+          </para>
+        </glossdef>
+      </glossentry>
 
-      <listitem>
-        <para><emphasis role="bold">Code:</emphasis> This is any numeric or alphanumeric code that is used to
-          identify the commodity. The <acronym>ISIN</acronym> code is an international unique identifying numeric
-          string that is associated with every stock, bond or mutual fund, and most kinds of traded options,
-          futures and commodities. There are also regional valid codes available like <acronym>CUSIP</acronym> in
-          the North America, <acronym>WKN</acronym> in DE, … This code is not required.
-        </para>
-      </listitem>
+      <glossentry>
+        <glossterm>Schließen</glossterm>
 
-      <listitem>
-        <para><emphasis role="bold">Fraction:</emphasis> This is the smallest traded unit of the commodity,
-          expressed as a fraction of a single nominal unit. This unit is used by &app; accounts as
-          the default fraction for trades in the commodity.
-        </para>
-      </listitem>
-    </itemizedlist>
+        <glossdef>
+          <para>Beendet den Wertpapier-Editor.
+          </para>
+        </glossdef>
+      </glossentry>
+    </glosslist>
 
     <sect2 id="tool-commodity">
-      <title>Adding or Editing a Commodity</title>
-
-      <para>To add a new commodity (stock, or mutual fund), click on <guilabel>Add</guilabel>, and enter the
-        details of the commodity into the <emphasis role="bold">New Security</emphasis> dialog box.
-        To edit an existing commodity, select the commodity from the Commodities list, click the
-        <guibutton>Edit</guibutton> button, and edit the <emphasis role="bold">Edit
-        Security</emphasis> dialog box. To remove a commodity, select the commodity and click the
-        <guibutton>Remove</guibutton> button.
-      </para>
+      <title>Wertpapier anlegen oder bearbeiten</title>
 
-      <para>The fields in the New/Edit Security screens are the same as defined for the Security Editor
-        <xref linkend="tool-security-edit"></xref>. Below these fields are the options for Online
-        Quotes.
+      <para>Der Wertpapier-Editor stellt ein weiteres Dialogfenster zu Verfügung in dem Sie Wertpapiere neu
+        anlegen oder auch bearbeiten können. Mit dem selben Dialog können Sie ebenfalls Währungen
+        bearbeiten. Nachfolgend wird Ihnen die Möglichkeiten beschrieben, die der Editor Ihnen
+        bietet.
       </para>
+
+      <table id="Tools-SecurityEditor-Dialog">
+        <title>Wertpapier/ Währung anlegen oder bearbeiten</title>
+
+        <tgroup align="left" cols="2">
+          <colspec colwidth="0.5*"/>
+
+          <colspec colwidth="0.5*"/>
+
+          <tbody>
+            <row valign="top">
+              <entry valign="bottom">
+                <para><figure>
+                    <title>Wertpapier anlegen oder bearbeiten</title><screenshot>
+                      <mediaobject>
+                        <imageobject>
+                          <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
+                         srccredit="Christian Wehling" width="100%"></imagedata>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
+                </para>
+              </entry>
+
+              <entry valign="bottom">
+                <para><figure>
+                    <title>Währung bearbeiten</title><screenshot>
+                      <mediaobject>
+                        <imageobject>
+                          <imagedata fileref="figures/Tools_SecurityEditor_edit.png" 
+                         srccredit="Christian Wehling" width="100%"></imagedata>
+                        </imageobject>
+                      </mediaobject>
+                    </screenshot>
+                  </figure>
+                </para>
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+
+      <variablelist>
+        <varlistentry>
+          <term>Wertpapierinformationen</term>
+
+          <listitem>
+            <note>
+              <para>Bei den fest vorgegeben Währungen können Sie <emphasis>nur</emphasis> das
+                <guilabel>Anzeigesymbol</guilabel> und die <guilabel>Börsenkursquelle</guilabel> anpassen.
+              </para>
+            </note>
+
+            <glosslist>
+              <glossentry id="tool-ge-FullName">
+                <glossterm>Voller Name</glossterm>
+                <glossdef>
+                  <para>Der vollständige Name des Wertpapiers sollte ein für Sie verständlicher Name, wie z.B.
+                    <emphasis>US-Dollars</emphasis> oder <emphasis>Amazon Stammaktien</emphasis>,
+                    sein.
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-Symbol">
+                <glossterm>Symbol/Abkürzung</glossterm>
+                <glossdef>
+                  <para>Geben Sie das Symbol oder die Abkürzung für das Wertpapier an. Dies ist in der Regel das
+                    Tickersymbol (bei Aktien) oder eine andere eindeutige Abkürzung. Wenn das
+                    Wertpapier an einer Börse gehandelt wird, ist es wichtig, dieselbe Kennung zu
+                    verwenden, die auch an dieser Börse verwendet wird. Für nationale Währungen
+                    entspricht das Symbol dem <ulink url="&url-wp-de;ISO_4217">ISO 4217</ulink>
+                    Währungscode.
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-DisplaySymbol">
+                <glossterm>Anzeigesymbol</glossterm>
+                <glossdef>
+                  <para>Wenn Sie hier keinen Eintrag vornehmen, wird das zuvor eingetragene Symbol bzw. die Abkürzung als
+                    Anzeigesymbol genutzt. Bei einer Währung ist hier das Währungssymbol eingestellt.
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-Namespace">
+                <glossterm>Typ</glossterm>
+                <glossdef>
+                  <para>wird auch <guilabel>Namensraum</guilabel> genannt und kennzeichnet Kategorien zur Organisation Ihrer
+                    Handelsgüter. Die Angabe hat für &app; keine Bedeutung, sie dient nur dazu,
+                    Ihnen das Auffinden des Handelsgutes in den Auswahllisten zu erleichtern.
+                  </para>
+
+                  <para>Da &app; Ihnen hier keine Vorgaben macht, können Sie die Typen selber eintragen, denkbar wären z.B.
+                    diese Einträge:
+                  </para>
+
+                  <itemizedlist>
+                    <listitem>
+                      <para>Handelsplatz für Wertpapiere wie z.B. DAX, EUREX usw.
+                      </para>
+                    </listitem>
+                    
+                    <listitem>
+                      <para>Crypto-Währung
+                      </para>
+                    </listitem>
+                    
+                    <listitem>
+                      <para>Inventar
+                      </para>
+                    </listitem>
+
+                    <listitem>
+                      <para>Dienstleistungen, z.B. mit unterschiedlichen Stundensätzen
+                      </para>
+                    </listitem>
+
+                    <listitem>
+                      <para>Benzinpreise für einen <quote>Spritrechner</quote> 
+                      </para>
+                    </listitem>
+                  </itemizedlist>
+
+                  <para>
+                    <caution>
+                      <para>Da das Wort <emphasis>Template</emphasis> in &app; ein reserviertes Wort ist,
+                        darf es von Ihnen <emphasis>nicht</emphasis> verwendet werden!
+                      </para>
+                    </caution>
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-ISIN-CUSIP">
+                <glossterm>ISIN, WKN oder anderer Code</glossterm>
+                <glossdef>
+                  <para>Dies ist ein numerischer oder alphanumerischer Code, der verwendet wird, um das Wertpapier zu
+                    identifizieren. Der
+                    <ulink url="&url-wp-de;Internationale_Wertpapierkennnummer"><acronym>ISIN</acronym></ulink>-Code
+                    ist eine internationale eindeutige numerische Zeichenfolge, die mit jeder Aktie,
+                    Anleihe oder jedem Investmentfonds und den meisten Arten von gehandelten
+                    Optionen, Futures und Rohstoffen verbunden ist. In Deutschland ist die
+                    <ulink url="&url-wp-de;Wertpapierkennnummer"><acronym>WKN</acronym></ulink>
+                    gebräuchlich, es existieren auch weitere, regional gültige Codes wie z.B. die des
+                    <ulink url="&url-wp-de;Committee_on_Uniform_Security_Identification_Procedures">
+                    <acronym>CUSIP</acronym></ulink> in Nord Amerika. Die Angabe des Code ist nicht
+                    erforderlich, kann aber beispielsweise nützlich sein um sich hierin gleich auch die ISIN zu merken,
+                    z.B. falls Sie später die Quelle für den Kursabruf wechseln.
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-Fraction">
+                <glossterm>Handelbare Stückelung</glossterm>
+                <glossdef>
+                  <para>Dies ist die kleinste gehandelte Einheit des Wertpapiers, ausgedrückt als Bruchteil einer einzelnen
+                    Nominaleinheit. Diese Einheit wird von &app;-Konten als Standardstückelung für
+                    den Handel mit dem Wertpapier verwendet.
+                  </para>
+                </glossdef>
+              </glossentry>
+            </glosslist>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term>Börsenkursquelle</term>
+
+          <listitem>
+            <glosslist>
+              <glossentry id="tool-ge-GetOnlineQuotes">
+                <glossterm>Börsenkurse online abrufen</glossterm>
+                <glossdef>
+                  <para>Das Aktivieren dieses Kontrollkästchens ermöglicht, den Abruf der Kurse von Währung oder
+                    Wertpapier von einer Online-Datenquelle.
+                    <note>
+                      <para>Wenn Sie den Kursabruf für eine Währung wünschen, dann müssen Sie nur noch die richtige
+                        <guilabel>Zeitzone</guilabel> einstellen.
+                      </para>
+                    </note>
+
+                    <note>
+                      <para>Wenn die Schaltfläche nicht angeklickt werden kann, dann ist das Paket &app-fq; nicht
+                        oder nicht richtig installiert. Lesen Sie in diesem Fall die Installationanleitung unter
+                        <xref linkend="finance-quote" />.
+                      </para>
+                    </note>
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-TypeQuoteSource">
+                <glossterm>Art der Kursabruf-Quelle</glossterm>
+                <glossdef>
+                  <para>Verwenden Sie die Optionsfelder, um die Quelle für die Online-Kurse auszuwählen.
+                    <variablelist>
+                      <varlistentry>
+                        <term><guilabel>Einzel</guilabel></term>
+
+                        <listitem>
+                          <para>Diese Auswahl ruft die Daten nur aus der angegebenen Quelle ab.
+                          </para>
+                        </listitem>
+                      </varlistentry>
+
+                      <varlistentry>
+                        <term><guilabel>Mehrere Kursquellen</guilabel></term>
+
+                        <listitem>
+                          <para>Kursquellen wie <quote>Europa</quote> sollten verwendet werden, wenn eine Ausfallsicherung
+                            gegenüber mehreren Datenquellen erwünscht ist.
+                          </para>
+
+                          <caution>
+                            <para>Die Option <guilabel>Mehrere Kursquellen</guilabel> ist nur sinnvoll, wenn alle ausgewählten
+                              Quellen das gleiche Symbol für Ihre Wertpapier verwenden.
+                            </para>
+                          </caution>
+                        </listitem>
+                      </varlistentry>
+
+                      <varlistentry>
+                        <term><guilabel>unbekannt</guilabel></term>
+<!-- Maintainers: To add, modify, remove sources
+edit https://github.com/Gnucash/gnucash/blob/maint/libgnucash/engine/gnc-commodity.c
+and update the appendix. -->
+                        <listitem>
+                          <para>&app; hat hier kein Hintergrundwissen über die Quelle. Das kann zwei verschiedene Gründe haben.
+                            Sie versuchen eine Quelle zu verwenden, die
+                            <itemizedlist>
+                              <listitem>
+                                <para>es <emphasis>nicht (mehr)</emphasis> in &app-fq; gibt oder
+                                </para>
+                              </listitem>
+
+                              <listitem>
+                                <para>neu in &app-fq; ist, aber <emphasis>noch nicht</emphasis> in &app; eingepflegt wurde.
+                                </para>
+                              </listitem>
+                            </itemizedlist>
+                          </para>
+                        </listitem>
+                      </varlistentry>
+                    </variablelist>
+                  </para>
+
+                  <para>Nachdem Sie die Art der Quelle für Kursangebote ausgewählt haben, wählen Sie eine Datenquelle aus
+                    dem Pulldown-Menü. Die zur Verfügung stehenden Datenquellen sind abhängig von
+                    der installierten Version von &app-fq; und werden Ihnen bei Verwendung des
+                    Befehls <command>gnc-fq-check</command> angezeigt. Details zu den derzeit
+                    unterstützten Datenquellen finden Sie unter <xref linkend="fq-sources"></xref>.
+                    <note>
+<!-- Is this note still valid? -->
+                      <para>Die Kursdatenquelle <quote>Yahoo as JSON</quote> liefert dabei auch die Kurse für die übrigen genannten
+                        Unternehmen (z.B. Fidelity Investments und T.Rowe Price).
+                      </para>
+                    </note>
+                  </para>
+
+                  <para>Beachten Sie allerdings, dass Sie bei Verwendung von <quote>Yahoo as JSON</quote> zusätzlich das
+                    Börsenplatzkürzel des Wertpapiers anfügen sollten, z.B. <quote>PA</quote>
+                    für Paris, <quote>BE</quote> für Berlin usw. Beispiel: 12150.PA (ein
+                    Peugeot-Papier am Pariser Markt). 
+                    <xref linkend="gnc-tbl-fq-yahoo-exchange-codes"></xref> enthält eine Liste von
+                    Suffixen für verschiedene Märkte auf der ganzen Welt.
+                    <tip>
+                      <para>Da einige Symbole eine spezielle Schreibweise erfordern, schauen Sie sich auch die Beispiele unter
+                        <ulink url="&url-wiki;Online_Quotes#Setting_up_online_quotes_in_GnuCash" /> an.
+                      </para>
+                    </tip>
+                  </para>
+
+                  <para>Pseudo-Symbole für den amerikanischen Lehrer-Pensionsfond TIAA-CREF-Fonds sind in der Tabelle
+                    <xref linkend="PsSymbs-TIAA-CREF"></xref> aufgeführt.
+                  </para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry id="tool-ge-TimeZone">
+                <glossterm>Zeitzone dieser Kurse</glossterm>
+                <glossdef>
+                  <para>Wählen Sie die Zeitzone für die Quelle der von Ihnen empfangenen Online-Börsenkurse.
+                    Beispielsweise verwendet Yahoo gewöhnlich die US-Eastern-Zeitzone, wählen Sie
+                    also <quote>America/New York</quote>, wenn Sie diese Börsenkursquelle
+                    verwenden.
+                  </para>
+                </glossdef>
+              </glossentry>
+            </glosslist>
+
+            <tip>
+              <para>Denken Sie daran, dass die <quote>Kurse</quote> von Investmentfonds in Wirklichkeit
+                <quote>Nettoinventarwerte</quote><footnote><para>auch Nettovermögenswert, engl. Net Asset
+                Value (NAV), siehe <ulink url="&url-wp-de;NAV" /></para></footnote>  sind, und erst mehrere
+                Stunden nach Börsenschluss verfügbar sind. Wenn die <quote>Kurse</quote> aktualisiert
+                werden, bevor die Nettoinventarwerte des aktuellen Tages durch die Fopnfsgesellschaft
+                ermittelt wurden, werden die Werte vom vorherigen Handelstag abgerufen.
+              </para>
+
+              <para>Wenn sie den Zeitpunkt der Wertermittlung genau wissen wollen, informieren sie sich
+                bei der ausgebenden Fonds-Gesellschaft.
+              </para>
+            </tip>
+
+            <note>
+              <para>Die Kursdatenquelle <quote>Yahoo as JSON</quote> gibt den Kurs normalerweise zeitverzögert
+                zur Original-Datenquelle an. Wie groß die zeitliche Abweichung ist, können Sie in der Tabelle
+                <xref linkend="gnc-tbl-fq-yahoo-exchange-codes" /> nachlesen.
+              </para>
+            </note>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
 
     <sect2 id="invest-stockprice-online3">
-      <title>Configuring Securities/Currencies for On-Line Retrieval of Prices</title>
-
-      <para>To support on-line quotations for a particular stock or mutual fund account, you must first enable
-        on-line price quoting and select a price source in the Security Editor. Online currency
-        quotes require only that the check-box for Online quotes and the timezone be selected, and
-        that the <quote>Get Quotes</quote> box be checked in the Security Editor.
+      <title>Konfigurieren von Wertpapieren/Währungen für den Online-Abruf von Kursen</title>
+<!-- FIXME remove this chapter -->
+<!-- 
+      <para>Um Online-Kurse für eine bestimmte Aktie oder ein Investmentfonds-Konto zu nutzen, müssen Sie
+        zunächst <guilabel>Börsenkurse online abrufen</guilabel> aktivieren und eine Kursquelle im
+        Wertpapier-Editor auswählen. Für die Online-Aktualisierung von Währungskursen müssen nur
+        die Zeitzone ausgewählt werden und das Kästchen <guilabel>Börsenkurse online
+        abrufen</guilabel> im Wertpapier-Editor aktiviert sein.
       </para>
-
-      <para>Detailed instructions are in the section on Creating New Accounts.
+ -->
+      <para>Detaillierte Anweisungen finden Sie im Abschnitt "Neue Konten erstellen":
         <xref linkend="accts-online-quotes"></xref>
       </para>
     </sect2>
diff --git a/manual/de/figures/Tools_SecurityEditor.png b/manual/de/figures/Tools_SecurityEditor.png
new file mode 100644
index 00000000..1d06d7f2
Binary files /dev/null and b/manual/de/figures/Tools_SecurityEditor.png differ
diff --git a/manual/de/figures/Tools_SecurityEditor_add.png b/manual/de/figures/Tools_SecurityEditor_add.png
new file mode 100644
index 00000000..809d7c61
Binary files /dev/null and b/manual/de/figures/Tools_SecurityEditor_add.png differ
diff --git a/manual/de/figures/Tools_SecurityEditor_edit.png b/manual/de/figures/Tools_SecurityEditor_edit.png
new file mode 100644
index 00000000..6ebed86a
Binary files /dev/null and b/manual/de/figures/Tools_SecurityEditor_edit.png differ

commit 140296ef652037d32bb72b365c4a65e2147400f0
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Apr 30 22:18:23 2022 +0200

    L10n:de: manual ch_Tools_Assistant: The "Close Book"

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index 93a11ab0..e46b4d0a 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5410,98 +5410,175 @@
   </sect1>
 
   <sect1 id="tool-close-book">
-    <title>Close Book</title>
-
-    <para>The <guilabel>Close Book</guilabel> dialog box is used for “closing the books,”--an
-      accounting process that resets the balances of the income and expense accounts. In this
-      process, income account balances are transferred into an income equity account, while expense
-      account balances are transferred into an expense equity account. You must specify both these
-      accounts, which may be the same. You must also specify the date for the closing transfer.
-    </para>
+    <title>Buchabschluss</title>
+
+    <abstract>
+      <para>Der Dialog <guilabel>Buch abschließen</guilabel>, welcher über den Menüeintrag &mc.to.cls-bok;
+        geöffnet wird, dient zum <quote>Abschließen der Bücher</quote>, einem Vorgang in der
+        Buchhaltung, bei dem die Salden der Ertrags- und Aufwandskonten zurückgesetzt werden.
+        Bei diesem Vorgang werden die Salden der Ertragskonten und der Aufwandskonto in ein Konto
+        vom Typ Eigenkapital übertragen.
+      </para>
 
-    <sect2 id="tool-close-book-anatomy">
-      <title>Dialog Box Details</title>
+      <para>In der betrieblichen Praxis erfolgt zuvor eine Gruppierung in den GuV-Konten nach
+        <ulink url="https://www.gesetze-im-internet.de/hgb/__275.html">§275 HGB</ulink>.
+        Siehe auch <ulink url="https://de.wikipedia.org/wiki/Gewinn-_und_Verlustrechnung">Gewinn- und Verlustrechnung</ulink>
+      </para>
+    </abstract>
 
-      <para>The dialog box has the following parts:
+    <note>
+      <para>Beachten Sie, dass der Abschluss der Bücher in &app; nicht für alle Anwender notwendig ist. Sie
+        <emphasis>müssen nicht</emphasis> Ihre Einnahmen- und Ausgabenkonten am Ende jeder
+        Finanzperiode ausgleichen, können es natürlich bei Bedarf tun.
       </para>
+    </note>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Closing Date:</guilabel> Specify the date for the closing transfer. You can type in a date
-            or choose one from the drop-down.
-          </para>
-        </listitem>
+    <para>Abhängig von der Verwendung von &app; (Privat oder Geschäftlich) gibt es zwei mögliche Szenarien,
+      wie Sie einen <quote>Buchabschluß</quote> durchführen können:
+    </para>
+
+    <variablelist>
+      <varlistentry>
+        <term>geschäftliche Nutzung</term>
 
         <listitem>
-          <para><guilabel>Income Total:</guilabel> Specify the account into which the total balance of all income
-            accounts will be transferred. Optionally you can create a new account to receive the
-            transfer using the <guibutton> New</guibutton> button.
+          <para>Man möchte die Zahlen, welche man extern, z.B. den Finanz-, Zoll- und sonstigen Behörden, berufständischen
+            Organisationen wie IHK, Geldgebern/Anteilseignern (Gewinnverwendung) und den Kreditgebern
+            (Sicherheit)) gemeldet hat, auch im Buch dokumentieren. Dann ist die Abschluß-Funktion
+            der richtige Ansatz.
           </para>
-        </listitem>
 
-        <listitem>
-          <para><guilabel>Expense Total:</guilabel> Specify the account into which the total balance of all expense
-            accounts will be transferred. Again, you can optionally create a new account to receive
-            the transfer using the <guibutton>New</guibutton> button.
+          <para>Als Nebeneffekt können Sie direkt im Kontenplan die Einnahmen und Ausgaben des aktuellen
+            Zeitraums sehen.
           </para>
         </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>private Nutzung</term>
 
         <listitem>
-          <para><guilabel>Description:</guilabel> Specify the description that will be entered in the closing entry.
+          <para>&app;s integrierte Berichte beinhalten geeignete Konzepte wie einbehaltene Gewinne zwischen zwei
+            verschiedenen Finanzperioden. Durch Auswahl des Berichtszeitraums kann man sich auch
+            ohne Buchabschluß die Zahlen jedes Zeitraums, oder auch mehrere Zeiträume,
+            nebeneinander anzeigen lassen.
           </para>
         </listitem>
-      </itemizedlist>
-    </sect2>
-
-    <sect2 id="tool-close-book-workings">
-      <title>How It Works</title>
+      </varlistentry>
+    </variablelist>
 
-      <para>&app; closes books by creating one transaction per currency for income accounts, and one transaction
-        per currency for expense accounts. The transactions all use the date selected by the user,
-        and each transaction may contain any number of splits. Each split moves the balance out of
-        one income or expense account. The last split in each closing transaction moves the total
-        offsetting debit/credit balance into the specified equity account.
+    <warning>
+      <para>Wenn Sie Ihre Bücher abschließen, müssen Sie mit Ungenauigkeiten in den Standardberichten
+        rechnen.
       </para>
+    </warning>
 
-      <para>Each transaction will use the description provided by the user in the
-        <guilabel>Description:</guilabel> entry.
+    <note>
+      <para>Ohne angepaßte Konfiguration, wie im Tip zum Abschlußdatum erläutert, verringert der
+        Abschluss der Bücher den Nutzen der Standardberichte, weil die Berichte derzeit keine
+        abschließenden Buchungen verstehen. Aus ihrer Sicht sieht es also so aus, als ob die
+        Nettoeinnahmen oder -ausgaben in jedem Konto für einen bestimmten Zeitraum einfach
+        null waren.
       </para>
+    </note>
 
-      <para>The fact that &app; just uses transactions to close the books makes it very simple to undo a book
-        closing: just delete the closing transactions.
-      </para>
-    </sect2>
+    <sect2 id="tool-close-book-anatomy">
+      <title>Beschreibung des Dialogs</title>
 
-    <sect2 id="tool-close-book-not">
-      <title>What It Doesn’t Do</title>
+      <figure pgwide="1">
+        <title>Der Dialog <quote>Buch abschließen</quote></title><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Tools_CloseBook.png" 
+                         srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-      <para>The book closing tool does not delete any accounts or transactions; create any new files; or hide
-        any accounts.
+      <para>Der Dialog besteht aus den folgenden Komponenten:
       </para>
-    </sect2>
 
-    <sect2 id="tool-close-book-need">
-      <title>Necessity</title>
+      <glosslist>
+        <glossentry>
+          <glossterm>Abschlussdatum</glossterm>
+          <glossdef>
+            <para>Geben Sie das Datum für die Abschlussbuchung an. Sie können ein Datum eingeben oder eines aus dem
+              Kalender auswählen.
+              <tip>
+                <para>Falls möglich, wählen Sie einen Tag, an dem es keine anderen wertverändernden Buchungen gibt,
+                  also etwa Silvester oder Neujahr. Für die Verwendung von <quote>normalen</quote>
+                  Berichten müssen Sie dieses Datum dann ausschließen.
+                </para>
+              </tip>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Erträge gesamt</glossterm>
+          <glossdef>
+            <para>Wählen Sie das Konto vom Typ <emphasis>Eigenkapital</emphasis> aus, auf das der Gesamtsaldo aller Ertragskonten übertragen werden soll.
+              Optional können Sie über die Schaltfläche <guibutton>Neu…</guibutton> ein neues
+              Konto anlegen.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Aufwendungen gesamt</glossterm>
+          <glossdef>
+            <para>Geben Sie das Eigenkapitalkonto an, auf das der Gesamtsaldo aller Aufwandskonten übertragen wird. Auch hier
+              können Sie optional ein neues Konto mit Hilfe der Schaltfläche
+              <guibutton>Neu…</guibutton> anlegen.
+              <tip>
+                <para>Die Konten für <guilabel>Ertrag</guilabel> und <guilabel>Aufwand</guilabel> können auch identisch
+                  sein.
+                </para>
+              </tip>
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Beschreibung</glossterm>
+          <glossdef>
+            <para>Geben Sie die Beschreibung an, die in die Abschlussbuchung eingetragen wird, z.B.
+              <userinput>Jahresabschluß <replaceable>JJ</replaceable></userinput>
+              oder <userinput>Monatabschluß <replaceable>JJ-MM</replaceable></userinput>.
+            </para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
+    </sect2>
 
-      <para>Note that closing the books in &app; is unnecessary. You do not need to zero out your income and
-        expense accounts at the end of each financial period. &app;’s built-in reports
-        automatically handle concepts like retained earnings between two different financial
-        periods.
+    <sect2 id="tool-close-book-workings">
+      <title>Funktionsweise</title>
+
+      <para>&app; schließt die Bücher ab, indem er je Währung eine Buchung für Ertragskonten und eine für
+        Aufwandskonten anlegt. Die Buchungen verwenden alle das vom Benutzer ausgewählte Datum, und
+        jede Buchung kann eine beliebige Anzahl von Buchungsteilen enthalten. Jeder Buchungsteil
+        verschiebt den Saldo aus einem Ertrags- oder Aufwandskonto. Der letzte Buchungsteil in jeder
+        Abschlussbuchung verschiebt den gesamten Soll-/Habensaldo auf das angegebene
+        Eigenkapitalkonto.
       </para>
 
-      <para>In fact, closing the books reduces the usefulness of the standard reports because the reports
-        don’t currently understand closing transactions. So from their point of view it simply
-        looks like the net income or expense in each account for a given period was simply zero.
+      <para>Für jede Buchung wird die Beschreibung genutzt, die der Benutzer im Eingabefeld
+        <guilabel>Beschreibung</guilabel> angegeben hat.
       </para>
-    </sect2>
-
-    <sect2 id="tool-close-book-conclusion">
-      <title>Conclusion</title>
 
-      <para>If you close your books, be prepared to see inaccuracies in the standard reports. On the other hand,
-        you will see current-period income and expense figures in the chart of accounts.
+      <para>Die Tatsache, dass &app; nur Buchungen verwendet, um die Bücher zu schließen, macht es sehr
+        einfach, einen Buchabschluss rückgängig zu machen: Löschen Sie einfach die
+        abschließenden Buchungen.
       </para>
+
+      <note>
+        <para>Das Buchabschluss-Werkzeug löscht keine Konten oder Buchungen, erstellt keine neuen Dateien und
+          verbirgt keine Konten.
+        </para>
+      </note>
     </sect2>
+<!-- FIXME source: remove the next three chapter. The content is integrated into the previous sections. -->
   </sect1>
 
   <sect1 id="tool-lots">
diff --git a/manual/de/figures/Tools_CloseBook.png b/manual/de/figures/Tools_CloseBook.png
new file mode 100644
index 00000000..8127fe39
Binary files /dev/null and b/manual/de/figures/Tools_CloseBook.png differ

commit 912b0d15b777e128371533d15b13c62a3182cdc2
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jun 24 06:54:21 2022 +0200

    Postprocessing of PR #250: Replace hardcoded URLs by entities

diff --git a/manual/C/Help_ch_GUIMenus.xml b/manual/C/Help_ch_GUIMenus.xml
index 593b9c60..e4c8a0db 100644
--- a/manual/C/Help_ch_GUIMenus.xml
+++ b/manual/C/Help_ch_GUIMenus.xml
@@ -3263,9 +3263,9 @@
       <tip>
         <para>Appearance of the Account Register Display is highly customizable (see
           <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/chapter_txns.html#txns-regstyle1">
+url="&url-docs-C;guide/chapter_txns.html#txns-regstyle1">
           Tutorial and Concepts Guide, Choosing a Register Style</ulink>)  and <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/chapter_txns.html#txns-columnwidths1">Setting
+url="&url-docs-C;guide/chapter_txns.html#txns-columnwidths1">Setting
           Column Widths</ulink>).
         </para>
       </tip>
@@ -3440,8 +3440,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/chapter_txns.
 
                 <entry namest="c2" nameend="c3">
                   <para>Radio button to select register display mode. See
-                    <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/chapter_txns.html#txns-regstyle1">
+                    <ulink url="&url-docs-C;guide/chapter_txns.html#txns-regstyle1">
                     Tutorial and Concepts Guide, Choosing a Register Style</ulink>.
                   </para>
                 </entry>

commit 3a45a8fb5dbe8bd5dd943380816cdd0fc103ba22
Merge: 3f2c6f4c b5d36e66
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jun 24 06:42:10 2022 +0200

    Merge PR #250 into maint


commit 3f2c6f4c7760a336b394d9ca7c943132c5d84984
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jun 24 06:11:31 2022 +0200

    Allow crosslinking the released or draft version

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 0e029953..3c214eac 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -32,12 +32,19 @@ 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.10">
-<!ENTITY date "27 March 2022">
-<!ENTITY vers-unstable "">
-<!ENTITY vers-stable "4.10">
-<!ENTITY series-unstable "master">
 <!ENTITY series-stable "4">
+<!ENTITY vers-stable "&series-stable;.10">
+<!ENTITY series-unstable "master">
+<!ENTITY vers-unstable "">
+
+<!ENTITY manrevision "&vers-stable;">
+<!ENTITY date "27 March 2022">
+<!-- Fixme: a dirty hack to reference the other document
+            Replace them after olink setup               -->
+<!ENTITY url-docs-top "https://www.gnucash.org/docs/">  <!-- also used for API -->
+<!ENTITY url-docs-draft "https://code.gnucash.org/docs/">  <!-- used while developing -->
+<!ENTITY url-docs-release "&url-docs-top;v&series-stable;/">  <!-- used on release -->
+<!ENTITY url-docs "&url-docs-draft;">
 
 <!--
   1. b) Publication - Translators can add transliterations
@@ -47,14 +54,13 @@ own entity definitions to use across all of our DocBook pages. -->
     and replace "&app;" by "&app-<lang>;" and "&appname;" by "&appname-<lang>;" in your translation.
 -->
 <!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 "<application>&appname;</application>">  <!-- This should be used in normal text -->
 <!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>">
 
   <!-- Operating Systems (3 letters), Bundles: -->
@@ -96,18 +102,17 @@ own entity definitions to use across all of our DocBook pages. -->
 <!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/">
+<!ENTITY url-doc-api-main "&url-docs-top;MAINT/">
+<!ENTITY url-doc-api-mast "&url-docs-top;MASTER/">
 <!-- Fixme: a dirty hack to reference the other document
             Replace them after olink setup
      append {guide|help}/<html-page>                      -->
-<!ENTITY url-docs-build-C "https://code.gnucash.org/docs/C/gnucash-">
-<!ENTITY url-docs-build-de "https://code.gnucash.org/docs/de/gnucash-">
-<!ENTITY url-docs-build-it "https://code.gnucash.org/docs/it/gnucash-">
-<!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-docs-C "&url-docs;C/gnucash-">
+<!ENTITY url-docs-de "&url-docs;de/gnucash-">
+<!ENTITY url-docs-it "&url-docs;it/gnucash-">
+<!ENTITY url-docs-ja "&url-docs;ja/gnucash-">
+<!ENTITY url-docs-pt "&url-docs;pt/gnucash-">
+<!ENTITY url-docs-ru "&url-docs;ru/gnucash-">
 
 <!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/ -->
diff --git a/guide/C/ch_importing.xml b/guide/C/ch_importing.xml
index 4c5ebede..7f9f098b 100644
--- a/guide/C/ch_importing.xml
+++ b/guide/C/ch_importing.xml
@@ -24,7 +24,7 @@
     <title>Outdated</title>
 
     <para>This is an older version of
-      <ulink url="&url-docs-build-C;help/trans-import.html"><quote>Common Transaction
+      <ulink url="&url-docs-C;help/trans-import.html"><quote>Common Transaction
       Operations</quote> in Help</ulink>. Better continue there until this update anomalie is
       resolved.
     </para>
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index be201a71..2fd799c8 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -1492,7 +1492,7 @@ Income
           <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
         </procedure>
 
-        <para>See <ulink url="&url-docs-build-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
+        <para>See <ulink url="&url-docs-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>
 
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index 350fe1ff..8470ae85 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -1619,7 +1619,7 @@ gcashdata.gnucash.7f0982.12093.LNK gcashdata.gnucash.LCK
           ändern.
 <!-- ToDo -->
           Für die Details dieser Optionen, sehen Sie im englischen &app; Manual,
-          <ulink url="&url-docs-build-C;-help/book-options.html"></ulink>, nach bis der Teil
+          <ulink url="&url-docs-C;-help/book-options.html"></ulink>, nach bis der Teil
           übersetzt ist.
         </para>
 
diff --git a/manual/C/Help_ch_Tools_Assistants.xml b/manual/C/Help_ch_Tools_Assistants.xml
index cd12808e..30f6d08a 100644
--- a/manual/C/Help_ch_Tools_Assistants.xml
+++ b/manual/C/Help_ch_Tools_Assistants.xml
@@ -5601,7 +5601,7 @@
     </itemizedlist>
 
     <para>Examples of using the <guilabel>Loan Repayment Calculator</guilabel> are given in the Tutorial and
-      Concepts Guide. <ulink url="&url-docs-build-C;guide/loans_calcs1.html"> &app; Tutorial and
+      Concepts Guide. <ulink url="&url-docs-C;guide/loans_calcs1.html"> &app; Tutorial and
       Concepts Guide’s Chapter on Loans</ulink>
     </para>
   </sect1>
@@ -6124,7 +6124,7 @@
 
         <para>See Tutorial and Concepts Guide,
           <ulink
-url="&url-docs-build-C;guide/invest-sell1.html#invest-sellLots"> Automatic
+url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
           Calculation of Capital Gain or Loss Using Lots</ulink> for more details.
         </para>
       </sect3>
diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/Help_ch_Account-Actions.xml
index 5bceb5ed..0c77058d 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/Help_ch_Account-Actions.xml
@@ -43,7 +43,7 @@
       </para>
     </tip>
 
-    <para>Neben den im <ulink url="&url-docs-build-de;guide/accts-types1.html">&app; Tutorial und
+    <para>Neben den im <ulink url="&url-docs-de;guide/accts-types1.html">&app; Tutorial und
       Konzepte</ulink> beschriebenen grundsätzlichen Kontoarten bietet &app; noch ein paar
       spezielle. Diese zeichnen sich insbesondere durch angepasste Vorschlagslisten –Zins- oder
       Dividendenzahlung– im Aktion-Feld und angepaßte Aktionen –z.B. gibt es beim Bankkonto
@@ -1315,7 +1315,7 @@
       <note>
         <para>Für Konten vom Typ <emphasis>Aktien</emphasis> und <emphasis>Investmentfonds</emphasis> müssen Sie
           die Anfangsbestände händisch eingeben. Bitte lesen Sie hierfür im
-          <ulink url="&url-docs-build-de;guide/invest-buy-stock1.html">&app; Tutorial und
+          <ulink url="&url-docs-de;guide/invest-buy-stock1.html">&app; Tutorial und
           Konzepte</ulink> die Beispiele, wie Sie diese Eingaben vornehmen können.
         </para>
       </note>
diff --git a/manual/de/Help_ch_Customize.xml b/manual/de/Help_ch_Customize.xml
index 9973d149..757dfc23 100644
--- a/manual/de/Help_ch_Customize.xml
+++ b/manual/de/Help_ch_Customize.xml
@@ -276,7 +276,7 @@ Translators:
 
                 <listitem>
                   <para>Entsprechend der
-                    <ulink url="&url-docs-build-C;guide/basics-accounting1.html#accounting_equation_dynamic"></ulink>
+                    <ulink url="&url-docs-C;guide/basics-accounting1.html#accounting_equation_dynamic"></ulink>
                     werden Passiva und Erträge negativ dargestellt.
                   </para>
                 </listitem>
@@ -289,7 +289,7 @@ Translators:
                   <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>.
+                    <ulink url="&url-docs-C;guide/basics-accounting1.html#accounting_equation_rearranged"></ulink>.
                   </para>
                 </listitem>
               </varlistentry>
diff --git a/manual/de/Help_ch_GUIMenus.xml b/manual/de/Help_ch_GUIMenus.xml
index f46173a3..0a2f656f 100644
--- a/manual/de/Help_ch_GUIMenus.xml
+++ b/manual/de/Help_ch_GUIMenus.xml
@@ -3877,7 +3877,7 @@
       <tip>
         <para>Das Aussehen der Anzeige eines Kontenblatts ist in hohem Maße konfigurierbar. (siehe
           <ulink
-url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
+url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
           Konzepte, Auswahl eines Registerstils</ulink>).
         </para>
       </tip>
@@ -4101,7 +4101,7 @@ url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 <entry namest="c2" nameend="c3">
                   <para>Optionsfeld zur Auswahl der Buchungsanzeige. Siehe
                     <ulink
-                    url="&url-docs-build-de;guide/chapter_txns.html#txns-regstyle1">
+                    url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1">
                     &app; Kurs und Konzepte, Auswählen eines Registerstils</ulink>.
                   </para>
                 </entry>
diff --git a/manual/de/Help_ch_GettingStarted.xml b/manual/de/Help_ch_GettingStarted.xml
index 823df736..7137f1c4 100644
--- a/manual/de/Help_ch_GettingStarted.xml
+++ b/manual/de/Help_ch_GettingStarted.xml
@@ -74,7 +74,7 @@ Translators:
         <listitem>
           <para>Benutzen Sie &app; das erste Mal und wollen sich vorerst nur über die Möglichkeiten der Anwendung
             informieren oder kennen sich noch nicht mit doppelter Buchführung aus, so kann die
-            Lektüre von <ulink url="&url-docs-build-de;guide">&app; Kurs und Konzepte</ulink> eine
+            Lektüre von <ulink url="&url-docs-de;guide">&app; Kurs und Konzepte</ulink> eine
             gute Wahl sein.
           </para>
         </listitem>
@@ -155,7 +155,7 @@ Translators:
         beschäftigen. In diesem Fall ist aber der <guilabel>Willkommen bei
         &appname;!</guilabel>-Dialog dann nicht mehr zugänglich. Um die anderen
         Auswahlmöglichkeiten zu testen, lesen Sie bitte in <xref linkend="acct-hierarchy" />,
-        <xref linkend="trans-import-qif" /> sowie in <ulink url="&url-docs-build-de;guide">&app;
+        <xref linkend="trans-import-qif" /> sowie in <ulink url="&url-docs-de;guide">&app;
         Kurs und Konzepte</ulink> nach. Dort erfahren Sie, wie Sie diese aus dem &app;-Menü heraus
         starten können.
       </para>
diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index 7b794b68..93a11ab0 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5404,7 +5404,7 @@
     </itemizedlist>
 
     <para>Examples of using the <guilabel>Loan Repayment Calculator</guilabel> are given in the Tutorial and
-      Concepts Guide. <ulink url="&url-docs-build-C;guide/loans_calcs1.html"> &app; Tutorial and
+      Concepts Guide. <ulink url="&url-docs-C;guide/loans_calcs1.html"> &app; Tutorial and
       Concepts Guide’s Chapter on Loans</ulink>
     </para>
   </sect1>
@@ -5927,7 +5927,7 @@
 
         <para>See Tutorial and Concepts Guide,
           <ulink
-url="&url-docs-build-C;guide/invest-sell1.html#invest-sellLots"> Automatic
+url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
           Calculation of Capital Gain or Loss Using Lots</ulink> for more details.
         </para>
       </sect3>
diff --git a/manual/de/Help_ch_Transactions.xml b/manual/de/Help_ch_Transactions.xml
index 8bfcc720..6da475b2 100644
--- a/manual/de/Help_ch_Transactions.xml
+++ b/manual/de/Help_ch_Transactions.xml
@@ -25,7 +25,7 @@ Translators:
   </para>
 
   <para>Die
-    <ulink url="&url-docs-build-de;guide/basics-accounting1.html#basics-accountingequation2">Bilanzgleichung</ulink>
+    <ulink url="&url-docs-de;guide/basics-accounting1.html#basics-accountingequation2">Bilanzgleichung</ulink>
     ist das Kernstück der Doppelten Buchführung. Für jede Veränderung im Wert eines Kontos muss
     es eine ausgleichende Buchung in einem anderen Konto geben. Dieses Konzept ist bekannt als das
     <emphasis>Prinzip des ausgeglichenen Saldos</emphasis> und ist von fundamentaler Bedeutung für
diff --git a/manual/it/gnucash-help.xml b/manual/it/gnucash-help.xml
index fb53c162..23585119 100644
--- a/manual/it/gnucash-help.xml
+++ b/manual/it/gnucash-help.xml
@@ -19753,7 +19753,7 @@ ________________________________________________________________________________
 
       <para>Esempi di utilizzo del <guilabel>Calcolatore di prestiti</guilabel> di &app; sono forniti nella
         «guida ai concetti e manuale».
-        <ulink url="&url-docs-build-it;guide/loans_calcs1.html">Capitolo sui prestiti nella «guida
+        <ulink url="&url-docs-it;guide/loans_calcs1.html">Capitolo sui prestiti nella «guida
         ai concetti e manuale»</ulink>
       </para>
     </sect1>
diff --git a/manual/it/it.po b/manual/it/it.po
index 78bd7654..463a8b7b 100644
--- a/manual/it/it.po
+++ b/manual/it/it.po
@@ -6355,8 +6355,8 @@ msgid "<guibutton>Payment Total:</guibutton> This field shows the total amount p
 msgstr "<guibutton>Pagamento totale:</guibutton> questo campo visualizza l’importo totale da pagare per restituire il prestito."
 
 #: C/gnucash-help.xml:2045(para)
-msgid "Examples of using the <guilabel>Loan Repayment Calculator</guilabel> are given in the Tutorial and Concepts Guide. <ulink url=\"&url-docs-build-C;guide/loans_calcs1.html\"><application>GnuCash</application> Tutorial and Concepts Guide’s Chapter on Loans</ulink>"
-msgstr "Esempi di utilizzo del <guilabel>Calcolatore di prestiti</guilabel> di &app; sono forniti nella «guida ai concetti e manuale». <ulink url=\"&url-docs-build-it;guide/loans_calcs1.html\">Capitolo sui prestiti nella «guida ai concetti e manuale»</ulink>"
+msgid "Examples of using the <guilabel>Loan Repayment Calculator</guilabel> are given in the Tutorial and Concepts Guide. <ulink url=\"&url-docs-C;guide/loans_calcs1.html\"><application>GnuCash</application> Tutorial and Concepts Guide’s Chapter on Loans</ulink>"
+msgstr "Esempi di utilizzo del <guilabel>Calcolatore di prestiti</guilabel> di &app; sono forniti nella «guida ai concetti e manuale». <ulink url=\"&url-docs-it;guide/loans_calcs1.html\">Capitolo sui prestiti nella «guida ai concetti e manuale»</ulink>"
 
 #: C/gnucash-help.xml:22(title)
 msgid "Reports And Charts"
diff --git a/manual/pt/Help_ch_Tools_Assistants.xml b/manual/pt/Help_ch_Tools_Assistants.xml
index 193193ea..b02bbe1a 100644
--- a/manual/pt/Help_ch_Tools_Assistants.xml
+++ b/manual/pt/Help_ch_Tools_Assistants.xml
@@ -5227,7 +5227,7 @@
     </itemizedlist>
 
     <para>Há exemplos de utilização da <guilabel>Calculadora de amortização de empréstimos</guilabel> no
-      Tutorial e guia de conceitos. Veja o <ulink url="&url-docs-build-pt;guide/loans_calcs1.html">
+      Tutorial e guia de conceitos. Veja o <ulink url="&url-docs-pt;guide/loans_calcs1.html">
       Tutorial e guia de conceitos do &app;, Capítulo sobre empréstimos</ulink>
     </para>
   </sect1>

commit f15b1864b1007c4043bf23a83ed82fd831af9171
Author: Christian Wehling <christian.wehling at web.de>
Date:   Thu Jun 23 16:44:19 2022 +0200

    manual ch_Finance_Quote: fix typo

diff --git a/manual/C/ch_Finance-Quote.xml b/manual/C/ch_Finance-Quote.xml
index 7577729f..d9a93294 100644
--- a/manual/C/ch_Finance-Quote.xml
+++ b/manual/C/ch_Finance-Quote.xml
@@ -95,13 +95,13 @@ Translators:
           </menuchoice>
           to run. This will install <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink>.
           <footnote>
-            <para>&app; Version 2.2.6 and befor require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink>. in
+            <para>&app; Version 2.2.6 and before require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink>. in
               version 5.8.
             </para>
           </footnote>
 
           <footnote>
-            <para>&app; Version 2.4 and befor require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink> Version
+            <para>&app; Version 2.4 and before require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink> Version
               5.16.3 and later.
             </para>
           </footnote>

commit b5d36e66fb0ced3094226d8a7f7af9ebc1323f02
Author: Christian Wehling <christian.wehling at web.de>
Date:   Mon Jan 24 17:56:44 2022 +0100

    [Bug 798414] How do I resize my register columns?
    
    * manual: Help_ch_GUIMenues
    * guide: ch_txns

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 0e029953..8edc9c36 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -80,6 +80,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!-- 
   4. Other formatting instructions -->
 <!ENTITY img-w "800px">  <!-- The maximum width of the graphic elements. -->
+<!ENTITY dArrow "<-|->"> <!-- double arrow: <-|->  -->
 
 <!-- 
   5. Some common URLs - should be changed on demand.
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 16f51212..4e3511ea 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -213,9 +213,16 @@
           it larger. Just drag its right-hand border out of the window to grow it. Be careful,
           though, as there's another column called rate whose width is set to 1 pixel to hide it
           (it's for internal use). Approach the divider from the left side and click as soon as the
-          cursor changes to a double-headed arrow.
+          cursor changes to a double-headed arrow (&dArrow;).
         </para>
       </note>
+      
+      <important>
+        <para>When in split mode there are different column markers in the header for split rows and transaction rows
+          depending on which type of row is active. In order to adjust split column widths one must first make
+          a split row active; to adjust transaction line column widths a transaction row must be active.
+        </para>
+      </important>
 
       <para>Column width settings except for the Description column are saved in the user's book state file and
         will be restored when the register is closed and reopened.
diff --git a/manual/C/Help_ch_GUIMenus.xml b/manual/C/Help_ch_GUIMenus.xml
index 3f6bd014..593b9c60 100644
--- a/manual/C/Help_ch_GUIMenus.xml
+++ b/manual/C/Help_ch_GUIMenus.xml
@@ -3264,7 +3264,9 @@
         <para>Appearance of the Account Register Display is highly customizable (see
           <ulink
 url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/chapter_txns.html#txns-regstyle1">
-          Tutorial and Concepts Guide, Choosing a Register Style</ulink>).
+          Tutorial and Concepts Guide, Choosing a Register Style</ulink>)  and <ulink
+url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-guide/chapter_txns.html#txns-columnwidths1">Setting
+          Column Widths</ulink>).
         </para>
       </tip>
 

commit 56bc8a23cbb67f3b1b05e1ee4e1c323fe8594047
Merge: 8509f27f 6bc43edc
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Jun 23 07:21:31 2022 +0200

    Merge remote-tracking branch 'cwehli/de_help_Tools_Intro' into maint


commit 275b10677b01bee190be2a0a930ab547e51231be
Author: Christian Wehling <christian.wehling at web.de>
Date:   Wed Feb 9 20:42:14 2022 +0100

    L10n:de: help_ch_Tools_Assistant: The "Price Editor"

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index bec9f1e8..951a9ccc 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -4999,189 +4999,455 @@
   </sect1>
 
   <sect1 id="tool-price">
-    <title>Price Editor</title>
+    <title>Kurs-Datenbank</title>
+
+    <para>Mit dem Menüpunkt &mc.to.price; haben Sie die Möglichkeit die Kurse für Ihre Devisen, Aktien
+      und Investmentfonds zu verwalten.
+    </para>
 
     <note>
-      <para>&app; uses the term <emphasis
-     role="Italic">commodity</emphasis> to mean anything that it
-        counts: Currencies, securities (i.e intangible assets like stock or mutual fund shares and
-        bonds), or tangible assets like trucks and computers. When valuing one commodity in terms of
-        another it uses the term <emphasis role="Italic">Exchange Rate</emphasis> between two
-        currencies and <emphasis
-     role="Italic">Price</emphasis> between a non-currency
-        commodity and a currency commodity. For the rest of this section we'll use "price" to mean
-        both price and exchange rate and "commodity" to mean any sort of commodity except where
-        currency behavior is different.
+      <para>&app; verwendet den Begriff <emphasis>Handelsgut</emphasis> für alles, was zählt: Währungen,
+        Wertpapiere (d.h. immaterielle Werte wie Aktien oder Investmentfondsanteile und Anleihen),
+        oder Sachwerte wie Lastwagen und Computer. Bei der Bewertung eines Handelsguts in Bezug auf
+        ein anderes wird der Begriff <emphasis>Wechselkurs</emphasis> zwischen zwei Währungen und
+        <emphasis>Preis</emphasis> zwischen einer Nicht-Währung und einer Währung benutzt. Im
+        weiteren Verlauf dieses Abschnitts verwenden wir den Begriff <quote>Preis</quote> sowohl
+        für den Preis als auch den Wechselkurs und <quote>Handelsgut</quote> für jede Art von
+        Ware, außer wenn das Währungsverhalten unterschiedlich ist.
       </para>
     </note>
 
-    <para>The Price Editor is used to list and edit the price of one commodity in another commodity. New
-      prices can be added, existing prices can be edited, and prices can be retrieved from a variety
-      of sources on the World-Wide Web when the commodity is properly configured.
-    </para>
+    <sect2 id="tool-price-db">
+      <title>Benutzen der Kurs-Datenbank</title>
 
-    <para>Each commodity pair can have one price per day. An existing price will be overwritten by a newer one
-      if the newer one has the same or a more preferred source. The order of source preference (1 is
-      most preferred) is:
-      <orderedlist>
-        <listitem>
-          <para>user:price-editor: Prices created manually in the Price Editor
-          </para>
-        </listitem>
+      <para>Die Kurs-Datenbank listet den Preis eines Handelsguts in Bezug zu einem anderen Handelsgut auf. Neue
+        Preise können hinzugefügt oder gelöscht, bestehende Preise bearbeitet und Preise aus
+        einer Auswahl von verschiedenen Quellen im World-Wide-Web abgerufen werden, wenn das
+        Handelsgut hierfür richtig konfiguriert ist.
+      </para>
 
-        <listitem>
-          <para>Finance::Quote: Online quotes
-          </para>
-        </listitem>
+      <figure pgwide="1">
+        <title>Die Kurs-Datenbank</title><screenshot>
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Tools_PriceDatabase.png" srccredit="Christian Wehling" width="&img-w;" />
+            </imageobject>
 
-        <listitem>
-          <para>user:price: Prices entered explicitly in the <guilabel>Exchange Rate</guilabel>entry of the
-            <guilabel>Transfer Funds</guilabel> dialog box or in the <guilabel>Price</guilabel>
-            column of a register for an account of types STOCK or MUTUAL
-          </para>
-        </listitem>
+            <imageobject role="fo">
+              <imagedata fileref="figures/Tools_PriceDatabase.png" srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-        <listitem>
-          <para>user:xfer-dialog: Prices calculated from an entry in the <guilabel>To Amount</guilabel> entry of the
-            <guilabel>Transfer Funds</guilabel> dialog box.
-          </para>
-        </listitem>
+      <para>Jedes Handelsgutpaar kann <emphasis>einen</emphasis> Preis pro Tag haben. Ein bestehender Preis wird
+        durch einen neueren Preis überschrieben wenn der neuere Preis die gleiche oder eine höher
+        priorisierte Quelle hat. Die Beschreibung der möglichen
+        <xref linkend="tool-ge-PriceSource" /> der Preise werden nachfolgend beschrieben.
+      </para>
 
-        <listitem>
-          <para>user:split-register: Prices calculated from the <guilabel>Shares</guilabel> and
-            <guilabel>Debit</guilabel> or <guilabel>Credit</guilabel> columns of a register for an
-            account of types STOCK or MUTUAL
-          </para>
-        </listitem>
+      <para>Die Steuerelemente in dem Dialog bieten die nachfolgenden Funktionen
+        <glosslist>
+          <glossentry>
+            <glossterm>Hinzufügen</glossterm>
+            <glossdef>
+              <para>Ermöglicht das manuelle Eintragen eines Kurses. Das Vorgehen hierbei wird in
+                <xref linkend="invest-stockprice-manual" /> beschrieben.
+              </para>
+            </glossdef>
+          </glossentry>
 
-        <listitem>
-          <para>user:stock-split: Prices entered in the <guilabel>Stock Split Assistant</guilabel>
-          </para>
-        </listitem>
-      </orderedlist>
+          <glossentry>
+            <glossterm>Entfernen</glossterm>
+            <glossdef>
+              <para>Löscht den markierten Kurswert aus der Datenbank.
+              </para>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Bearbeiten</glossterm>
+            <glossdef>
+              <para>Bietet die Möglichkeit einen markierten Kurs zu bearbeiten, siehe
+                <xref linkend="invest-stockprice-manual" />
+              </para>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Alte Entfernen</glossterm>
+            <glossdef>
+              <para>Ermöglicht in einem weiteren Dialog das <xref linkend="invest-stockprice-delete" /> an Hand einer
+                Datumsauswahl.
+              </para>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Kurse abrufen</glossterm>
+            <glossdef>
+              <para>Wenn &app-fq; installiert und eine Online-Quelle für die Börsenkurse ausgewählt ist, werden mit
+                betätigen dieser Schaltfläche für die konfigurierten Währungen und
+                Aktien/Investmentfonds die Kurse online abgerufen und eingetragen.
+<!-- FIXME insert <xref linkend="tool-ge-GetOnlineQuotes" /> to the new "Security Editor/Get Online Quotes" -->
+              </para>
+            </glossdef>
+          </glossentry>
 
-      <note>
-        <para>Prices created manually in the <guilabel>Price Editor</guilabel> are preferred over prices retrieved
-          via Finance::Quote so Finance::Quote will fail to update such manually-created prices.
-        </para>
-      </note>
-    </para>
+          <glossentry>
+            <glossterm>Schließen</glossterm>
+            <glossdef>
+              <para>Beendet die Kurs-Datenbank und schließt den Dialog.
+              </para>
+            </glossdef>
+          </glossentry>
+        </glosslist>
+      </para>
+    </sect2>
 
-    <para>The <guilabel>Price Editor</guilabel> displays existing prices as follows:
-      <itemizedlist>
-        <listitem>
-          <para><emphasis role="bold">Security: </emphasis>The Security/commodity being priced. The display is
-            sorted by the <guilabel>Namespace</guilabel> that the individual securities are listed
-            on. The list is expanded by clicking on the <guilabel>caret</guilabel> on the left of
-            the name.
-          </para>
-        </listitem>
+    <sect2 id="invest-stockprice-manual">
+      <title>Hinzufügen oder Bearbeiten von Kurswerten</title>
 
-        <listitem>
-          <para><emphasis role="bold">Currency: </emphasis>The currency the price is recorded in.
-          </para>
-        </listitem>
+      <para>Nachdem Sie in der Kurs-Datenbank entweder die Schaltfläche <guibutton>Hinzufügen</guibutton> oder
+        <guibutton>Bearbeiten</guibutton> betätigt haben wird Ihnen dieser Dialog angezeigt.
+      </para>
 
-        <listitem>
-          <para><emphasis role="bold">Date: </emphasis>The date the price was recorded.
-          </para>
-        </listitem>
+      <figure pgwide="1">
+        <title>Der Kurs-Editor</title><screenshot>
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Tools_PriceEditor_add.png" srccredit="Christian Wehling" width="&img-w;" />
+            </imageobject>
 
-        <listitem>
-          <para><emphasis role="bold">Source: </emphasis>The source of the commodities price quote, listed above.
-          </para>
-        </listitem>
+            <imageobject role="fo">
+              <imagedata fileref="figures/Tools_PriceEditor_add.png" srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-        <listitem>
-          <para><emphasis role="bold">Type: </emphasis>There are several different types of stock price quotes.
-          </para>
+      <note>
+        <para>Manuell im <guilabel>Kurs Editor</guilabel> eingetragene Preise werden gegenüber den mittels
+          &app-fq; abgerufenen Preisen bevorzugt. &app-fq; wird daher diese Preise nicht aktualisieren.
+        </para>
+      </note>
 
-          <itemizedlist>
-            <listitem>
-              <para><emphasis role="bold">Bid: </emphasis>Indicates what a specialist dealer is prepared to pay for a
-                stock.
+      <para>Die <guilabel>Kurs-Datenbank</guilabel> zeigt die vorhandenen Preise wie folgt an:
+        <glosslist>
+          <glossentry>
+            <glossterm>Namensraum</glossterm>
+            <glossdef>
+              <para>Sind Kategorien zur Organisation Ihrer Wertpapiere.
+<!-- FIXME: weitere Beschreibungen stehen unter <xref linkend="tool-ge-Namespace" /> im SecurityEditor. -->
               </para>
-            </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">Ask: </emphasis>Indicates at what price the dealers are prepared to sell a
-                stock.
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Wertpapier</glossterm>
+            <glossdef>
+              <para>Das zu bepreisende Wertpapier/die zu bepreisende Währung. Die Anzeige ist nach dem
+                <guilabel>Namensraum</guilabel> sortiert, in dem die einzelnen Wertpapiere gelistet
+                sind. Die Liste wird durch einen Klick auf das <guilabel>Dreieck</guilabel> links
+                neben dem Namen erweitert.
               </para>
-            </listitem>
+            </glossdef>
+          </glossentry>
 
-            <listitem>
-              <para><emphasis role="bold">Last: </emphasis>Indicate the price at which the last trade in that
-                stock/security occurred at. This is the price most commonly quoted in the media.
+          <glossentry>
+            <glossterm>Währung</glossterm>
+            <glossdef>
+              <para>Die Währung, in der der Preis erfasst wird.
               </para>
-            </listitem>
+            </glossdef>
+          </glossentry>
 
-            <listitem>
-              <para><emphasis role="bold">Net Asset Value: </emphasis>Are typically used for mutual funds. They are
-                calculated on the net value of the fund’s assets each day around the time of
-                the market close and are in effect until the next recalculation.
+          <glossentry>
+            <glossterm>Datum</glossterm>
+            <glossdef>
+              <para>Das Datum, an dem der Preis erfasst wurde.
               </para>
-            </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">Unknown: </emphasis>Use this if the type of price quoted is not known.
+            </glossdef>
+          </glossentry>
+
+          <glossentry id="tool-ge-PriceSource">
+            <glossterm>Quellen</glossterm>
+            <glossdef>
+              <para>Die Quelle der Kursnotierung der oben aufgeführten Handelsgüter; der erste Eintrag ist die am
+                meisten bevorzugte Quelle:
+                <glosslist>
+                  <glossentry>
+                    <glossterm>user:price-editor</glossterm>
+                    <glossdef>
+                      <para>Manuell im Preiseditor eingetragene Preise.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>Finance::Quote</glossterm>
+                    <glossdef>
+                      <para>Preise mit Hilfe von &app-fq; online abgerufen.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>user:price</glossterm>
+                    <glossdef>
+                      <para>Preise, die explizit als <guilabel>Wechselkurs</guilabel> im Dialog <guilabel>Buchen</guilabel>
+                        (<xref linkend="trans-win-price" />) oder in der Spalte
+                        <guilabel>Preis</guilabel> eines Registers für ein Konto des Typs
+                        Aktienkonto oder Investmentfonds eingetragen wurden.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>user:xfer-dialog</glossterm>
+                    <glossdef>
+                      <para>Preise, die aus dem Eintrag im <guilabel>Zum Betrag</guilabel>-Feld des Dialogs
+                        <guilabel>Buchen</guilabel> (<xref linkend="trans-win-price" />) errechnet
+                        wurden.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>user:split-register</glossterm>
+                    <glossdef>
+                      <para>Preise, die aus den Spalten <guilabel>Anteile</guilabel> und <guilabel>Kauf</guilabel> oder
+                        <guilabel>Verkauf</guilabel> (bei informellen Bezeichnungen) eines Registers
+                        für ein Konto des Typs Aktienkontos oder Investmentfonds berechnet wurden.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>user:stock-split</glossterm>
+                    <glossdef>
+                      <para>Preise, die in dem <guilabel>Aktienteilungs-Assistent</guilabel> (<xref linkend="stock-split" />)
+                        eingegeben wurden.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+                </glosslist>
               </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+            </glossdef>
+          </glossentry>
+
+          <glossentry>
+            <glossterm>Typ (Kontoart)</glossterm>
+            <glossdef>
+              <para>Es werden verschiedene Arten für Kursnotierungen verwendet:
+                <glosslist>
+                  <glossentry>
+                    <glossterm>Bid (Geldkurs)</glossterm>
+                    <glossdef>
+                      <para>Gibt an, was ein Fachhändler für eine Aktie zu zahlen bereit ist.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>Ask (Briefkurs)</glossterm>
+                    <glossdef>
+                      <para>Gibt an, zu welchem Preis der Händler bereit sind, eine Aktie zu verkaufen.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>Last (Vortag)</glossterm>
+                    <glossdef>
+                      <para>Gibt den Kurs an, zu dem der letzte Handel mit dieser Aktie/Wertpapier vollzogen wurde. Dieser Preis
+                        wird meistens in den Medien genannt.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>Net Asset Value (Nettoanteilswert)</glossterm>
+                    <glossdef>
+                      <para>Werden in der Regel für Investmentfonds verwendet. Sie werden auf der Grundlage des Nettowerts des
+                        Fondsvermögens jeden Tag um den Zeitpunkt des Marktschlusses berechnet und
+                        gelten bis zur nächsten Neuberechnung.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+
+                  <glossentry>
+                    <glossterm>Unknown (Unbekannt)</glossterm>
+                    <glossdef>
+                      <para>Zeigt an, das die Art des angegebenen Preises nicht bekannt ist.
+                      </para>
+                    </glossdef>
+                  </glossentry>
+                </glosslist>
+              </para>
+            </glossdef>
+          </glossentry>
 
-        <listitem>
-          <para><emphasis role="bold">Price: </emphasis>The actual price of the commodity.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </para>
+          <glossentry>
+            <glossterm>Preis</glossterm>
+            <glossdef>
+              <para>Der tatsächliche Preis des Handelsgutes.
+              </para>
+            </glossdef>
+          </glossentry>
+        </glosslist>
+      </para>
+    </sect2>
 
-    <sect2 id="invest-stockprice-manual">
-      <title>Adding a stock price manually</title>
+    <sect2 id="invest-stockprice-delete">
+      <title>Entfernen von alten Kurswerten</title>
 
-      <para>To add a new price, click on <guilabel>Add</guilabel>, and enter the details of the security and
-        price into the dialog box. To edit an existing price, select the price in the price list,
-        click the <guibutton>Edit</guibutton> button, and edit the figures.
+      <para>Um nur einen Preis zu entfernen, markieren Sie den Preis und klicken Sie auf die Schaltfläche
+        <guibutton>Entfernen</guibutton>. Wenn Sie alle Preise, die älter als ein bestimmtes Datum
+        sind, entfernen möchten, klicken Sie auf die Schaltfläche <guibutton>Alte
+        entfernen</guibutton> und geben Sie die Details in das Dialogfenster ein.
       </para>
 
-      <para>To remove just one price, select the price and click the <guibutton>Remove</guibutton> button. If
-        you want to remove all prices older than a certain date, click on the <guilabel>Remove
-        Old</guilabel> button and enter the details in the dialog box.
-      </para>
+      <figure pgwide="1">
+        <title>Löschen von Kurswerten</title><screenshot>
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/Tools_PriceEditor_del.png" srccredit="Christian Wehling" width="&img-w;" />
+            </imageobject>
 
-      <para>A pop-up will display with the message <emphasis role="bold">"Delete all stock prices based upon the
-        criteria below:".</emphasis> Enter the date of the last price you wish to delete.
-      </para>
+            <imageobject role="fo">
+              <imagedata fileref="figures/Tools_PriceEditor_del.png" srccredit="Christian Wehling" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-      <para>Two check-boxes are below the date field;
+      <para>Mit Hilfe dieses Dialogs können Sie die zu löschenden Kurse an Hand einer Datumsangabe auswählen.
+        Zusätzlich können Sie eine Regel auswählen, die festlegt welcher letzte verfügbare Kurs
+        behalten werden soll.
       </para>
 
-      <itemizedlist>
-        <listitem>
-          <para><guilabel>Delete manually entered prices</guilabel> - If checked, delete manually entered stock
-            prices dated earlier than the specified date. Otherwise only stock prices added by
-            <application>Finance::Quote</application> will be deleted.
-          </para>
-        </listitem>
+      <glosslist>
+        <glossentry>
+          <glossterm>Kursdaten nach folgenden Kriterien löschen</glossterm>
+          <glossdef>
+            <para><glosslist>
+                <glossentry>
+                  <glossterm>Online geholte Kurse einschließen</glossterm>
+                  <glossdef>
+                    <para>Mit dieser Auswahl werden die Aktienkurse, die von &app-fq; hinzugefügt wurden, gelöscht.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>Manuell eingegebene Kurswerte einschließen</glossterm>
+                  <glossdef>
+                    <para>Wenn markiert, werden manuell eingegebene Aktienkurse gelöscht, die vor dem angegebenen Datum
+                      liegen.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>Automatisch erzeugte</glossterm>
+                  <glossdef>
+                    <para>&app; legt automatisch einen Kurs an, der zeitlich zu der Buchung passt die mehr als eine Währung
+                      betrifft. Wenn Sie dieses Kontrollkästchen aktivieren, werden diese Einträge
+                      ebenfalls gelöscht.
+                      <warning>
+                        <para>Bitte seien Sie mit der Verwendung dieser Möglichkeit vorsichtig, da z.B. die Kontenübersicht und
+                          auch Berichte unzuverlässig werden können.
+                        </para>
+                      </warning>
+                    </para>
+                  </glossdef>
+                </glossentry>
+              </glosslist>
+            </para>
+          </glossdef>
+        </glossentry>
 
-        <listitem>
-          <para><guilabel>Delete last price for a stock</guilabel> - If checked, delete all prices before the
-            specified date. Otherwise the last stock price dated before the date will be kept and
-            all earlier quotes deleted.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </sect2>
+        <glossentry>
+          <glossterm>Vor dem Datum</glossterm>
+          <glossdef>
+            <para>Wählen Sie ein Datum bis zu die Kurswerte gelöscht werden sollen.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Von diesen Devisen/Wertpapieren</glossterm>
+          <glossdef>
+            <para>Markieren sie die Devisen und Wertpapiere aus, für die Sie die alten Kurse entfernen möchten. Die
+              Auflistung unterstützt eine Mehrfachauswahl.
+            </para>
+          </glossdef>
+        </glossentry>
+
+        <glossentry>
+          <glossterm>Den letzten verfügbaren Kurs mit folgender Regel behalten</glossterm>
+          <glossdef>
+            <para><glosslist>
+                <glossentry>
+                  <glossterm>Keine</glossterm>
+                  <glossdef>
+                    <para>Mit dieser Auswahl werden alle Kurse der markierten Wertpapiere vor dem eingestellten Datum
+                      gelöscht.
+                    </para>
+                  </glossdef>
+                </glossentry>
 
-    <sect2 id="invest-stockprice-online1">
-      <title>Configuring for use of the <guibutton>Get Quotes</guibutton> button</title>
+                <glossentry>
+                  <glossterm>Letzter der Woche</glossterm>
+                  <glossdef>
+                    <para>Sofern vorhanden, wird der letzte Kurs aus jeder Woche bis zum Datum behalten.
+                    </para>
+                  </glossdef>
+                </glossentry>
 
-      <para>To support on-line quotations for a particular stock or mutual fund account, you must first enable
-        on-line price quoting and select a price source in the Security. This is described in detail
-        in <xref linkend="invest-stockprice-online3"></xref>. Once on-line quotes are enabled, and
-        <application>Finance::Quote</application> is installed, you can update prices for your
-        stocks and mutual funds manually by clicking the <guibutton>Get Quotes</guibutton> button.
-      </para>
+                <glossentry>
+                  <glossterm>Letzter des Monats</glossterm>
+                  <glossdef>
+                    <para>Behalte den letzten Preis jedes Monats vor dem Datum.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>Letzter des Quartals</glossterm>
+                  <glossdef>
+                    <para>Behält den letzten Preis des Quartals, wobei das Quartal von dem Enddatum der verwendeten
+                      Buchführungsperiode abhängt.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>Letzter der Periode</glossterm>
+                  <glossdef>
+                    <para>Sofern vorhanden, wird der letzte Preis jeder Buchführungsperiode vor dem Datum behalten, wobei Sie
+                      die <xref linkend="prefs-accounting-period" /> in den &app;-Einstellungen
+                      festlegen können.
+                    </para>
+                  </glossdef>
+                </glossentry>
+
+                <glossentry>
+                  <glossterm>Skaliert</glossterm>
+                  <glossdef>
+                    <para>Mit dieser Auswahl werden mehrere Regeln gleichzeitig angewendet. Kurse die, im Bezug auf das
+                      gewählte Datum, älter als ein Jahr sind werden mit der Regel <quote>Letzter
+                      des Monats</quote> behandelt. Die Kurse, die zwischen 6 und 12 Monate alt sind
+                      werden entsprechend der Regel <quote>Letzter der Woche</quote> gelöscht.
+                    </para>
+                  </glossdef>
+                </glossentry>
+              </glosslist>
+            </para>
+          </glossdef>
+        </glossentry>
+      </glosslist>
     </sect2>
   </sect1>
 
diff --git a/manual/de/figures/Tools_PriceDatabase.png b/manual/de/figures/Tools_PriceDatabase.png
new file mode 100644
index 00000000..94dfa2c6
Binary files /dev/null and b/manual/de/figures/Tools_PriceDatabase.png differ
diff --git a/manual/de/figures/Tools_PriceEditor_add.png b/manual/de/figures/Tools_PriceEditor_add.png
new file mode 100644
index 00000000..b7cc1f0e
Binary files /dev/null and b/manual/de/figures/Tools_PriceEditor_add.png differ
diff --git a/manual/de/figures/Tools_PriceEditor_del.png b/manual/de/figures/Tools_PriceEditor_del.png
new file mode 100644
index 00000000..2c622646
Binary files /dev/null and b/manual/de/figures/Tools_PriceEditor_del.png differ

commit 6bc43edc7a7fa6139700c5d94f5184441b9c7ffe
Author: Christian Wehling <christian.wehling at web.de>
Date:   Wed May 25 21:45:10 2022 +0200

    L10n:de: manual ch_Tools_Assistant: Intro

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index bec9f1e8..7b794b68 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -1,54 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter SYSTEM "gnc-gui-de.dtd">
-<!--
-      (Do not remove this comment block.)
-  Version: 2.0.x
-   Last modified: April 15th 2007
-        modified: August 12th 2006
-	modified: February 28th 2005
-
+<!-- (Do not remove this comment block.)
+  Version: 4.9
+  Last modified: Juli 2022 
+       modified: April 15th 2007
+       modified: August 12th 2006
+       modified: February 28th 2005
   Maintainers:
-               Chris Lyttle <chris at wilddev.net>
-               Neil Williams <linux at codehelp.co.uk>
-
+    Chris Lyttle <chris at wilddev.net>
+    Neil Williams <linux at codehelp.co.uk>
   Author:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Translators:
-               (translators put your name and email here)
+    Christian Wehling <christian.wehling at web.de>
 -->
 <chapter id="ch_AccRegTools">
-  <title>Tools & Assistants</title>
-
-  <para>&untranslated-de;
-  </para>
+  <title>Assistenten und ähnliche Werkzeuge</title>
 
   <abstract>
-    <para>&app; offers many specialized <guimenu>Tools</guimenu>. These tools enable access to the enhanced
-      functionality of &app;. They are accessed via the <guimenu>Tools</guimenu> menu from any
-      window that displays the &app; standard menu. Some of these tools may be deactivated for
-      several reasons:
-      <itemizedlist spacing="compact">
+    <para>&app; enthält eine Reihe von Werkzeuge, um zeitaufwendige oder komplexere Vorgänge zu vereinfachen.
+      Wenn das aktuelle Fenster das Standardmenü beinhaltet, kann, sofern es keinen passenderen Kontext gibt, über das Menü &gm.tool;
+      darauf zugegriffen werden. Weitere Assistenten sind auch im Menü &gm.act; enthalten. 
+    </para>
+  </abstract>
+
+  <important>
+    <para>
+      Einige dieser Werkzeuge können aus den folgenden Gründen deaktiviert sein:
+      <itemizedlist>
         <listitem>
-          <para>the tools is not appropriate for the current window,
+          <para>Die Werkzeuge sind nicht für das aktuelle Fenster geeignet.
           </para>
         </listitem>
 
         <listitem>
-          <para>the required software is not found on your system,
+          <para>&app; kann die erforderliche Software, z.B. &app-fq; für den Abruf von Online-Kursen, nicht auf Ihrem System finden.
           </para>
         </listitem>
 
         <listitem>
-          <para>the package maintainer disabled it in the build process.
+          <para>Der Paketbetreuer hat sie während des Erstellungsprozesses deaktiviert, z,B. &app-aqb; für das Online-Banking.
           </para>
         </listitem>
       </itemizedlist>
-    </para>
-  </abstract>
+      </para>
+    </important>
+
 
   <sect1 id="tool-find">
     <title>Find</title>
 
+    <para>&untranslated-de;
+    </para>
+
     <para>The &app; <emphasis>Find</emphasis> assistant can be used to <link linkend="tool-find-txn">find
       transactions</link> or to perform <link linkend="tool-find-bsnss">business related</link>
       research on your data file.

commit 8509f27f49b7dacb31bb80994baa8e874b1e32e4
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Jan 11 21:24:52 2022 +0100

    F::Q Description of installing Perl

diff --git a/manual/C/ch_Finance-Quote.xml b/manual/C/ch_Finance-Quote.xml
index dd6b31a7..7577729f 100644
--- a/manual/C/ch_Finance-Quote.xml
+++ b/manual/C/ch_Finance-Quote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "gnc-docbookx.dtd">
+<!DOCTYPE chapter SYSTEM "gnc-gui-C.dtd">
 <!-- (Do not remove this comment block.)
 Version: 1.0.0
 Last modified: August 08th 2021
@@ -14,7 +14,7 @@ Translators:
 -->
 <chapter id="finance-quote"
          xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Setting up the Online Quote update</title>
+  <title>Setting up the Quote update</title>
 
   <para>If you have more than a couple of commodities, you will tire of having to update their quotes
     constantly. &app; has the ability to automatically download the most recent quote for your
@@ -22,6 +22,107 @@ Translators:
     which must be installed in order to activate this feature.
   </para>
 
+  <itemizedlist>
+    <title>Prerequisites for an Online Quote update with &app-fq; are</title>
+
+    <listitem>
+      <para>the &app-perl; language interpreter and
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>the &app-perl;-module &app-fq; with any dependencies.
+      </para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>If you get stuck while performing the steps described here, you can reach many helpful users on the
+      channels mentioned under <xref linkend="more_help" />.
+    </para>
+  </note>
+
+  <para>You can also leave out this step and manually update your stock quotes.
+  </para>
+
+  <sect1 id="finance-quote-perl-install">
+    <title>Installing &app-perl;</title>
+
+    <para>The installation of &app-perl; is essentially dependent on the operating system used. The effort for
+      installation is low and is described in this section.
+    </para>
+
+    <para>To check if &app-perl; is already installed on your system, call the command
+      <informalexample>
+<screen>perl -v</screen>
+      </informalexample>
+      in the terminal. If you are shown the version number of the &app-perl; interpreter, then
+      continue with <xref linkend="finance-quote-install" />.
+    </para>
+
+    <procedure>
+      <title>On &lin;</title>
+
+      <step>
+        <para>On most systems &app-perl; is probably already installed. If with the previous command does not show
+          a version, then the easiest way is to use your system’s package manager for installation.
+        </para>
+      </step>
+
+      <step>
+        <para>When using the &app; &flatpak; package, &app-perl; and &app-fq; are already functionally installed.
+        </para>
+      </step>
+    </procedure>
+
+    <procedure>
+      <title>On &mac;</title>
+
+      <step>
+        <para>&app-perl; is normally already set up under &mac;.
+        </para>
+      </step>
+    </procedure>
+
+    <procedure>
+      <title>On &win;</title>
+
+      <step>
+        <para>Under &win; run the program
+          <menuchoice>
+            <guimenu>Start</guimenu> <guisubmenu>&appname;</guisubmenu> <guimenuitem>Install Online
+            Price Retrieval</guimenuitem>
+          </menuchoice>
+          to run. This will install <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink>.
+          <footnote>
+            <para>&app; Version 2.2.6 and befor require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink>. in
+              version 5.8.
+            </para>
+          </footnote>
+
+          <footnote>
+            <para>&app; Version 2.4 and befor require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink> Version
+              5.16.3 and later.
+            </para>
+          </footnote>
+        </para>
+      </step>
+
+      <step>
+        <para>For execution you need <emphasis>Administrator privilegies</emphasis>, which are requested in the
+          dialog. The installation can take more then 15 minutes.
+        </para>
+      </step>
+
+      <step>
+        <para>If during the installation the error message <computeroutput>No such file or directory
+          </computeroutput> or <computeroutput>permission denied</computeroutput> are displayed,
+          then it may help to disable the antivirus software temporarily.
+        </para>
+      </step>
+    </procedure>
+  </sect1>
+
   <sect1 id="finance-quote-install">
     <title>Installing &app-fq;</title>
 
@@ -39,45 +140,12 @@ SYNOPSIS
       If no documentation is displayed, you will have to continue with this chapter.
     </para>
 
-    <itemizedlist>
-      <title>Prerequisites for an Online Quote update with &app-fq;</title>
-
-      <listitem>
-        <para>the &app-perl; language interpreter,
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>the &app-perl;-module &app-fq; and
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>any dependencies required by the &app-fq; module.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <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
-        <ulink url="&url-irc;">#&appname; IRC channel</ulink>.
-        You can also find more information in the &app; wiki at
-        <ulink url="&url-wiki-OQ;">Online Quotes</ulink>. You can also leave out this step and
-        manually update your stock quotes.
-      </para>
-    </note>
-
-    <para>The installation of &app-perl; is not the focus of this manual. A detailed description can be found
-      in the &app; Wiki at <ulink url="&url-wiki-OQ;#Perl">Perl</ulink>.
-    </para>
-
     <para>The process of installing &app-fq; depends on the system. For the different supported systems, you
       can follow the instructions below:
     </para>
 
     <procedure>
-      <title>Installing &app-fq; on &lin;</title>
+      <title>On &lin;</title>
 
       <step>
         <simpara>Close &app;.
@@ -135,7 +203,7 @@ SYNOPSIS
     </procedure>
 
     <procedure>
-      <title>Installing &app-fq; on &mac;</title>
+      <title>On &mac;</title>
 
       <step>
         <simpara>Close &app;.
@@ -162,7 +230,7 @@ SYNOPSIS
     </procedure>
 
     <procedure>
-      <title>Installing &app-fq; on &win;</title>
+      <title>On &win;</title>
 
       <step>
         <simpara>Close &app;.
@@ -172,7 +240,7 @@ SYNOPSIS
       <step>
         <simpara>Run
           <menuchoice>
-            <guimenu>Start</guimenu> <guisubmenu>&app;</guisubmenu> <guimenuitem>Install Online
+            <guimenu>Start</guimenu> <guisubmenu>&appname;</guisubmenu> <guimenuitem>Install Online
             Price Retrieval</guimenuitem>
           </menuchoice>
           . This is a small utility that installs &app-fq; for you.
@@ -182,7 +250,7 @@ SYNOPSIS
   </sect1>
 
   <sect1 id="finance-quote-scheduler">
-    <title>Configuring for Getting Online Quotes Periodically</title>
+    <title>Configuring for Getting Quotes Periodically</title>
 
     <para>The command <command>gnucash-cli --quotes get &user-datafile;</command>
       <footnote>
@@ -194,8 +262,8 @@ SYNOPSIS
         </simpara>
       </footnote>
       can be used to fetch the current quotes of your stocks and write them directly into your
-      &app;-data file without starting the GUI. Thus an automatic, regular updating of the
-      price database is possible.
+      &app;-data file without starting the GUI. Thus an automatic, regular updating of the price
+      database is possible.
       <warning>
         <para>Please note that the data file should not be open in another instance of &app; at the same time!
         </para>
@@ -282,7 +350,7 @@ gnucash-cli --quotes get &user-datafile; > /dev/null 2>&1</screen>
       <para>Adjust the time to the close of the stock exchange and consider <emphasis>fund quotes</emphasis>,
         that the net asset value (NAV) is determined well after the markets closed. The types have
         their description in <xref linkend="tool-price" />.
-<!-- FIXME: aadjust the link to a proper ID -->
+<!-- FIXME: adjust the link to a proper ID -->
       </para>
     </example>
 
diff --git a/manual/de/ch_Finance-Quote.xml b/manual/de/ch_Finance-Quote.xml
index 734fbb1c..5b780b78 100644
--- a/manual/de/ch_Finance-Quote.xml
+++ b/manual/de/ch_Finance-Quote.xml
@@ -14,14 +14,119 @@ Translators:
 -->
 <chapter id="finance-quote"
          xmlns:xi="http://www.w3.org/2001/XInclude">
-  <title>Die Online-Kursaktualisierung einrichten</title>
+  <title>Einrichtung der Kursaktualisierung</title>
 
-  <para>Wenn Sie mehr als ein paar Devisen und Wertpapiere besitzen, werden Sie es bald leid sein, die Kurse
-    ständig per Hand aktualisieren zu müssen. &app; bietet Ihnen die Möglichkeit, automatisch den
-    aktuellsten Kurs für Ihre Devisen und Wertpapiere über das Internet herunterzuladen. Hierfür
-    wird das &app-perl;-Modul &app-fq; verwendet.
+  <para>Wenn Sie mehr als ein paar Devisen und Wertpapiere besitzen, werden Sie es vielleicht bald leid
+    sein, die Kurse ständig per Hand aktualisieren zu müssen. &app; bietet Ihnen die Möglichkeit,
+    automatisch den aktuellsten Kurs für Ihre Devisen und Wertpapiere über das Internet
+    herunterzuladen. Hierfür wird das &app-perl;-Modul &app-fq; verwendet.
   </para>
 
+  <itemizedlist>
+    <title>Die Vorraussetzungen für eine Online-Kursabfrage mit &app-fq; sind</title>
+
+    <listitem>
+      <para>ein &app-perl; Interpreter und
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>das &app-perl;-Module &app-fq; mit allen Abhängigkeiten.
+      </para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>Wenn Sie bei der Durchführung der hier beschriebenen Schritte nicht mehr weiterwissen, 
+      können Sie auf den unter <xref linkend="more_help" /> genannten Kanäle viele hilfsbereiten
+      Anwender erreichen.
+    </para>
+  </note>
+
+  <para>Sie können diesen Schritt auch weglassen und Ihre Aktienkurse weiterhin manuell aktualisieren.
+  </para>
+
+  <sect1 id="finance-quote-perl-install">
+    <title>Installieren von &app-perl;</title>
+
+    <para>Die Installation von &app-perl; ist im wesentlichen von dem verwendeten Betriebssystem abhängig.
+      Der Aufwand zur Installation ist gering und wird in diesem Abschnitt beschrieben.
+    </para>
+
+    <para>Um zu überprüfen ob auf Ihrem System &app-perl; schon bereits installiert ist, rufen Sie den Befehl
+      <informalexample>
+<screen>perl -v</screen>
+      </informalexample>
+      im Terminal auf. Wird Ihnen die Versionsnummer des &app-perl;-Interpreters angezeigt, dann
+      machen Sie mit <xref linkend="finance-quote-install" /> weiter.
+    </para>
+
+    <procedure>
+      <title>Unter &lin;</title>
+
+      <step>
+        <para>Bei den meisten Systemen ist &app-perl; wahrscheinlich bereits installiert. Wird mit dem vorherigen
+          Befehl keine Version angezeigt wird, dann verwenden Sie am einfachsten die Paketverwaltung
+          Ihres Systems zur Installation.
+        </para>
+      </step>
+
+      <step>
+        <para>Verwenden Sie das &app; &flatpak; Paket sind &app-perl; und &app-fq; bereits funktionsfähig
+          installiert.
+        </para>
+      </step>
+    </procedure>
+
+    <procedure>
+      <title>Unter &mac;</title>
+
+      <step>
+        <para>&app-perl; ist unter &mac; normalerweise schon eingerichtet.
+        </para>
+      </step>
+    </procedure>
+
+    <procedure>
+      <title>Unter &win;</title>
+
+      <step>
+        <para>Unter &win; führen Sie das Programm
+          <menuchoice>
+            <guimenu>Start</guimenu> <guisubmenu>&appname;</guisubmenu>
+            <guimenuitem>Online-Preisabfrage installieren</guimenuitem>
+          </menuchoice>
+          aus. Dies wird <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink>
+          installieren.
+          <footnote>
+            <para>&app; Version 2.2.6 und früher benötigen <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink> in
+              Version 5.8.
+            </para>
+          </footnote>
+
+          <footnote>
+            <para>&app; Version 2.4 und früher benötigen <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink> ab
+              Version 5.16.3.
+            </para>
+          </footnote>
+        </para>
+      </step>
+
+      <step>
+        <para>Zu Ausführung beötigen Sie <emphasis>Administratorenrechte</emphasis>, die im Dialog abgefragt
+          werden. Die Installation kann mehr als 15 Minuten dauern.
+        </para>
+      </step>
+
+      <step>
+        <para>Werden während der Installation die Fehlermeldung <computeroutput>No such file or directory
+          </computeroutput> oder <computeroutput>permission denied</computeroutput> angezeigt, dann
+          kann es helfen das Antivirenprogramm vorübergehend zu deaktiviern.
+        </para>
+      </step>
+    </procedure>
+  </sect1>
+
   <sect1 id="finance-quote-install">
     <title>Installieren von &app-fq;</title>
 
@@ -39,47 +144,12 @@ SYNOPSIS
       konfigurieren. Wenn nicht, dann gibt Ihnen dieser Abschnitt eine Anleitung zur Installation.
     </para>
 
-    <itemizedlist>
-      <title>Die Vorraussetzungen für eine Online-Kursaktualisierung mit &app-fq; sind</title>
-
-      <listitem>
-        <para>ein &app-perl; Interpreter,
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>das &app-perl;-Module &app-fq; selber und
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>alle Abhängigkeiten, die für das Modul &app-fq; erforderlich sind.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>Wenn Sie sich bei der Durchführung mit den nachfolgend beschriebenen 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 
-        <ulink url="&url-irc;">#&appname; IRC-Kanal</ulink>.
-        Weitere Informationen finden Sie auch im &app; Wiki unter
-        <ulink url="&url-wiki-de;Aktienhandel">Aktienhandel</ulink>. Sie können diesen Schritt auch
-        weglassen und Ihre Aktienkurse manuell aktualisieren.
-      </para>
-    </note>
-
-    <para>Die Installation von &app-perl; liegt nicht im Fokus dieser Anleitung. Eine ausführliche
-      Beschreibung ist im englischsprachigen &app; Wiki unter
-      <ulink url="&url-wiki-OQ;#Perl">Perl</ulink> zu finden.
-    </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>
 
     <procedure>
-      <title>Installieren von &app-fq; unter &lin;</title>
+      <title>Unter &lin;</title>
 
       <step>
         <simpara>Beenden Sie &app;.
@@ -124,8 +194,8 @@ SYNOPSIS
           </footnote>
           Modul gestartet um die Installation vorzunehmen. Wenn Sie das CPAN zum ersten Mal starten,
           müssen Sie es einrichten und konfigurieren. Auf den meisten Systemen können Sie jedoch
-          die Standardeinstellungen akzeptieren und die erste Frage <computeroutput>Are you ready
-          for manual configuration? [yes]</computeroutput> mit <userinput>no</userinput> beantworten
+          die Standardvorgaben akzeptieren und die erste Frage <computeroutput>Are you ready for
+          manual configuration? [yes]</computeroutput> mit <userinput>no</userinput> beantworten
           damit &app-fq; erfolgreich installiert wird.
         </para>
       </step>
@@ -140,7 +210,7 @@ SYNOPSIS
     </procedure>
 
     <procedure>
-      <title>Installieren von &app-fq; in &mac;</title>
+      <title>Unter &mac;</title>
 
       <step>
         <simpara>Beenden Sie &app;.
@@ -168,7 +238,7 @@ SYNOPSIS
     </procedure>
 
     <procedure>
-      <title>Installieren von &app-fq; unter &win;</title>
+      <title>Unter &win;</title>
 
       <step>
         <simpara>Beenden Sie &app;.
@@ -178,8 +248,8 @@ SYNOPSIS
       <step>
         <simpara>Führen Sie
           <menuchoice>
-            <guimenu>Start</guimenu> <guisubmenu>&app;</guisubmenu> <guimenuitem>Online-Preisabfrage
-            installieren</guimenuitem>
+            <guimenu>Start</guimenu> <guisubmenu>&appname;</guisubmenu>
+            <guimenuitem>Online-Preisabfrage installieren</guimenuitem>
           </menuchoice>
           aus. Dies ist ein kleines Hilfsprogramm, das &app-fq; für Sie installiert.
         </simpara>
@@ -188,7 +258,7 @@ SYNOPSIS
   </sect1>
 
   <sect1 id="finance-quote-scheduler">
-    <title>Automatisierte Abfrage von Online-Kursen</title>
+    <title>Automatisierte Abfrage von Kursen</title>
 
     <para>Mit dem Kommando <command>gnucash-cli --quotes get &user-datafile;</command>
       <footnote>
@@ -200,10 +270,11 @@ SYNOPSIS
         </simpara>
       </footnote>
       können Sie die aktuellen Kurse Ihrer Devisen und Wertpapiere abrufen und direkt in ihre
-      &app;-Datendatei schreiben ohne die Benutzeroberfläche zu starten. Somit ist eine automatische,
-      regelmäßige Aktualisierung der Kursdatenbank möglich.
+      &app;-Datendatei schreiben ohne die Benutzeroberfläche zu starten. Somit ist eine
+      automatische, regelmäßige Aktualisierung der Kursdatenbank möglich.
       <warning>
-        <para>Beachten Sie bitte, dass die Datendatei nicht gleichzeitig in einer anderen Instanz von &app; geöffnet sein darf!
+        <para>Beachten Sie bitte, dass die Datendatei nicht gleichzeitig in einer anderen Instanz von &app;
+          geöffnet sein darf!
         </para>
       </warning>
     </para>
@@ -296,9 +367,11 @@ gnucash-cli --quotes get &user-datafile; > /dev/null 2>&1</screen>
       </para>
     </example>
 
-    <para>Einige Benutzer haben im englischsprachigen Wiki Ergänzungen und ihre Erfahrungen auf der
+    <para>Einige Benutzer haben im &app; Wiki unter
+      <ulink url="&url-wiki-de;Aktienhandel">Aktienhandel</ulink> und ausführlicher im
+      englischsprachigen Wiki
       <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on
-      GnuCash Wiki</ulink> zusammengestellt.
+      GnuCash Wiki</ulink> ihre Erfahrungen und weiter Ergänzungen zusammengestellt.
     </para>
   </sect1>
 </chapter>

commit 6ddeb5db7c981f33db892809138849fa52e54990
Merge: 5397c292 067bbf08
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 13 21:29:34 2022 +0200

    Merge PR #243 into maint


commit 067bbf08c28dfddc833b6f658f1e87eb45ed99c7
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Sep 28 20:51:33 2021 +0200

    L10n:de ch_Account-Actions: Weiterentwicklung mit neuen Abschnitten
    
    * neuer Abschnitt "Kontoeigenschaften vererben" erstellt
    * Bilder für den Dialog "neues Konto erstellen" eingefügt
    * die Abschnitte "neues Konto erstellen" und "Konto bearbeiten"
    in "Konto erstellen oder bearbeiten" zusammengefasst
    * neuer Abschnitt "Konto löschen" erstellt
    * Beschreibung für die Konfiguration eines Kontos zum Abruf von
    Online-Kursen für das Verschieben zum "Wertpapier-Editor" vorbereitet

diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/Help_ch_Account-Actions.xml
index ec5508d9..5bceb5ed 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/Help_ch_Account-Actions.xml
@@ -317,13 +317,23 @@
           <row rowsep="1">
             <entry namest="c2">
               <para>Eigenkapital
+                <footnote id="fn-equity-kat">
+                  <para><caution>
+                      <para><computeroutput>Eigenkapital</computeroutput> und seine temporären Varianten
+                        <computeroutput>Ertrag</computeroutput> und
+                        <computeroutput>Aufwand</computeroutput> sollten bei offizieller
+                        Buchführung grundsätzlich in der Landeswährung geführt werden.
+                      </para>
+                    </caution>
+                  </para>
+                </footnote>
               </para>
             </entry>
 <!-- FIXME source: insert link -->
             <entry namest="c3">
               <para>Eigenkapital repräsentiert Ihren wirtschaftlichen Nettowert. Diese Kontenart wird nur an zwei
                 Zeitpunkten bebucht: Wenn sie Ihr Buch beginnen, werden hier die Anfangsbestände
-                gegengebucht. (siehe <xref linkend="open-balance" />) Und am Ende einer
+                gegengebucht. (siehe <xref linkend="acct-open-balance" />) Und am Ende einer
                 Buchungsperiode verwendet &app; dieses Konto um den
                 <xref linkend="tool-close-book" /> zu erfassen. Bei einem Haushalt empfiehlt es
                 sich, ein(en) Konto/enbaum pro Bewohner anzulegen.
@@ -361,7 +371,7 @@
 
           <row>
             <entry namest="c1">
-              <para>Erträge
+              <para>Ertrag <footnoteref linkend="fn-equity-kat" />
               </para>
             </entry>
 
@@ -379,7 +389,7 @@
 
           <row rowsep="1">
             <entry namest="c1">
-              <para>Aufwand
+              <para>Aufwand <footnoteref linkend="fn-equity-kat" />
               </para>
             </entry>
 <!-- FIXME source: insert footnote -->
@@ -531,7 +541,7 @@
         Kontonummern. Wenn Sie einen Bericht erstellen, wird die Sortierreihenfolge nach der Nummer
         bestimmt. Es ist üblich, dass die Nummern der <quote>Blatt</quote>-Konten nicht mit Null
         enden, während die Nummern der höheren Hierarchieebenen jeweils mehr Nullen am Ende haben
-        und als <xref linkend="accts-placeholder" /> gekennzeichnet sind.
+        und als <xref linkend="acct-placeholder" /> gekennzeichnet sind.
       </para>
     </tip>
 
@@ -856,14 +866,38 @@
   <sect1 id="chart-edit">
     <title>Kontenplan bearbeiten</title>
 
-    <para>Den Kontenplan können Sie mithilfe des Eingabebereichs <guilabel>Hauptkonto</guilabel> im
-      Dialogfenster <guilabel>Konto bearbeiten</guilabel> verändern. Dort ist es möglich, ein
-      Konto an eine beliebige Stelle in der Kontenübersicht zu bewegen. Es wird empfohlen, Konten
-      generell als Unterkonten eines Hauptkontos mit verwandter Kontoart zu führen. Einzelheiten
-      hierzu sind im Abschnitt <xref linkend="acct-types" /> beschrieben. Die