gnucash-docs master: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Fri Aug 12 10:24:36 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/80c951c1 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5c45dc7a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/103437c1 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/dbcbf4c1 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/10da28b0 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5aecd6e4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/59c643d5 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/00630bd1 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/408c2787 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c5328ed2 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/cc76a8cd (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1bb97cfc (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/18f8c648 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/cd99403e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/c6b28e9f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b196fb0b (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/dba3a713 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/afef9670 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/59013c31 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/2422e674 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6617ed72 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/bdd42fe5 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b3f46b4f (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/a6ab2c12 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/9b8cf9ed (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/cf87b6e7 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/70bc6796 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/6de20edc (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/21304f7c (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b6408959 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/5a3b7106 (commit)



commit 80c951c16989288e8fef13a1b80e6afd2d1ffb65
Merge: 5a3b7106 5c45dc7a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Aug 12 16:21:39 2022 +0200

    Merge branch 'maint'


commit 5c45dc7aa1c18f587b7178630a25c8ad42d662ed
Merge: 10da28b0 103437c1
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Aug 7 03:37:07 2022 +0200

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


commit 103437c1461584dd11862b38788a35b1723f6b70
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Jul 26 21:31:44 2022 +0200

    manual ch_Finance_Quote: insert ENTITY for the F::Q installer

diff --git a/manual/C/ch_Finance-Quote.xml b/manual/C/ch_Finance-Quote.xml
index d9a93294..8f477d7e 100644
--- a/manual/C/ch_Finance-Quote.xml
+++ b/manual/C/ch_Finance-Quote.xml
@@ -88,12 +88,8 @@ Translators:
       <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>.
+        <para>Under &win; run the program &mc.start.win-install-fq; to run. This will
+          install <ulink url="&url-wp-en;Strawberry_Perl">Strawberry Perl</ulink>.
           <footnote>
             <para>&app; Version 2.2.6 and before require <ulink url="&url-wp-en;ActivePerl">ActivePerl</ulink>. in
               version 5.8.
@@ -238,12 +234,7 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Run
-          <menuchoice>
-            <guimenu>Start</guimenu> <guisubmenu>&appname;</guisubmenu> <guimenuitem>Install Online
-            Price Retrieval</guimenuitem>
-          </menuchoice>
-          . This is a small utility that installs &app-fq; for you.
+        <simpara>Run &mc.start.win-install-fq;. This is a small utility that installs &app-fq; for you.
         </simpara>
       </step>
     </procedure>
diff --git a/manual/de/ch_Finance-Quote.xml b/manual/de/ch_Finance-Quote.xml
index 5b780b78..0ff46a14 100644
--- a/manual/de/ch_Finance-Quote.xml
+++ b/manual/de/ch_Finance-Quote.xml
@@ -91,13 +91,8 @@ Translators:
       <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.
+        <para>Unter &win; führen Sie das Programm &mc.start.win-install-fq; 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.
@@ -246,12 +241,8 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Führen Sie
-          <menuchoice>
-            <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>Führen Sie &mc.start.win-install-fq; aus. Dies ist ein kleines Hilfsprogramm,
+          das &app-fq; für Sie installiert.
         </simpara>
       </step>
     </procedure>

commit dbcbf4c15304c2c370f81288f512ae48b189c81b
Author: Christian Wehling <christian.wehling at web.de>
Date:   Wed Aug 3 17:32:56 2022 +0200

    gnc-gui-struct.dtd: Menuchoice for the F::Q installer under Win

diff --git a/docbook/gnc-gui-C.dtd b/docbook/gnc-gui-C.dtd
index 0d89e6df..7dff0f19 100644
--- a/docbook/gnc-gui-C.dtd
+++ b/docbook/gnc-gui-C.dtd
@@ -355,6 +355,10 @@
 <!ENTITY % gl.new-acct-hi-setup "<guilabel>New Account Hierarchy Setup</guilabel>">
 <!ENTITY gl.new-acct-hi-setup "%gl.new-acct-hi-setup;">
 
+<!-- Strings from gnucash-on-windows//inno_setup/gnucash-mingw64.iss -->
+<!ENTITY % gm.start.win "<guimenu>Start</guimenu>">
+<!ENTITY % gsm.start.win-gc "<guisubmenu>GnuCash</guisubmenu>">
+<!ENTITY % gmi.start.win-install-fq "<guimenuitem>Install Online Price Retrieval for GnuCash</guimenuitem>">
 
 
 <!-- untranslated message -->
diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 5f196a9a..55040044 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -354,6 +354,14 @@
 <!-- guilabel -->
 <!ENTITY % gl.new-acct-hi-setup "<guilabel>Neuen Kontenplan erstellen</guilabel>">
 
+
+<!-- Strings from gnucash-on-windows//inno_setup/gnucash-mingw64.iss -->
+<!ENTITY % gm.start.win "<guimenu>Start</guimenu>">
+<!ENTITY % gsm.start.win-gc "<guisubmenu>GnuCash</guisubmenu>">
+<!ENTITY % gmi.start.win-install-fq "<guimenuitem>Erweiterung um Kurse mit GnuCash online abzurufen</guimenuitem>">
+
+
+
 <!-- untranslated message -->
 <!ENTITY % untranslated 'Geehrte Leser, leider hat bisher niemand eine Ãœbersetzung
   der folgenden Teile erstellt. Falls Sie uns dabei helfen möchten, folgen Sie
diff --git a/docbook/gnc-gui-struct.dtd b/docbook/gnc-gui-struct.dtd
index be831ada..4e4c87fe 100644
--- a/docbook/gnc-gui-struct.dtd
+++ b/docbook/gnc-gui-struct.dtd
@@ -640,67 +640,18 @@
 <!ENTITY mc.rec.help. "<menuchoice>&gm.rec.help;&gmi.rec.help.hlp;</menuchoice>">
 
 
-
-
-<!-- menuchoice -->
-<!-- <!ENTITY mc.Zzz "<menuchoice>%gm.xx;[%gsm.yy;]%gmi.zz;</menuchoice>"> -->
-<!-- Description:
-     mc: short for <menuchoice>…</menuchoice>, describes the whole chain
-     to select a menu item and start the command.
-     To enable the most meaningful context possible, the last menu item
-     is to be used as the entity abbreviation. -->
-
-
-<!-- File Menuchoice -->
-<!-- <!ENTITY mc.file.new "<menuchoice>&sc.fi.new;&gm.file;&gm.fi.new;</menuchoice>">
--->
-
-<!-- Edit Menuchoice -->
-
-
-<!-- View Menuchoice -->
-
-
-<!-- Action Menuchoice -->
-<!-- <!ENTITY mc.Since_Last_Run "<menuchoice>&gm.act;&gsm.ac.scd;&gmi.ac.scd.slr;</menuchoice>">
--->
-
-<!-- Transactions Menuchoice -->
-
-
-<!-- Business Menuchoice -->
-
-
-<!-- Reports Menuchoice -->
-
-
-<!-- Tools Menuchoice -->
-<!-- <!ENTITY mc.AQB_Setup "<menuchoice>&gm.tool;&gmi.to.aqb;</menuchoice>">
-<!ENTITY mc.Price_DB "<menuchoice>&gm.tool;&gmi.to.price;</menuchoice>">
-<!ENTITY mc.Security_Editor "<menuchoice>&gm.tool;&gmi.to.sec;</menuchoice>">
-<!ENTITY mc.Loan_Calc "<menuchoice>&gm.tool;&gmi.to.loan;</menuchoice>">
-<!ENTITY mc.Close_Book "<menuchoice>&gm.tool;&gmi.to.cls-bok;</menuchoice>">
-<!ENTITY mc.Import_Map "<menuchoice>&gm.tool;&gmi.to.imp-map;</menuchoice>">
-<!ENTITY mc.Linked_Docs "<menuchoice>&gm.tool;&gmi.to.link-doc;</menuchoice>">
-<!ENTITY mc.General_Journal "<menuchoice>&gm.tool;&gmi.to.gen-jour;</menuchoice>">
--->
-
-<!-- Window Menuchoice -->
-<!-- <!ENTITY mc.New_Window "<menuchoice>%gm.win;%gmi.win.win;</menuchoice>">
-<!ENTITY mc.Window_with_Page "<menuchoice>%gm.win;%gmi.win.page;</menuchoice>">
--->
-
-<!-- Help Menuchoice -->
-<!-- <!ENTITY mc.Guide "<menuchoice>%gm.help;%gmi.help.guide;</menuchoice>">
-<!ENTITY mc.Tip_of_Day "<menuchoice>%gm.help;%gmi.help.tip;</menuchoice>">
-<!ENTITY mc.Help "<menuchoice>%gm.help;%gmi.help.cont;</menuchoice>">
-<!ENTITY mc.About "<menuchoice>%gm.help;%gmi.help.abo;</menuchoice>">
--->
-
 <!-- guilabel -->
 <!ENTITY gl.new-acct-hi-setup "%gl.new-acct-hi-setup;">
 
 
+<!-- Strings for Windows -->
+<!-- used in gnucash-on-windows//inno_setup/gnucash-mingw64.iss -->
+<!ENTITY gm.start.win "%gm.start.win;">
+<!ENTITY gsm.start.win-gc "%gsm.start.win-gc;">
+<!ENTITY gmi.start.win-install-fq "%gmi.start.win-install-fq;">
+<!ENTITY mc.start.win-install-fq "<menuchoice>%gm.start.win;%gsm.start.win-gc;%gmi.start.win-install-fq;</menuchoice>">
+
+
 <!-- Include "gnc-docbookx.dtd" -->
 <!ENTITY % gnc-docbookx SYSTEM "gnc-docbookx.dtd">
 %gnc-docbookx;

commit 10da28b0cf644b76cf9815877849f41a4c837dae
Author: Christian Wehling <christian.wehling at web.de>
Date:   Fri Jul 29 20:25:11 2022 +0200

    L10N:de: small corrections in the German spelling

diff --git a/manual/de/ch_Customize.xml b/manual/de/ch_Customize.xml
index 0b45cd7a..7baf9ed3 100644
--- a/manual/de/ch_Customize.xml
+++ b/manual/de/ch_Customize.xml
@@ -2325,7 +2325,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
 
                   <listitem>
                     <para>Wenn Sie diese Option für eine bestehende Datei ändern, werden die bisherigen Daten nicht
-                      geändert. Das bedeutet wenn Sie die Option auf die eine Art einstellen,
+                      geändert. Das bedeutet, wenn Sie die Option auf die eine Art einstellen,
                       Buchungen eingeben (oder importieren), dann die Option ändern und
                       zusätzliche Buchungen eingeben (oder importieren) und dazwischen hin- und
                       herwechseln, erhalten Sie eine Datei, die scheinbar eine inkonsistente
diff --git a/manual/de/ch_GUIMenus.xml b/manual/de/ch_GUIMenus.xml
index edf3d0de..c724aeed 100644
--- a/manual/de/ch_GUIMenus.xml
+++ b/manual/de/ch_GUIMenus.xml
@@ -3741,7 +3741,7 @@
                 </para>
 
                 <note>
-                  <para>Ist nur aktiv wenn geänderten Daten noch nicht gespeichert wurden.
+                  <para>Ist nur aktiv, wenn geänderten Daten noch nicht gespeichert wurden.
                   </para>
                 </note>
               </entry>
@@ -4797,7 +4797,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 </para>
 
                 <note>
-                  <para>Ist nur aktiv wenn geänderten Daten noch nicht gespeichert wurden.
+                  <para>Ist nur aktiv, wenn geänderten Daten noch nicht gespeichert wurden.
                   </para>
                 </note>
               </entry>
@@ -5383,7 +5383,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 </para>
 
                 <note>
-                  <para>Ist nur aktiv wenn geänderten Daten noch nicht gespeichert wurden.
+                  <para>Ist nur aktiv, wenn geänderten Daten noch nicht gespeichert wurden.
                   </para>
                 </note>
               </entry>
@@ -6246,7 +6246,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                   </para>
 
                   <note>
-                    <para>Einige Schaltflächen in der <emphasis>Menüleiste</emphasis> werden erst aktiv wenn in der
+                    <para>Einige Schaltflächen in der <emphasis>Menüleiste</emphasis> werden erst aktiv, wenn in der
                       Ãœbersicht <quote>Terminierte Buchungen</quote> eine Buchung markiert ist.
                     </para>
                   </note>
@@ -6439,7 +6439,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 </para>
 
                 <note>
-                  <para>Ist nur aktiv wenn geänderten Daten noch nicht gespeichert wurden.
+                  <para>Ist nur aktiv, wenn geänderten Daten noch nicht gespeichert wurden.
                   </para>
                 </note>
               </entry>
@@ -6819,7 +6819,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 </para>
 
                 <note>
-                  <para>Ist nur aktiv wenn geänderten Daten noch nicht gespeichert wurden.
+                  <para>Ist nur aktiv, wenn geänderten Daten noch nicht gespeichert wurden.
                   </para>
                 </note>
               </entry>
diff --git a/manual/de/ch_Tools_Assistants.xml b/manual/de/ch_Tools_Assistants.xml
index 713a8177..dc834944 100644
--- a/manual/de/ch_Tools_Assistants.xml
+++ b/manual/de/ch_Tools_Assistants.xml
@@ -5146,7 +5146,7 @@
 
       <para>Jedes Handelsgutpaar kann <emphasis>nur einen</emphasis> Preis pro Tag haben. Daher eignet sich &app;
         nicht sonderlich für Intra-Day-Trading. Ein bestehender Preis wird
-        durch einen neueren Preis überschrieben wenn der neuere Preis die gleiche oder eine höher
+        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>
diff --git a/manual/de/ch_Transactions.xml b/manual/de/ch_Transactions.xml
index 678e2262..567a0599 100644
--- a/manual/de/ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -232,7 +232,7 @@ Translators:
 
         <listitem>
           <para>Geben Sie den Wechselkurs oder den Betrag in das numerische Feld ein, das dem von Ihnen gewählten
-            Optionsfeld entspricht. &app; wird den anderen Betrag für Sie berechnen wenn Sie das
+            Optionsfeld entspricht. &app; wird den anderen Betrag für Sie berechnen, sobald Sie das
             Feld verlassen. Wenn aktiviert, können Sie mit der Schaltfläche <guilabel>Wechselkurs
             abrufen</guilabel> den aktuellen Kurs aus der Datenbank verwenden.
           </para>
@@ -520,12 +520,12 @@ Translators:
       Markierung liegt, das Symbol für die <guilabel>Verknüpfung</guilabel> mit
       <itemizedlist>
         <listitem>
-          <para>einer <emphasis>Büroklammer</emphasis> wenn zu der Buchung eine Datei zugeordnet ist, oder
+          <para>einer <emphasis>Büroklammer</emphasis>, wenn zu der Buchung eine Datei zugeordnet ist, oder
           </para>
         </listitem>
 
         <listitem>
-          <para>einer <emphasis>Kette</emphasis> wenn ein Hyperlink eingetragen ist
+          <para>einer <emphasis>Kette</emphasis>, wenn ein Hyperlink eingetragen ist
           </para>
         </listitem>
       </itemizedlist>
@@ -736,7 +736,7 @@ Translators:
     <para>Kontenbücher für Konten des Typs Aktienkonto oder Investmentfonds enthalten die vier Spalten
       <guilabel>Anteile</guilabel>, <guilabel>Preis</guilabel>, <guilabel>Kauf</guilabel> und
       <guilabel>Verkauf</guilabel> (die letzten beiden sind <guilabel>Soll</guilabel> bzw.
-      <guilabel>Haben</guilabel> wenn Sie in den <guilabel>&app; Einstellungen</guilabel> für das
+      <guilabel>Haben</guilabel>, wenn Sie in den <guilabel>&app; Einstellungen</guilabel> für das
       <guilabel>Konto</guilabel> die <guilabel>Buchungsüberschriften aus Rechnungswesen</guilabel>
       aktiviert haben). Geben Sie zwei beliebige Werte ein und &app; berechnet den anderen für Sie;
       wenn Sie 3 eingeben und das Ergebnis nicht ausgeglichen ist, fragt &app;, welcher Wert
@@ -1260,7 +1260,7 @@ Translators:
                       <term><guilabel>Bei Erstellung benachrichtigen</guilabel></term>
 
                       <listitem>
-                        <para>Ist nur aktiv wenn die Option <guilabel>Automatisch erstellen</guilabel> ausgewählt ist. Hiermit
+                        <para>Ist nur aktiv, wenn die Option <guilabel>Automatisch erstellen</guilabel> ausgewählt ist. Hiermit
                           können Sie angeben, dass Sie vor der automatischen Ausführung der
                           terminerten Buchung benachrichtigt werden.
                         </para>
@@ -1530,7 +1530,7 @@ Translators:
         <term><guilabel>Scheckformat</guilabel></term>
 
         <listitem>
-          <para>Versuchen Sie zuerst das Quicken-Format. Wählen Sie den Eintrag <quote>Benutzerdefiniert</quote>
+          <para>Versuchen Sie zuerst das Quicken-Format. Wählen Sie den Eintrag <quote>Benutzerdefiniert</quote>,
             wenn Sie ein anderes Druckformat benutzen wollen.
           </para>
         </listitem>

commit 5aecd6e4fa0caa3efbe90542e8219423dd85ecaf
Author: Christian Wehling <christian.wehling at web.de>
Date:   Tue Jul 26 21:29:53 2022 +0200

    L10N:de: manual: ch_GUIMenus: Verbesserung hinsichtlich Kurs <-> Preis

diff --git a/manual/de/ch_GUIMenus.xml b/manual/de/ch_GUIMenus.xml
index edf3d0de..0dd71661 100644
--- a/manual/de/ch_GUIMenus.xml
+++ b/manual/de/ch_GUIMenus.xml
@@ -320,7 +320,7 @@
               </entry>
 
               <entry namest="c3">
-                <para>Startet den <guilabel>Preis-Import-Assistent</guilabel>. Hiermit können Kurswerte aus einer
+                <para>Startet den <guilabel>Kurs-Import-Assistent</guilabel>. Hiermit können Kurswerte aus einer
                   <acronym>CSV</acronym>-Datei importiert werden.
                 </para>
               </entry>
@@ -2437,7 +2437,7 @@
               </entry>
 
               <entry>
-                <para>Werkzeug zum Eingeben oder Ändern von Aktien-/Fondspreisen. Details unter
+                <para>Werkzeug zum Eingeben oder Ändern der Kurse von Wertpapieren. Details unter
                   <xref linkend="tool-price"></xref>
                 </para>
               </entry>

commit 59c643d5e21d33bde4a24ed312fa94a8a6f433da
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sun Jul 24 19:44:27 2022 +0200

    manual: Changed ref 'invest-stockprice-...' into 'tool-price-...'

diff --git a/manual/C/ch_Tools_Assistants.xml b/manual/C/ch_Tools_Assistants.xml
index 5b0b7539..39f811b0 100644
--- a/manual/C/ch_Tools_Assistants.xml
+++ b/manual/C/ch_Tools_Assistants.xml
@@ -5337,7 +5337,7 @@
       </itemizedlist>
     </para>
 
-    <sect2 id="invest-stockprice-manual">
+    <sect2 id="tool-price-manual">
       <title>Adding a stock price manually</title>
 
       <para>To add a new price, click on <guilabel>Add</guilabel>, and enter the details of the security and
@@ -5374,12 +5374,12 @@
       </itemizedlist>
     </sect2>
 
-    <sect2 id="invest-stockprice-online1">
+    <sect2 id="tool-price-online1">
       <title>Configuring for use of the <guibutton>Get Quotes</guibutton> button</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. This is described in detail
-        in <xref linkend="invest-stockprice-online3"></xref>. Once on-line quotes are enabled, and
+        in <xref linkend="tool-price-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>
@@ -5492,7 +5492,7 @@
       </para>
     </sect2>
 
-    <sect2 id="invest-stockprice-online3">
+    <sect2 id="tool-price-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
diff --git a/manual/C/ch_Transactions.xml b/manual/C/ch_Transactions.xml
index aba6dbb6..1cb3b696 100644
--- a/manual/C/ch_Transactions.xml
+++ b/manual/C/ch_Transactions.xml
@@ -172,7 +172,7 @@ Translators:
       </para>
 
       <para>If a relevant price is available in the price database (see
-        <xref linkend="invest-stockprice-manual"/>) the <guilabel>Exchange Rate</guilabel> will have
+        <xref linkend="tool-price-manual"/>) the <guilabel>Exchange Rate</guilabel> will have
         that as a default entry.
       </para>
 
@@ -201,7 +201,7 @@ Translators:
       <note>
         <para>If you have created a price in the <guilabel>Price Editor</guilabel> (see
           <xref
-      linkend="invest-stockprice-manual"/>) for the current date quote retrieval
+      linkend="tool-price-manual"/>) for the current date quote retrieval
           will not update that price. You must first delete the manually-created price in the
           <guilabel>Price Editor</guilabel> before you
           <keycombo action="click">
diff --git a/manual/de/ch_Tools_Assistants.xml b/manual/de/ch_Tools_Assistants.xml
index e395a81e..713a8177 100644
--- a/manual/de/ch_Tools_Assistants.xml
+++ b/manual/de/ch_Tools_Assistants.xml
@@ -5157,7 +5157,7 @@
             <glossterm>Hinzufügen</glossterm>
             <glossdef>
               <para>Ermöglicht das manuelle Eintragen eines Kurses. Das Vorgehen hierbei wird in
-                <xref linkend="invest-stockprice-manual" /> beschrieben.
+                <xref linkend="tool-price-manual" /> beschrieben.
               </para>
             </glossdef>
           </glossentry>
@@ -5174,7 +5174,7 @@
             <glossterm>Bearbeiten</glossterm>
             <glossdef>
               <para>Bietet die Möglichkeit einen markierten Kurs zu bearbeiten, siehe
-                <xref linkend="invest-stockprice-manual" />
+                <xref linkend="tool-price-manual" />
               </para>
             </glossdef>
           </glossentry>
@@ -5182,7 +5182,7 @@
           <glossentry>
             <glossterm>Alte Entfernen</glossterm>
             <glossdef>
-              <para>Ermöglicht in einem weiteren Dialog das <xref linkend="invest-stockprice-delete" /> an Hand einer
+              <para>Ermöglicht in einem weiteren Dialog das <xref linkend="tool-price-delete" /> an Hand einer
                 Datumsauswahl.
               </para>
             </glossdef>
@@ -5210,7 +5210,7 @@
       </para>
     </sect2>
 
-    <sect2 id="invest-stockprice-manual">
+    <sect2 id="tool-price-manual">
       <title>Hinzufügen oder Bearbeiten von Kurswerten</title>
 
       <para>Nachdem Sie in der Kurs-Datenbank entweder die Schaltfläche <guibutton>Hinzufügen</guibutton> oder
@@ -5402,7 +5402,7 @@
       </para>
     </sect2>
 
-    <sect2 id="invest-stockprice-delete">
+    <sect2 id="tool-price-delete">
       <title>Entfernen von alten Kurswerten</title>
 
       <para>Um nur einen Preis zu entfernen, markieren Sie den Preis und klicken Sie auf die Schaltfläche
diff --git a/manual/de/ch_Transactions.xml b/manual/de/ch_Transactions.xml
index a8689167..678e2262 100644
--- a/manual/de/ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -208,7 +208,7 @@ Translators:
       </para>
 
       <para>Wenn ein entsprechender Kurs in der Kursdatenbank vorhanden ist (siehe
-        <xref linkend="invest-stockprice-manual"/>), wird der <guilabel>Wechselkurs</guilabel>
+        <xref linkend="tool-price-manual"/>), wird der <guilabel>Wechselkurs</guilabel>
         diesen als Vorgabe verwenden.
       </para>
 
@@ -242,7 +242,7 @@ Translators:
       <note>
         <para>Wenn Sie einen Kurs für das aktuelle Datum in der <guilabel>Kurs-Datenbank</guilabel> eingegeben
           haben (siehe <xref
-      linkend="invest-stockprice-manual"/>) wird der Abruf des
+      linkend="tool-price-manual"/>) wird der Abruf des
           Wechselkurs den Kurs nicht aktualisieren. Sie müssen zuerst den manuell erstellten Kurs
           in der <guilabel>Kurs-Datenbank</guilabel> entfernen bevor Sie die <guibutton>Wechselkurs
           abrufen</guibutton> Schaltfläche betätigen.
diff --git a/manual/it/gnucash-help.xml b/manual/it/gnucash-help.xml
index 4c68e1cb..7bce5462 100644
--- a/manual/it/gnucash-help.xml
+++ b/manual/it/gnucash-help.xml
@@ -11097,7 +11097,7 @@ Translators:
         </para>
 
         <para>If a relevant price is available in the price database (see
-          <xref linkend="invest-stockprice-manual"/>) the <guilabel>Exchange Rate</guilabel> will
+          <xref linkend="tool-price-manual"/>) the <guilabel>Exchange Rate</guilabel> will
           have that as a default entry.
         </para>
 
@@ -11125,7 +11125,7 @@ Translators:
 
         <note>
           <para>If you have created a price in the <guilabel>Price Editor</guilabel> (see
-            <xref linkend="invest-stockprice-manual"/>) for the current date quote retrieval will
+            <xref linkend="tool-price-manual"/>) for the current date quote retrieval will
             not update that price. You must first delete the manually-created prce in the
             <guilabel>Price Editor</guilabel> before clicking the <guibutton>Fetch Rate</guibutton>
             button.
@@ -19478,7 +19478,7 @@ ________________________________________________________________________________
         </itemizedlist>
       </para>
 
-      <sect2 id="invest-stockprice-manual">
+      <sect2 id="tool-price-manual">
         <title>Aggiungere manualmente il prezzo di un’azione</title>
 
         <para>Per inserire un nuovo prezzo, premere <guibutton>Aggiungi</guibutton> e inserire i dettagli del
@@ -19519,13 +19519,13 @@ ________________________________________________________________________________
         </itemizedlist>
       </sect2>
 
-      <sect2 id="invest-stockprice-online1">
+      <sect2 id="tool-price-online1">
         <title>Configurazione per l’utilizzo del pulsante <guilabel>Ricevi quotazioni</guilabel></title>
 
         <para>Per avere il supporto alla ricezione delle quotazioni tramite internet per una particolare azione o
           fondo comune, occorre prima di tutto abilitare l’opzione per la ricezione delle
           quotazioni e selezionare una fonte nell’<guilabel>Editor titolo</guilabel>. Questo
-          processo è descritto in dettaglio in <xref linkend="invest-stockprice-online3"/>. Una
+          processo è descritto in dettaglio in <xref linkend="tool-price-online3"/>. Una
           volta abilitato il servizio e installato il modulo
           <application>Finance::Quote</application>, sarà possibile aggiornare le quotazioni delle
           proprie azioni e dei propri fondi comuni premendo semplicemente il pulsante
@@ -19642,7 +19642,7 @@ ________________________________________________________________________________
         </para>
       </sect2>
 
-      <sect2 id="invest-stockprice-online3">
+      <sect2 id="tool-price-online3">
         <title>Configurare titoli e valute per la ricezione online dei prezzi</title>
 
         <para>Per avere il supporto alla ricezione delle quotazioni online per una particolare azione o fondo
diff --git a/manual/it/it.po b/manual/it/it.po
index bff2030e..58986b4e 100644
--- a/manual/it/it.po
+++ b/manual/it/it.po
@@ -6235,8 +6235,8 @@ msgid "Configuring for use of the <guibutton>Get Quotes</guibutton> button"
 msgstr "Configurazione per l’utilizzo del pulsante <guilabel>Ricevi quotazioni</guilabel>"
 
 #: C/gnucash-help.xml:1885(para)
-msgid "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\"/>. 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."
-msgstr "Per avere il supporto alla ricezione delle quotazioni tramite internet per una particolare azione o fondo comune, occorre prima di tutto abilitare l’opzione per la ricezione delle quotazioni e selezionare una fonte nell’<guilabel>Editor titolo</guilabel>. Questo processo è descritto in dettaglio in <xref linkend=\"invest-stockprice-online3\"/>. Una volta abilitato il servizio e installato il modulo <application>Finance::Quote</application>, sarà possibile aggiornare le quotazioni delle proprie azioni e dei propri fondi comuni premendo semplicemente il pulsante <guibutton>Ricevi quotazioni</guibutton>."
+msgid "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=\"tool-price-online3\"/>. 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."
+msgstr "Per avere il supporto alla ricezione delle quotazioni tramite internet per una particolare azione o fondo comune, occorre prima di tutto abilitare l’opzione per la ricezione delle quotazioni e selezionare una fonte nell’<guilabel>Editor titolo</guilabel>. Questo processo è descritto in dettaglio in <xref linkend=\"tool-price-online3\"/>. Una volta abilitato il servizio e installato il modulo <application>Finance::Quote</application>, sarà possibile aggiornare le quotazioni delle proprie azioni e dei propri fondi comuni premendo semplicemente il pulsante <guibutton>Ricevi quotazioni</guibutton>."
 
 #: C/gnucash-help.xml:1896(para)
 msgid "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 <application>GnuCash</application>."
diff --git a/manual/pt/ch_Tools_Assistants.xml b/manual/pt/ch_Tools_Assistants.xml
index b02bbe1a..cd1bae30 100644
--- a/manual/pt/ch_Tools_Assistants.xml
+++ b/manual/pt/ch_Tools_Assistants.xml
@@ -4963,7 +4963,7 @@
       </itemizedlist>
     </para>
 
-    <sect2 id="invest-stockprice-manual">
+    <sect2 id="tool-price-manual">
       <title>Adicionar manualmente uma cotação de acção</title>
 
       <para>Para adicionar uma nova cotação, clique em <guilabel>Adicionar</guilabel> e insira os detalhes da
@@ -5000,12 +5000,12 @@
       </itemizedlist>
     </sect2>
 
-    <sect2 id="invest-stockprice-online1">
+    <sect2 id="tool-price-online1">
       <title>Configurar o uso do botão <guibutton>Obter cotações</guibutton></title>
 
       <para>Para suportar cotações online duma dada conta de acção ou fundo, primeiro tem de activar as
         cotações online e seleccionar uma origem de cotações na garantia. Isto é descrito em
-        detalhe em <xref linkend="invest-stockprice-online3"></xref>. Uma vez activadas as
+        detalhe em <xref linkend="tool-price-online3"></xref>. Uma vez activadas as
         cotações online e o <application>Finance::Quote</application> instalado, pode actualizar
         cotações das suas acções e fundos manualmente, clicando em <guibutton>Obter
         cotações</guibutton>.
@@ -5117,7 +5117,7 @@
       </para>
     </sect2>
 
-    <sect2 id="invest-stockprice-online3">
+    <sect2 id="tool-price-online3">
       <title>Configurar Garantias/Moedas para obtenção de cotações online</title>
 
       <para>Para suportar cotações online de uma acção ou fundo em particular, primeiro tem de activar as
diff --git a/manual/pt/ch_Transactions.xml b/manual/pt/ch_Transactions.xml
index 4ba7cad5..04256eee 100644
--- a/manual/pt/ch_Transactions.xml
+++ b/manual/pt/ch_Transactions.xml
@@ -243,7 +243,7 @@ Translators:
       </para>
 
       <para>Se estiver disponível uma cotação relevante na base de dados (veja
-        <xref linkend="invest-stockprice-manual"/>), a <guilabel>Taxa de câmbio</guilabel> terá um
+        <xref linkend="tool-price-manual"/>), a <guilabel>Taxa de câmbio</guilabel> terá um
         valor predefinido.
       </para>
 
@@ -270,7 +270,7 @@ Translators:
 
       <note>
         <para>Se criou uma cotação no <guilabel>Editor de cotações</guilabel> (veja
-          <xref linkend="invest-stockprice-manual"/>) para a data actual, este botão não actualiza
+          <xref linkend="tool-price-manual"/>) para a data actual, este botão não actualiza
           essa cotação. Terá primeiro de eliminar a cotação criada manualmente no
           <guilabel>Editor de cotações</guilabel> antes de clicar no botão <guibutton>Obter
           taxa</guibutton>.

commit 00630bd196934fb798af94af44a618750528fed7
Merge: c5328ed2 408c2787
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Jul 19 02:15:41 2022 +0200

    Merge PR #262 into maint


commit 408c2787d3d51c6b37a86144966558268ed590a8
Author: Christian Wehling <christian.wehling at web.de>
Date:   Wed Feb 23 20:53:34 2022 +0100

    L10n:de: manual ch_Tools_Assistant: The "Since Last Run" Dialog

diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 9ad210fc..5f196a9a 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -95,8 +95,8 @@
 <!ENTITY % gmi.ac.onli.sepa-int "<guimenuitem>SEPA Interne Um<accel>b</accel>uchung</guimenuitem>">
 <!ENTITY % gmi.ac.onli.int-tr "<guimenuitem><accel>I</accel>nterne Umbuchung…</guimenuitem>">
 <!ENTITY % gmi.ac.onli.log "<guimenuitem>Verlaufs<accel>f</accel>enster anzeigen</guimenuitem>">
-<!ENTITY % gsm.ac.scd "<gusubimenu>Term<accel>i</accel>nierte Buchungen</guimenuitem>">
-<!ENTITY % gmi.ac.scd.tr-ed "<guimenuitem>Terminierte Buchungen <accel>E</accel>ditor…</guimenuitem>">
+<!ENTITY % gsm.ac.scd "<guisubmenu>Term<accel>i</accel>nierte Buchungen</guisubmenu>">
+<!ENTITY % gmi.ac.scd.tr-ed "<guimenuitem><accel>E</accel>ditor für Terminierte Buchungen…</guimenuitem>">
 <!ENTITY % gmi.ac.scd.slr "<guimenuitem>Seit <accel>l</accel>etzem Aufruf…</guimenuitem>">
 <!ENTITY % gmi.ac.scd.loan "<guimenuitem><accel>H</accel>ypothek & Darlehen Assistent…</guimenuitem>">
 <!ENTITY % gsm.ac.bgt "<guisubmenu>B<accel>u</accel>dget</guisubmenu>">
diff --git a/manual/de/ch_Tools_Assistants.xml b/manual/de/ch_Tools_Assistants.xml
index db597a52..e395a81e 100644
--- a/manual/de/ch_Tools_Assistants.xml
+++ b/manual/de/ch_Tools_Assistants.xml
@@ -4192,136 +4192,212 @@
   </sect1>
 
   <sect1 id="trans-sched-slr">
-    <title>Since Last Run Assistant</title>
-
-    <para>The <guilabel>Since Last Run</guilabel> assistant is run automatically when &app; is started. It is
-      used to enter into the register any transactions that are due to be automatically entered (see
-      <xref linkend="trans-sched"></xref>). The run on &app; start can be altered in the
-      <link linkend="prefs-sched">Scheduled Transactions</link> tab of the <guilabel>&appname;
-      Preferences</guilabel>. To run the <guilabel>Since Last Run</guilabel> assistant manually, go
-      to
-      <menuchoice>
-        <guilabel>Actions</guilabel><guisubmenu>Scheduled Transactions</guisubmenu>
-        <guimenuitem>Since Last Run...</guimenuitem>
-      </menuchoice>
-    </para>
+    <title>Der <quote>Seit letztem Aufruf</quote> Dialog</title>
 
-    <para>In the <guilabel>Since Last Run</guilabel> assistant window you can see three columns:
-    </para>
+    <abstract>
+      <para>Falls Sie mit <xref linkend="trans-sched" /> arbeiten, kann mit Hilfe des <guilabel>Seit
+        letztem Aufruf</guilabel> Dialogs geprüft werden, ob seit der letzten &app;-Sitzung mindestens
+        eine davon zur Ausführung ansteht. Er dient der Kontrolle von geplanten Buchungen vor der Eintragung in
+        die Konten.
+      </para>
+    </abstract>
+    <para>Der Dialog kann auf zwei verschiedene Arten gestartet werden:
+      <variablelist>
+        <varlistentry>
+          <term>manuell</term>
+          <listitem>
+            <para>Im Menü unter &mc.ac.scd.slr;. Dies kann dann hilfreich sein, wenn Sie im <xref linkend="sched-editor" />
+              etwas Neues ausprobiert haben oder zum Neustart nach einem versehentlichen Abbruch.
+            </para>
+          </listitem>
+        </varlistentry>
 
-    <variablelist termlength="8">
-      <varlistentry>
-        <term><guilabel>Transaction</guilabel></term>
+        <varlistentry>
+          <term>automatisch</term>
+          <listitem>
+            <para>Durch Aktivierung in den <guilabel>&appname; Eigenschaften</guilabel> auf
+              dem Reiter <xref linkend="prefs-sched" /> wird der Dialog selbsttätig während
+              des &app;-Starts ausgeführt.
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </para>      
 
-        <listitem>
-          <para>The name assigned in the <guilabel>Scheduled Transaction Editor</guilabel> that identifies the
-            scheduled transaction.
-          </para>
-        </listitem>
-      </varlistentry>
+    <figure pgwide="1">
+      <title>Der <quote>Seit letztem Aufruf</quote> Dialog</title><screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/Tools_SinceLastRun.png" srccredit="Christian Wehling" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
-      <varlistentry>
-        <term><guilabel>State</guilabel></term>
+    <para>Die anstehenden Buchungen werden Ihnen in einer tabellarischen Form zur weiteren Bearbeitung
+      aufgelistet.
+    </para>
 
-        <listitem>
-          <para>The <guilabel>state</guilabel> column of the scheduled transaction can be one of the following:
+    <glosslist>
+      <title>Beschreibung der Spalten des <quote>Seit letztem Aufruf</quote> Dialogs</title>
+      <glossentry>
+        <glossterm>Buchung</glossterm>
+
+        <glossdef>
+          <para>Der Name der geplanten Buchung, der in dem <xref linkend="sched-editor" /> zur
+            Identifizierung der eingetragen wurde.
           </para>
+        </glossdef>
+      </glossentry>
 
-          <tip>
-            <para>Click on the <guilabel>state</guilabel> field in the row of a transaction to change its state (this
-              option is available only if the <guilabel>state</guilabel> field is not
-              <emphasis>empty</emphasis>)
-            </para>
-          </tip>
+      <glossentry>
+        <glossterm>Status</glossterm>
 
-          <variablelist termlength="8">
-            <varlistentry>
-              <term><guilabel>Ignored</guilabel></term>
+        <glossdef>
+          <variablelist>
+          <title>Aktionen für die geplante Buchung:</title>
+            <tip>
+              <para>Klicken Sie auf das Feld <guilabel>Status</guilabel> in der Zeile einer Buchung, um ihren Status
+                zu ändern. Diese Option ist nur verfügbar, wenn das Feld für den
+                <guilabel>Status</guilabel> nicht <emphasis>leer</emphasis> ist.
+              </para>
+            </tip>
+
+           <varlistentry>
+              <term>Ignoriert</term>
 
               <listitem>
-                <para>If a scheduled transaction is being displayed, either to be created or as a reminder, the user can
-                  set the status to <guilabel>Ignored</guilabel> to skip this event. The scheduled
-                  transaction will not be entered in the register and the next reminder for this
-                  scheduled transaction will be the next occurrence. For instance, if you have a
-                  scheduled transaction set up with a reminder to transfer $500 at the end of the
-                  month to your <emphasis>savings</emphasis> account but you bought yourself a
-                  computer this month and don’t have the money for this month’s transfer
-                  then you would set the status to <guilabel>Ignored</guilabel>.
+                <para>Wenn eine Buchung angezeigt wird, die entweder erstellt werden soll oder als Erinnerung
+                  dient, kann der Benutzer den Status auf <guilabel>Ignoriert</guilabel> setzen, um
+                  dieses Ereignis zu überspringen. Die Buchung wird <emphasis>nicht</emphasis> in das
+                  Konto eingetragen und die nächste Erinnerung für diese Buchung ist das nächste geplante Vorkommnis.
+                </para>
+
+                <para>Wenn Sie zum Beispiel eine geplante Buchung mit einer Erinnerung zur Ãœberweisung von 500 Euro am
+                  Ende des Monats auf Ihr <emphasis>Sparkonto</emphasis> eingerichtet haben, aber
+                  Sie haben sich in diesem Monat bereits einen Computer gekauft und somit das Geld
+                  für die Überweisung nicht über, dann würden Sie den Status auf
+                  <guilabel>Ignoriert</guilabel> setzen.
                 </para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><guilabel>Postponed</guilabel></term>
+              <term>Zurückgestellt</term>
 
               <listitem>
-                <para>If a scheduled transaction has been listed with a status <guilabel>To-create</guilabel> but you want
-                  to hold it and not have it entered to your register yet, then you can set it to
-                  <guilabel>Postponed</guilabel>. When at some later time you change it back to
-                  <guilabel>To-create</guilabel> it will be created with the original posted-date.
-                  If you want to change that you must edit the transaction after it's created.
+                <para>Wenn eine geplante Buchung mit dem Status <guilabel>Zu Erstellen</guilabel> aufgelistet wird, Sie
+                  diese aber zurückhalten und noch nicht in Ihr Konto eintragen wollen, dann
+                  können Sie den <guilabel>Status</guilabel> auf
+                  <guilabel>Zurückgestellt</guilabel> setzen. Wenn Sie ihn zu einem späteren
+                  Zeitpunkt wieder auf <guilabel>Zu Erstellen</guilabel> ändern, wird die
+                  Buchung mit dem ursprünglichen Buchungsdatum angelegt. Möchten Sie stattdessen
+                  ein anderes Datum verwenden, müssen Sie die Buchung nach ihrer Erstellung manuell
+                  bearbeiten.
+                </para>
+
+                <para>Wenn Sie z.B. für eine geplante Buchung den exakten Betrag erst noch überprüfen wollen, bietet es
+                  sich an, mit dem Kennzeichen <guilabel>Zurückgestellt</guilabel> die Ausführung dieser Buchung
+                  aufzuschieben und zu einem späteren Zeitpunkt auszuführen.                  
                 </para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><guilabel>Reminder</guilabel></term>
+              <term>Erinnerung</term>
 
               <listitem>
-                <para>You are <emphasis>n</emphasis> days from the scheduled transaction due date. The number of days
-                  <emphasis>n</emphasis> to remind in advance, is set either in the
-                  <guilabel>&appname; Preferences</guilabel> <link linkend="prefs-sched">Scheduled
-                  Transactions</link> tab or in the <guilabel>Overview</guilabel> tab of the
-                  <link linkend="sched-editor">Scheduled Transaction Editor</link>.
+                <para>Es verbleiben noch <emphasis>n</emphasis> Tage, bevor die Buchung fällig wird. Die Anzahl
+                  der Tage <emphasis>n</emphasis> an die im Voraus erinnert werden soll, wird
+                  entweder in den <guilabel>&appname; Einstellungen</guilabel> unter
+                  <xref linkend="prefs-sched" /> oder auf der Registerkarte
+                  <guilabel>Ãœbersicht</guilabel> in dem <xref linkend="sched-editor" />
+                  angegeben.
                 </para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><guilabel>To-create</guilabel></term>
+              <term>Zu Erstellen</term>
 
               <listitem>
-                <para>This scheduled transaction will be automatically created when you press <guibutton>OK</guibutton>.
+                <para>Diese Buchung wird automatisch erstellt, wenn Sie <guibutton>OK</guibutton> drücken.
                 </para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term><emphasis>Empty</emphasis></term>
+              <term>Leer</term>
 
               <listitem>
-                <para>An empty field means that no operations are pending for the scheduled transaction.
+                <para>Wird eine Buchung aufgelistet, für die kein Ausführungsdatum angezeigt wird, bedeutet das,
+                  dass eine Buchung im <xref linkend="sched-editor" /> geplant ist, allerdings momentan
+                  keine Vorgänge zur Ausführung anstehen.
                 </para>
               </listitem>
             </varlistentry>
           </variablelist>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+        </glossdef>
+      </glossentry>
 
-    <para>At the bottom of the window there are two buttons:
-    </para>
+      <glossentry>
+        <glossterm>Wert</glossterm>
 
-    <itemizedlist>
-      <listitem>
-        <para>The <guibutton>Cancel</guibutton> button is used to exit the <guilabel>Since Last Run</guilabel>
-          window without creating the transactions scheduled to be entered.
-        </para>
-      </listitem>
+        <glossdef>
+          <para>Ist für die Eintragung in das Konto noch die Angabe des Buchungswerts notwendig, so wird das mit
+            dem Hinweis <emphasis>(Wert benötigt)</emphasis> angezeigt. Dies kann z.B. bei einer
+            Buchung zwischen zwei Konten mit unterschiedlichen Währungen auf Grund von Kursschwankungen notwendig sein.
+          </para>
 
-      <listitem>
-        <para>The <guibutton>Ok</guibutton> button closes the <guilabel>Since Last Run</guilabel> window and
-          applies the pending operations.
-        </para>
-      </listitem>
-    </itemizedlist>
+          <para>Sie können mit einem Doppelklick auf den Hinweistext ein Eingabefeld öffnen und einen Wert für
+            die Buchung eintragen. Das passiert ebenfalls, wenn Sie mit <guilabel>OK</guilabel> die
+            Buchung in ein Konto übernehmen wollen.
+          </para>
+        </glossdef>
+      </glossentry>
+    </glosslist>
 
-    <para>At the bottom right of the <guilabel>Since Last Run</guilabel> window there is also an option that
-      allows to <guilabel>Review created transactions</guilabel>. If this option is enabled when
-      there are one or more transactions <guilabel>To-create</guilabel>, pressing
-      <guibutton>OK</guibutton> will open a register window in which are shown the details of the
-      scheduled transactions splits entered automatically by &app;.
-    </para>
+    <glosslist>
+      <title>Steuerelemente des <quote>Seit letztem Aufruf</quote> Dialogs</title>
+      <glossentry>
+        <glossterm>Erzeugte Buchungen durchsehen</glossterm>
+
+        <glossdef>
+          <para>Wenn diese Option aktiviert ist, während eine oder mehrere Buchungen <guilabel>Zu
+            erstellen</guilabel> sind, wird durch Drücken von <guibutton>OK</guibutton> ein neues
+            Registerfenster geöffnet, in dem die Details der automatisch von &app; erstellten
+            Buchungsteile angezeigt und von Ihnen bearbeitet werden können.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Hilfe</glossterm>
+
+        <glossdef>
+          <para>Öffnet diese Seite im Hilfe-Fenster.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Abbrechen</glossterm>
+
+        <glossdef>
+          <para>Beendet den Dialog ohne Änderungen an Ihren Daten vorzunehmen.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Ok</glossterm>
+
+        <glossdef>
+          <para>Die Schaltfläche schließt den Dialog und führt die anstehenden Vorgänge aus.
+          </para>
+        </glossdef>
+      </glossentry>
+    </glosslist>
   </sect1>
 
   <sect1 id="trans-sched-loans">
diff --git a/manual/de/ch_Transactions.xml b/manual/de/ch_Transactions.xml
index ebf49589..a8689167 100644
--- a/manual/de/ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -1195,7 +1195,7 @@ Translators:
     </sect2>
 
     <sect2 id="sched-editor">
-      <title>Bearbeiten von terminierten Buchungen</title>
+      <title>Editor für geplante Buchungen</title>
 <!-- Todo: has been redesigned -->
       <note>
         <para>Wenn Sie in der Übersicht der <guilabel>Terminerten Buchungen</guilabel> die Schaltfläche
diff --git a/manual/de/figures/Tools_SinceLastRun.png b/manual/de/figures/Tools_SinceLastRun.png
new file mode 100644
index 00000000..fe1304d8
Binary files /dev/null and b/manual/de/figures/Tools_SinceLastRun.png differ

commit c5328ed2f8cc0824f3f53f8ec4d207127381f96f
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Jul 16 23:19:45 2022 +0200

    L10N:de: manual, ch_GettingStarted: improvement
    
    * sect1
    * abstract
    * glosslist
    * minor fixing

diff --git a/manual/de/ch_GettingStarted.xml b/manual/de/ch_GettingStarted.xml
index 842994b1..285e51a1 100644
--- a/manual/de/ch_GettingStarted.xml
+++ b/manual/de/ch_GettingStarted.xml
@@ -24,47 +24,75 @@ Translators:
   <para>… mit &app; ist leicht!
   </para>
 
-  <para>Lassen Sie sich mit diesem <emphasis>Hilfedokument</emphasis> und dem Assistenten <quote>Willkommen
-    in &appname;!</quote> schnell und einfach in die Arbeit mit &app; einführen.
-  </para>
+  <abstract>
+    <para>Lassen Sie sich mit diesem <emphasis>Hilfedokument</emphasis> und dem Assistenten <quote>Willkommen
+      in &appname;!</quote> schnell und einfach in die Arbeit mit &app; einführen.
+    </para>
+  </abstract>
 
-  <figure pgwide="1">
-    <title>Der Startbildschirm</title><screenshot>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/splash.png" 
-                 srccredit="Frank H. Ellenberger" />
-        </imageobject>
-      </mediaobject>
-    </screenshot>
-  </figure>
-
-  <itemizedlist>
-    <para>Im unteren Bereich des Startbildschirms werden u.a. diese Informationen dargestellt:</para>
-    <listitem>
-      <para>Die Versionsnummer von &app;
-      </para>
-    </listitem>
-  
-    <listitem>
-      <para>Den Fortschritt während des Programmstarts
+  <sect1>
+    <title>Der Startbildschirm</title>
+
+    <abstract>
+      <para>Damit Sie über den Fortschritt des Programmstarts informiert sind, wird
+        im Begrüßungsbild von &app; ein Statusbalken angezeigt.
       </para>
-    </listitem>
+    </abstract>
     
-    <listitem>
-      <para>optional das Erweiterungsmodul <quote>&app-fq;</quote>
-      </para>
-    </listitem>
+    <figure pgwide="1">
+      <title>Der Startbildschirm</title><screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/splash.png" 
+                   srccredit="Frank H. Ellenberger" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
-    <listitem>
-      <para>optional das Laden einer Datendatei
-      </para>
-    </listitem>
-  </itemizedlist>
+    <para>Wenn Sie der Ansicht des Startbildschirms überdrüssig sind, können Sie diesen in den
+      &app;-Einstellungen auf dem Reiter <xref linkend="prefs-general" /> die Anzeige abschalten.
+      <caution>
+        <para>Wenn Sie diese Anzeige deaktivieren, kann bei dem Programmstart der Eindruck entstehen,
+          das &app; scheinbar nicht reagiert. Es ist z.B. möglich, dass eine neue Version beim ersten Laden einer
+          Datei zusätzliche Prüfungen oder Umwandlungen vornimmt, die zeitaufwendig sein können.
+        </para>
+      </caution>
+    </para>
+
+    <itemizedlist>
+      <para>Im unteren Bereich des Startbildschirms werden u.a. diese Informationen dargestellt:</para>
+      <listitem>
+        <para>Die Versionsnummer von &app;
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>Den Fortschritt während des Programmstarts
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>optional das Erweiterungsmodul <quote>&app-fq;</quote>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>optional das Laden einer Datendatei
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
 
   <sect1 id="first-time">
     <title>Willkommen in &appname;!</title>
 
+    <abstract>
+      <para>Beim <emphasis>ersten</emphasis> Start von &app; soll Sie dieser Dialog dabei unterstützen,
+        schnell mit Ihrer Arbeit in &app; beginnen zu können.
+      </para>
+    </abstract>
+
     <figure pgwide="1">
       <title>Der <quote>Willkommen in &appname;!</quote>-Dialog</title><screenshot>
         <mediaobject>
@@ -76,57 +104,56 @@ Translators:
       </screenshot>
     </figure>
 
-    <para>Dieser Dialog soll Sie dabei unterstützen, dass Sie schnell mit Ihrer Arbeit in &app; beginnen
-      können. Er enthält die folgenden Steuerungselemente:
+    <para>Der Dialog beinhaltet die folgenden Steuerungselemente:
     </para>
 
-    <variablelist id="CreateAccounts" >
-      <varlistentry>
-        <term><guibutton><accel>N</accel>eue Konten erstellen</guibutton></term>
+    <glosslist>
+      <glossentry>
+        <glossterm><guibutton><accel>N</accel>eue Konten erstellen</guibutton></glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Startet den Assistenten <xref linkend="acct-hierarchy"/>, der Ihnen dabei behilflich ist, eine erste
             sinnvolle Struktur für Konten, einen sogenannten Kontenplan, in &app; anzulegen.
           </para>
-        </listitem>
-      </varlistentry>
+        </glossdef>
+      </glossentry>
 
-      <varlistentry>
-        <term><guibutton>QIF-Dateien <accel>i</accel>mportieren</guibutton></term>
+      <glossentry>
+        <glossterm><guibutton>QIF-Dateien <accel>i</accel>mportieren</guibutton></glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Sind Sie bereits im Besitz von z.B. Quicken-Dateien (<filename>.qif</filename>-Dateien) aus einem
             anderen Finanzprogramm und möchten diese importieren, dann entscheiden Sie sich für
             diesen Punkt (siehe hierzu <xref linkend="trans-import-qif"/>).
           </para>
-        </listitem>
-      </varlistentry>
+        </glossdef>
+      </glossentry>
 
-      <varlistentry>
-        <term><guibutton>Die <accel>E</accel>inführung für neue Benutzer öffnen</guibutton></term>
+      <glossentry>
+        <glossterm><guibutton>Die <accel>E</accel>inführung für neue Benutzer öffnen</guibutton></glossterm>
 
-        <listitem>
+        <glossdef>
           <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-de;guide">&app; Kurs und Konzepte</ulink> eine
             gute Wahl sein.
           </para>
-        </listitem>
-      </varlistentry>
+        </glossdef>
+      </glossentry>
 
-      <varlistentry>
-        <term><guibutton>Ok</guibutton></term>
+      <glossentry>
+        <glossterm><guibutton>Ok</guibutton></glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Mit <guibutton>Ok</guibutton> wird die zuvor gewählte Aktion gestartet.
           </para>
-        </listitem>
-      </varlistentry>
+        </glossdef>
+      </glossentry>
 
-      <varlistentry>
-        <term><guibutton>Abbrechen</guibutton></term>
+      <glossentry>
+        <glossterm><guibutton>Abbrechen</guibutton></glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Die Schaltfläche dient dazu, diesen Eingabebildschirm zu verlassen. Es wird dann wie folgt gefragt:
             <figure pgwide="1">
               <title>Soll das Begrüßungsfenster erneut angezeigt werden?</title><screenshot>
@@ -138,51 +165,51 @@ Translators:
                 </mediaobject>
               </screenshot>
             </figure>
-          </para>
 
-          <variablelist>
-            <varlistentry>
-              <term><guibutton>Nein</guibutton></term>
-
-              <listitem>
-                <para>Wenn Sie das <guilabel>Willkommen bei &appname;!</guilabel> Fenster nicht nochmal sehen wollen
-                  klicken Sie diese Schaltfläche.
-                </para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><guibutton>Ja</guibutton></term>
-
-              <listitem>
-                <para>Klicken Sie diese Schaltfläche oder drücken Sie <keycap>Enter</keycap> auf Ihrer Tastatur damit
-                  der <guilabel>Willkommen bei &appname;!</guilabel> Bildschirm abermals angezeigt
-                  wird.
-                </para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-
-          <note>
-            <para>Nach Auswahl einer der beiden oberen Antworten lässt Sie &app; mit einem minimalen
-              &app;-Hauptfenster alleine. Welche Möglichkeiten Ihnen dann für Ihre weitere Arbeit
-              zur Verfügung stehen wird in <xref linkend="gui-window-nofile" /> beschrieben.
-            </para>
-          </note>
-
-          <figure pgwide="1">
-            <title>Minimales &app; Hauptfenster</title><screenshot>
-              <mediaobject>
-                <imageobject>
-                  <imagedata fileref="figures/window-main-empty.png" 
-                   srccredit="Frank H. Ellenberger" />
-                </imageobject>
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+            <variablelist>
+              <varlistentry>
+                <term><guibutton>Nein</guibutton></term>
+
+                <listitem>
+                  <para>Wenn Sie das <guilabel>Willkommen bei &appname;!</guilabel> Fenster nicht nochmal sehen wollen
+                    klicken Sie diese Schaltfläche.
+                  </para>
+                </listitem>
+              </varlistentry>
+
+              <varlistentry>
+                <term><guibutton>Ja</guibutton></term>
+
+                <listitem>
+                  <para>Klicken Sie diese Schaltfläche oder drücken Sie <keycap>Enter</keycap> auf Ihrer Tastatur damit
+                    der <guilabel>Willkommen bei &appname;!</guilabel> Bildschirm abermals angezeigt
+                    wird.
+                  </para>
+                </listitem>
+              </varlistentry>
+            </variablelist>
+
+            <note>
+              <para>Nach Auswahl einer der beiden oberen Antworten lässt Sie &app; mit einem minimalen
+                &app;-Hauptfenster alleine. Welche Möglichkeiten Ihnen dann für Ihre weitere Arbeit
+                zur Verfügung stehen wird in <xref linkend="gui-window-nofile" /> beschrieben.
+              </para>
+            </note>
+
+            <figure pgwide="1">
+              <title>Minimales &app; Hauptfenster</title><screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata fileref="figures/window-main-empty.png" 
+                     srccredit="Frank H. Ellenberger" />
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+            </figure>
+          </para>
+        </glossdef>
+      </glossentry>
+    </glosslist>
 
     <note>
       <para>Es besteht auch die Möglichkeit, dass Sie sich später mit den anderen Auswahlmöglichkeiten
@@ -208,12 +235,12 @@ Translators:
   <sect1 id="tip-of-the-day">
     <title>Tipp des Tages</title>
 
-    <para>Das Fenster <guilabel>&appname; Tipp des Tages</guilabel> öffnet sich immer dann, wenn Sie &app;
-      starten, es sei denn, er wurde in den <guilabel>&appname; Einstellungen</guilabel>
-      deaktiviert. Er gibt Tipps zu Funktionen und Verwendung von &app;. Sie können die drei
-      Schaltflächen am unteren Rand des Bildschirms verwenden, um sich die einzelnen Tipps
-      durchzulesen.
-    </para>
+    <abstract>
+      <para>Das Fenster <guilabel>&appname;-Tipp des Tages</guilabel> öffnet sich immer dann, wenn Sie &app;
+        starten, es sei denn, er wurde in den <guilabel>&appname; Einstellungen</guilabel>
+        deaktiviert. Er gibt Tipps zu Funktionen und Verwendung von &app;.
+      </para>
+    </abstract>
 
     <figure pgwide="1">
       <title>Der <quote>Tipp des Tages</quote>.</title><screenshot>
@@ -226,52 +253,53 @@ Translators:
       </screenshot>
     </figure>
 
-    <variablelist>
-      <varlistentry>
-        <term><guibutton>Vorheriger</guibutton></term>
+    <para>Mit den Steuerelementen am unteren Rand des Dialogs können Sie die Anzeige dieser Tipps
+      de-/aktivieren und die einzelnen Tipps durchblättern.
+    </para>
+
+    <glosslist>
+      <glossentry>
+        <glossterm>Tipps beim Programmstart anzeigen</glossterm>
+
+        <glossdef>
+          <para>Mit dem Kontrollkästchen können Sie festlegen, ob Sie einen <guilabel>Tipp des
+          Tages</guilabel> bei jedem Programmstart von &app; lesen wollen oder nicht.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Vorheriger</glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Zeigt den vorherigen Tipp an.
           </para>
-        </listitem>
-      </varlistentry>
+        </glossdef>
+      </glossentry>
 
-      <varlistentry>
-        <term><guibutton>Nächster</guibutton></term>
+      <glossentry>
+        <glossterm>Nächster</glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Geht zum nächsten Tipp weiter.
           </para>
-        </listitem>
-      </varlistentry>
+        </glossdef>
+      </glossentry>
 
-      <varlistentry>
-        <term><guibutton>Schließen</guibutton></term>
+      <glossentry>
+        <glossterm>Schließen</glossterm>
 
-        <listitem>
+        <glossdef>
           <para>Verlässt diese Darstellung mit den hilfreichen <guilabel>Tipps des Tages</guilabel>.
           </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Mit dem Kontrollkästchen <guibutton>Tipps beim Programmstart anzeigen</guibutton> können Sie
-      festlegen, ob Sie einen <guilabel>Tipp des Tages</guilabel> beim jedem Programmstart von &app;
-      lesen wollen oder nicht.
-    </para>
-
-    <para>Auf der Registerkarte <guilabel>Allgemein</guilabel> in den
-      <menuchoice>
-        <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
-      </menuchoice>
-      ist möglich, den <guilabel>Tipp des Tages</guilabel> wieder zu aktivieren, falls Sie die
-      Anzeige einmal abgestellt haben. Das <guilabel>Tipp des Tages</guilabel>- Fenster kann auch
-      manuell geöffnet werden, indem Sie im Menü
-      <menuchoice>
-        <guimenu><accel>H</accel>ilfe</guimenu><guimenuitem><accel>T</accel>ipp des
-        Tages</guimenuitem>
-      </menuchoice>
-      auswählen.
+        </glossdef>
+      </glossentry>
+    </glosslist>
+
+    <para>Auf der Registerkarte <xref linkend="prefs-general" /> in den &app;-Einstellungen, die Sie
+      im Menü unter &mc.ed.pref; erreichen, ist möglich, den <guilabel>Tipp des Tages</guilabel> wieder
+      zu aktivieren, falls Sie die Anzeige einmal abgestellt haben. Das <guilabel>Tipp des
+      Tages</guilabel>-Fenster kann auch manuell geöffnet werden, indem Sie im Menü &mc.help.tip; auswählen.
     </para>
   </sect1>
 </chapter>

commit cc76a8cdb497930ced516ebe7fdca0cd5fd3acd9
Author: Christian Wehling <christian.wehling at web.de>
Date:   Wed Jul 13 11:18:09 2022 +0200

    L10N:de: Description of splash.png and remove one unneeded picture

diff --git a/manual/de/ch_GettingStarted.xml b/manual/de/ch_GettingStarted.xml
index 2397c288..842994b1 100644
--- a/manual/de/ch_GettingStarted.xml
+++ b/manual/de/ch_GettingStarted.xml
@@ -28,6 +28,40 @@ Translators:
     in &appname;!</quote> schnell und einfach in die Arbeit mit &app; einführen.
   </para>
 
+  <figure pgwide="1">
+    <title>Der Startbildschirm</title><screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="figures/splash.png" 
+                 srccredit="Frank H. Ellenberger" />
+        </imageobject>
+      </mediaobject>
+    </screenshot>
+  </figure>
+
+  <itemizedlist>
+    <para>Im unteren Bereich des Startbildschirms werden u.a. diese Informationen dargestellt:</para>
+    <listitem>
+      <para>Die Versionsnummer von &app;
+      </para>
+    </listitem>
+  
+    <listitem>
+      <para>Den Fortschritt während des Programmstarts
+      </para>
+    </listitem>
+    
+    <listitem>
+      <para>optional das Erweiterungsmodul <quote>&app-fq;</quote>
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>optional das Laden einer Datendatei
+      </para>
+    </listitem>
+  </itemizedlist>
+
   <sect1 id="first-time">
     <title>Willkommen in &appname;!</title>
 
diff --git a/manual/de/figures/summarybar-selector.png b/manual/de/figures/summarybar-selector.png
deleted file mode 100644
index 9a331c39..00000000
Binary files a/manual/de/figures/summarybar-selector.png and /dev/null differ

commit 1bb97cfc21fff01127f6927824f74954381a03ca
Author: TANIGUCHI Yasuaki <yasuakit at gmail.com>
Date:   Tue Jul 12 00:54:06 2022 +0200

    Fix a typo in guide/de mentioned in PR #234

diff --git a/guide/de/ch_cc.xml b/guide/de/ch_cc.xml
index 1f4ba95d..cf044931 100644
--- a/guide/de/ch_cc.xml
+++ b/guide/de/ch_cc.xml
@@ -372,7 +372,7 @@
     <sect2 id="cc-together-refund2">
       <title>(Rück-)Erstattung</title>
 
-      <para>Nun nehmen Sie an, dass Sie am 15.04.20115 die Kleidung, die Sie am 11.04.2015 vom Fashionhaus
+      <para>Nun nehmen Sie an, dass Sie am 15.04.2015 die Kleidung, die Sie am 11.04.2015 vom Fashionhaus
         gekauft haben, zurückgeben und sie Ihnen eine Gutschrift auf Ihre Kreditkarte geben. Geben
         Sie eine Buchung für Ihre Kreditkartenrückerstattung über den vollen Betrag von 100,- €
         ein. Erinnern Sie sich, die gleichen Übertragskonten zu nutzen, die Sie für den

commit 18f8c648ac06ea5ee5ad8669d3758ccd8870aa35
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Jul 9 21:35:25 2022 +0200

    L10n:de: gnc-gui-de.dtd: bug fixing

diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 118741d3..9ad210fc 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -259,8 +259,8 @@
 <!-- Tools-Menu -->
 <!ENTITY % gm.tool "<guimenu><accel>W</accel>erkzeuge</guimenu>">
 <!ENTITY % gmi.to.aqb "<guimenuitem><accel>O</accel>nlinebanking Einrichtung…</guimenuitem>">
-<!ENTITY % gmi.to.price "<guimenuitem><accel>K</accel>urs Datenbank</guimenuitem>">
-<!ENTITY % gmi.to.sec "<guimenuitem><accel>W</accel>ertpapier Editor</guimenuitem>">
+<!ENTITY % gmi.to.price "<guimenuitem><accel>K</accel>urs-Datenbank</guimenuitem>">
+<!ENTITY % gmi.to.sec "<guimenuitem><accel>W</accel>ertpapier-Editor</guimenuitem>">
 <!ENTITY % gmi.to.loan "<guimenuitem><accel>D</accel>arlehensrechner</guimenuitem>">
 <!ENTITY % gmi.to.cls-bok "<guimenuitem>Buch<accel>a</accel>bschluss</guimenuitem>">
 <!ENTITY % gmi.to.imp-map "<guimenuitem><accel>I</accel>mport-Zuordnungen Editor</guimenuitem>">

commit cd99403e14f2e5c8d61d5685114f76f1907d888d
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Jul 9 21:33:18 2022 +0200

    L10N:de: manual ch_Tools_Assistants, "Security Editor"

diff --git a/manual/de/ch_Tools_Assistants.xml b/manual/de/ch_Tools_Assistants.xml
index 4c1a591e..db597a52 100644
--- a/manual/de/ch_Tools_Assistants.xml
+++ b/manual/de/ch_Tools_Assistants.xml
@@ -5505,7 +5505,7 @@
     </abstract>  
       
     <para>  
-      Aufgerufen wird der <guilabel>Wertpapier Editor</guilabel> mit dem
+      Aufgerufen wird der <guilabel>Wertpapier-Editor</guilabel> mit dem
       gleichnamigen Menüpunkt &mc.to.sec;.
     </para>
 
@@ -5674,14 +5674,14 @@
                 <glossterm>Voller Name</glossterm>
                 <glossdef>
                   <para>Der vollständige Name sollte eine für Sie verständliche Beschreibung, wie z.B.
-                    <emphasis>US-Dollars</emphasis> oder <emphasis>Amazon Stammaktien</emphasis>
+                    <emphasis>US-Dollar</emphasis> oder <emphasis>Amazon Stammaktie</emphasis>
                     bei Wertpaieren oder bei Anleihen z.B. <emphasis>Emitent, x %, Endfälligkeitsdatum</emphasis> sein.
                     <tip>
                       <para>Bei Anleihen empfiehlt es sich, die regelmäßigen Zinszahlungen und die Endfälligkeit gleich als
                         <xref linkend="trans-sched" /> anzulegen. Das hilft den Überblick bei seiner Liquidität zu behalten.
                       </para>
                       <para>Zu den Ausschüttungen von Aktien und Fonds kann man das auch, allerdings muss man für die Höhe
-                        eine Variable verwenden, da sie jetzt noch nicht bekannt ist.
+                        eine Variable verwenden, da die Dividende oder Gewinnausschüttung jetzt noch nicht bekannt ist.
                       </para>
                     </tip>
                   </para>
@@ -5692,12 +5692,10 @@
                 <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
+                    Tickersymbol (bei Aktien) oder die WKN bei vielen deutschen Fonds-Gesellschaften. Für nationale Währungen
                     entspricht das Symbol der ISO 4217.
                     <tip>
-                      <para>Wenn Sie Ihre Kursdaten mit &app-fq; abrufen möchten, ist es wichtig ist, dass das
+                      <para>Wenn Sie Ihre Kursdaten mit &app-fq; abrufen möchten, ist zu Beachten, dass das
                         Symbol mit dem in der zugeordneten Kursquelle übereinstimmt.
                         Beachten Sie auch die Hinweise zu dem <xref linkend="tool-ge-TypeQuoteSource" />.
                       </para>
@@ -5711,6 +5709,11 @@
                 <glossdef>
                   <para>Wenn Sie hier keinen Eintrag vornehmen, wird das zuvor eingetragene Symbol bzw. die Abkürzung
                     auch als Anzeigesymbol genutzt. Bei einer Währung ist hier das Währungssymbol eingestellt.
+                    <tip>
+                      <para>Will man z.B. als Kanadier nur das <quote>$</quote>-Zeichen angezeigt bekommen, fügt man
+                        zuvor beim USD <quote>US</quote> vor dem $ ein und kann anschließend den Präfix beim CAD entfernen.
+                      </para>
+                    </tip>
                   </para>
                 </glossdef>
               </glossentry>
@@ -5743,7 +5746,7 @@
 
                   <para>Obwohl &app; Ihnen hier keine Vorgaben mehr macht<footnote>
                       <para>Bis GnuCash 4.9 gab es eine Vorschlagsliste die sehr nordamerikanisch geprägt war und
-                        für Benutzer in anderen Teilen der Welt wenig Sinn machte.
+                        für Benutzer in anderen Teilen der Welt eher störend war.
                       </para>
                     </footnote>, können in dem Auswahlfeld noch Einträge aus vorherigen Eingaben enthalten sein.
                     Sie können die Liste selber mit weiteren Typen ergänzen, denkbar wäre z.B. diese Gruppierung:
@@ -5778,7 +5781,7 @@
 
                   <para>
                     <caution>
-                      <para>Da das Wort <computeroutput>template</computeroutput> in &app; ein reserviertes Wort ist,
+                      <para>Da das Wort <computeroutput>template</computeroutput> in dieser Liste ein reserviertes Wort ist,
                         darf es von Ihnen <emphasis>nicht</emphasis> verwendet werden!
                       </para>
                     </caution>
@@ -5795,8 +5798,8 @@
                     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 auch noch die
-                    <ulink url="&url-wp-de;Wertpapierkennnummer"><acronym>WKN</acronym></ulink>
-                    gebräuchlich.
+                    <ulink url="&url-wp-de;Wertpapierkennnummer"><acronym>WKN</acronym></ulink> und in der Schweiz die
+                    <ulink url="&url-wp-de;Valorennummer">Valorennummer</ulink> gebräuchlich.
                   </para>
 
                   <para>Die Angabe des Code ist nicht erforderlich, kann aber beispielsweise nützlich sein um sich

commit c6b28e9f6acb698eca96463284172c4ac344c8cc
Merge: b196fb0b 6617ed72
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jul 11 18:11:30 2022 +0200

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


commit b196fb0b88efc39abb53fafb518c883c6ce288d0
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 9 16:22:02 2022 -0700

    Fix html build failure
    
    styletrigger and figtrigger must depend on htmltrigger.

diff --git a/cmake/AddHtmlTarget.cmake b/cmake/AddHtmlTarget.cmake
index 44dddd16..0c8e5fc5 100644
--- a/cmake/AddHtmlTarget.cmake
+++ b/cmake/AddHtmlTarget.cmake
@@ -36,14 +36,14 @@ function (add_html_target docname lang entities figures)
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html_figtrigger"
         COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
         COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/html_figtrigger"
-        DEPENDS ${figures})
+        DEPENDS ${figures} "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger")
 
     # Copy style icons for this document (warning, info,...)
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/styletrigger"
         COMMAND  ${CMAKE_COMMAND} -E copy ${styleicons} "${BUILD_DIR}/stylesheet"
         COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/styletrigger"
-        DEPENDS ${styleicons})
+        DEPENDS ${styleicons} "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger")
 
     add_custom_target("${lang}-${docname}-html"
         DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger"

commit dba3a713953ac3ec141af52e834203952a5a1e81
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 9 16:15:51 2022 -0700

    Fix ghelp build failure
    
    Missed step in creating ghelptrigger.

diff --git a/cmake/AddGHelpTarget.cmake b/cmake/AddGHelpTarget.cmake
index 2a2dd422..840e5149 100644
--- a/cmake/AddGHelpTarget.cmake
+++ b/cmake/AddGHelpTarget.cmake
@@ -33,7 +33,8 @@ function (add_ghelp_target docname lang entities figures)
     add_custom_command(
       OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger"
       COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
-      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures")
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures"
+      COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger")
 
 
     add_custom_command(
@@ -47,7 +48,7 @@ function (add_ghelp_target docname lang entities figures)
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ghelp_figtrigger"
         COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
         COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/ghelp_figtrigger"
-        DEPENDS ${figures})
+        DEPENDS ${figures} "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger")
 
     add_custom_target("${lang}-${docname}-ghelp"
         DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger"

commit afef9670092daeed882b7cc6d556342ab5dedf04
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 8 16:42:32 2022 -0700

    Only build GHelp files by default on Unix-not-Apple
    
    Windows and macOS don't have Yelp so it's not useful.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b8ac267..95a1488f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,11 @@ if (WITH_HTML)
     add_custom_target(html)
 endif()
 if (WITH_GHELP)
+  if (UNIX AND NOT APPLE)
     add_custom_target(ghelp ALL)
+  else(UNIX AND NOT APPLE)
+    add_custom_target(ghelp)
+  endif()
 endif()
 if (WITH_PDF)
     add_custom_target(pdf)

commit 59013c31d26c15ff56b0ee7afff49a57bb0d2bba
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 8 16:24:24 2022 -0700

    Create ${DATADIR_BUILD}/gnome only when making the GHelp target.

diff --git a/cmake/AddGHelpTarget.cmake b/cmake/AddGHelpTarget.cmake
index fc623728..2a2dd422 100644
--- a/cmake/AddGHelpTarget.cmake
+++ b/cmake/AddGHelpTarget.cmake
@@ -11,8 +11,6 @@
 function (add_ghelp_target docname lang entities figures)
 
     set(BUILD_DIR "${DATADIR_BUILD}/gnome/help/${docname}/${lang}")
-    file(MAKE_DIRECTORY "${BUILD_DIR}")
-    file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
 
     set(source_files "")
     foreach(xml_file ${entities} ${docname}.xml)
@@ -32,6 +30,12 @@ function (add_ghelp_target docname lang entities figures)
         list(APPEND dest_files "${BUILD_DIR}/${xml_file}")
     endforeach()
 
+    add_custom_command(
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger"
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures")
+
+
     add_custom_command(
         OUTPUT ${dest_files}
         COMMAND ${CMAKE_COMMAND} -E copy ${source_files} "${BUILD_DIR}"
@@ -39,7 +43,6 @@ function (add_ghelp_target docname lang entities figures)
         WORKING_DIRECTORY "${BUILD_DIR}")
 
     # Copy figures for this document
-    file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ghelp_figtrigger"
         COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
@@ -47,7 +50,8 @@ function (add_ghelp_target docname lang entities figures)
         DEPENDS ${figures})
 
     add_custom_target("${lang}-${docname}-ghelp"
-        DEPENDS ${dest_files}
+        DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger"
+                 ${dest_files}
                 "${CMAKE_CURRENT_BINARY_DIR}/ghelp_figtrigger")
 
     add_dependencies(${docname}-ghelp "${lang}-${docname}-ghelp")

commit 2422e674ade7ce3a38aa4af1fd3711bb59ab19b9
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jul 8 16:09:08 2022 -0700

    Create ${DOCDIR_BUILD} only if one of the targets that needs it is built.

diff --git a/cmake/AddEpubTarget.cmake b/cmake/AddEpubTarget.cmake
index fdef2baf..6dfcb0d4 100644
--- a/cmake/AddEpubTarget.cmake
+++ b/cmake/AddEpubTarget.cmake
@@ -4,7 +4,6 @@ function (add_epub_target docname lang entities figures)
     set(EPUB_TMPDIR "${CMAKE_CURRENT_BINARY_DIR}/epub")
 
     set(BUILD_DIR "${DOCDIR_BUILD}/${lang}")
-    file(MAKE_DIRECTORY "${BUILD_DIR}")
 
     add_custom_command(
         OUTPUT "${BUILD_DIR}/${epubfile}"
@@ -20,6 +19,7 @@ function (add_epub_target docname lang entities figures)
                             "${CMAKE_SOURCE_DIR}/xsl/1.79.2/epub/docbook.xsl"
                             "${CMAKE_CURRENT_SOURCE_DIR}/${docname}.xml"
         COMMAND cmake -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/figures" "${EPUB_TMPDIR}/OEBPS/figures"
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
         COMMAND cd "${EPUB_TMPDIR}" && zip -X -r "${BUILD_DIR}/${epubfile}" mimetype META-INF OEBPS
         DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd" ${figures})
 
diff --git a/cmake/AddHtmlTarget.cmake b/cmake/AddHtmlTarget.cmake
index a3efa23f..44dddd16 100644
--- a/cmake/AddHtmlTarget.cmake
+++ b/cmake/AddHtmlTarget.cmake
@@ -12,16 +12,16 @@ function (add_html_target docname lang entities figures)
 
     set(styledir "${CMAKE_SOURCE_DIR}/stylesheet")
     file(GLOB styleicons "${CMAKE_SOURCE_DIR}/stylesheet/*.png")
-
     set(BUILD_DIR "${DOCDIR_BUILD}/${lang}/${docname}")
-    file(MAKE_DIRECTORY "${BUILD_DIR}")
-    file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
-    file(MAKE_DIRECTORY "${BUILD_DIR}/stylesheet")
+
 
     # Convert xml to html with xsltproc
     # xsltproc --xinclude -o outputdir/ /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl filename.xml
     add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger"
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger"
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures"
+      COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/stylesheet"
         COMMAND  ${XSLTPROC} ${XSLTPROCFLAGS} ${XSLTPROCFLAGS_HTML}
                              -o "${BUILD_DIR}/"
                              --param use.id.as.filename "1"
@@ -32,7 +32,6 @@ function (add_html_target docname lang entities figures)
         DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd")
 
     # Copy figures for this document
-    file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html_figtrigger"
         COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
@@ -40,7 +39,6 @@ function (add_html_target docname lang entities figures)
         DEPENDS ${figures})
 
     # Copy style icons for this document (warning, info,...)
-    file(MAKE_DIRECTORY "${BUILD_DIR}/stylesheet")
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/styletrigger"
         COMMAND  ${CMAKE_COMMAND} -E copy ${styleicons} "${BUILD_DIR}/stylesheet"
@@ -55,7 +53,7 @@ function (add_html_target docname lang entities figures)
     add_dependencies(${docname}-html "${lang}-${docname}-html")
 
     if(WITH_HTML_INSTALL)
-        install(DIRECTORY ${BUILD_DIR}
+        install(TARGET "${lang}-${docname}-html"
           DESTINATION "${CMAKE_INSTALL_DOCDIR}/${lang}")
     endif()
 endfunction()
diff --git a/cmake/AddPdfTarget.cmake b/cmake/AddPdfTarget.cmake
index 8bc34b84..cdb4ce6f 100644
--- a/cmake/AddPdfTarget.cmake
+++ b/cmake/AddPdfTarget.cmake
@@ -4,7 +4,6 @@ function (add_pdf_target docname lang entities figures)
     set(pdffile "${docname}.pdf")
 
     set(BUILD_DIR "${DOCDIR_BUILD}/${lang}")
-    file(MAKE_DIRECTORY "${BUILD_DIR}")
 
     # Determine paper format depending on language (which maps to the document's directory name)
     # * for language "C" (fallback language) determine paper format based on current locale
@@ -21,6 +20,7 @@ function (add_pdf_target docname lang entities figures)
 
     add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${fofile}"
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
         COMMAND ${XSLTPROC} ${XSLTPROCFLAGS} ${XSLTPROCFLAGS_FO}
                             -o "${CMAKE_CURRENT_BINARY_DIR}/${fofile}"
                             --stringparam fop1.extensions 1

commit 6617ed720a50bdc402affec9f7deccbe9c71f6ca
Author: Christian Wehling <christian.wehling at web.de>
Date:   Thu Jun 30 21:59:54 2022 +0200

    manual: remove superfluous "Help_" from file names

diff --git a/manual/C/CMakeLists.txt b/manual/C/CMakeLists.txt
index a737bc20..83f3ecf0 100644
--- a/manual/C/CMakeLists.txt
+++ b/manual/C/CMakeLists.txt
@@ -1,20 +1,20 @@
 set (entities
-        Help_ch_Intro.xml
-        Help_ch_GettingHelp.xml
-        Help_ch_GettingStarted.xml
-        Help_ch_GUIMenus.xml
-        Help_ch_Account-Actions.xml
-        Help_ch_Transactions.xml
-        Help_ch_Business.xml
-        Help_ch_Tools_Assistants.xml
-        Help_ch_Reports.xml
-        Help_ch_Customize.xml
+        ch_Intro.xml
+        ch_GettingHelp.xml
+        ch_GettingStarted.xml
+        ch_GUIMenus.xml
+        ch_Account-Actions.xml
+        ch_Transactions.xml
+        ch_Business.xml
+        ch_Tools_Assistants.xml
+        ch_Reports.xml
+        ch_Customize.xml
         ch_Finance-Quote.xml
-        Help_chtacctseg.xml
-        Help_chartofaccts.xml
-        Help_legal.xml
-        Help_txf-categories.xml
-        Help_fdl-appendix.xml
-        Help_tips-appendix.xml)
+        chtacctseg.xml
+        chartofaccts.xml
+        legal.xml
+        txf-categories.xml
+        fdl-appendix.xml
+        tips-appendix.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/manual/C/Help_ch_Account-Actions.xml b/manual/C/ch_Account-Actions.xml
similarity index 99%
rename from manual/C/Help_ch_Account-Actions.xml
rename to manual/C/ch_Account-Actions.xml
index 858dc67b..eed47334 100644
--- a/manual/C/Help_ch_Account-Actions.xml
+++ b/manual/C/ch_Account-Actions.xml
@@ -328,7 +328,7 @@
       chart of accounts is as a tree. The main branches represent entire categories or groups, while
       the leaves of the tree denote individual bank accounts or expense categories. When a summary
       report is requested, typically only the main branches are shown in the report, rather than the
-      individual accounts. For example, a chart of accounts might look like the following:<xi:include href="Help_chtacctseg.xml"/>
+      individual accounts. For example, a chart of accounts might look like the following:<xi:include href="chtacctseg.xml"/>
     </para>
 
     <note id="accts-code">
diff --git a/manual/C/Help_ch_Business.xml b/manual/C/ch_Business.xml
similarity index 100%
rename from manual/C/Help_ch_Business.xml
rename to manual/C/ch_Business.xml
diff --git a/manual/C/Help_ch_Customize.xml b/manual/C/ch_Customize.xml
similarity index 98%
rename from manual/C/Help_ch_Customize.xml
rename to manual/C/ch_Customize.xml
index 35d7948b..eefb3a21 100755
--- a/manual/C/Help_ch_Customize.xml
+++ b/manual/C/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"
+              <imagedata fileref="figures/Pref_AccntPeriod.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
+              <imagedata fileref="figures/Pref_AccntPeriod.png"
                          srccredit="Chris Good"/>
             </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"
+              <imagedata fileref="figures/Pref_Accnts.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Accnts.png"
+              <imagedata fileref="figures/Pref_Accnts.png"
                          srccredit="Chris Good"/>
             </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"
+              <imagedata fileref="figures/Pref_Business.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Business.png"
+              <imagedata fileref="figures/Pref_Business.png"
                          srccredit="Chris Good"/>
             </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"
+              <imagedata fileref="figures/Pref_General.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_General.png"
+              <imagedata fileref="figures/Pref_General.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -529,12 +529,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Import</guilabel> tab</title><screenshot id="Prefer_Import">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Import.png"
+              <imagedata fileref="figures/Pref_Import.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Import.png"
+              <imagedata fileref="figures/Pref_Import.png"
                          srccredit="Chris Good"/>
             </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"
+              <imagedata fileref="figures/Pref_DateTime.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_DateTime.png"
+              <imagedata fileref="figures/Pref_DateTime.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -778,12 +778,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_OnlineBanking.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
+              <imagedata fileref="figures/Pref_OnlineBanking.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -831,12 +831,12 @@ Translators:
         <title>The <guimenuitem>Preferences</guimenuitem> window, <guilabel>Online Quotes</guilabel> tab</title><screenshot id="Prefer-online-quotes">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Quotes.png"
+              <imagedata fileref="figures/Pref_Quotes.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Quotes.png"
+              <imagedata fileref="figures/Pref_Quotes.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -881,12 +881,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_Printing.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Printing.png"
+              <imagedata fileref="figures/Pref_Printing.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -925,12 +925,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_Register.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Register.png"
+              <imagedata fileref="figures/Pref_Register.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -1024,12 +1024,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_RegisterDefaults.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
+              <imagedata fileref="figures/Pref_RegisterDefaults.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -1112,12 +1112,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_Reports.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Reports.png"
+              <imagedata fileref="figures/Pref_Reports.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -1171,12 +1171,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_Sched.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Sched.png"
+              <imagedata fileref="figures/Pref_Sched.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -1248,12 +1248,12 @@ Translators:
         <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"
+              <imagedata fileref="figures/Pref_Windows.png"
                          srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Windows.png"
+              <imagedata fileref="figures/Pref_Windows.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -1368,7 +1368,7 @@ Translators:
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Accounts</guilabel> tab</title><screenshot id="Book_Options_Accounts">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+              <imagedata fileref="figures/Book_Options_Accounts.png"
                          srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
@@ -1465,7 +1465,7 @@ Translators:
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Budgeting</guilabel> tab</title><screenshot id="Book_Options_Budgeting">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+              <imagedata fileref="figures/Book_Options_Budgeting.png"
                          srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
@@ -1483,7 +1483,7 @@ Translators:
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Business</guilabel> tab</title><screenshot id="Book_Options_Business">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Book_Options_Business.png"
+              <imagedata fileref="figures/Book_Options_Business.png"
                          srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
@@ -1589,7 +1589,7 @@ Translators:
         <title>The <guimenuitem>Book Options</guimenuitem> window, <guilabel>Counters</guilabel> tab</title><screenshot id="Book_Options_Counters">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+              <imagedata fileref="figures/Book_Options_Counters.png"
                          srccredit="Frank H. Ellenberger"/>
             </imageobject>
           </mediaobject>
@@ -2600,7 +2600,7 @@ Translators:
         Detailed <acronym>TXF</acronym> Category Descriptions
       </para>
 
-      <xi:include href="Help_txf-categories.xml" />
+      <xi:include href="txf-categories.xml" />
     </sect2>
   </sect1>
 
diff --git a/manual/C/Help_ch_GUIMenus.xml b/manual/C/ch_GUIMenus.xml
similarity index 99%
rename from manual/C/Help_ch_GUIMenus.xml
rename to manual/C/ch_GUIMenus.xml
index 71da240d..39ad44bc 100644
--- a/manual/C/Help_ch_GUIMenus.xml
+++ b/manual/C/ch_GUIMenus.xml
@@ -38,7 +38,7 @@
     <para>You can access commonly used sub-windows and tools through this window.
     </para>
 
-    <figure id="Help_Main_WindowCallouts">
+    <figure id="Main_WindowCallouts">
       <title>The Main &app; Window</title><mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/Main-window-callouts.png"
@@ -63,7 +63,7 @@
 
     <para>When you start &app;, after a couple of windows (Splash screen, Tip of the Day) the main window will
       be displayed. This window is divided into the following sections (see
-      <xref linkend="Help_Main_WindowCallouts"/> for reference):
+      <xref linkend="Main_WindowCallouts"/> for reference):
     </para>
 
     <variablelist>
@@ -168,12 +168,12 @@
       <title>The <emphasis>Account Tree</emphasis> Display.</title><screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png"
+            <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Cristian Marchi" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png"
+            <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Cristian Marchi"/>
           </imageobject>
 
@@ -3234,12 +3234,12 @@
         <title>The <emphasis>Account Register</emphasis> Display.</title><screenshot id="AccountReg_Screen">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png"
+              <imagedata fileref="figures/AccountReg_Screen.png"
                        srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png"
+              <imagedata fileref="figures/AccountReg_Screen.png"
                        srccredit="Cristian Marchi"/>
             </imageobject>
 
@@ -4347,12 +4347,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"
+              <imagedata fileref="figures/Report_Screen.png"
                        srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Report_Screen.png"
+              <imagedata fileref="figures/Report_Screen.png"
                        srccredit="Cristian Marchi"/>
             </imageobject>
 
diff --git a/manual/C/Help_ch_GettingHelp.xml b/manual/C/ch_GettingHelp.xml
similarity index 100%
rename from manual/C/Help_ch_GettingHelp.xml
rename to manual/C/ch_GettingHelp.xml
diff --git a/manual/C/Help_ch_GettingStarted.xml b/manual/C/ch_GettingStarted.xml
similarity index 100%
rename from manual/C/Help_ch_GettingStarted.xml
rename to manual/C/ch_GettingStarted.xml
diff --git a/manual/C/Help_ch_Intro.xml b/manual/C/ch_Intro.xml
similarity index 100%
rename from manual/C/Help_ch_Intro.xml
rename to manual/C/ch_Intro.xml
diff --git a/manual/C/Help_ch_Reports.xml b/manual/C/ch_Reports.xml
similarity index 99%
rename from manual/C/Help_ch_Reports.xml
rename to manual/C/ch_Reports.xml
index 5047eed9..6e13c8bf 100644
--- a/manual/C/Help_ch_Reports.xml
+++ b/manual/C/ch_Reports.xml
@@ -414,15 +414,15 @@
           <title>Report Options</title>
 
           <figure>
-            <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
+            <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="TxRptOpt_Screen">
               <mediaobject>
                 <imageobject role="html">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
+                  <imagedata fileref="figures/TxRptOpt_Screen.png"
                      srccredit="Geert Janssens" width="510px"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
+                  <imagedata fileref="figures/TxRptOpt_Screen.png"
                      srccredit="Geert Janssens"/>
                 </imageobject>
 
diff --git a/manual/C/Help_ch_Tools_Assistants.xml b/manual/C/ch_Tools_Assistants.xml
similarity index 99%
rename from manual/C/Help_ch_Tools_Assistants.xml
rename to manual/C/ch_Tools_Assistants.xml
index c11cf952..5b0b7539 100644
--- a/manual/C/Help_ch_Tools_Assistants.xml
+++ b/manual/C/ch_Tools_Assistants.xml
@@ -5742,12 +5742,12 @@
         <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"
+              <imagedata fileref="figures/Tool_LotsStk.png"
               srccredit="Chris Good" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Tool_LotsStk.png"
+              <imagedata fileref="figures/Tool_LotsStk.png"
                          srccredit="Chris Good"/>
             </imageobject>
 
@@ -5790,7 +5790,7 @@
 
         <para><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png"
+              <imagedata fileref="figures/Tool_Lots_h_double_arrow.png"
                 width="48px" />
             </imageobject>
 
@@ -5801,7 +5801,7 @@
 
           <inlinemediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png"
+              <imagedata fileref="figures/Tool_Lots_v_double_arrow.png"
                 width="48px" />
             </imageobject>
           </inlinemediaobject>
@@ -6186,12 +6186,12 @@ url="&url-docs-C;guide/invest-sell1.html#invest-sellLots"> Automatic
           <title>Lots in Account window for business features</title><screenshot id="tool-lotsInAcctBus">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Tool_LotsBus.png"
+                <imagedata fileref="figures/Tool_LotsBus.png"
                 srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Tool_LotsBus.png"
+                <imagedata fileref="figures/Tool_LotsBus.png"
                            srccredit="Chris Good"/>
               </imageobject>
 
diff --git a/manual/C/Help_ch_Transactions.xml b/manual/C/ch_Transactions.xml
similarity index 98%
rename from manual/C/Help_ch_Transactions.xml
rename to manual/C/ch_Transactions.xml
index 89d5a8f0..aba6dbb6 100644
--- a/manual/C/Help_ch_Transactions.xml
+++ b/manual/C/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"
+            <imagedata fileref="figures/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"
+            <imagedata fileref="figures/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" srccredit="David Cousens" width="510"/>
+                <imagedata fileref="figures/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 fileref="figures/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  fileref="figures/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 width="515px" fileref="figures/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  fileref="figures/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  fileref="figures/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 fileref="figures/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 fileref="figures/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 fileref="figures/Import_MatchPicker.png" srccredit="David Cousens" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png" srccredit="David Cousens"/>
+              <imagedata fileref="figures/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 fileref="figures/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 fileref="figures/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 fileref="figures/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 fileref="figures/Choose_Export_Settings.png" srccredit="David Cousens"/>
           </imageobject>
         </mediaobject>
       </screenshot>
diff --git a/manual/C/Help_chartofaccts.xml b/manual/C/chartofaccts.xml
similarity index 100%
rename from manual/C/Help_chartofaccts.xml
rename to manual/C/chartofaccts.xml
diff --git a/manual/C/Help_chtacctseg.xml b/manual/C/chtacctseg.xml
similarity index 100%
rename from manual/C/Help_chtacctseg.xml
rename to manual/C/chtacctseg.xml
diff --git a/manual/C/Help_fdl-appendix.xml b/manual/C/fdl-appendix.xml
similarity index 100%
rename from manual/C/Help_fdl-appendix.xml
rename to manual/C/fdl-appendix.xml
diff --git a/manual/C/figures/Help_AccountReg_Screen.png b/manual/C/figures/AccountReg_Screen.png
similarity index 100%
rename from manual/C/figures/Help_AccountReg_Screen.png
rename to manual/C/figures/AccountReg_Screen.png
diff --git a/manual/C/figures/Help_AccountTree_Screen.png b/manual/C/figures/AccountTree_Screen.png
similarity index 100%
rename from manual/C/figures/Help_AccountTree_Screen.png
rename to manual/C/figures/AccountTree_Screen.png
diff --git a/manual/C/figures/Help_Book_Options_Accounts.png b/manual/C/figures/Book_Options_Accounts.png
similarity index 100%
rename from manual/C/figures/Help_Book_Options_Accounts.png
rename to manual/C/figures/Book_Options_Accounts.png
diff --git a/manual/C/figures/Help_Book_Options_Budgeting.png b/manual/C/figures/Book_Options_Budgeting.png
similarity index 100%
rename from manual/C/figures/Help_Book_Options_Budgeting.png
rename to manual/C/figures/Book_Options_Budgeting.png
diff --git a/manual/C/figures/Help_Book_Options_Business.png b/manual/C/figures/Book_Options_Business.png
similarity index 100%
rename from manual/C/figures/Help_Book_Options_Business.png
rename to manual/C/figures/Book_Options_Business.png
diff --git a/manual/C/figures/Help_Book_Options_Counters.png b/manual/C/figures/Book_Options_Counters.png
similarity index 100%
rename from manual/C/figures/Help_Book_Options_Counters.png
rename to manual/C/figures/Book_Options_Counters.png
diff --git a/manual/C/figures/Help_CSV_Import_Transactions_Delete.png b/manual/C/figures/CSV_Import_Transactions_Delete.png
similarity index 100%
rename from manual/C/figures/Help_CSV_Import_Transactions_Delete.png
rename to manual/C/figures/CSV_Import_Transactions_Delete.png
diff --git a/manual/C/figures/Help_CSV_Import_Transactions_Save.png b/manual/C/figures/CSV_Import_Transactions_Save.png
similarity index 100%
rename from manual/C/figures/Help_CSV_Import_Transactions_Save.png
rename to manual/C/figures/CSV_Import_Transactions_Save.png
diff --git a/manual/C/figures/Help_CSV_Import_transactions_Preview.png b/manual/C/figures/CSV_Import_transactions_Preview.png
similarity index 100%
rename from manual/C/figures/Help_CSV_Import_transactions_Preview.png
rename to manual/C/figures/CSV_Import_transactions_Preview.png
diff --git a/manual/C/figures/Help_CSV_Transaction_Import_Assistant.png b/manual/C/figures/CSV_Transaction_Import_Assistant.png
similarity index 100%
rename from manual/C/figures/Help_CSV_Transaction_Import_Assistant.png
rename to manual/C/figures/CSV_Transaction_Import_Assistant.png
diff --git a/manual/C/figures/Help_Choose_Export_Settings.png b/manual/C/figures/Choose_Export_Settings.png
similarity index 100%
rename from manual/C/figures/Help_Choose_Export_Settings.png
rename to manual/C/figures/Choose_Export_Settings.png
diff --git a/manual/C/figures/Help_Import_Map_Editor.png b/manual/C/figures/Import_Map_Editor.png
similarity index 100%
rename from manual/C/figures/Help_Import_Map_Editor.png
rename to manual/C/figures/Import_Map_Editor.png
diff --git a/manual/C/figures/Help_Import_MatchPicker.png b/manual/C/figures/Import_MatchPicker.png
similarity index 100%
rename from manual/C/figures/Help_Import_MatchPicker.png
rename to manual/C/figures/Import_MatchPicker.png
diff --git a/manual/C/figures/Help_Import_QIF_Druid.png b/manual/C/figures/Import_QIF_Druid.png
similarity index 100%
rename from manual/C/figures/Help_Import_QIF_Druid.png
rename to manual/C/figures/Import_QIF_Druid.png
diff --git a/manual/C/figures/Help_Import_Transaction_matcher_1.png b/manual/C/figures/Import_Transaction_matcher_1.png
similarity index 100%
rename from manual/C/figures/Help_Import_Transaction_matcher_1.png
rename to manual/C/figures/Import_Transaction_matcher_1.png
diff --git a/manual/C/figures/Help_Pref_AccntPeriod.png b/manual/C/figures/Pref_AccntPeriod.png
similarity index 100%
rename from manual/C/figures/Help_Pref_AccntPeriod.png
rename to manual/C/figures/Pref_AccntPeriod.png
diff --git a/manual/C/figures/Help_Pref_Accnts.png b/manual/C/figures/Pref_Accnts.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Accnts.png
rename to manual/C/figures/Pref_Accnts.png
diff --git a/manual/C/figures/Help_Pref_Business.png b/manual/C/figures/Pref_Business.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Business.png
rename to manual/C/figures/Pref_Business.png
diff --git a/manual/C/figures/Help_Pref_DateTime.png b/manual/C/figures/Pref_DateTime.png
similarity index 100%
rename from manual/C/figures/Help_Pref_DateTime.png
rename to manual/C/figures/Pref_DateTime.png
diff --git a/manual/C/figures/Help_Pref_General.png b/manual/C/figures/Pref_General.png
similarity index 100%
rename from manual/C/figures/Help_Pref_General.png
rename to manual/C/figures/Pref_General.png
diff --git a/manual/C/figures/Help_Pref_Import.png b/manual/C/figures/Pref_Import.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Import.png
rename to manual/C/figures/Pref_Import.png
diff --git a/manual/C/figures/Help_Pref_OnlineBanking.png b/manual/C/figures/Pref_OnlineBanking.png
similarity index 100%
rename from manual/C/figures/Help_Pref_OnlineBanking.png
rename to manual/C/figures/Pref_OnlineBanking.png
diff --git a/manual/C/figures/Help_Pref_Printing.png b/manual/C/figures/Pref_Printing.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Printing.png
rename to manual/C/figures/Pref_Printing.png
diff --git a/manual/C/figures/Help_Pref_Quotes.png b/manual/C/figures/Pref_Quotes.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Quotes.png
rename to manual/C/figures/Pref_Quotes.png
diff --git a/manual/C/figures/Help_Pref_Register.png b/manual/C/figures/Pref_Register.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Register.png
rename to manual/C/figures/Pref_Register.png
diff --git a/manual/C/figures/Help_Pref_RegisterDefaults.png b/manual/C/figures/Pref_RegisterDefaults.png
similarity index 100%
rename from manual/C/figures/Help_Pref_RegisterDefaults.png
rename to manual/C/figures/Pref_RegisterDefaults.png
diff --git a/manual/C/figures/Help_Pref_Reports.png b/manual/C/figures/Pref_Reports.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Reports.png
rename to manual/C/figures/Pref_Reports.png
diff --git a/manual/C/figures/Help_Pref_Sched.png b/manual/C/figures/Pref_Sched.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Sched.png
rename to manual/C/figures/Pref_Sched.png
diff --git a/manual/C/figures/Help_Pref_Windows.png b/manual/C/figures/Pref_Windows.png
similarity index 100%
rename from manual/C/figures/Help_Pref_Windows.png
rename to manual/C/figures/Pref_Windows.png
diff --git a/manual/C/figures/Help_Report_Screen.png b/manual/C/figures/Report_Screen.png
similarity index 100%
rename from manual/C/figures/Help_Report_Screen.png
rename to manual/C/figures/Report_Screen.png
diff --git a/manual/C/figures/Help_Tool_LotsBus.png b/manual/C/figures/Tool_LotsBus.png
similarity index 100%
rename from manual/C/figures/Help_Tool_LotsBus.png
rename to manual/C/figures/Tool_LotsBus.png
diff --git a/manual/C/figures/Help_Tool_LotsStk.png b/manual/C/figures/Tool_LotsStk.png
similarity index 100%
rename from manual/C/figures/Help_Tool_LotsStk.png
rename to manual/C/figures/Tool_LotsStk.png
diff --git a/manual/C/figures/Help_Tool_Lots_h_double_arrow.png b/manual/C/figures/Tool_Lots_h_double_arrow.png
similarity index 100%
rename from manual/C/figures/Help_Tool_Lots_h_double_arrow.png
rename to manual/C/figures/Tool_Lots_h_double_arrow.png
diff --git a/manual/C/figures/Help_Tool_Lots_v_double_arrow.png b/manual/C/figures/Tool_Lots_v_double_arrow.png
similarity index 100%
rename from manual/C/figures/Help_Tool_Lots_v_double_arrow.png
rename to manual/C/figures/Tool_Lots_v_double_arrow.png
diff --git a/manual/C/figures/Help_Trans_Assoc_Dialog.png b/manual/C/figures/Trans_Assoc_Dialog.png
similarity index 100%
rename from manual/C/figures/Help_Trans_Assoc_Dialog.png
rename to manual/C/figures/Trans_Assoc_Dialog.png
diff --git a/manual/C/figures/Help_Trans_Assoc_Symbols.png b/manual/C/figures/Trans_Assoc_Symbols.png
similarity index 100%
rename from manual/C/figures/Help_Trans_Assoc_Symbols.png
rename to manual/C/figures/Trans_Assoc_Symbols.png
diff --git a/manual/C/figures/Help_TxRptOpt_Screen.png b/manual/C/figures/TxRptOpt_Screen.png
similarity index 100%
rename from manual/C/figures/Help_TxRptOpt_Screen.png
rename to manual/C/figures/TxRptOpt_Screen.png
diff --git a/manual/C/gnucash-help.xml b/manual/C/gnucash-help.xml
index ed208d7f..14b12824 100644
--- a/manual/C/gnucash-help.xml
+++ b/manual/C/gnucash-help.xml
@@ -32,7 +32,7 @@
 <address><email>gnucash-user at gnucash.org</email></address>
     </publisher>
 
-    <xi:include href="Help_legal.xml" />
+    <xi:include href="legal.xml" />
 
     <authorgroup>
       <author>
@@ -524,34 +524,34 @@
 -->
   </preface>
 
-  <xi:include href="Help_ch_Intro.xml" />
+  <xi:include href="ch_Intro.xml" />
 
-  <xi:include href="Help_ch_GettingHelp.xml" />
+  <xi:include href="ch_GettingHelp.xml" />
 
-  <xi:include href="Help_ch_GettingStarted.xml" />
+  <xi:include href="ch_GettingStarted.xml" />
 
-  <xi:include href="Help_ch_GUIMenus.xml" />
+  <xi:include href="ch_GUIMenus.xml" />
 
-  <xi:include href="Help_ch_Account-Actions.xml" />
+  <xi:include href="ch_Account-Actions.xml" />
 <!-- subchapters:
-  Help_chartofaccts.xml"
+  chartofaccts.xml"
 -->
-  <xi:include href="Help_ch_Transactions.xml" />
+  <xi:include href="ch_Transactions.xml" />
 
-  <xi:include href="Help_ch_Business.xml" />
+  <xi:include href="ch_Business.xml" />
 
-  <xi:include href="Help_ch_Tools_Assistants.xml" />
+  <xi:include href="ch_Tools_Assistants.xml" />
 
-  <xi:include href="Help_ch_Reports.xml" />
+  <xi:include href="ch_Reports.xml" />
 
-  <xi:include href="Help_ch_Customize.xml" />
+  <xi:include href="ch_Customize.xml" />
 <!-- subchapters:
-  Help_txf-ategories.xml
+  txf-ategories.xml
 -->
 
   <xi:include href="ch_Finance-Quote.xml" />
 
-  <xi:include href="Help_tips-appendix.xml" />
+  <xi:include href="tips-appendix.xml" />
 
-  <xi:include href="Help_fdl-appendix.xml" />
+  <xi:include href="fdl-appendix.xml" />
 </book>
diff --git a/manual/C/Help_legal.xml b/manual/C/legal.xml
similarity index 100%
rename from manual/C/Help_legal.xml
rename to manual/C/legal.xml
diff --git a/manual/C/Help_tips-appendix.xml b/manual/C/tips-appendix.xml
similarity index 100%
rename from manual/C/Help_tips-appendix.xml
rename to manual/C/tips-appendix.xml
diff --git a/manual/C/Help_txf-categories.xml b/manual/C/txf-categories.xml
similarity index 100%
rename from manual/C/Help_txf-categories.xml
rename to manual/C/txf-categories.xml
diff --git a/manual/de/CMakeLists.txt b/manual/de/CMakeLists.txt
index c63c8bc5..c0e70a50 100644
--- a/manual/de/CMakeLists.txt
+++ b/manual/de/CMakeLists.txt
@@ -1,22 +1,22 @@
 set (entities
-        Help_ch_Intro.xml
-        Help_ch_GettingHelp.xml
-        Help_ch_GettingStarted.xml
-        Help_ch_GUIMenus.xml
-        Help_ch_Account-Actions.xml
-        Help_ch_Transactions.xml
-        Help_ch_Business.xml
-        Help_ch_Tools_Assistants.xml
-        Help_ch_Reports.xml
-        Help_ch_Customize.xml
+        ch_Intro.xml
+        ch_GettingHelp.xml
+        ch_GettingStarted.xml
+        ch_GUIMenus.xml
+        ch_Account-Actions.xml
+        ch_Transactions.xml
+        ch_Business.xml
+        ch_Tools_Assistants.xml
+        ch_Reports.xml
+        ch_Customize.xml
         ch_Finance-Quote.xml
-        Help_fdl-appendix.xml
-        Help_legal.xml
+        fdl-appendix.xml
+        legal.xml
         para-assist-buttons.xml
-        Help_chartofaccts.xml
-        Help_chtacctseg.xml
-        Help_para-assist-intro.xml
-        Help_txf-categories.xml
-        Help_tips-appendix.xml)
+        chartofaccts.xml
+        chtacctseg.xml
+        para-assist-intro.xml
+        txf-categories.xml
+        tips-appendix.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/ch_Account-Actions.xml
similarity index 99%
rename from manual/de/Help_ch_Account-Actions.xml
rename to manual/de/ch_Account-Actions.xml
index d00c94a2..da43ca8d 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/ch_Account-Actions.xml
@@ -530,7 +530,7 @@
       dargestellt und nicht die Einzelkonten.
     </para>
 
-    <para>Eine Kontenhierarchie könnte beispielsweise wie folgt aussehen:<xi:include href="Help_chtacctseg.xml"/>
+    <para>Eine Kontenhierarchie könnte beispielsweise wie folgt aussehen:<xi:include href="chtacctseg.xml"/>
     </para>
 
     <tip id="accts-code">
@@ -560,7 +560,7 @@
 <!--        <para>Nachfolgend ist ein Beispiel für eine Kontenübersicht dargestellt. Jedes Konto besitzt eine vorgegebene
             Kontoart. Dieses Beispiel kombiniert einige typische geschäftliche und private Konten.</para>
             
-        <xi:include href="Help_chartofaccts.xml" /> -->
+        <xi:include href="chartofaccts.xml" /> -->
   </sect1>
 
   <sect1 id="acct-hierarchy">
@@ -2356,7 +2356,7 @@
       </screenshot>
     </figure>
 
-    <xi:include href="Help_para-assist-intro.xml"/>
+    <xi:include href="para-assist-intro.xml"/>
 
     <procedure>
       <title>Schritte des CSV-Importprozesses</title>
@@ -2738,7 +2738,7 @@
         </screenshot>
       </figure>
 
-      <xi:include href="Help_para-assist-intro.xml"/>
+      <xi:include href="para-assist-intro.xml"/>
 
       <procedure>
         <title>Schritte des Exportdialogs</title>
diff --git a/manual/de/Help_ch_Business.xml b/manual/de/ch_Business.xml
similarity index 100%
rename from manual/de/Help_ch_Business.xml
rename to manual/de/ch_Business.xml
diff --git a/manual/de/Help_ch_Customize.xml b/manual/de/ch_Customize.xml
similarity index 98%
rename from manual/de/Help_ch_Customize.xml
rename to manual/de/ch_Customize.xml
index 3ec7da1d..0b45cd7a 100644
--- a/manual/de/Help_ch_Customize.xml
+++ b/manual/de/ch_Customize.xml
@@ -24,7 +24,7 @@ Translators:
 <chapter id="custom-gnucash"
          xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>&app; anpassen</title>
-<!-- FIXME source: move to Help_ch_GUIMenus
+<!-- FIXME source: move to ch_GUIMenus
   <sect1 id="account-options">
     <title>Anpassen der Anzeige für die Kontenübersicht</title>
   </sect1>
@@ -97,12 +97,12 @@ Translators:
           <guilabel>Buchführungsperioden</guilabel></title><screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" 
+              <imagedata fileref="figures/Pref_AccntPeriod.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png" 
+              <imagedata fileref="figures/Pref_AccntPeriod.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
@@ -225,12 +225,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Konten</guilabel></title><screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" 
+              <imagedata fileref="figures/Pref_Accnts.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Accnts.png" 
+              <imagedata fileref="figures/Pref_Accnts.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -395,12 +395,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Geschäft</guilabel></title><screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Business.png" 
+              <imagedata fileref="figures/Pref_Business.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Business.png" 
+              <imagedata fileref="figures/Pref_Business.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -562,12 +562,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für <guilabel>Zahl, Datum, Zeit</guilabel></title><screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" 
+              <imagedata fileref="figures/Pref_DateTime.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_DateTime.png" 
+              <imagedata fileref="figures/Pref_DateTime.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -747,12 +747,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für alles <guilabel>Allgemein</guilabel>e</title><screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_General.png" 
+              <imagedata fileref="figures/Pref_General.png" 
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_General.png" 
+              <imagedata fileref="figures/Pref_General.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1025,12 +1025,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für den <guilabel>Import</guilabel></title><screenshot id="Prefer_Import">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Import.png"
+              <imagedata fileref="figures/Pref_Import.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Import.png" 
+              <imagedata fileref="figures/Pref_Import.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1237,12 +1237,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Onlinebanking</guilabel></title><screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
+              <imagedata fileref="figures/Pref_OnlineBanking.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png" 
+              <imagedata fileref="figures/Pref_OnlineBanking.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1326,12 +1326,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> die <guilabel>Online Kurse</guilabel></title><screenshot id="Prefer-online-quotes">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Quotes.png"
+              <imagedata fileref="figures/Pref_Quotes.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Quotes.png" 
+              <imagedata fileref="figures/Pref_Quotes.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1377,12 +1377,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Drucken</guilabel></title><screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Printing.png"
+              <imagedata fileref="figures/Pref_Printing.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Printing.png" 
+              <imagedata fileref="figures/Pref_Printing.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1445,12 +1445,12 @@ Translators:
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Kontobuch</guilabel></title><screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Register.png"
+              <imagedata fileref="figures/Pref_Register.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Register.png" 
+              <imagedata fileref="figures/Pref_Register.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1663,12 +1663,12 @@ Translators:
           Kontobuch</guilabel></title><screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
+              <imagedata fileref="figures/Pref_RegisterDefaults.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" 
+              <imagedata fileref="figures/Pref_RegisterDefaults.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1791,12 +1791,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Berichte</guilabel></title><screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Reports.png"
+              <imagedata fileref="figures/Pref_Reports.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Reports.png" 
+              <imagedata fileref="figures/Pref_Reports.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -1884,12 +1884,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für <guilabel>Terminierte Buchungen</guilabel></title><screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Sched.png"
+              <imagedata fileref="figures/Pref_Sched.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Sched.png" 
+              <imagedata fileref="figures/Pref_Sched.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -2003,12 +2003,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Fenster</guilabel></title><screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Windows.png"
+              <imagedata fileref="figures/Pref_Windows.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Windows.png" 
+              <imagedata fileref="figures/Pref_Windows.png" 
                          srccredit="Christian Wehling"/>
             </imageobject>
 
@@ -2193,12 +2193,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Der Reiter <quote>Konten</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Accounts">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+              <imagedata fileref="figures/Book_Options_Accounts.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Accounts.png"
+              <imagedata fileref="figures/Book_Options_Accounts.png"
                          srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
@@ -2384,12 +2384,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Der Reiter <quote>Budgets</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Budgeting">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+              <imagedata fileref="figures/Book_Options_Budgeting.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Budgeting.png"
+              <imagedata fileref="figures/Book_Options_Budgeting.png"
                          srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
@@ -2408,12 +2408,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Der Reiter <quote>Geschäft</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Business">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Business.png"
+              <imagedata fileref="figures/Book_Options_Business.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Business.png"
+              <imagedata fileref="figures/Book_Options_Business.png"
                          srccredit="Christian Wehling"/>
             </imageobject>
           </mediaobject>
@@ -2530,12 +2530,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Der Reiter <quote>Nummern-Zähler</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Counters">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+              <imagedata fileref="figures/Book_Options_Counters.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Counters.png"
+              <imagedata fileref="figures/Book_Options_Counters.png"
                          srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
@@ -2610,12 +2610,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Der Reiter <quote>Steuern</quote> im Fenster der Buch-Optionen</title><screenshot id="Book_Options_Tax">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Book_Options_Tax.png"
+              <imagedata fileref="figures/Book_Options_Tax.png"
                          srccredit="Christian Wehling" width="&img-w;"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Book_Options_Tax.png"
+              <imagedata fileref="figures/Book_Options_Tax.png"
                          srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
@@ -2672,7 +2672,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <title>Die Auswahl von HTML-Stilvorlagen</title><screenshot id="Style_Choose">
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Style_Choose.png"
+              <imagedata fileref="figures/Style_Choose.png"
                          srccredit="Christian Wehling" />
             </imageobject>
 
@@ -2721,7 +2721,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
                 <title>Eine neue Stilvorlagen erstellen</title><screenshot>
                   <mediaobject>
                     <imageobject>
-                      <imagedata fileref="figures/Help_Style_New.png"
+                      <imagedata fileref="figures/Style_New.png"
                          srccredit="Christian Wehling" />
                     </imageobject>
                   </mediaobject>
@@ -3746,7 +3746,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <para>Table 32. Detailed <acronym>TXF</acronym> Category Descriptions
       </para>
 
-      <xi:include href="Help_txf-categories.xml" />
+      <xi:include href="txf-categories.xml" />
     </sect2>
   </sect1>
 
@@ -3770,12 +3770,12 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Das <guilabel>Warnungen zurücksetzen</guilabel> Fenster</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Reset_Warnings.png" 
+            <imagedata fileref="figures/Reset_Warnings.png" 
                          srccredit="Christian Wehling"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Reset_Warnings.png" 
+            <imagedata fileref="figures/Reset_Warnings.png" 
                          srccredit="Christian Wehling"/>
           </imageobject>
         </mediaobject>
diff --git a/manual/de/Help_ch_GUIMenus.xml b/manual/de/ch_GUIMenus.xml
similarity index 99%
rename from manual/de/Help_ch_GUIMenus.xml
rename to manual/de/ch_GUIMenus.xml
index d111949d..edf3d0de 100644
--- a/manual/de/Help_ch_GUIMenus.xml
+++ b/manual/de/ch_GUIMenus.xml
@@ -26,7 +26,7 @@
   <sect1 id="gui-windows">
     <title>Bereiche des &app; Hauptfensters</title>
 
-    <figure id="Help_Main_WindowCallouts">
+    <figure id="Main_WindowCallouts">
       <title>Die Bereiche des &app;-Hauptfensters</title><mediaobject>
         <imageobject role="html">
           <imagedata fileref="figures/Main-window-callouts.png"
@@ -57,7 +57,7 @@
 
     <para>Wenn Sie &app; starten, wird nach ein paar Fenstern (Begrüßungsbildschirm, Tipp des Tages) das
       Hauptfenster angezeigt. Dieses Fenster ist in die folgenden Bereiche unterteilt (vergleiche
-      <xref linkend="Help_Main_WindowCallouts"/> zur Information):
+      <xref linkend="Main_WindowCallouts"/> zur Information):
     </para>
 
     <variablelist>
@@ -2674,12 +2674,12 @@
       <title>Die Anzeige der <emphasis>Kontenübersicht</emphasis></title><screenshot id="AccTree_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png"
+            <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png"
+            <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Christian Wehling" />
           </imageobject>
 
@@ -3832,12 +3832,12 @@
       <title>Die Ansicht des <emphasis>Kontenblatt</emphasis>s</title><screenshot id="AccountReg_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_AccountReg_Screen.png"
+            <imagedata fileref="figures/AccountReg_Screen.png"
                        srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountReg_Screen.png"
+            <imagedata fileref="figures/AccountReg_Screen.png"
                        srccredit="Christian Wehling" />
           </imageobject>
 
@@ -4958,12 +4958,12 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Das <emphasis>Berichtsfenster</emphasis></title><screenshot id="Report_Screen">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Report_Screen.png"
+            <imagedata fileref="figures/Report_Screen.png"
                        srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Report_Screen.png"
+            <imagedata fileref="figures/Report_Screen.png"
                        srccredit="Christian Wehling" />
           </imageobject>
 
@@ -5542,11 +5542,11 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Der Assistent zum Abgleichen von Buchungen</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Reconcile_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
+            <imagedata fileref="figures/Reconcile_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Reconcile_Screen.png" srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Reconcile_Screen.png" srccredit="Christian Wehling" />
           </imageobject>
 
           <caption>
@@ -6179,11 +6179,11 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Arbeiten mit terminierten Buchungen</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Scheduled_Transactions.png" srccredit="Christian Wehling" width="&img-w;" />
+            <imagedata fileref="figures/Scheduled_Transactions.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Scheduled_Transactions.png" srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Scheduled_Transactions.png" srccredit="Christian Wehling" />
           </imageobject>
 
           <caption>
@@ -6505,11 +6505,11 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Die Budgetansicht</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Budget_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
+            <imagedata fileref="figures/Budget_Screen.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Budget_Screen.png" srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Budget_Screen.png" srccredit="Christian Wehling" />
           </imageobject>
 
           <caption>
diff --git a/manual/de/Help_ch_GettingHelp.xml b/manual/de/ch_GettingHelp.xml
similarity index 100%
rename from manual/de/Help_ch_GettingHelp.xml
rename to manual/de/ch_GettingHelp.xml
diff --git a/manual/de/Help_ch_GettingStarted.xml b/manual/de/ch_GettingStarted.xml
similarity index 97%
rename from manual/de/Help_ch_GettingStarted.xml
rename to manual/de/ch_GettingStarted.xml
index 7137f1c4..2397c288 100644
--- a/manual/de/Help_ch_GettingStarted.xml
+++ b/manual/de/ch_GettingStarted.xml
@@ -161,12 +161,12 @@ Translators:
       </para>
     </note>
   </sect1>
-<!-- FIXME: move into Help_ch_Account-Actions.xml and merge with "acct-create"-->
+<!-- FIXME: move into ch_Account-Actions.xml and merge with "acct-create"-->
 <!--  <sect1 id="acct-hierarchy">
     <title>New Account Hierarchy Setup</title>
     <para></para>
   </sect1> -->
-<!-- FIXME source: The import of QIF-Files is describt in Help_ch_Transactions.xml id="trans-import-qif". -->
+<!-- FIXME source: The import of QIF-Files is describt in ch_Transactions.xml id="trans-import-qif". -->
 <!--  <sect1 id="import-qif">
     <title>Import QIF Files</title>
     <para></para>
diff --git a/manual/de/Help_ch_Intro.xml b/manual/de/ch_Intro.xml
similarity index 100%
rename from manual/de/Help_ch_Intro.xml
rename to manual/de/ch_Intro.xml
diff --git a/manual/de/Help_ch_Reports.xml b/manual/de/ch_Reports.xml
similarity index 99%
rename from manual/de/Help_ch_Reports.xml
rename to manual/de/ch_Reports.xml
index bf4cde4c..d1531147 100644
--- a/manual/de/Help_ch_Reports.xml
+++ b/manual/de/ch_Reports.xml
@@ -417,10 +417,10 @@
           <title>Report Options</title>
 
           <figure>
-            <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
+            <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="TxRptOpt_Screen">
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
+                  <imagedata fileref="figures/TxRptOpt_Screen.png"
                      srccredit="Geert Janssens"/>
                 </imageobject>
                 <caption>
diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/ch_Tools_Assistants.xml
similarity index 99%
rename from manual/de/Help_ch_Tools_Assistants.xml
rename to manual/de/ch_Tools_Assistants.xml
index 9bc4ba2d..4c1a591e 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/ch_Tools_Assistants.xml
@@ -6316,11 +6316,11 @@ tips_appendix.xml and to adapt the text here. -->
         <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"
+              <imagedata fileref="figures/Tool_LotsStk.png"
               srccredit="Chris Good" width="&img-w;"/>
             </imageobject>
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Tool_LotsStk.png"
+              <imagedata fileref="figures/Tool_LotsStk.png"
                          srccredit="Chris Good"/>
             </imageobject>
             <caption>
@@ -6358,7 +6358,7 @@ tips_appendix.xml and to adapt the text here. -->
 
         <para><inlinemediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png"
+              <imagedata fileref="figures/Tool_Lots_h_double_arrow.png"
                 width="48px" />
             </imageobject>
 
@@ -6369,7 +6369,7 @@ tips_appendix.xml and to adapt the text here. -->
 
           <inlinemediaobject>
             <imageobject>
-              <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png"
+              <imagedata fileref="figures/Tool_Lots_v_double_arrow.png"
                 width="48px" />
             </imageobject>
           </inlinemediaobject>
@@ -6753,11 +6753,11 @@ tips_appendix.xml and to adapt the text here. -->
           <title>Lots in Account window for business features</title><screenshot id="tool-lotsInAcctBus">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Tool_LotsBus.png"
+                <imagedata fileref="figures/Tool_LotsBus.png"
                   srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Tool_LotsBus.png"
+                <imagedata fileref="figures/Tool_LotsBus.png"
                            srccredit="Chris Good" />
               </imageobject>
               <caption>
diff --git a/manual/de/Help_ch_Transactions.xml b/manual/de/ch_Transactions.xml
similarity index 99%
rename from manual/de/Help_ch_Transactions.xml
rename to manual/de/ch_Transactions.xml
index ff73dc68..ebf49589 100644
--- a/manual/de/Help_ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -459,12 +459,12 @@ Translators:
       <title>Der <quote>Buchungsverknüpfung bearbeiten</quote> Dialog</title><screenshot>
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Trans_Assoc_Dialog.png" 
+            <imagedata fileref="figures/Trans_Assoc_Dialog.png" 
                          srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Trans_Assoc_Dialog.png" 
+            <imagedata fileref="figures/Trans_Assoc_Dialog.png" 
                          srccredit="Christian Wehling" />
           </imageobject>
         </mediaobject>
@@ -508,7 +508,7 @@ Translators:
       <title>Kette und Büroklammer</title><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/Help_Trans_Assoc_Symbols.png" 
+            <imagedata fileref="figures/Trans_Assoc_Symbols.png" 
                        srccredit="Frank H. Ellenberger" />
           </imageobject>
         </mediaobject>
@@ -1835,11 +1835,11 @@ Translators:
         <title>Der Assistent zum Importieren von QIF-Dateien</title><screenshot id="ImportQIFDruid">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_QIF_Druid.png"  srccredit="Christian Wehling" width="&img-w;" />
+              <imagedata fileref="figures/Import_QIF_Druid.png"  srccredit="Christian Wehling" width="&img-w;" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_QIF_Druid.png"  srccredit="Christian Wehling" />
+              <imagedata fileref="figures/Import_QIF_Druid.png"  srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2158,11 +2158,11 @@ Translators:
         <title>Der CSV-Buchungsimport-Assistent - Einführung</title><screenshot id="CSV_Transaction_Import_Assistant">
           <mediaobject>
             <imageobject role="html">
-              <imagedata  fileref="figures/Help_CSV_Transaction_Import_Assistant.png"  srccredit="Christian Wehling" width="&img-w;" />
+              <imagedata  fileref="figures/CSV_Transaction_Import_Assistant.png"  srccredit="Christian Wehling" width="&img-w;" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_CSV_Transaction_Import_Assistant.png"  srccredit="Christian Wehling" />
+              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"  srccredit="Christian Wehling" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -2254,11 +2254,11 @@ Translators:
               <title>Der CSV Import Vorschau Bereich</title><screenshot id="CSV_Import_Preview">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png"  srccredit="Christian Wehling" width="&img-w;" />
+                    <imagedata  fileref="figures/CSV_Import_transactions_Preview.png"  srccredit="Christian Wehling" width="&img-w;" />
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata  fileref="figures/Help_CSV_Import_transactions_Preview.png"  srccredit="Christian Wehling" />
+                    <imagedata  fileref="figures/CSV_Import_transactions_Preview.png"  srccredit="Christian Wehling" />
                   </imageobject>
 
                   <caption>
@@ -2850,11 +2850,11 @@ Translators:
         <title>Buchungszuordnung während eines Importvorgangs</title><screenshot id="ImportMatcherScreenShot">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png"  srccredit="Christian Wehling" width="&img-w;" />
+              <imagedata fileref="figures/Import_Transaction_matcher_1.png"  srccredit="Christian Wehling" width="&img-w;" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_Transaction_matcher_1.png"  srccredit="Christian Wehling" />
+              <imagedata fileref="figures/Import_Transaction_matcher_1.png"  srccredit="Christian Wehling" />
             </imageobject>
 
             <caption>
@@ -3587,11 +3587,11 @@ Translators:
         <title>Der Buchungsauswähler Dialog</title><screenshot id="ImportMatcherPicker">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png"  srccredit="Christian Wehling" width="&img-w;" />
+              <imagedata fileref="figures/Import_MatchPicker.png"  srccredit="Christian Wehling" width="&img-w;" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_MatchPicker.png"  srccredit="Christian Wehling" />
+              <imagedata fileref="figures/Import_MatchPicker.png"  srccredit="Christian Wehling" />
             </imageobject>
 
             <caption>
@@ -3759,11 +3759,11 @@ Translators:
         <title>Der Import-Zuordnungen Editor</title><screenshot>
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Import_Map_Editor.png"  srccredit="Christian Wehling" width="&img-w;" />
+              <imagedata fileref="figures/Import_Map_Editor.png"  srccredit="Christian Wehling" width="&img-w;" />
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Import_Map_Editor.png"  srccredit="Christian Wehling" />
+              <imagedata fileref="figures/Import_Map_Editor.png"  srccredit="Christian Wehling" />
             </imageobject>
 
             <caption>
@@ -3978,11 +3978,11 @@ Translators:
       <title>Assistent für den Export von Buchungen</title><screenshot id="export-transactions-wizard">
         <mediaobject>
           <imageobject role="html">
-            <imagedata fileref="figures/Help_Choose_Export_Settings.png"  srccredit="Christian Wehling" width="&img-w;" />
+            <imagedata fileref="figures/Choose_Export_Settings.png"  srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_Choose_Export_Settings.png"  srccredit="Christian Wehling" />
+            <imagedata fileref="figures/Choose_Export_Settings.png"  srccredit="Christian Wehling" />
           </imageobject>
         </mediaobject>
       </screenshot>
diff --git a/manual/de/Help_chartofaccts.xml b/manual/de/chartofaccts.xml
similarity index 100%
rename from manual/de/Help_chartofaccts.xml
rename to manual/de/chartofaccts.xml
diff --git a/manual/de/Help_chtacctseg.xml b/manual/de/chtacctseg.xml
similarity index 100%
rename from manual/de/Help_chtacctseg.xml
rename to manual/de/chtacctseg.xml
diff --git a/manual/de/Help_fdl-appendix.xml b/manual/de/fdl-appendix.xml
similarity index 100%
rename from manual/de/Help_fdl-appendix.xml
rename to manual/de/fdl-appendix.xml
diff --git a/manual/de/figures/Help_AccountReg_Screen.png b/manual/de/figures/AccountReg_Screen.png
similarity index 100%
rename from manual/de/figures/Help_AccountReg_Screen.png
rename to manual/de/figures/AccountReg_Screen.png
diff --git a/manual/de/figures/Help_AccountTree_Screen.png b/manual/de/figures/AccountTree_Screen.png
similarity index 100%
rename from manual/de/figures/Help_AccountTree_Screen.png
rename to manual/de/figures/AccountTree_Screen.png
diff --git a/manual/de/figures/Help_Book_Options_Accounts.png b/manual/de/figures/Book_Options_Accounts.png
similarity index 100%
rename from manual/de/figures/Help_Book_Options_Accounts.png
rename to manual/de/figures/Book_Options_Accounts.png
diff --git a/manual/de/figures/Help_Book_Options_Budgeting.png b/manual/de/figures/Book_Options_Budgeting.png
similarity index 100%
rename from manual/de/figures/Help_Book_Options_Budgeting.png
rename to manual/de/figures/Book_Options_Budgeting.png
diff --git a/manual/de/figures/Help_Book_Options_Business.png b/manual/de/figures/Book_Options_Business.png
similarity index 100%
rename from manual/de/figures/Help_Book_Options_Business.png
rename to manual/de/figures/Book_Options_Business.png
diff --git a/manual/de/figures/Help_Book_Options_Counters.png b/manual/de/figures/Book_Options_Counters.png
similarity index 100%
rename from manual/de/figures/Help_Book_Options_Counters.png
rename to manual/de/figures/Book_Options_Counters.png
diff --git a/manual/de/figures/Help_Book_Options_Tax.png b/manual/de/figures/Book_Options_Tax.png
similarity index 100%
rename from manual/de/figures/Help_Book_Options_Tax.png
rename to manual/de/figures/Book_Options_Tax.png
diff --git a/manual/de/figures/Help_Budget_Screen.png b/manual/de/figures/Budget_Screen.png
similarity index 100%
rename from manual/de/figures/Help_Budget_Screen.png
rename to manual/de/figures/Budget_Screen.png
diff --git a/manual/de/figures/Help_CSV_Import_transactions_Preview.png b/manual/de/figures/CSV_Import_transactions_Preview.png
similarity index 100%
rename from manual/de/figures/Help_CSV_Import_transactions_Preview.png
rename to manual/de/figures/CSV_Import_transactions_Preview.png
diff --git a/manual/de/figures/Help_CSV_Transaction_Import_Assistant.png b/manual/de/figures/CSV_Transaction_Import_Assistant.png
similarity index 100%
rename from manual/de/figures/Help_CSV_Transaction_Import_Assistant.png
rename to manual/de/figures/CSV_Transaction_Import_Assistant.png
diff --git a/manual/de/figures/Help_Choose_Export_Settings.png b/manual/de/figures/Choose_Export_Settings.png
similarity index 100%
rename from manual/de/figures/Help_Choose_Export_Settings.png
rename to manual/de/figures/Choose_Export_Settings.png
diff --git a/manual/de/figures/Help_Import_Map_Editor.png b/manual/de/figures/Import_Map_Editor.png
similarity index 100%
rename from manual/de/figures/Help_Import_Map_Editor.png
rename to manual/de/figures/Import_Map_Editor.png
diff --git a/manual/de/figures/Help_Import_MatchPicker.png b/manual/de/figures/Import_MatchPicker.png
similarity index 100%
rename from manual/de/figures/Help_Import_MatchPicker.png
rename to manual/de/figures/Import_MatchPicker.png
diff --git a/manual/de/figures/Help_Import_QIF_Druid.png b/manual/de/figures/Import_QIF_Druid.png
similarity index 100%
rename from manual/de/figures/Help_Import_QIF_Druid.png
rename to manual/de/figures/Import_QIF_Druid.png
diff --git a/manual/de/figures/Help_Import_Transaction_matcher_1.png b/manual/de/figures/Import_Transaction_matcher_1.png
similarity index 100%
rename from manual/de/figures/Help_Import_Transaction_matcher_1.png
rename to manual/de/figures/Import_Transaction_matcher_1.png
diff --git a/manual/de/figures/Help_Pref_AccntPeriod.png b/manual/de/figures/Pref_AccntPeriod.png
similarity index 100%
rename from manual/de/figures/Help_Pref_AccntPeriod.png
rename to manual/de/figures/Pref_AccntPeriod.png
diff --git a/manual/de/figures/Help_Pref_Accnts.png b/manual/de/figures/Pref_Accnts.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Accnts.png
rename to manual/de/figures/Pref_Accnts.png
diff --git a/manual/de/figures/Help_Pref_Business.png b/manual/de/figures/Pref_Business.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Business.png
rename to manual/de/figures/Pref_Business.png
diff --git a/manual/de/figures/Help_Pref_DateTime.png b/manual/de/figures/Pref_DateTime.png
similarity index 100%
rename from manual/de/figures/Help_Pref_DateTime.png
rename to manual/de/figures/Pref_DateTime.png
diff --git a/manual/de/figures/Help_Pref_General.png b/manual/de/figures/Pref_General.png
similarity index 100%
rename from manual/de/figures/Help_Pref_General.png
rename to manual/de/figures/Pref_General.png
diff --git a/manual/de/figures/Help_Pref_Import.png b/manual/de/figures/Pref_Import.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Import.png
rename to manual/de/figures/Pref_Import.png
diff --git a/manual/de/figures/Help_Pref_OnlineBanking.png b/manual/de/figures/Pref_OnlineBanking.png
similarity index 100%
rename from manual/de/figures/Help_Pref_OnlineBanking.png
rename to manual/de/figures/Pref_OnlineBanking.png
diff --git a/manual/de/figures/Help_Pref_Printing.png b/manual/de/figures/Pref_Printing.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Printing.png
rename to manual/de/figures/Pref_Printing.png
diff --git a/manual/de/figures/Help_Pref_Quotes.png b/manual/de/figures/Pref_Quotes.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Quotes.png
rename to manual/de/figures/Pref_Quotes.png
diff --git a/manual/de/figures/Help_Pref_Register.png b/manual/de/figures/Pref_Register.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Register.png
rename to manual/de/figures/Pref_Register.png
diff --git a/manual/de/figures/Help_Pref_RegisterDefaults.png b/manual/de/figures/Pref_RegisterDefaults.png
similarity index 100%
rename from manual/de/figures/Help_Pref_RegisterDefaults.png
rename to manual/de/figures/Pref_RegisterDefaults.png
diff --git a/manual/de/figures/Help_Pref_Reports.png b/manual/de/figures/Pref_Reports.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Reports.png
rename to manual/de/figures/Pref_Reports.png
diff --git a/manual/de/figures/Help_Pref_Sched.png b/manual/de/figures/Pref_Sched.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Sched.png
rename to manual/de/figures/Pref_Sched.png
diff --git a/manual/de/figures/Help_Pref_Windows.png b/manual/de/figures/Pref_Windows.png
similarity index 100%
rename from manual/de/figures/Help_Pref_Windows.png
rename to manual/de/figures/Pref_Windows.png
diff --git a/manual/de/figures/Help_Reconcile_Screen.png b/manual/de/figures/Reconcile_Screen.png
similarity index 100%
rename from manual/de/figures/Help_Reconcile_Screen.png
rename to manual/de/figures/Reconcile_Screen.png
diff --git a/manual/de/figures/Help_Report_Screen.png b/manual/de/figures/Report_Screen.png
similarity index 100%
rename from manual/de/figures/Help_Report_Screen.png
rename to manual/de/figures/Report_Screen.png
diff --git a/manual/de/figures/Help_Reset_Warnings.png b/manual/de/figures/Reset_Warnings.png
similarity index 100%
rename from manual/de/figures/Help_Reset_Warnings.png
rename to manual/de/figures/Reset_Warnings.png
diff --git a/manual/de/figures/Help_Scheduled_Transactions.png b/manual/de/figures/Scheduled_Transactions.png
similarity index 100%
rename from manual/de/figures/Help_Scheduled_Transactions.png
rename to manual/de/figures/Scheduled_Transactions.png
diff --git a/manual/de/figures/Help_Style_Choose.png b/manual/de/figures/Style_Choose.png
similarity index 100%
rename from manual/de/figures/Help_Style_Choose.png
rename to manual/de/figures/Style_Choose.png
diff --git a/manual/de/figures/Help_Style_New.png b/manual/de/figures/Style_New.png
similarity index 100%
rename from manual/de/figures/Help_Style_New.png
rename to manual/de/figures/Style_New.png
diff --git a/manual/de/figures/Help_Tool_LotsBus.png b/manual/de/figures/Tool_LotsBus.png
similarity index 100%
rename from manual/de/figures/Help_Tool_LotsBus.png
rename to manual/de/figures/Tool_LotsBus.png
diff --git a/manual/de/figures/Help_Tool_LotsStk.png b/manual/de/figures/Tool_LotsStk.png
similarity index 100%
rename from manual/de/figures/Help_Tool_LotsStk.png
rename to manual/de/figures/Tool_LotsStk.png
diff --git a/manual/de/figures/Help_Tool_Lots_h_double_arrow.png b/manual/de/figures/Tool_Lots_h_double_arrow.png
similarity index 100%
rename from manual/de/figures/Help_Tool_Lots_h_double_arrow.png
rename to manual/de/figures/Tool_Lots_h_double_arrow.png
diff --git a/manual/de/figures/Help_Tool_Lots_v_double_arrow.png b/manual/de/figures/Tool_Lots_v_double_arrow.png
similarity index 100%
rename from manual/de/figures/Help_Tool_Lots_v_double_arrow.png
rename to manual/de/figures/Tool_Lots_v_double_arrow.png
diff --git a/manual/de/figures/Help_Trans_Assoc_Dialog.png b/manual/de/figures/Trans_Assoc_Dialog.png
similarity index 100%
rename from manual/de/figures/Help_Trans_Assoc_Dialog.png
rename to manual/de/figures/Trans_Assoc_Dialog.png
diff --git a/manual/de/figures/Help_Trans_Assoc_Symbols.png b/manual/de/figures/Trans_Assoc_Symbols.png
similarity index 100%
rename from manual/de/figures/Help_Trans_Assoc_Symbols.png
rename to manual/de/figures/Trans_Assoc_Symbols.png
diff --git a/manual/de/figures/Help_TxRptOpt_Screen.png b/manual/de/figures/TxRptOpt_Screen.png
similarity index 100%
rename from manual/de/figures/Help_TxRptOpt_Screen.png
rename to manual/de/figures/TxRptOpt_Screen.png
diff --git a/manual/de/gnucash-help.xml b/manual/de/gnucash-help.xml
index 8b86a5f2..37383b9e 100644
--- a/manual/de/gnucash-help.xml
+++ b/manual/de/gnucash-help.xml
@@ -50,7 +50,7 @@
 <address><email>gnucash-user at gnucash.org</email></address>
     </publisher>
 
-    <xi:include href="Help_legal.xml" />
+    <xi:include href="legal.xml" />
 
     <authorgroup>
       <author>
@@ -499,29 +499,29 @@
     </para>
   </preface>
 
-  <xi:include href="Help_ch_Intro.xml" />
+  <xi:include href="ch_Intro.xml" />
 
-  <xi:include href="Help_ch_GettingHelp.xml" />
+  <xi:include href="ch_GettingHelp.xml" />
 
-  <xi:include href="Help_ch_GettingStarted.xml" />
+  <xi:include href="ch_GettingStarted.xml" />
 
-  <xi:include href="Help_ch_GUIMenus.xml" />
+  <xi:include href="ch_GUIMenus.xml" />
 
-  <xi:include href="Help_ch_Account-Actions.xml" />
+  <xi:include href="ch_Account-Actions.xml" />
 
-  <xi:include href="Help_ch_Transactions.xml" />
+  <xi:include href="ch_Transactions.xml" />
 
-  <xi:include href="Help_ch_Business.xml" />
+  <xi:include href="ch_Business.xml" />
 
-  <xi:include href="Help_ch_Tools_Assistants.xml" />
+  <xi:include href="ch_Tools_Assistants.xml" />
 
-  <xi:include href="Help_ch_Reports.xml" />
+  <xi:include href="ch_Reports.xml" />
 
-  <xi:include href="Help_ch_Customize.xml" />
+  <xi:include href="ch_Customize.xml" />
   
   <xi:include href="ch_Finance-Quote.xml" />
 
-  <xi:include href="Help_tips-appendix.xml" />
+  <xi:include href="tips-appendix.xml" />
 
-  <xi:include href="Help_fdl-appendix.xml" />
+  <xi:include href="fdl-appendix.xml" />
 </book>
diff --git a/manual/de/Help_legal.xml b/manual/de/legal.xml
similarity index 100%
rename from manual/de/Help_legal.xml
rename to manual/de/legal.xml
diff --git a/manual/de/Help_para-assist-intro.xml b/manual/de/para-assist-intro.xml
similarity index 100%
rename from manual/de/Help_para-assist-intro.xml
rename to manual/de/para-assist-intro.xml
diff --git a/manual/de/Help_tips-appendix.xml b/manual/de/tips-appendix.xml
similarity index 100%
rename from manual/de/Help_tips-appendix.xml
rename to manual/de/tips-appendix.xml
diff --git a/manual/de/Help_txf-categories.xml b/manual/de/txf-categories.xml
similarity index 100%
rename from manual/de/Help_txf-categories.xml
rename to manual/de/txf-categories.xml
diff --git a/manual/it/CMakeLists.txt b/manual/it/CMakeLists.txt
index 4e237443..824f62cc 100644
--- a/manual/it/CMakeLists.txt
+++ b/manual/it/CMakeLists.txt
@@ -1,21 +1,21 @@
 set (COMPONENTS
         ${top_srcdir}/help/C/gnucash-help.xml
-        ${top_srcdir}/help/C/Help_ch_Intro.xml
-        ${top_srcdir}/help/C/Help_ch_GettingHelp.xml
-        ${top_srcdir}/help/C/Help_ch_GettingStarted.xml
-        ${top_srcdir}/help/C/Help_ch_GUIMenus.xml
-        ${top_srcdir}/help/C/Help_ch_Account-Actions.xml
-        ${top_srcdir}/help/C/Help_ch_Transactions.xml
-        ${top_srcdir}/help/C/Help_ch_Business.xml
-        ${top_srcdir}/help/C/Help_ch_Tools_Assistants.xml
-        ${top_srcdir}/help/C/Help_ch_Reports.xml
-        ${top_srcdir}/help/C/Help_ch_Customize.xml
-        ${top_srcdir}/help/C/Help_chtacctseg.xml
-        ${top_srcdir}/help/C/Help_chartofaccts.xml
-        ${top_srcdir}/help/C/Help_legal.xml
-        ${top_srcdir}/help/C/Help_txf-categories.xml
-        ${top_srcdir}/help/C/Help_fdl-appendix.xml
-        ${top_srcdir}/help/C/Help_tips-appendix.xml)
+        ${top_srcdir}/help/C/ch_Intro.xml
+        ${top_srcdir}/help/C/ch_GettingHelp.xml
+        ${top_srcdir}/help/C/ch_GettingStarted.xml
+        ${top_srcdir}/help/C/ch_GUIMenus.xml
+        ${top_srcdir}/help/C/ch_Account-Actions.xml
+        ${top_srcdir}/help/C/ch_Transactions.xml
+        ${top_srcdir}/help/C/ch_Business.xml
+        ${top_srcdir}/help/C/ch_Tools_Assistants.xml
+        ${top_srcdir}/help/C/ch_Reports.xml
+        ${top_srcdir}/help/C/ch_Customize.xml
+        ${top_srcdir}/help/C/chtacctseg.xml
+        ${top_srcdir}/help/C/chartofaccts.xml
+        ${top_srcdir}/help/C/legal.xml
+        ${top_srcdir}/help/C/txf-categories.xml
+        ${top_srcdir}/help/C/fdl-appendix.xml
+        ${top_srcdir}/help/C/tips-appendix.xml)
 
 #gnucash-help.xml: ${COMPONENTS} ${srcdir}/it.po
 #	xml2po -e -p ${srcdir}/it.po -o $@ ${top_srcdir}/help/C/gnucash-help.xml
diff --git a/manual/it/figures/Help_AccountReg_Screen.png b/manual/it/figures/AccountReg_Screen.png
similarity index 100%
rename from manual/it/figures/Help_AccountReg_Screen.png
rename to manual/it/figures/AccountReg_Screen.png
diff --git a/manual/it/figures/Help_AccountTree_Screen.png b/manual/it/figures/AccountTree_Screen.png
similarity index 100%
rename from manual/it/figures/Help_AccountTree_Screen.png
rename to manual/it/figures/AccountTree_Screen.png
diff --git a/manual/it/figures/Help_Pref_AccntPeriod.png b/manual/it/figures/Pref_AccntPeriod.png
similarity index 100%
rename from manual/it/figures/Help_Pref_AccntPeriod.png
rename to manual/it/figures/Pref_AccntPeriod.png
diff --git a/manual/it/figures/Help_Pref_Accnts.png b/manual/it/figures/Pref_Accnts.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Accnts.png
rename to manual/it/figures/Pref_Accnts.png
diff --git a/manual/it/figures/Help_Pref_Business.png b/manual/it/figures/Pref_Business.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Business.png
rename to manual/it/figures/Pref_Business.png
diff --git a/manual/it/figures/Help_Pref_DateTime.png b/manual/it/figures/Pref_DateTime.png
similarity index 100%
rename from manual/it/figures/Help_Pref_DateTime.png
rename to manual/it/figures/Pref_DateTime.png
diff --git a/manual/it/figures/Help_Pref_General.png b/manual/it/figures/Pref_General.png
similarity index 100%
rename from manual/it/figures/Help_Pref_General.png
rename to manual/it/figures/Pref_General.png
diff --git a/manual/it/figures/Help_Pref_OnlineBanking.png b/manual/it/figures/Pref_OnlineBanking.png
similarity index 100%
rename from manual/it/figures/Help_Pref_OnlineBanking.png
rename to manual/it/figures/Pref_OnlineBanking.png
diff --git a/manual/it/figures/Help_Pref_Printing.png b/manual/it/figures/Pref_Printing.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Printing.png
rename to manual/it/figures/Pref_Printing.png
diff --git a/manual/it/figures/Help_Pref_Register.png b/manual/it/figures/Pref_Register.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Register.png
rename to manual/it/figures/Pref_Register.png
diff --git a/manual/it/figures/Help_Pref_RegisterDefaults.png b/manual/it/figures/Pref_RegisterDefaults.png
similarity index 100%
rename from manual/it/figures/Help_Pref_RegisterDefaults.png
rename to manual/it/figures/Pref_RegisterDefaults.png
diff --git a/manual/it/figures/Help_Pref_Reports.png b/manual/it/figures/Pref_Reports.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Reports.png
rename to manual/it/figures/Pref_Reports.png
diff --git a/manual/it/figures/Help_Pref_Sched.png b/manual/it/figures/Pref_Sched.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Sched.png
rename to manual/it/figures/Pref_Sched.png
diff --git a/manual/it/figures/Help_Pref_Windows.png b/manual/it/figures/Pref_Windows.png
similarity index 100%
rename from manual/it/figures/Help_Pref_Windows.png
rename to manual/it/figures/Pref_Windows.png
diff --git a/manual/it/figures/Help_Report_Screen.png b/manual/it/figures/Report_Screen.png
similarity index 100%
rename from manual/it/figures/Help_Report_Screen.png
rename to manual/it/figures/Report_Screen.png
diff --git a/manual/it/gnucash-help.xml b/manual/it/gnucash-help.xml
index 316482f2..4c68e1cb 100644
--- a/manual/it/gnucash-help.xml
+++ b/manual/it/gnucash-help.xml
@@ -1544,7 +1544,7 @@
           avviene attraverso questa finestra.
         </para>
 
-        <figure id="Help_Main_WindowCallouts">
+        <figure id="Main_WindowCallouts">
           <title>La finestra principale di &app;</title><mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Main-window-callouts.png" srccredit="Cristian Marchi" width="510"/>
@@ -1567,7 +1567,7 @@
 
         <para>All’avvio di &app;, dopo un paio di finestre (Schermata di avvio e suggerimento del giorno)
           apparirà la finestra principale. Questa è suddivisa nelle seguenti sezioni (vedere
-          <xref linkend="Help_Main_WindowCallouts"/> per un riferimento):
+          <xref linkend="Main_WindowCallouts"/> per un riferimento):
         </para>
 
         <variablelist>
@@ -1675,11 +1675,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" srccredit="Cristian Marchi" width="510"/>
+              <imagedata fileref="figures/AccountTree_Screen.png" srccredit="Cristian Marchi" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_AccountTree_Screen.png" srccredit="Cristian Marchi"/>
+              <imagedata fileref="figures/AccountTree_Screen.png" srccredit="Cristian Marchi"/>
             </imageobject>
 
             <textobject>
@@ -4396,11 +4396,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" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/AccountReg_Screen.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_AccountReg_Screen.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/AccountReg_Screen.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -6282,11 +6282,11 @@
           <title>La <emphasis>finestra del resoconto</emphasis></title><screenshot id="Report_Screen">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_Report_Screen.png" srccredit="Cristian Marchi" width="510"/>
+                <imagedata fileref="figures/Report_Screen.png" srccredit="Cristian Marchi" width="510"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Report_Screen.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Report_Screen.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -19903,11 +19903,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" srccredit="Chris Good" width="510px"/>
+                <imagedata fileref="figures/Tool_LotsStk.png" srccredit="Chris Good" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Tool_LotsStk.png" srccredit="Chris Good"/>
+                <imagedata fileref="figures/Tool_LotsStk.png" srccredit="Chris Good"/>
               </imageobject>
 
               <textobject>
@@ -19949,7 +19949,7 @@ ________________________________________________________________________________
 
           <para><inlinemediaobject>
               <imageobject>
-                <imagedata fileref="figures/Help_Tool_Lots_h_double_arrow.png" width="48px"/>
+                <imagedata fileref="figures/Tool_Lots_h_double_arrow.png" width="48px"/>
               </imageobject>
 
               <textobject>
@@ -19959,7 +19959,7 @@ ________________________________________________________________________________
 
             <inlinemediaobject>
               <imageobject>
-                <imagedata fileref="figures/Help_Tool_Lots_v_double_arrow.png" width="48px"/>
+                <imagedata fileref="figures/Tool_Lots_v_double_arrow.png" width="48px"/>
               </imageobject>
             </inlinemediaobject>
           </para>
@@ -20344,11 +20344,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" srccredit="Chris Good" width="510px"/>
+                  <imagedata fileref="figures/Tool_LotsBus.png" srccredit="Chris Good" width="510px"/>
                 </imageobject>
 
                 <imageobject role="fo">
-                  <imagedata fileref="figures/Help_Tool_LotsBus.png" srccredit="Chris Good"/>
+                  <imagedata fileref="figures/Tool_LotsBus.png" srccredit="Chris Good"/>
                 </imageobject>
 
                 <textobject>
@@ -20813,14 +20813,14 @@ ________________________________________________________________________________
             <title>Opzioni del resoconto</title>
 
             <figure>
-              <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
+              <title><emphasis>Transaction Report, Report Options</emphasis></title><screenshot id="TxRptOpt_Screen">
                 <mediaobject>
                   <imageobject role="html">
-                    <imagedata fileref="figures/Help_TxRptOpt_Screen.png" srccredit="Geert Janssens" width="510px"/>
+                    <imagedata fileref="figures/TxRptOpt_Screen.png" srccredit="Geert Janssens" width="510px"/>
                   </imageobject>
 
                   <imageobject role="fo">
-                    <imagedata fileref="figures/Help_TxRptOpt_Screen.png" srccredit="Geert Janssens"/>
+                    <imagedata fileref="figures/TxRptOpt_Screen.png" srccredit="Geert Janssens"/>
                   </imageobject>
 
                   <textobject>
@@ -23479,11 +23479,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_AccntPeriod.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_AccntPeriod.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_AccntPeriod.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23563,11 +23563,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Accnts.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Accnts.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Accnts.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23671,11 +23671,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Business.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Business.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Business.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23794,11 +23794,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_DateTime.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_DateTime.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_DateTime.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -23885,11 +23885,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_General.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_General.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_General.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24069,11 +24069,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_OnlineBanking.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_OnlineBanking.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_OnlineBanking.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24232,11 +24232,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Printing.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Printing.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Printing.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24279,11 +24279,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Register.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Register.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Register.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24398,11 +24398,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_RegisterDefaults.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_RegisterDefaults.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_RegisterDefaults.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24489,11 +24489,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Reports.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Reports.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Reports.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24548,11 +24548,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Sched.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Sched.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Sched.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
@@ -24618,11 +24618,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" srccredit="Cristian Marchi" width="510px"/>
+                <imagedata fileref="figures/Pref_Windows.png" srccredit="Cristian Marchi" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_Pref_Windows.png" srccredit="Cristian Marchi"/>
+                <imagedata fileref="figures/Pref_Windows.png" srccredit="Cristian Marchi"/>
               </imageobject>
 
               <textobject>
diff --git a/manual/it/it.po b/manual/it/it.po
index 463a8b7b..bff2030e 100644
--- a/manual/it/it.po
+++ b/manual/it/it.po
@@ -23,106 +23,106 @@ msgstr "@@image: 'figures/Main-window-callouts.png'; md5=2d9ec66d4ff37517cd8c0b5
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:141(None)
 #: C/gnucash-help.xml:146(None)
-msgid "@@image: 'figures/Help_AccountTree_Screen.png'; md5=d2ca382a5369f4cc9530e7e2ff180516"
-msgstr "@@image: 'figures/Help_AccountTree_Screen.png'; md5=d2ca382a5369f4cc9530e7e2ff180516"
+msgid "@@image: 'figures/AccountTree_Screen.png'; md5=d2ca382a5369f4cc9530e7e2ff180516"
+msgstr "@@image: 'figures/AccountTree_Screen.png'; md5=d2ca382a5369f4cc9530e7e2ff180516"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:1821(None)
 #: C/gnucash-help.xml:1826(None)
-msgid "@@image: 'figures/Help_AccountReg_Screen.png'; md5=a78714b5a9c872d18739ea8c2e0aede5"
-msgstr "@@image: 'figures/Help_AccountReg_Screen.png'; md5=a78714b5a9c872d18739ea8c2e0aede5"
+msgid "@@image: 'figures/AccountReg_Screen.png'; md5=a78714b5a9c872d18739ea8c2e0aede5"
+msgstr "@@image: 'figures/AccountReg_Screen.png'; md5=a78714b5a9c872d18739ea8c2e0aede5"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:3009(None)
 #: C/gnucash-help.xml:3014(None)
-msgid "@@image: 'figures/Help_Report_Screen.png'; md5=5ca6cae46ac808a4d880a243d377a528"
-msgstr "@@image: 'figures/Help_Report_Screen.png'; md5=5ca6cae46ac808a4d880a243d377a528"
+msgid "@@image: 'figures/Report_Screen.png'; md5=5ca6cae46ac808a4d880a243d377a528"
+msgstr "@@image: 'figures/Report_Screen.png'; md5=5ca6cae46ac808a4d880a243d377a528"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:79(None)
 #: C/gnucash-help.xml:83(None)
-msgid "@@image: 'figures/Help_Pref_AccntPeriod.png'; md5=4ac260ee08a8c9f0c34b3f5a27959241"
-msgstr "@@image: 'figures/Help_Pref_AccntPeriod.png'; md5=4ac260ee08a8c9f0c34b3f5a27959241"
+msgid "@@image: 'figures/Pref_AccntPeriod.png'; md5=4ac260ee08a8c9f0c34b3f5a27959241"
+msgstr "@@image: 'figures/Pref_AccntPeriod.png'; md5=4ac260ee08a8c9f0c34b3f5a27959241"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:156(None)
 #: C/gnucash-help.xml:160(None)
-msgid "@@image: 'figures/Help_Pref_Accnts.png'; md5=2c4635f89d9fadf2cdcb2665767ebaf0"
-msgstr "@@image: 'figures/Help_Pref_Accnts.png'; md5=2c4635f89d9fadf2cdcb2665767ebaf0"
+msgid "@@image: 'figures/Pref_Accnts.png'; md5=2c4635f89d9fadf2cdcb2665767ebaf0"
+msgstr "@@image: 'figures/Pref_Accnts.png'; md5=2c4635f89d9fadf2cdcb2665767ebaf0"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:248(None)
 #: C/gnucash-help.xml:252(None)
-msgid "@@image: 'figures/Help_Pref_Business.png'; md5=3ac6567b4b758c1c2012349a89defdc3"
-msgstr "@@image: 'figures/Help_Pref_Business.png'; md5=3ac6567b4b758c1c2012349a89defdc3"
+msgid "@@image: 'figures/Pref_Business.png'; md5=3ac6567b4b758c1c2012349a89defdc3"
+msgstr "@@image: 'figures/Pref_Business.png'; md5=3ac6567b4b758c1c2012349a89defdc3"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:326(None)
 #: C/gnucash-help.xml:330(None)
-msgid "@@image: 'figures/Help_Pref_DateTime.png'; md5=df9bfd84c1098f8b3051c474f763b651"
-msgstr "@@image: 'figures/Help_Pref_DateTime.png'; md5=df9bfd84c1098f8b3051c474f763b651"
+msgid "@@image: 'figures/Pref_DateTime.png'; md5=df9bfd84c1098f8b3051c474f763b651"
+msgstr "@@image: 'figures/Pref_DateTime.png'; md5=df9bfd84c1098f8b3051c474f763b651"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:390(None)
 #: C/gnucash-help.xml:394(None)
-msgid "@@image: 'figures/Help_Pref_General.png'; md5=5d0270a76f6345921da14a861cbf01c7"
-msgstr "@@image: 'figures/Help_Pref_General.png'; md5=5d0270a76f6345921da14a861cbf01c7"
+msgid "@@image: 'figures/Pref_General.png'; md5=5d0270a76f6345921da14a861cbf01c7"
+msgstr "@@image: 'figures/Pref_General.png'; md5=5d0270a76f6345921da14a861cbf01c7"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:515(None)
 #: C/gnucash-help.xml:519(None)
-msgid "@@image: 'figures/Help_Pref_OnlineBanking.png'; md5=54715b4bc624bdf49305b6e67cb7bd7b"
-msgstr "@@image: 'figures/Help_Pref_OnlineBanking.png'; md5=54715b4bc624bdf49305b6e67cb7bd7b"
+msgid "@@image: 'figures/Pref_OnlineBanking.png'; md5=54715b4bc624bdf49305b6e67cb7bd7b"
+msgstr "@@image: 'figures/Pref_OnlineBanking.png'; md5=54715b4bc624bdf49305b6e67cb7bd7b"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:618(None)
 #: C/gnucash-help.xml:622(None)
-msgid "@@image: 'figures/Help_Pref_Printing.png'; md5=22a306a3deb6579bd3db9f6a452f8492"
-msgstr "@@image: 'figures/Help_Pref_Printing.png'; md5=22a306a3deb6579bd3db9f6a452f8492"
+msgid "@@image: 'figures/Pref_Printing.png'; md5=22a306a3deb6579bd3db9f6a452f8492"
+msgstr "@@image: 'figures/Pref_Printing.png'; md5=22a306a3deb6579bd3db9f6a452f8492"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:665(None)
 #: C/gnucash-help.xml:669(None)
-msgid "@@image: 'figures/Help_Pref_Register.png'; md5=521ea159f8c13dc94a30ca82a542da88"
-msgstr "@@image: 'figures/Help_Pref_Register.png'; md5=521ea159f8c13dc94a30ca82a542da88"
+msgid "@@image: 'figures/Pref_Register.png'; md5=521ea159f8c13dc94a30ca82a542da88"
+msgstr "@@image: 'figures/Pref_Register.png'; md5=521ea159f8c13dc94a30ca82a542da88"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:778(None)
 #: C/gnucash-help.xml:782(None)
-msgid "@@image: 'figures/Help_Pref_RegisterDefaults.png'; md5=ec42978ac5106f2a95a532722e53fabb"
-msgstr "@@image: 'figures/Help_Pref_RegisterDefaults.png'; md5=ec42978ac5106f2a95a532722e53fabb"
+msgid "@@image: 'figures/Pref_RegisterDefaults.png'; md5=ec42978ac5106f2a95a532722e53fabb"
+msgstr "@@image: 'figures/Pref_RegisterDefaults.png'; md5=ec42978ac5106f2a95a532722e53fabb"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:865(None)
 #: C/gnucash-help.xml:869(None)
-msgid "@@image: 'figures/Help_Pref_Reports.png'; md5=a5b039aea2c271aca1973b9cb41af0bf"
-msgstr "@@image: 'figures/Help_Pref_Reports.png'; md5=a5b039aea2c271aca1973b9cb41af0bf"
+msgid "@@image: 'figures/Pref_Reports.png'; md5=a5b039aea2c271aca1973b9cb41af0bf"
+msgstr "@@image: 'figures/Pref_Reports.png'; md5=a5b039aea2c271aca1973b9cb41af0bf"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:922(None)
 #: C/gnucash-help.xml:926(None)
-msgid "@@image: 'figures/Help_Pref_Sched.png'; md5=e03282247b611cbf35b4f7712b505afa"
-msgstr "@@image: 'figures/Help_Pref_Sched.png'; md5=e03282247b611cbf35b4f7712b505afa"
+msgid "@@image: 'figures/Pref_Sched.png'; md5=e03282247b611cbf35b4f7712b505afa"
+msgstr "@@image: 'figures/Pref_Sched.png'; md5=e03282247b611cbf35b4f7712b505afa"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/gnucash-help.xml:991(None)
 #: C/gnucash-help.xml:995(None)
-msgid "@@image: 'figures/Help_Pref_Windows.png'; md5=6dcc5dbf9cf1422e49c9d7da39e2740c"
-msgstr "@@image: 'figures/Help_Pref_Windows.png'; md5=6dcc5dbf9cf1422e49c9d7da39e2740c"
+msgid "@@image: 'figures/Pref_Windows.png'; md5=6dcc5dbf9cf1422e49c9d7da39e2740c"
+msgstr "@@image: 'figures/Pref_Windows.png'; md5=6dcc5dbf9cf1422e49c9d7da39e2740c"
 
 #: C/gnucash-help.xml:59(title)
 msgid "<application>GnuCash</application> Help Manual"
@@ -1003,8 +1003,8 @@ msgid "The parts in which the main <application>GnuCash</application> window is
 msgstr "Le parti in cui è suddivisa la finestra principale di &app;."
 
 #: C/gnucash-help.xml:62(para)
-msgid "When you start <application>GnuCash</application>, after a couple of windows (Splash screen, Tip of the Day) the main window will be displayed. This window is divided into the following sections (see <xref linkend=\"Help_Main_WindowCallouts\"/> for reference):"
-msgstr "All’avvio di &app;, dopo un paio di finestre (Schermata di avvio e suggerimento del giorno) apparirà la finestra principale. Questa è suddivisa nelle seguenti sezioni (vedere <xref linkend=\"Help_Main_WindowCallouts\"/> per un riferimento):"
+msgid "When you start <application>GnuCash</application>, after a couple of windows (Splash screen, Tip of the Day) the main window will be displayed. This window is divided into the following sections (see <xref linkend=\"Main_WindowCallouts\"/> for reference):"
+msgstr "All’avvio di &app;, dopo un paio di finestre (Schermata di avvio e suggerimento del giorno) apparirà la finestra principale. Questa è suddivisa nelle seguenti sezioni (vedere <xref linkend=\"Main_WindowCallouts\"/> per un riferimento):"
 
 #: C/gnucash-help.xml:67(term)
 msgid "Titlebar"
diff --git a/manual/pt/CMakeLists.txt b/manual/pt/CMakeLists.txt
index c4b56972..391a4f4b 100644
--- a/manual/pt/CMakeLists.txt
+++ b/manual/pt/CMakeLists.txt
@@ -1,19 +1,19 @@
 set (entities
-        Help_ch_Intro.xml
-        Help_ch_GettingHelp.xml
-        Help_ch_GettingStarted.xml
-        Help_ch_GUIMenus.xml
-        Help_ch_Account-Actions.xml
-        Help_ch_Transactions.xml
-        Help_ch_Business.xml
-        Help_ch_Tools_Assistants.xml
-        Help_ch_Reports.xml
-        Help_ch_Customize.xml
-        Help_chtacctseg.xml
-        Help_chartofaccts.xml
-        Help_legal.xml
-        Help_txf-categories.xml
-        Help_fdl-appendix.xml
-        Help_tips-appendix.xml)
+        ch_Intro.xml
+        ch_GettingHelp.xml
+        ch_GettingStarted.xml
+        ch_GUIMenus.xml
+        ch_Account-Actions.xml
+        ch_Transactions.xml
+        ch_Business.xml
+        ch_Tools_Assistants.xml
+        ch_Reports.xml
+        ch_Customize.xml
+        chtacctseg.xml
+        chartofaccts.xml
+        legal.xml
+        txf-categories.xml
+        fdl-appendix.xml
+        tips-appendix.xml)
 
 add_gnc_doc_targets(${docname} "${entities}")
diff --git a/manual/pt/Help_ch_Account-Actions.xml b/manual/pt/ch_Account-Actions.xml
similarity index 99%
rename from manual/pt/Help_ch_Account-Actions.xml
rename to manual/pt/ch_Account-Actions.xml
index b02dfca7..9dcc314c 100644
--- a/manual/pt/Help_ch_Account-Actions.xml
+++ b/manual/pt/ch_Account-Actions.xml
@@ -331,7 +331,7 @@
       representam contas bancárias individuais, ou categorias de despesa. Quando é pedido um
       relatório de sumário, tipicamente só os ramos principais são mostrados no relatório, não
       as contas individuais. Por exemplo, um plano de contas poderia ser parecido com o seguinte:
-      <xi:include href="Help_chtacctseg.xml"/>
+      <xi:include href="chtacctseg.xml"/>
     </para>
 
     <note id="accts-code">
diff --git a/manual/pt/Help_ch_Business.xml b/manual/pt/ch_Business.xml
similarity index 100%
rename from manual/pt/Help_ch_Business.xml
rename to manual/pt/ch_Business.xml
diff --git a/manual/pt/Help_ch_Customize.xml b/manual/pt/ch_Customize.xml
similarity index 98%
rename from manual/pt/Help_ch_Customize.xml
rename to manual/pt/ch_Customize.xml
index eba5ee5c..7c3882dd 100644
--- a/manual/pt/Help_ch_Customize.xml
+++ b/manual/pt/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"
+              <imagedata fileref="figures/Pref_Accnts.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Accnts.png"
+              <imagedata fileref="figures/Pref_Accnts.png"
                          srccredit="Pedro Albuquerque"/>
             </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"
+              <imagedata fileref="figures/Pref_DateTime.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_DateTime.png"
+              <imagedata fileref="figures/Pref_DateTime.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -304,12 +304,12 @@
         <title>O separador <guilabel>Preferências — Diário</guilabel></title><screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Register.png"
+              <imagedata fileref="figures/Pref_Register.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Register.png"
+              <imagedata fileref="figures/Pref_Register.png"
                          srccredit="Pedro Albuquerque"/>
             </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"
+              <imagedata fileref="figures/Pref_General.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_General.png"
+              <imagedata fileref="figures/Pref_General.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -616,12 +616,12 @@
         <title>O separador <guilabel>Preferências — Impressão</guilabel></title><screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Printing.png"
+              <imagedata fileref="figures/Pref_Printing.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Printing.png"
+              <imagedata fileref="figures/Pref_Printing.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -665,12 +665,12 @@
         <title>O separador <guilabel>Preferências — Janelas</guilabel></title><screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Windows.png"
+              <imagedata fileref="figures/Pref_Windows.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Windows.png"
+              <imagedata fileref="figures/Pref_Windows.png"
                          srccredit="Pedro Albuquerque"/>
             </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"
+              <imagedata fileref="figures/Pref_Business.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Business.png"
+              <imagedata fileref="figures/Pref_Business.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -882,12 +882,12 @@
         <title>The <guilabel>Preferências — Online Banking</guilabel> tab</title><screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
+              <imagedata fileref="figures/Pref_OnlineBanking.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_OnlineBanking.png"
+              <imagedata fileref="figures/Pref_OnlineBanking.png"
                          srccredit="Pedro Albuquerque"/>
             </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"
+              <imagedata fileref="figures/Pref_AccntPeriod.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_AccntPeriod.png"
+              <imagedata fileref="figures/Pref_AccntPeriod.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -1134,12 +1134,12 @@
         <title>O separador <guilabel>Preferências — Predefinições do diário</guilabel></title><screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
+              <imagedata fileref="figures/Pref_RegisterDefaults.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_RegisterDefaults.png"
+              <imagedata fileref="figures/Pref_RegisterDefaults.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -1230,12 +1230,12 @@
         <title>O separador <guilabel>Preferências — Relatórios</guilabel></title><screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Reports.png"
+              <imagedata fileref="figures/Pref_Reports.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Reports.png"
+              <imagedata fileref="figures/Pref_Reports.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -1293,12 +1293,12 @@
         <title>O separador <guilabel>Preferências — Transacções agendadas</guilabel> tab</title><screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
-              <imagedata fileref="figures/Help_Pref_Sched.png"
+              <imagedata fileref="figures/Pref_Sched.png"
                          srccredit="Pedro Albuquerque" width="510px"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Pref_Sched.png"
+              <imagedata fileref="figures/Pref_Sched.png"
                          srccredit="Pedro Albuquerque"/>
             </imageobject>
 
@@ -2699,7 +2699,7 @@
       <para>Table 32. Detailed <acronym>TXF</acronym> Category Descriptions
       </para>
 
-      <xi:include href="Help_txf-categories.xml" />
+      <xi:include href="txf-categories.xml" />
     </sect2>-->
   </sect1>
 
diff --git a/manual/pt/Help_ch_GUIMenus.xml b/manual/pt/ch_GUIMenus.xml
similarity index 99%
rename from manual/pt/Help_ch_GUIMenus.xml
rename to manual/pt/ch_GUIMenus.xml
index 3a483e6a..fbefad75 100644
--- a/manual/pt/Help_ch_GUIMenus.xml
+++ b/manual/pt/ch_GUIMenus.xml
@@ -41,7 +41,7 @@
       <para>Pode aceder a sub-janelas e ferramentas habitualmente utilizadas através desta janela.
       </para>
 
-      <figure id="Help_Main_WindowCallouts">
+      <figure id="Main_WindowCallouts">
         <title>A janela principal do &app;</title><mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/Main-window-callouts.png"
@@ -66,7 +66,7 @@
 
       <para>Quando inicia o &app;, após um par de janelas (logótipo e dica do dia), é mostrada a janela
         principal. Esta janela é dividida nas seguintes secções (veja
-        <xref linkend="Help_Main_WindowCallouts"/> para referência):
+        <xref linkend="Main_WindowCallouts"/> para referência):
       </para>
 
       <warning>
@@ -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"
+            <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Pedro Albuquerque" width="510"/>
           </imageobject>
 
           <imageobject role="fo">
-            <imagedata fileref="figures/Help_AccountTree_Screen.png"
+            <imagedata fileref="figures/AccountTree_Screen.png"
                        srccredit="Pedro Albuquerque"/>
           </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"
+              <imagedata fileref="figures/AccountReg_Screen.png"
                        srccredit="Pedro Albuquerque" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_AccountReg_Screen.png"
+              <imagedata fileref="figures/AccountReg_Screen.png"
                        srccredit="Pedro Albuquerque"/>
             </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"
+              <imagedata fileref="figures/Report_Screen.png"
                        srccredit="Pedro Albuquerque" width="510"/>
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/Help_Report_Screen.png"
+              <imagedata fileref="figures/Report_Screen.png"
                        srccredit="Pedro Albuquerque"/>
             </imageobject>
 
diff --git a/manual/pt/Help_ch_GettingHelp.xml b/manual/pt/ch_GettingHelp.xml
similarity index 100%
rename from manual/pt/Help_ch_GettingHelp.xml
rename to manual/pt/ch_GettingHelp.xml
diff --git a/manual/pt/Help_ch_GettingStarted.xml b/manual/pt/ch_GettingStarted.xml
similarity index 100%
rename from manual/pt/Help_ch_GettingStarted.xml
rename to manual/pt/ch_GettingStarted.xml
diff --git a/manual/pt/Help_ch_Intro.xml b/manual/pt/ch_Intro.xml
similarity index 100%
rename from manual/pt/Help_ch_Intro.xml
rename to manual/pt/ch_Intro.xml
diff --git a/manual/pt/Help_ch_Reports.xml b/manual/pt/ch_Reports.xml
similarity index 99%
rename from manual/pt/Help_ch_Reports.xml
rename to manual/pt/ch_Reports.xml
index ac19c77f..a103f8dd 100644
--- a/manual/pt/Help_ch_Reports.xml
+++ b/manual/pt/ch_Reports.xml
@@ -104,15 +104,15 @@
         <title>Opções do relatório</title>
 
         <figure>
-          <title><emphasis>Relatório de transacções — opções</emphasis></title><screenshot id="Help_TxRptOpt_Screen">
+          <title><emphasis>Relatório de transacções — opções</emphasis></title><screenshot id="TxRptOpt_Screen">
             <mediaobject>
               <imageobject role="html">
-                <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
+                <imagedata fileref="figures/TxRptOpt_Screen.png"
                      srccredit="Pedro Albuquerque" width="510px"/>
               </imageobject>
 
               <imageobject role="fo">
-                <imagedata fileref="figures/Help_TxRptOpt_Screen.png"
+                <imagedata fileref="figures/TxRptOpt_Screen.png"
                      srccredit="Pedro Albuquerque"/>
               </imageobject>
 
diff --git a/manual/pt/Help_ch_Tools_Assistants.xml b/manual/pt/ch_Tools_Assistants.xml
similarity index 100%
rename from manual/pt/Help_ch_Tools_Assistants.xml
rename to manual/pt/ch_Tools_Assistants.xml
diff --git a/manual/pt/Help_ch_Transactions.xml b/manual/pt/ch_Transactions.xml
similarity index 100%
rename from manual/pt/Help_ch_Transactions.xml
rename to manual/pt/ch_Transactions.xml
diff --git a/manual/pt/Help_chartofaccts.xml b/manual/pt/chartofaccts.xml
similarity index 100%
rename from manual/pt/Help_chartofaccts.xml
rename to manual/pt/chartofaccts.xml
diff --git a/manual/pt/Help_chtacctseg.xml b/manual/pt/chtacctseg.xml
similarity index 100%
rename from manual/pt/Help_chtacctseg.xml
rename to manual/pt/chtacctseg.xml
diff --git a/manual/pt/Help_fdl-appendix.xml b/manual/pt/fdl-appendix.xml
similarity index 100%
rename from manual/pt/Help_fdl-appendix.xml
rename to manual/pt/fdl-appendix.xml
diff --git a/manual/pt/figures/Help_AccountReg_Screen.png b/manual/pt/figures/AccountReg_Screen.png
similarity index 100%
rename from manual/pt/figures/Help_AccountReg_Screen.png
rename to manual/pt/figures/AccountReg_Screen.png
diff --git a/manual/pt/figures/Help_AccountTree_Screen.png b/manual/pt/figures/AccountTree_Screen.png
similarity index 100%
rename from manual/pt/figures/Help_AccountTree_Screen.png
rename to manual/pt/figures/AccountTree_Screen.png
diff --git a/manual/pt/figures/Help_Pref_AccntPeriod.png b/manual/pt/figures/Pref_AccntPeriod.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_AccntPeriod.png
rename to manual/pt/figures/Pref_AccntPeriod.png
diff --git a/manual/pt/figures/Help_Pref_Accnts.png b/manual/pt/figures/Pref_Accnts.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Accnts.png
rename to manual/pt/figures/Pref_Accnts.png
diff --git a/manual/pt/figures/Help_Pref_Business.png b/manual/pt/figures/Pref_Business.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Business.png
rename to manual/pt/figures/Pref_Business.png
diff --git a/manual/pt/figures/Help_Pref_DateTime.png b/manual/pt/figures/Pref_DateTime.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_DateTime.png
rename to manual/pt/figures/Pref_DateTime.png
diff --git a/manual/pt/figures/Help_Pref_General.png b/manual/pt/figures/Pref_General.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_General.png
rename to manual/pt/figures/Pref_General.png
diff --git a/manual/pt/figures/Help_Pref_OnlineBanking.png b/manual/pt/figures/Pref_OnlineBanking.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_OnlineBanking.png
rename to manual/pt/figures/Pref_OnlineBanking.png
diff --git a/manual/pt/figures/Help_Pref_Printing.png b/manual/pt/figures/Pref_Printing.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Printing.png
rename to manual/pt/figures/Pref_Printing.png
diff --git a/manual/pt/figures/Help_Pref_Register.png b/manual/pt/figures/Pref_Register.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Register.png
rename to manual/pt/figures/Pref_Register.png
diff --git a/manual/pt/figures/Help_Pref_RegisterDefaults.png b/manual/pt/figures/Pref_RegisterDefaults.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_RegisterDefaults.png
rename to manual/pt/figures/Pref_RegisterDefaults.png
diff --git a/manual/pt/figures/Help_Pref_Reports.png b/manual/pt/figures/Pref_Reports.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Reports.png
rename to manual/pt/figures/Pref_Reports.png
diff --git a/manual/pt/figures/Help_Pref_Sched.png b/manual/pt/figures/Pref_Sched.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Sched.png
rename to manual/pt/figures/Pref_Sched.png
diff --git a/manual/pt/figures/Help_Pref_Windows.png b/manual/pt/figures/Pref_Windows.png
similarity index 100%
rename from manual/pt/figures/Help_Pref_Windows.png
rename to manual/pt/figures/Pref_Windows.png
diff --git a/manual/pt/figures/Help_TxRptOpt_Screen.png b/manual/pt/figures/TxRptOpt_Screen.png
similarity index 100%
rename from manual/pt/figures/Help_TxRptOpt_Screen.png
rename to manual/pt/figures/TxRptOpt_Screen.png
diff --git a/manual/pt/gnucash-help.xml b/manual/pt/gnucash-help.xml
index 37262833..db093509 100644
--- a/manual/pt/gnucash-help.xml
+++ b/manual/pt/gnucash-help.xml
@@ -36,7 +36,7 @@
 <address><email>gnucash-user at gnucash.org</email></address>
     </publisher>
 
-    <xi:include href="Help_legal.xml" />
+    <xi:include href="legal.xml" />
 
     <authorgroup>
       <author>
@@ -474,27 +474,27 @@
     </para>
   </preface>
 
-  <xi:include href="Help_ch_Intro.xml" />
+  <xi:include href="ch_Intro.xml" />
 
-  <xi:include href="Help_ch_GettingHelp.xml" />
+  <xi:include href="ch_GettingHelp.xml" />
 
-  <xi:include href="Help_ch_GettingStarted.xml" />
+  <xi:include href="ch_GettingStarted.xml" />
 
-  <xi:include href="Help_ch_GUIMenus.xml" />
+  <xi:include href="ch_GUIMenus.xml" />
 
-  <xi:include href="Help_ch_Account-Actions.xml" />
+  <xi:include href="ch_Account-Actions.xml" />
 
-  <xi:include href="Help_ch_Transactions.xml" />
+  <xi:include href="ch_Transactions.xml" />
 
-  <xi:include href="Help_ch_Business.xml" />
+  <xi:include href="ch_Business.xml" />
 
-  <xi:include href="Help_ch_Tools_Assistants.xml" />
+  <xi:include href="ch_Tools_Assistants.xml" />
 
-  <xi:include href="Help_ch_Reports.xml" />
+  <xi:include href="ch_Reports.xml" />
 
-  <xi:include href="Help_ch_Customize.xml" />
+  <xi:include href="ch_Customize.xml" />
 
-  <xi:include href="Help_tips-appendix.xml" />
+  <xi:include href="tips-appendix.xml" />
 
-  <xi:include href="Help_fdl-appendix.xml" />
+  <xi:include href="fdl-appendix.xml" />
 </book>
diff --git a/manual/pt/Help_legal.xml b/manual/pt/legal.xml
similarity index 100%
rename from manual/pt/Help_legal.xml
rename to manual/pt/legal.xml
diff --git a/manual/pt/Help_tips-appendix.xml b/manual/pt/tips-appendix.xml
similarity index 100%
rename from manual/pt/Help_tips-appendix.xml
rename to manual/pt/tips-appendix.xml
diff --git a/manual/pt/Help_txf-categories.xml b/manual/pt/txf-categories.xml
similarity index 100%
rename from manual/pt/Help_txf-categories.xml
rename to manual/pt/txf-categories.xml

commit bdd42fe57aaff81b97f3868a31347e4ffc1091eb
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jul 6 16:58:51 2022 +0200

    Add option to enable/disable html install rules
    
    It's only used on MacOS and interferes with the linux distribution builds.
    The option is enabled by default on MacOS and disabled on other platforms.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9784defd..2b8ac267 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,13 @@ else()
 endif()
 option (WITH_MOBI "Enable build rules for Mobipocket document format" OFF)
 
+if(APPLE)
+    option (WITH_HTML_INSTALL "Enable install rules for html document format" ON)
+else()
+    option (WITH_HTML_INSTALL "Enable install rules for html document format" OFF)
+endif()
+
+
 # ############################################################
 # Following parameters can equally be set using -D switches on the CMake command line.
 # Set font dirs and font for Russian pdf documents
diff --git a/cmake/AddHtmlTarget.cmake b/cmake/AddHtmlTarget.cmake
index 917b5b9a..a3efa23f 100644
--- a/cmake/AddHtmlTarget.cmake
+++ b/cmake/AddHtmlTarget.cmake
@@ -54,7 +54,8 @@ function (add_html_target docname lang entities figures)
 
     add_dependencies(${docname}-html "${lang}-${docname}-html")
 
-    install(DIRECTORY ${BUILD_DIR}
-      DESTINATION "${CMAKE_INSTALL_DOCDIR}/${lang}"
-      )
+    if(WITH_HTML_INSTALL)
+        install(DIRECTORY ${BUILD_DIR}
+          DESTINATION "${CMAKE_INSTALL_DOCDIR}/${lang}")
+    endif()
 endfunction()

commit b3f46b4fac0ef87e3e5bdcf15e3e43463ceec17e
Merge: a6ab2c12 70bc6796
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jul 4 23:00:17 2022 +0200

    Merge PR #274 into maint

diff --cc manual/de/Help_ch_Tools_Assistants.xml
index 3c73a20e,06275466..9bc4ba2d
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@@ -5954,7 -5941,62 +5967,46 @@@ tips_appendix.xml and to adapt the tex
            </listitem>
          </varlistentry>
        </variablelist>
+       </sect3>
+       
+       <sect3 id="tools-commodity-currency-edit">
+         <title>ISO-Währung bearbeiten</title>
+ 
+         <abstract>
+           <para>Mit Hilfe dieses Dialoges haben Sie die Möglichkeit ISO-Währung zu bearbeiten.
+             Allerdings sind die meisten Eigenschaften von der ISO definiert sind, können nicht verändert werden.
+           </para>
+         </abstract>
+ 
+         <figure>
+           <title>Währung bearbeiten</title><screenshot>
+             <mediaobject>
+               <imageobject>
+                 <imagedata fileref="figures/Tools_SecurityEditor_edit.png" 
+                            srccredit="Christian Wehling"/>
+                 </imageobject>
+             </mediaobject>
+           </screenshot>
+         </figure>
+ 
+         <para>Bei den fest vorgegeben ISO-Währungen besteht <emphasis>nur</emphasis> die Möglichkeit,
+           <itemizedlist>
+             <listitem>
+               <para>das <xref linkend="tool-ge-DisplaySymbol" />,</para>
+             </listitem>
+             
+             <listitem>
+               <para>die <xref linkend="tool-ge-TypeQuoteSource" /> und</para>
+             </listitem>
+             
+             <listitem>
+               <para>die <xref linkend="tool-ge-TimeZone" /></para>
+             </listitem>
+           </itemizedlist>
+           anzupassen.
+         </para>
+       </sect3>
      </sect2>
 -
 -    <sect2 id="invest-stockprice-online3">
 -      <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>Detaillierte Anweisungen finden Sie im Abschnitt "Neue Konten erstellen":
 -        <xref linkend="accts-online-quotes"></xref>
 -      </para>
 -    </sect2>
    </sect1>
  
    <sect1 id="tool-calc">

commit a6ab2c12ee4346d8b5618ba921f4c805adc9fe52
Merge: 9b8cf9ed cf87b6e7
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Jul 3 10:38:19 2022 +0200

    Merge PR #275 into maint


commit 9b8cf9ed43d7043964917836cbbb132a11a5449b
Merge: 6de20edc b6408959
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Jul 2 05:37:53 2022 +0200

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


commit cf87b6e7f16f525528dee8a39702c92c1ad9c859
Author: Christian Wehling <christian.wehling at web.de>
Date:   Thu Jun 30 20:57:24 2022 +0200

    L10N:de: manual ch_Tools_Assistants, further improvements of the "Price
    Editor"

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index aef368a7..669a639f 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5005,17 +5005,47 @@
   <sect1 id="tool-price">
     <title>Kurs-Datenbank</title>
 
+    <abstract>
+      <para>Die Kurs-Datenbank listet die Preise eines Handelsguts zu verschiedenen Zeitpunken und ggf. auf
+        verschiedenen Märkten in Bezug zu einem anderen Handelsgut auf. Neue
+        Preise können hinzugefügt oder gelöscht, bestehende Preise bearbeitet und aus
+        einer Auswahl von verschiedenen Quellen im World-Wide-Web abgerufen werden, wenn das
+        Handelsgut hierfür richtig konfiguriert ist.
+      </para>
+    </abstract>
+
     <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>
 
+    <glosslist>
+      <glossentry>
+        <glossterm>Handelsgut</glossterm>
+        <glossdef>
+          <para>Steht in &app; 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.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Wechselkurs</glossterm>
+        <glossdef>
+          <para>Wird für den Vergleich zwischen zwei Währungen verwendet.
+          </para>
+        </glossdef>
+      </glossentry>
+
+      <glossentry>
+        <glossterm>Preis</glossterm>
+        <glossdef>
+          <para>Kommt zwischen einer Nicht-Währung und einer Währung zur Anwendung.
+          </para>
+        </glossdef>
+      </glossentry>    
+    </glosslist>
     <note>
-      <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
+      <para>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>
@@ -5024,12 +5054,6 @@
     <sect2 id="tool-price-db">
       <title>Benutzen der Kurs-Datenbank</title>
 
-      <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>
-
       <figure pgwide="1">
         <title>Die Kurs-Datenbank</title><screenshot>
           <mediaobject>
@@ -5044,7 +5068,8 @@
         </screenshot>
       </figure>
 
-      <para>Jedes Handelsgutpaar kann <emphasis>einen</emphasis> Preis pro Tag haben. Ein bestehender Preis wird
+      <para>Jedes Handelsgutpaar kann <emphasis>nur einen</emphasis> Preis pro Tag haben. Daher eignet sich &app;
+        nicht sonderlich für Intra-Day-Trading. 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.
@@ -5091,8 +5116,8 @@
             <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.
+                Betätigen dieser Schaltfläche für die konfigurierten Währungen und
+                Aktien/Investmentfonds die Kurse online abgerufen und eingetragen. (Siehe <xref linkend="tool-ge-GetOnlineQuotes" />) 
 <!-- FIXME insert <xref linkend="tool-ge-GetOnlineQuotes" /> to the new "Security Editor/Get Online Quotes" -->
               </para>
             </glossdef>
@@ -5101,7 +5126,7 @@
           <glossentry>
             <glossterm>Schließen</glossterm>
             <glossdef>
-              <para>Beendet die Kurs-Datenbank und schließt den Dialog.
+              <para>Schließt das Fenster der Kursdatenbank.
               </para>
             </glossdef>
           </glossentry>
@@ -5127,18 +5152,13 @@
         </screenshot>
       </figure>
 
-      <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>
-
       <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.
+              <para>Sind Kategorien zur Organisation Ihrer Wertpapiere. Weitere Beschreibungen stehen
+                unter <xref linkend="tool-ge-Namespace" />
 <!-- FIXME: weitere Beschreibungen stehen unter <xref linkend="tool-ge-Namespace" /> im SecurityEditor. -->
               </para>
             </glossdef>
@@ -5181,6 +5201,11 @@
                     <glossterm>user:price-editor</glossterm>
                     <glossdef>
                       <para>Manuell im Preiseditor eingetragene Preise.
+                        <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>
                       </para>
                     </glossdef>
                   </glossentry>
@@ -5238,7 +5263,7 @@
           </glossentry>
 
           <glossentry>
-            <glossterm>Typ (Kontoart)</glossterm>
+            <glossterm>Typ (Kursart)</glossterm>
             <glossdef>
               <para>Es werden verschiedene Arten für Kursnotierungen verwendet:
                 <glosslist>
@@ -5259,7 +5284,7 @@
                   </glossentry>
 
                   <glossentry>
-                    <glossterm>Last (Vortag)</glossterm>
+                    <glossterm>Last (Zuletzt)</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.
@@ -5272,7 +5297,8 @@
                     <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.
+                        gelten bis zur nächsten Neuberechnung. Informieren Sie sich bei der Fondsgesellschaft
+                        nach dem Zeitpunkt der Kursermittlung.
                       </para>
                     </glossdef>
                   </glossentry>

commit 70bc6796150493c00cb37978dfbfb3332d1ea107
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sun Jun 26 13:53:01 2022 +0200

    L10N:de: manual ch_Tools_Assistants, further improvements of the
    "Security Editor"

diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index aef368a7..06275466 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5457,7 +5457,7 @@
 
     <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.:
+        Währungen gemäß <ulink url="&url-wp-de;ISO_4217">ISO 4217</ulink> sind. Darunter fallen z.B.:
         <itemizedlist>
           <listitem>
             <para>Aktien und andere Wertpapiere,
@@ -5474,7 +5474,7 @@
             </para>
           </listitem>
         </itemizedlist>
-        Er zeigt auch die Definitionen der Währungen, die in &app; verfügbar sind.
+        Er zeigt auch die Definitionen der ISO-Währungen, die in &app; verfügbar sind.
       </para>
     </abstract>  
       
@@ -5505,8 +5505,7 @@
     </para>
 
     <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.
+      wobei zwei Spalten von &app; an Hand Ihrer Eingaben automatisch ausgefüllt werden.
     </para>
 
     <glosslist>
@@ -5522,7 +5521,7 @@
       <glossentry id="tool-ge-UniqueName">
         <glossterm>Eindeutiger Name</glossterm>
         <glossdef>
-          <para>Der <guilabel>Eindeutige Name</guilabel> setzt sich aus dem <guilabel>Namensraum</guilabel> (Typ)
+          <para>Der <guilabel>Eindeutige Name</guilabel> setzt sich aus dem <guilabel>Namensraum</guilabel>
             und dem <guilabel>Symbol</guilabel> zusammen.
           </para>
         </glossdef>
@@ -5538,13 +5537,25 @@
         <glossterm>Nationale Währungen anzeigen</glossterm>
 
         <glossdef>
-          <para>Mit Aktivieren dieses Kontrollkästchens werden die Währungseinträge zu Ihrer Information
+          <para>Mit Aktivieren dieses Kontrollkästchens werden die ISO-Währungen 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>
+                Da diese fest in &app; eingetragen sind, können diese Einträge weder
+                <itemizedlist>
+                  <listitem>
+                    <para>hinzugefügt noch
+                    </para>
+                  </listitem>
+
+                  <listitem>
+                    <para>gelöscht
+                    </para>
+                  </listitem>
+                </itemizedlist>
+                werden.
+              </para>
+            </note>            
           </para>
         </glossdef>
       </glossentry>
@@ -5553,12 +5564,9 @@
         <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>
-            </note>
+          <para>Öffnet den Dialog <guilabel>Neues Wertpapier</guilabel> in dem Sie ein neues Wertpapier (Aktie,
+            Investmentfonds, Anleihe, Option usw.) anlegen können. Dies erfolgt mit dem selben Dialog
+            in dem Sie auch ein <xref linkend="tools-commodity-add" /> können.
           </para>
         </glossdef>
       </glossentry>
@@ -5571,12 +5579,7 @@
             <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>
-            </note>
-
-            <note>
-              <para>Eine Währung kann aus der Auflistung nicht gelöscht werden.
+                darauf aufmerksam gemacht und müssen diese Einträge zuvor händisch entfernen.
               </para>
             </note>
           </para>
@@ -5588,8 +5591,8 @@
 
         <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.
+            Daten werden in dem Dialog <xref linkend="tools-commodity-add" /> bzw.
+            <xref linkend="tools-commodity-currency-edit" /> zur Änderungen angeboten.
           </para>
         </glossdef>
       </glossentry>
@@ -5607,72 +5610,54 @@
     <sect2 id="tool-commodity">
       <title>Wertpapier anlegen oder bearbeiten</title>
 
-      <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*"/>
+      <abstract>
+        <para>Der Wertpapier-Editor stellt ein weiteres Dialogfenster zu Verfügung in dem Sie Wertpapiere neu
+          anlegen und Vorhandene auch bearbeiten können. Mit dem selben Dialog können Sie ebenfalls die ISO-Währungen
+          bearbeiten. Nachfolgend werden Ihnen die Möglichkeiten beschrieben, die der Editor Ihnen
+          bietet.
+        </para>
+      </abstract>
+      
+      <sect3 id="tools-commodity-add">
+        <title>Wertpapier bearbeiten</title>
 
-          <colspec colwidth="0.5*"/>
+        <abstract>
+          <para>Dieser Dialog untertützt Sie dabei ein neues Handelsgut anzulegen
+            oder ein bestehendes Handelsgut zu bearbeiten.
+          </para>
+        </abstract>
 
-          <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"/>
-                        </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"/>
-                        </imageobject>
-                      </mediaobject>
-                    </screenshot>
-                  </figure>
-                </para><!--
-              </entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table> -->
+        <figure>
+          <title>Wertpapier anlegen oder bearbeiten</title><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/Tools_SecurityEditor_add.png" 
+                         srccredit="Christian Wehling"/>
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
       <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>Der vollständige Name sollte eine für Sie verständliche Beschreibung, wie z.B.
+                    <emphasis>US-Dollars</emphasis> oder <emphasis>Amazon Stammaktien</emphasis>
+                    bei Wertpaieren oder bei Anleihen z.B. <emphasis>Emitent, x %, Endfälligkeitsdatum</emphasis> sein.
+                    <tip>
+                      <para>Bei Anleihen empfiehlt es sich, die regelmäßigen Zinszahlungen und die Endfälligkeit gleich als
+                        <xref linkend="trans-sched" /> anzulegen. Das hilft den Überblick bei seiner Liquidität zu behalten.
+                      </para>
+                      <para>Zu den Ausschüttungen von Aktien und Fonds kann man das auch, allerdings muss man für die Höhe
+                        eine Variable verwenden, da sie jetzt noch nicht bekannt ist.
+                      </para>
+                    </tip>
                   </para>
                 </glossdef>
               </glossentry>
@@ -5684,8 +5669,13 @@
                     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.
+                    entspricht das Symbol der ISO 4217.
+                    <tip>
+                      <para>Wenn Sie Ihre Kursdaten mit &app-fq; abrufen möchten, ist es wichtig ist, dass das
+                        Symbol mit dem in der zugeordneten Kursquelle übereinstimmt.
+                        Beachten Sie auch die Hinweise zu dem <xref linkend="tool-ge-TypeQuoteSource" />.
+                      </para>
+                    </tip>
                   </para>
                 </glossdef>
               </glossentry>
@@ -5693,22 +5683,44 @@
               <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>Wenn Sie hier keinen Eintrag vornehmen, wird das zuvor eingetragene Symbol bzw. die Abkürzung
+                    auch als Anzeigesymbol genutzt. Bei einer Währung ist hier das Währungssymbol eingestellt.
                   </para>
                 </glossdef>
               </glossentry>
 
               <glossentry id="tool-ge-Namespace">
-                <glossterm>Typ</glossterm>
+                <glossterm>Namensraum</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>Kennzeichnet Kategorien zur Strukturierung 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.
+                    <note>
+                      <para>Ähnlich einer Kontonummer bietet der Namensraum eine Möglichkeit,
+                        seine Investments sachlich zu sortieren. Grundsätzlich bietet es sich an, sie nach
+                        Risiko zu gruppieren. Zum Beispiel kann als erste Ebene der Typ des Wertpapiers
+                        angegeben werden und als optionale 2. Ebene die Nominalwährung.
+<screen>:
+|
++--Anleihe
+|   |--CHF
+|   |--EUR
++--Aktie
+|   |--CHF
+|   |--EUR
+|   |--GBP
+|
+:</screen>
+                      </para>
+                    </note>
                   </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>Obwohl &app; Ihnen hier keine Vorgaben mehr macht<footnote>
+                      <para>Bis GnuCash 4.9 gab es eine Vorschlagsliste die sehr nordamerikanisch geprägt war und
+                        für Benutzer in anderen Teilen der Welt wenig Sinn machte.
+                      </para>
+                    </footnote>, können in dem Auswahlfeld noch Einträge aus vorherigen Eingaben enthalten sein.
+                    Sie können die Liste selber mit weiteren Typen ergänzen, denkbar wäre z.B. diese Gruppierung:
                   </para>
 
                   <itemizedlist>
@@ -5740,7 +5752,7 @@
 
                   <para>
                     <caution>
-                      <para>Da das Wort <emphasis>Template</emphasis> in &app; ein reserviertes Wort ist,
+                      <para>Da das Wort <computeroutput>template</computeroutput> in &app; ein reserviertes Wort ist,
                         darf es von Ihnen <emphasis>nicht</emphasis> verwendet werden!
                       </para>
                     </caution>
@@ -5748,21 +5760,21 @@
                 </glossdef>
               </glossentry>
 
-              <glossentry id="tool-ge-ISIN-CUSIP">
+              <glossentry id="tool-ge-ISIN">
                 <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
+                    identifizieren. Die
+                    <ulink url="&url-wp-de;Internationale_Wertpapierkennnummer"><acronym>ISIN</acronym></ulink>
                     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
+                    Optionen, Futures und Rohstoffen verbunden ist. In Deutschland ist auch noch 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.
+                    gebräuchlich.
+                  </para>
+
+                  <para>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>
@@ -5772,7 +5784,8 @@
                 <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.
+                    den Handel mit dem Wertpapier, beispielsweise bei offenen Fonds, aus denen Depot- oder Verwaltungs-Gebühren
+                    durch Verkäufe in Hundertstel oder Tausendstel beglichen werden, verwendet.
                   </para>
                 </glossdef>
               </glossentry>
@@ -5790,12 +5803,6 @@
                 <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
@@ -5873,28 +5880,34 @@ and update the appendix. -->
                       </para>
                     </note>
                   </para>
-
+<!-- Translators: You can add a sentence about your secondary regional exchanges from table
+"gnc-tbl-fq-yahoo-exchange-codes"in tips_appendix.xml -->
                   <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). 
+                    Börsenplatzkürzel des Wertpapiers anfügen sollten, z.B. <quote>F</quote> für Frankfurt,
+                    <quote>SW</quote> für Swiss oder <quote>VI</quote> für Vienna, usw. Als Beispiele sind
+                    hier VOW.F, NESN.SW und VOE.VI genannt. <quote>DE</quote> steht hier für
+                    <emphasis>Deutsche Börse XETRA</emphasis>.
                     <xref linkend="gnc-tbl-fq-yahoo-exchange-codes"></xref> enthält eine Liste von
                     Suffixen für verschiedene Märkte auf der ganzen Welt.
+<!-- Translators: Some fund companies create their own pseudo-symbols that differ from the regional codes, such as
+the TIAA-CREF fund as a regional fund. You are free to add corresponding tables from your language area in the
+tips_appendix.xml and to adapt the text here. -->
+                    <footnote>
+                      <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>
+                    </footnote>
                     <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>
+                <glossterm>Zeitzone</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
@@ -5928,6 +5941,45 @@ and update the appendix. -->
           </listitem>
         </varlistentry>
       </variablelist>
+      </sect3>
+      
+      <sect3 id="tools-commodity-currency-edit">
+        <title>ISO-Währung bearbeiten</title>
+
+        <abstract>
+          <para>Mit Hilfe dieses Dialoges haben Sie die Möglichkeit ISO-Währung zu bearbeiten.
+            Allerdings sind die meisten Eigenschaften von der ISO definiert sind, können nicht verändert werden.
+          </para>
+        </abstract>
+
+        <figure>
+          <title>Währung bearbeiten</title><screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/Tools_SecurityEditor_edit.png" 
+                           srccredit="Christian Wehling"/>
+                </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
+
+        <para>Bei den fest vorgegeben ISO-Währungen besteht <emphasis>nur</emphasis> die Möglichkeit,
+          <itemizedlist>
+            <listitem>
+              <para>das <xref linkend="tool-ge-DisplaySymbol" />,</para>
+            </listitem>
+            
+            <listitem>
+              <para>die <xref linkend="tool-ge-TypeQuoteSource" /> und</para>
+            </listitem>
+            
+            <listitem>
+              <para>die <xref linkend="tool-ge-TimeZone" /></para>
+            </listitem>
+          </itemizedlist>
+          anzupassen.
+        </para>
+      </sect3>
     </sect2>
 
     <sect2 id="invest-stockprice-online3">
diff --git a/manual/de/Help_ch_Transactions.xml b/manual/de/Help_ch_Transactions.xml
index 6da475b2..ff73dc68 100644
--- a/manual/de/Help_ch_Transactions.xml
+++ b/manual/de/Help_ch_Transactions.xml
@@ -1057,7 +1057,7 @@ Translators:
   </sect1>
 
   <sect1 id="trans-sched">
-    <title>Buchungen terminieren</title>
+    <title>Terminierte Buchungen</title>
 
     <para>Terminierte Buchungen bieten die Möglichkeit, Buchungssätze automatisch zu einem bestimmten
       Zeitpunkt in das Kontobuch einzugeben. Mit dem <xref linkend="sched-editor" /> lassen sich
diff --git a/manual/de/figures/Tools_SecurityEditor.png b/manual/de/figures/Tools_SecurityEditor.png
index 1d06d7f2..3190a308 100644
Binary files a/manual/de/figures/Tools_SecurityEditor.png 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
index 809d7c61..d0722e5d 100644
Binary files a/manual/de/figures/Tools_SecurityEditor_add.png 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
index 6ebed86a..90f592f2 100644
Binary files a/manual/de/figures/Tools_SecurityEditor_edit.png and b/manual/de/figures/Tools_SecurityEditor_edit.png differ

commit 6de20edc7ed9a00cdd8f4ea5882a1c3e55ca45c6
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 27 08:28:44 2022 +0200

    Manual: Minor structural cleanup of GUIMenus (C, de)

diff --git a/manual/C/Help_ch_GUIMenus.xml b/manual/C/Help_ch_GUIMenus.xml
index e6b3f1af..71da240d 100644
--- a/manual/C/Help_ch_GUIMenus.xml
+++ b/manual/C/Help_ch_GUIMenus.xml
@@ -11,19 +11,18 @@
 	    modified: February 28th 2005
 
   Maintainers:
-               Frank H. Ellenberger
-               Cristian Marchi <cri79 at libero.it>
-               Alex Aycinena <alex.aycinena at gmail.com>
-               Chris Lyttle <chris at wilddev.net>
-               Neil Williams <linux at codehelp.co.uk>
-
+    Frank H. Ellenberger
+    Cristian Marchi <cri79 at libero.it>
+    Alex Aycinena <alex.aycinena at gmail.com>
+    Chris Lyttle <chris at wilddev.net>
+    Neil Williams <linux at codehelp.co.uk>
   Author:
-               Chris Lyttle <chris at wilddev.net>
+    Chris Lyttle <chris at wilddev.net>
   Translators:
                (translators put your name and email here)
 -->
 <chapter id="GUIMenus">
-  <title>&app; Windows & Menus Options Overview</title>
+  <title>&app; Windows & Menus</title>
 
   <para>The main &app; window displays the accounts, reports, menu selections and tools you may use to
     process your financial data. This section gives you an overview of the different windows and
@@ -34,136 +33,132 @@
   </para>
 
   <sect1 id="gui-windows">
-    <title>&app; Windows and Menus</title>
+    <title>&app; Main Windows Areas</title>
 
-    <sect2 id="Main-window">
-      <title>Main &app; Window</title>
+    <para>You can access commonly used sub-windows and tools through this window.
+    </para>
 
-      <para>You can access commonly used sub-windows and tools through this window.
-      </para>
+    <figure id="Help_Main_WindowCallouts">
+      <title>The Main &app; Window</title><mediaobject>
+        <imageobject role="html">
+          <imagedata fileref="figures/Main-window-callouts.png"
+                     srccredit="Frank H. Ellenberger" width="510" />
+        </imageobject>
 
-      <figure id="Help_Main_WindowCallouts">
-        <title>The Main &app; Window</title><mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/Main-window-callouts.png"
-                       srccredit="Frank H. Ellenberger" width="510" />
-          </imageobject>
+        <imageobject role="fo">
+          <imagedata fileref="figures/Main-window-callouts.png"
+                     srccredit="Frank H. Ellenberger" width="510" />
+        </imageobject>
 
-          <imageobject role="fo">
-            <imagedata fileref="figures/Main-window-callouts.png"
-                       srccredit="Frank H. Ellenberger" width="510" />
-          </imageobject>
+        <textobject>
+          <phrase>&app; main window parts</phrase>
+        </textobject>
 
-          <textobject>
-            <phrase>&app; main window parts</phrase>
-          </textobject>
+        <caption>
+          <para>The parts in which the main &app; window is divided.
+          </para>
+        </caption>
+      </mediaobject>
+    </figure>
 
-          <caption>
-            <para>The parts in which the main &app; window is divided.
-            </para>
-          </caption>
-        </mediaobject>
-      </figure>
+    <para>When you start &app;, after a couple of windows (Splash screen, Tip of the Day) the main window will
+      be displayed. This window is divided into the following sections (see
+      <xref linkend="Help_Main_WindowCallouts"/> for reference):
+    </para>
 
-      <para>When you start &app;, after a couple of windows (Splash screen, Tip of the Day) the main window will
-        be displayed. This window is divided into the following sections (see
-        <xref linkend="Help_Main_WindowCallouts"/> for reference):
-      </para>
+    <variablelist>
+      <varlistentry>
+        <term>Titlebar</term>
 
-      <variablelist>
-        <varlistentry>
-          <term>Titlebar</term>
+        <listitem>
+          <para>Displays the name of the currently opened file and the active tab’s name
+          </para>
+        </listitem>
+      </varlistentry>
 
-          <listitem>
-            <para>Displays the name of the currently opened file and the active tab’s name
-            </para>
-          </listitem>
-        </varlistentry>
+      <varlistentry>
+        <term>Menubar</term>
 
-        <varlistentry>
-          <term>Menubar</term>
+        <listitem>
+          <para>Displays the available menu entries
+          </para>
+        </listitem>
+      </varlistentry>
 
-          <listitem>
-            <para>Displays the available menu entries
-            </para>
-          </listitem>
-        </varlistentry>
+      <varlistentry>
+        <term>Toolbar</term>
 
-        <varlistentry>
-          <term>Toolbar</term>
+        <listitem>
+          <para>Displays the available <emphasis>Toolbar</emphasis> buttons
+          </para>
+        </listitem>
+      </varlistentry>
 
-          <listitem>
-            <para>Displays the available <emphasis>Toolbar</emphasis> buttons
-            </para>
-          </listitem>
-        </varlistentry>
+      <varlistentry>
+        <term>Tab bar</term>
 
-        <varlistentry>
-          <term>Tab bar</term>
+        <listitem>
+          <para>Lists the open reports, registers and tree of accounts
+          </para>
+        </listitem>
+      </varlistentry>
 
-          <listitem>
-            <para>Lists the open reports, registers and tree of accounts
-            </para>
-          </listitem>
-        </varlistentry>
+      <varlistentry>
+        <term>Main pane</term>
 
-        <varlistentry>
-          <term>Main pane</term>
+        <listitem>
+          <para>The major display space showing the content of the currently selected tab
+          </para>
+        </listitem>
+      </varlistentry>
 
-          <listitem>
-            <para>The major display space showing the content of the currently selected tab
-            </para>
-          </listitem>
-        </varlistentry>
+      <varlistentry>
+        <term>Summarybar</term>
 
-        <varlistentry>
-          <term>Summarybar</term>
+        <listitem>
+          <para>Displays a financial summary
+          </para>
+        </listitem>
+      </varlistentry>
 
-          <listitem>
-            <para>Displays a financial summary
-            </para>
-          </listitem>
-        </varlistentry>
+      <varlistentry>
+        <term>Statusbar</term>
 
-        <varlistentry>
-          <term>Statusbar</term>
+        <listitem>
+          <para>Gives a description of the active menu item and shows a progress bar
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
-          <listitem>
-            <para>Gives a description of the active menu item and shows a progress bar
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
+    <note>
+      <para>The contents and options within the various sub-menus of the different sections of the main &app;
+        window will vary upon the active display window.
+      </para>
+    </note>
 
-      <note>
-        <para>The contents and options within the various sub-menus of the different sections of the main &app;
-          window will vary upon the active display window.
-        </para>
-      </note>
+    <para>The tree of accounts is labeled <guilabel>Accounts</guilabel> in the <firstterm>Tab bar</firstterm>,
+      and displays all your accounts and their balances, grouped according to standard accounting
+      practice.
+    </para>
 
-      <para>The tree of accounts is labeled <guilabel>Accounts</guilabel> in the <firstterm>Tab bar</firstterm>,
-        and displays all your accounts and their balances, grouped according to standard accounting
-        practice.
+    <tip>
+      <para>To open an additional view of the tree of accounts go to
+        <menuchoice>
+          <guimenu>View</guimenu> <guimenuitem>New Accounts Page</guimenuitem>
+        </menuchoice>
+        . This will open the account tree in the existing window.
       </para>
+    </tip>
 
-      <tip>
-        <para>To open an additional view of the tree of accounts go to
-          <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>New Accounts Page</guimenuitem>
-          </menuchoice>
-          . This will open the account tree in the existing window.
-        </para>
-      </tip>
-
-      <tip>
-        <para>To open a new window with a tree of accounts view, go to
-          <menuchoice>
-            <guimenu>Windows</guimenu> <guimenuitem>New Window with Page</guimenuitem>
-          </menuchoice>
-          .
-        </para>
+    <tip>
+      <para>To open a new window with a tree of accounts view, go to
+        <menuchoice>
+          <guimenu>Windows</guimenu> <guimenuitem>New Window with Page</guimenuitem>
+        </menuchoice>
+        .
+      </para>
       </tip>
-    </sect2>
   </sect1>
 
   <sect1 id="gui-acct-tree">
diff --git a/manual/de/Help_ch_GUIMenus.xml b/manual/de/Help_ch_GUIMenus.xml
index 8b1e8a4d..d111949d 100644
--- a/manual/de/Help_ch_GUIMenus.xml
+++ b/manual/de/Help_ch_GUIMenus.xml
@@ -21,10 +21,10 @@
     Christian Wehling <christian.wehling at web.de>
 -->
 <chapter id="GUIMenus">
-  <title>&app; Hauptfenster & Menüs</title>
+  <title>&app; Fenster & Menüs</title>
 
   <sect1 id="gui-windows">
-    <title>&app; Hauptfenster und Menüpunkte</title>
+    <title>Bereiche des &app; Hauptfensters</title>
 
     <figure id="Help_Main_WindowCallouts">
       <title>Die Bereiche des &app;-Hauptfensters</title><mediaobject>
@@ -176,7 +176,7 @@
   </sect1>
 <!-- FIXME source: new section -->
   <sect1 id="gui-window-nofile">
-    <title>Menüs ohne &appname;-Datendatei</title>
+    <title>Immer verfügbare Menüpunkte</title>
 
     <para>Auch wenn in &app; keine Datendatei geöffnet ist, entweder weil Sie &app; von der Kommandozeile mit
       dem Befehl <command>gnucash --nofile</command> gestartet haben, oder Sie den Assistenten
@@ -194,10 +194,10 @@
     </para>
 
     <sect2 id="gui-window-file-menu">
-      <title>&appname; - <guimenu><accel>D</accel>atei</guimenu>-Menü</title>
+      <title><guimenu><accel>D</accel>atei</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-FileMenu">
-        <title>&appname; - Datei-Menü - Zugriff auf Datei- und Kontenoperation sowie Druckfunktion</title>
+        <title>Datei-Menü - Zugriff auf Datei- und Kontenoperation sowie Druckfunktion</title>
 
         <titleabbrev>&appname; - Datei-Menü</titleabbrev>
 
@@ -629,10 +629,10 @@
     </sect2>
 
     <sect2 id="gui-window-edit-menu">
-      <title>&appname; - <guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
+      <title><guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-EditMenu">
-        <title>&appname; - Bearbeiten-Menü - Bearbeitungsfunktionen für Dateien und Konten sowie Einstellungen</title>
+        <title>Bearbeiten-Menü - Bearbeitungsfunktionen für Dateien und Konten sowie Einstellungen</title>
 
         <titleabbrev>&appname; - Bearbeiten-Menü</titleabbrev>
 
@@ -746,10 +746,10 @@
     </sect2>
 
     <sect2 id="gui-window-view-menu">
-      <title>&appname; - <guimenu><accel>A</accel>nsicht</guimenu>-Menü</title>
+      <title><guimenu><accel>A</accel>nsicht</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ViewMenu">
-        <title>&appname; - Ansicht-Menü - Ändern der Ansicht der Kontenübersicht</title>
+        <title>Ansicht-Menü - Ändern der Ansicht der Kontenübersicht</title>
 
         <titleabbrev>&appname; - Ansicht-Menü</titleabbrev>
 
@@ -840,10 +840,10 @@
     </sect2>
 
     <sect2 id="gui-window-actions-menu">
-      <title>&appname; - <guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
+      <title><guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ActionsMenu">
-        <title>&appname; - Aktionen-Menü - Anlegen terminierter Buchungen, Überprüfen von Konten, Durchführen
+        <title>Aktionen-Menü - Anlegen terminierter Buchungen, Überprüfen von Konten, Durchführen
           von Aktienteilungen, Buchen und Abgleichen von Geschäftsvorgängen</title>
 
         <titleabbrev>&appname; - Aktionen-Menü</titleabbrev>
@@ -1158,10 +1158,10 @@
     </sect2>
 
     <sect2 id="gui-window-business-menu">
-      <title>&appname; - <guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
+      <title><guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-BusinessMenu">
-        <title>&appname; - Geschäft-Menü - &app;-Funktionen für Kleinunternehmen</title>
+        <title>Geschäft-Menü - &app;-Funktionen für Kleinunternehmen</title>
 
         <titleabbrev>&appname; - Geschäft-Menü</titleabbrev>
 
@@ -1562,10 +1562,10 @@
     </sect2>
 
     <sect2 id="gui-window-reports-menu">
-      <title>&appname; - <guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
+      <title><guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ReportsMenu">
-        <title>&appname; - Berichte-Menü - Zugriff auf &app; Berichte und Diagramme</title>
+        <title>Berichte-Menü - Zugriff auf &app; Berichte und Diagramme</title>
 
         <titleabbrev>&appname; - Berichte-Menü</titleabbrev>
 <!-- Translators: Attention, the menu items in GnuCash differ in the order between C and de.
@@ -2393,10 +2393,10 @@
     </sect2>
 
     <sect2 id="gui-window-tools-menu">
-      <title>&appname; - <guimenu><accel>W</accel>erkzeuge</guimenu>-Menü</title>
+      <title><guimenu><accel>W</accel>erkzeuge</guimenu>-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ToolsMenu">
-        <title>&appname; - Werkzeuge-Menü - Verschiedene Hilfsmittel und Editoren</title>
+        <title>Werkzeuge-Menü - Verschiedene Hilfsmittel und Editoren</title>
 
         <titleabbrev>&appname; - Werkzeuge-Menü</titleabbrev>
 
@@ -2526,10 +2526,10 @@
     </sect2>
 
     <sect2 id="gui-window-windows-menu">
-      <title>&appname; - &gm.win;-Menü</title>
+      <title>&gm.win;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-WindowsMenu">
-        <title>&appname; - Fenster-Menü</title>
+        <title>Fenster-Menü</title>
 
         <tgroup cols="2">
           <thead>
@@ -2588,10 +2588,10 @@
     </sect2>
 
     <sect2 id="gui-window-help-menu">
-      <title>&appname; - &gm.help;-Menü</title>
+      <title>&gm.help;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-HelpMenu">
-        <title>&appname; - Hilfe-Menü - Diese Hilfe sowie das Dokument &app;-Kurs und Konzepte</title>
+        <title>Hilfe-Menü - Diese Hilfe sowie das Dokument &app;-Kurs und Konzepte</title>
 
         <titleabbrev>&appname; - Hilfe-Menü</titleabbrev>
 

commit 21304f7c0157ec43123ec8ea82ecab15a5b59a59
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 27 07:04:04 2022 +0200

    gnc-dobookx.dtd: Mention predefined entities

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 8692a3e0..dc45092d 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -23,6 +23,8 @@ own entity definitions to use across all of our DocBook pages. -->
 
 <!--
 ***** New/Modified Element and Attribute Declarations *****
+Avoid to overwrite the predefined entities from
+https://www.w3.org/2003/entities/2007/w3centities-f.ent
 ***********************************************************
 -->
 
@@ -84,7 +86,7 @@ own entity definitions to use across all of our DocBook pages. -->
 <!ENTITY user-datafile "<filename><replaceable>${HOME}/gnucash-filename</replaceable></filename>">
 
 <!-- 
-  4. Other formatting instructions -->
+  4. Formatting instructions and new glyphs -->
 <!ENTITY img-w "800px">  <!-- The maximum width of the graphic elements. -->
 <!ENTITY dArrow "<-|->"> <!-- double arrow: <-|->  -->
 

commit b6408959a6198a0a695d2535c7d8d08f9e6fb6b1
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sun Jun 26 12:18:53 2022 +0200

    L10N:de: manual Remove obsolete cross references
    
    For compatibility reasons some xrefs between ch_Account-Actions and
    ch_Tools-Assistants were still maintained which have now been cleaned
    up.

diff --git a/manual/de/Help_ch_Account-Actions.xml b/manual/de/Help_ch_Account-Actions.xml
index c9ffb51a..d00c94a2 100644
--- a/manual/de/Help_ch_Account-Actions.xml
+++ b/manual/de/Help_ch_Account-Actions.xml
@@ -1025,25 +1025,6 @@
           <listitem>
             <para>Ein optionaler Nummernschlüssel wie in <xref linkend="accts-code" /> beschrieben.
             </para>
-<!-- FIXME source: new note -->
-            <note>
-              <para>Ähnlich der Kontonummer bietet der Typ eines Wertpapiers oder einer Währung eine Möglichkeit,
-                seine Investments sachlich zu sortieren. Grundsätzlich bietet es sich an, sie nach
-                Risiko zu gruppieren. Zum Beispiel kann als erste Ebene der Typ des Wertpapiers
-                angegeben werden und als optionale 2. Ebene die Nominalwährung.
-<screen>:
-|
-+--Bond
-|   |--CHF
-|   |--EUR
-+--Aktie
-|   |--CHF
-|   |--EUR
-|   |--GBP
-|
-:</screen>
-              </para>
-            </note>
           </listitem>
         </varlistentry>
 
@@ -1082,7 +1063,7 @@
                 <para>Werden mit dem Konto <guilabel>Aktien</guilabel> oder <guilabel>Investmentfonds</guilabel>
                   verwaltet, dann kann mit dem sich öffnenden Dialog <guilabel>Bitte wählen Sie
                   das Wertpapier</guilabel> auch ein neues Wertpapier erstellt werden. Dies wird in
-                  <xref linkend="tool-security-edit"></xref> beschrieben.
+                  <xref linkend="tool-commodity"></xref> beschrieben.
                 </para>
               </note>
             </para>
@@ -1369,25 +1350,6 @@
         </varlistentry>
       </variablelist>
     </sect2>
-
-    <sect2 id="accts-online-quotes">
-<!-- FIXME: move this section to section "tool-security-editor" -->
-      <title>Verwenden der Online-Kursaktualisierung</title>
-
-      <orderedlist>
-        <listitem>
-          <para>&app; bedient sich eines externen Tools zum Abrufen von Online-Kursen. Dieses Tool ist ein
-            &app-perl;-Modul namens &app-fq; und muss zusätzlich zu &app; auf Ihrem Computer
-            installiert sein.
-          </para>
-
-          <tip>
-            <para>Die Installation wird in <xref linkend="finance-quote" /> detailiert beschrieben.
-            </para>
-          </tip>
-        </listitem>
-      </orderedlist>
-    </sect2>
   </sect1>
 
   <sect1 id="chart-renumber">
diff --git a/manual/de/Help_ch_Tools_Assistants.xml b/manual/de/Help_ch_Tools_Assistants.xml
index aef368a7..3c0e356b 100644
--- a/manual/de/Help_ch_Tools_Assistants.xml
+++ b/manual/de/Help_ch_Tools_Assistants.xml
@@ -5929,22 +5929,6 @@ and update the appendix. -->
         </varlistentry>
       </variablelist>
     </sect2>
-
-    <sect2 id="invest-stockprice-online3">
-      <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>Detaillierte Anweisungen finden Sie im Abschnitt "Neue Konten erstellen":
-        <xref linkend="accts-online-quotes"></xref>
-      </para>
-    </sect2>
   </sect1>
 
   <sect1 id="tool-calc">



Summary of changes:
 CMakeLists.txt                                     |  11 +
 cmake/AddEpubTarget.cmake                          |   2 +-
 cmake/AddGHelpTarget.cmake                         |  15 +-
 cmake/AddHtmlTarget.cmake                          |  23 +-
 cmake/AddPdfTarget.cmake                           |   2 +-
 docbook/gnc-docbookx.dtd                           |   4 +-
 docbook/gnc-gui-C.dtd                              |   4 +
 docbook/gnc-gui-de.dtd                             |  16 +-
 docbook/gnc-gui-struct.dtd                         |  65 +-
 guide/de/ch_cc.xml                                 |   2 +-
 manual/C/CMakeLists.txt                            |  32 +-
 ..._Account-Actions.xml => ch_Account-Actions.xml} |   2 +-
 manual/C/{Help_ch_Business.xml => ch_Business.xml} |   0
 .../C/{Help_ch_Customize.xml => ch_Customize.xml}  |  66 +--
 manual/C/ch_Finance-Quote.xml                      |  15 +-
 manual/C/{Help_ch_GUIMenus.xml => ch_GUIMenus.xml} | 231 ++++----
 ...{Help_ch_GettingHelp.xml => ch_GettingHelp.xml} |   0
 ...ch_GettingStarted.xml => ch_GettingStarted.xml} |   0
 manual/C/{Help_ch_Intro.xml => ch_Intro.xml}       |   0
 manual/C/{Help_ch_Reports.xml => ch_Reports.xml}   |   6 +-
 ...ools_Assistants.xml => ch_Tools_Assistants.xml} |  20 +-
 ...elp_ch_Transactions.xml => ch_Transactions.xml} |  36 +-
 .../C/{Help_chartofaccts.xml => chartofaccts.xml}  |   0
 manual/C/{Help_chtacctseg.xml => chtacctseg.xml}   |   0
 .../C/{Help_fdl-appendix.xml => fdl-appendix.xml}  |   0
 ...AccountReg_Screen.png => AccountReg_Screen.png} | Bin
 ...countTree_Screen.png => AccountTree_Screen.png} | Bin
 ...ions_Accounts.png => Book_Options_Accounts.png} | Bin
 ...ns_Budgeting.png => Book_Options_Budgeting.png} | Bin
 ...ions_Business.png => Book_Options_Business.png} | Bin
 ...ions_Counters.png => Book_Options_Counters.png} | Bin
 ...lete.png => CSV_Import_Transactions_Delete.png} | Bin
 ...s_Save.png => CSV_Import_Transactions_Save.png} | Bin
 ...iew.png => CSV_Import_transactions_Preview.png} | Bin
 ...nt.png => CSV_Transaction_Import_Assistant.png} | Bin
 ...ort_Settings.png => Choose_Export_Settings.png} | Bin
 ...Import_Map_Editor.png => Import_Map_Editor.png} | Bin
 ...port_MatchPicker.png => Import_MatchPicker.png} | Bin
 ...p_Import_QIF_Druid.png => Import_QIF_Druid.png} | Bin
 ...cher_1.png => Import_Transaction_matcher_1.png} | Bin
 ...p_Pref_AccntPeriod.png => Pref_AccntPeriod.png} | Bin
 .../{Help_Pref_Accnts.png => Pref_Accnts.png}      | Bin
 .../{Help_Pref_Business.png => Pref_Business.png}  | Bin
 .../{Help_Pref_DateTime.png => Pref_DateTime.png}  | Bin
 .../{Help_Pref_General.png => Pref_General.png}    | Bin
 .../{Help_Pref_Import.png => Pref_Import.png}      | Bin
 ...ef_OnlineBanking.png => Pref_OnlineBanking.png} | Bin
 .../{Help_Pref_Printing.png => Pref_Printing.png}  | Bin
 .../{Help_Pref_Quotes.png => Pref_Quotes.png}      | Bin
 .../{Help_Pref_Register.png => Pref_Register.png}  | Bin
 ...isterDefaults.png => Pref_RegisterDefaults.png} | Bin
 .../{Help_Pref_Reports.png => Pref_Reports.png}    | Bin
 .../{Help_Pref_Sched.png => Pref_Sched.png}        | Bin
 .../{Help_Pref_Windows.png => Pref_Windows.png}    | Bin
 .../{Help_Report_Screen.png => Report_Screen.png}  | Bin
 .../{Help_Tool_LotsBus.png => Tool_LotsBus.png}    | Bin
 .../{Help_Tool_LotsStk.png => Tool_LotsStk.png}    | Bin
 ...uble_arrow.png => Tool_Lots_h_double_arrow.png} | Bin
 ...uble_arrow.png => Tool_Lots_v_double_arrow.png} | Bin
 ...ans_Assoc_Dialog.png => Trans_Assoc_Dialog.png} | Bin
 ...s_Assoc_Symbols.png => Trans_Assoc_Symbols.png} | Bin
 ...elp_TxRptOpt_Screen.png => TxRptOpt_Screen.png} | Bin
 manual/C/gnucash-help.xml                          |  30 +-
 manual/C/{Help_legal.xml => legal.xml}             |   0
 .../{Help_tips-appendix.xml => tips-appendix.xml}  |   0
 ...{Help_txf-categories.xml => txf-categories.xml} |   0
 manual/de/CMakeLists.txt                           |  34 +-
 manual/de/Help_ch_GettingStarted.xml               | 244 --------
 ..._Account-Actions.xml => ch_Account-Actions.xml} |  48 +-
 .../de/{Help_ch_Business.xml => ch_Business.xml}   |   0
 .../de/{Help_ch_Customize.xml => ch_Customize.xml} |  90 +--
 manual/de/ch_Finance-Quote.xml                     |  17 +-
 .../de/{Help_ch_GUIMenus.xml => ch_GUIMenus.xml}   |  86 +--
 ...{Help_ch_GettingHelp.xml => ch_GettingHelp.xml} |   0
 manual/de/ch_GettingStarted.xml                    | 306 ++++++++++
 manual/de/{Help_ch_Intro.xml => ch_Intro.xml}      |   0
 manual/de/{Help_ch_Reports.xml => ch_Reports.xml}  |   4 +-
 ...ools_Assistants.xml => ch_Tools_Assistants.xml} | 653 +++++++++++++--------
 ...elp_ch_Transactions.xml => ch_Transactions.xml} |  54 +-
 .../de/{Help_chartofaccts.xml => chartofaccts.xml} |   0
 manual/de/{Help_chtacctseg.xml => chtacctseg.xml}  |   0
 .../de/{Help_fdl-appendix.xml => fdl-appendix.xml} |   0
 ...AccountReg_Screen.png => AccountReg_Screen.png} | Bin
 ...countTree_Screen.png => AccountTree_Screen.png} | Bin
 ...ions_Accounts.png => Book_Options_Accounts.png} | Bin
 ...ns_Budgeting.png => Book_Options_Budgeting.png} | Bin
 ...ions_Business.png => Book_Options_Business.png} | Bin
 ...ions_Counters.png => Book_Options_Counters.png} | Bin
 ...p_Book_Options_Tax.png => Book_Options_Tax.png} | Bin
 .../{Help_Budget_Screen.png => Budget_Screen.png}  | Bin
 ...iew.png => CSV_Import_transactions_Preview.png} | Bin
 ...nt.png => CSV_Transaction_Import_Assistant.png} | Bin
 ...ort_Settings.png => Choose_Export_Settings.png} | Bin
 ...Import_Map_Editor.png => Import_Map_Editor.png} | Bin
 ...port_MatchPicker.png => Import_MatchPicker.png} | Bin
 ...p_Import_QIF_Druid.png => Import_QIF_Druid.png} | Bin
 ...cher_1.png => Import_Transaction_matcher_1.png} | Bin
 ...p_Pref_AccntPeriod.png => Pref_AccntPeriod.png} | Bin
 .../{Help_Pref_Accnts.png => Pref_Accnts.png}      | Bin
 .../{Help_Pref_Business.png => Pref_Business.png}  | Bin
 .../{Help_Pref_DateTime.png => Pref_DateTime.png}  | Bin
 .../{Help_Pref_General.png => Pref_General.png}    | Bin
 .../{Help_Pref_Import.png => Pref_Import.png}      | Bin
 ...ef_OnlineBanking.png => Pref_OnlineBanking.png} | Bin
 .../{Help_Pref_Printing.png => Pref_Printing.png}  | Bin
 .../{Help_Pref_Quotes.png => Pref_Quotes.png}      | Bin
 .../{Help_Pref_Register.png => Pref_Register.png}  | Bin
 ...isterDefaults.png => Pref_RegisterDefaults.png} | Bin
 .../{Help_Pref_Reports.png => Pref_Reports.png}    | Bin
 .../{Help_Pref_Sched.png => Pref_Sched.png}        | Bin
 .../{Help_Pref_Windows.png => Pref_Windows.png}    | Bin
 ...p_Reconcile_Screen.png => Reconcile_Screen.png} | Bin
 .../{Help_Report_Screen.png => Report_Screen.png}  | Bin
 ...{Help_Reset_Warnings.png => Reset_Warnings.png} | Bin
 ...Transactions.png => Scheduled_Transactions.png} | Bin
 .../{Help_Style_Choose.png => Style_Choose.png}    | Bin
 .../figures/{Help_Style_New.png => Style_New.png}  | Bin
 .../{Help_Tool_LotsBus.png => Tool_LotsBus.png}    | Bin
 .../{Help_Tool_LotsStk.png => Tool_LotsStk.png}    | Bin
 ...uble_arrow.png => Tool_Lots_h_double_arrow.png} | Bin
 ...uble_arrow.png => Tool_Lots_v_double_arrow.png} | Bin
 manual/de/figures/Tools_SecurityEditor.png         | Bin 50103 -> 53036 bytes
 manual/de/figures/Tools_SecurityEditor_add.png     | Bin 42658 -> 42652 bytes
 manual/de/figures/Tools_SecurityEditor_edit.png    | Bin 41864 -> 42021 bytes
 manual/de/figures/Tools_SinceLastRun.png           | Bin 0 -> 25883 bytes
 ...ans_Assoc_Dialog.png => Trans_Assoc_Dialog.png} | Bin
 ...s_Assoc_Symbols.png => Trans_Assoc_Symbols.png} | Bin
 ...elp_TxRptOpt_Screen.png => TxRptOpt_Screen.png} | Bin
 manual/de/figures/summarybar-selector.png          | Bin 54170 -> 0 bytes
 manual/de/gnucash-help.xml                         |  26 +-
 manual/de/{Help_legal.xml => legal.xml}            |   0
 ...para-assist-intro.xml => para-assist-intro.xml} |   0
 .../{Help_tips-appendix.xml => tips-appendix.xml}  |   0
 ...{Help_txf-categories.xml => txf-categories.xml} |   0
 manual/it/CMakeLists.txt                           |  32 +-
 ...AccountReg_Screen.png => AccountReg_Screen.png} | Bin
 ...countTree_Screen.png => AccountTree_Screen.png} | Bin
 ...p_Pref_AccntPeriod.png => Pref_AccntPeriod.png} | Bin
 .../{Help_Pref_Accnts.png => Pref_Accnts.png}      | Bin
 .../{Help_Pref_Business.png => Pref_Business.png}  | Bin
 .../{Help_Pref_DateTime.png => Pref_DateTime.png}  | Bin
 .../{Help_Pref_General.png => Pref_General.png}    | Bin
 ...ef_OnlineBanking.png => Pref_OnlineBanking.png} | Bin
 .../{Help_Pref_Printing.png => Pref_Printing.png}  | Bin
 .../{Help_Pref_Register.png => Pref_Register.png}  | Bin
 ...isterDefaults.png => Pref_RegisterDefaults.png} | Bin
 .../{Help_Pref_Reports.png => Pref_Reports.png}    | Bin
 .../{Help_Pref_Sched.png => Pref_Sched.png}        | Bin
 .../{Help_Pref_Windows.png => Pref_Windows.png}    | Bin
 .../{Help_Report_Screen.png => Report_Screen.png}  | Bin
 manual/it/gnucash-help.xml                         |  94 +--
 manual/it/it.po                                    |  68 +--
 manual/pt/CMakeLists.txt                           |  32 +-
 ..._Account-Actions.xml => ch_Account-Actions.xml} |   2 +-
 .../pt/{Help_ch_Business.xml => ch_Business.xml}   |   0
 .../pt/{Help_ch_Customize.xml => ch_Customize.xml} |  50 +-
 .../pt/{Help_ch_GUIMenus.xml => ch_GUIMenus.xml}   |  16 +-
 ...{Help_ch_GettingHelp.xml => ch_GettingHelp.xml} |   0
 ...ch_GettingStarted.xml => ch_GettingStarted.xml} |   0
 manual/pt/{Help_ch_Intro.xml => ch_Intro.xml}      |   0
 manual/pt/{Help_ch_Reports.xml => ch_Reports.xml}  |   6 +-
 ...ools_Assistants.xml => ch_Tools_Assistants.xml} |   8 +-
 ...elp_ch_Transactions.xml => ch_Transactions.xml} |   4 +-
 .../pt/{Help_chartofaccts.xml => chartofaccts.xml} |   0
 manual/pt/{Help_chtacctseg.xml => chtacctseg.xml}  |   0
 .../pt/{Help_fdl-appendix.xml => fdl-appendix.xml} |   0
 ...AccountReg_Screen.png => AccountReg_Screen.png} | Bin
 ...countTree_Screen.png => AccountTree_Screen.png} | Bin
 ...p_Pref_AccntPeriod.png => Pref_AccntPeriod.png} | Bin
 .../{Help_Pref_Accnts.png => Pref_Accnts.png}      | Bin
 .../{Help_Pref_Business.png => Pref_Business.png}  | Bin
 .../{Help_Pref_DateTime.png => Pref_DateTime.png}  | Bin
 .../{Help_Pref_General.png => Pref_General.png}    | Bin
 ...ef_OnlineBanking.png => Pref_OnlineBanking.png} | Bin
 .../{Help_Pref_Printing.png => Pref_Printing.png}  | Bin
 .../{Help_Pref_Register.png => Pref_Register.png}  | Bin
 ...isterDefaults.png => Pref_RegisterDefaults.png} | Bin
 .../{Help_Pref_Reports.png => Pref_Reports.png}    | Bin
 .../{Help_Pref_Sched.png => Pref_Sched.png}        | Bin
 .../{Help_Pref_Windows.png => Pref_Windows.png}    | Bin
 ...elp_TxRptOpt_Screen.png => TxRptOpt_Screen.png} | Bin
 manual/pt/gnucash-help.xml                         |  26 +-
 manual/pt/{Help_legal.xml => legal.xml}            |   0
 .../{Help_tips-appendix.xml => tips-appendix.xml}  |   0
 ...{Help_txf-categories.xml => txf-categories.xml} |   0
 185 files changed, 1302 insertions(+), 1180 deletions(-)
 rename manual/C/{Help_ch_Account-Actions.xml => ch_Account-Actions.xml} (99%)
 rename manual/C/{Help_ch_Business.xml => ch_Business.xml} (100%)
 rename manual/C/{Help_ch_Customize.xml => ch_Customize.xml} (98%)
 rename manual/C/{Help_ch_GUIMenus.xml => ch_GUIMenus.xml} (97%)
 rename manual/C/{Help_ch_GettingHelp.xml => ch_GettingHelp.xml} (100%)
 rename manual/C/{Help_ch_GettingStarted.xml => ch_GettingStarted.xml} (100%)
 rename manual/C/{Help_ch_Intro.xml => ch_Intro.xml} (100%)
 rename manual/C/{Help_ch_Reports.xml => ch_Reports.xml} (99%)
 rename manual/C/{Help_ch_Tools_Assistants.xml => ch_Tools_Assistants.xml} (99%)
 rename manual/C/{Help_ch_Transactions.xml => ch_Transactions.xml} (98%)
 rename manual/C/{Help_chartofaccts.xml => chartofaccts.xml} (100%)
 rename manual/C/{Help_chtacctseg.xml => chtacctseg.xml} (100%)
 rename manual/C/{Help_fdl-appendix.xml => fdl-appendix.xml} (100%)
 rename manual/C/figures/{Help_AccountReg_Screen.png => AccountReg_Screen.png} (100%)
 rename manual/C/figures/{Help_AccountTree_Screen.png => AccountTree_Screen.png} (100%)
 rename manual/C/figures/{Help_Book_Options_Accounts.png => Book_Options_Accounts.png} (100%)
 rename manual/C/figures/{Help_Book_Options_Budgeting.png => Book_Options_Budgeting.png} (100%)
 rename manual/C/figures/{Help_Book_Options_Business.png => Book_Options_Business.png} (100%)
 rename manual/C/figures/{Help_Book_Options_Counters.png => Book_Options_Counters.png} (100%)
 rename manual/C/figures/{Help_CSV_Import_Transactions_Delete.png => CSV_Import_Transactions_Delete.png} (100%)
 rename manual/C/figures/{Help_CSV_Import_Transactions_Save.png => CSV_Import_Transactions_Save.png} (100%)
 rename manual/C/figures/{Help_CSV_Import_transactions_Preview.png => CSV_Import_transactions_Preview.png} (100%)
 rename manual/C/figures/{Help_CSV_Transaction_Import_Assistant.png => CSV_Transaction_Import_Assistant.png} (100%)
 rename manual/C/figures/{Help_Choose_Export_Settings.png => Choose_Export_Settings.png} (100%)
 rename manual/C/figures/{Help_Import_Map_Editor.png => Import_Map_Editor.png} (100%)
 rename manual/C/figures/{Help_Import_MatchPicker.png => Import_MatchPicker.png} (100%)
 rename manual/C/figures/{Help_Import_QIF_Druid.png => Import_QIF_Druid.png} (100%)
 rename manual/C/figures/{Help_Import_Transaction_matcher_1.png => Import_Transaction_matcher_1.png} (100%)
 rename manual/C/figures/{Help_Pref_AccntPeriod.png => Pref_AccntPeriod.png} (100%)
 rename manual/C/figures/{Help_Pref_Accnts.png => Pref_Accnts.png} (100%)
 rename manual/C/figures/{Help_Pref_Business.png => Pref_Business.png} (100%)
 rename manual/C/figures/{Help_Pref_DateTime.png => Pref_DateTime.png} (100%)
 rename manual/C/figures/{Help_Pref_General.png => Pref_General.png} (100%)
 rename manual/C/figures/{Help_Pref_Import.png => Pref_Import.png} (100%)
 rename manual/C/figures/{Help_Pref_OnlineBanking.png => Pref_OnlineBanking.png} (100%)
 rename manual/C/figures/{Help_Pref_Printing.png => Pref_Printing.png} (100%)
 rename manual/C/figures/{Help_Pref_Quotes.png => Pref_Quotes.png} (100%)
 rename manual/C/figures/{Help_Pref_Register.png => Pref_Register.png} (100%)
 rename manual/C/figures/{Help_Pref_RegisterDefaults.png => Pref_RegisterDefaults.png} (100%)
 rename manual/C/figures/{Help_Pref_Reports.png => Pref_Reports.png} (100%)
 rename manual/C/figures/{Help_Pref_Sched.png => Pref_Sched.png} (100%)
 rename manual/C/figures/{Help_Pref_Windows.png => Pref_Windows.png} (100%)
 rename manual/C/figures/{Help_Report_Screen.png => Report_Screen.png} (100%)
 rename manual/C/figures/{Help_Tool_LotsBus.png => Tool_LotsBus.png} (100%)
 rename manual/C/figures/{Help_Tool_LotsStk.png => Tool_LotsStk.png} (100%)
 rename manual/C/figures/{Help_Tool_Lots_h_double_arrow.png => Tool_Lots_h_double_arrow.png} (100%)
 rename manual/C/figures/{Help_Tool_Lots_v_double_arrow.png => Tool_Lots_v_double_arrow.png} (100%)
 rename manual/C/figures/{Help_Trans_Assoc_Dialog.png => Trans_Assoc_Dialog.png} (100%)
 rename manual/C/figures/{Help_Trans_Assoc_Symbols.png => Trans_Assoc_Symbols.png} (100%)
 rename manual/C/figures/{Help_TxRptOpt_Screen.png => TxRptOpt_Screen.png} (100%)
 rename manual/C/{Help_legal.xml => legal.xml} (100%)
 rename manual/C/{Help_tips-appendix.xml => tips-appendix.xml} (100%)
 rename manual/C/{Help_txf-categories.xml => txf-categories.xml} (100%)
 delete mode 100644 manual/de/Help_ch_GettingStarted.xml
 rename manual/de/{Help_ch_Account-Actions.xml => ch_Account-Actions.xml} (98%)
 rename manual/de/{Help_ch_Business.xml => ch_Business.xml} (100%)
 rename manual/de/{Help_ch_Customize.xml => ch_Customize.xml} (98%)
 rename manual/de/{Help_ch_GUIMenus.xml => ch_GUIMenus.xml} (98%)
 rename manual/de/{Help_ch_GettingHelp.xml => ch_GettingHelp.xml} (100%)
 create mode 100644 manual/de/ch_GettingStarted.xml
 rename manual/de/{Help_ch_Intro.xml => ch_Intro.xml} (100%)
 rename manual/de/{Help_ch_Reports.xml => ch_Reports.xml} (99%)
 rename manual/de/{Help_ch_Tools_Assistants.xml => ch_Tools_Assistants.xml} (91%)
 rename manual/de/{Help_ch_Transactions.xml => ch_Transactions.xml} (98%)
 rename manual/de/{Help_chartofaccts.xml => chartofaccts.xml} (100%)
 rename manual/de/{Help_chtacctseg.xml => chtacctseg.xml} (100%)
 rename manual/de/{Help_fdl-appendix.xml => fdl-appendix.xml} (100%)
 rename manual/de/figures/{Help_AccountReg_Screen.png => AccountReg_Screen.png} (100%)
 rename manual/de/figures/{Help_AccountTree_Screen.png => AccountTree_Screen.png} (100%)
 rename manual/de/figures/{Help_Book_Options_Accounts.png => Book_Options_Accounts.png} (100%)
 rename manual/de/figures/{Help_Book_Options_Budgeting.png => Book_Options_Budgeting.png} (100%)
 rename manual/de/figures/{Help_Book_Options_Business.png => Book_Options_Business.png} (100%)
 rename manual/de/figures/{Help_Book_Options_Counters.png => Book_Options_Counters.png} (100%)
 rename manual/de/figures/{Help_Book_Options_Tax.png => Book_Options_Tax.png} (100%)
 rename manual/de/figures/{Help_Budget_Screen.png => Budget_Screen.png} (100%)
 rename manual/de/figures/{Help_CSV_Import_transactions_Preview.png => CSV_Import_transactions_Preview.png} (100%)
 rename manual/de/figures/{Help_CSV_Transaction_Import_Assistant.png => CSV_Transaction_Import_Assistant.png} (100%)
 rename manual/de/figures/{Help_Choose_Export_Settings.png => Choose_Export_Settings.png} (100%)
 rename manual/de/figures/{Help_Import_Map_Editor.png => Import_Map_Editor.png} (100%)
 rename manual/de/figures/{Help_Import_MatchPicker.png => Import_MatchPicker.png} (100%)
 rename manual/de/figures/{Help_Import_QIF_Druid.png => Import_QIF_Druid.png} (100%)
 rename manual/de/figures/{Help_Import_Transaction_matcher_1.png => Import_Transaction_matcher_1.png} (100%)
 rename manual/de/figures/{Help_Pref_AccntPeriod.png => Pref_AccntPeriod.png} (100%)
 rename manual/de/figures/{Help_Pref_Accnts.png => Pref_Accnts.png} (100%)
 rename manual/de/figures/{Help_Pref_Business.png => Pref_Business.png} (100%)
 rename manual/de/figures/{Help_Pref_DateTime.png => Pref_DateTime.png} (100%)
 rename manual/de/figures/{Help_Pref_General.png => Pref_General.png} (100%)
 rename manual/de/figures/{Help_Pref_Import.png => Pref_Import.png} (100%)
 rename manual/de/figures/{Help_Pref_OnlineBanking.png => Pref_OnlineBanking.png} (100%)
 rename manual/de/figures/{Help_Pref_Printing.png => Pref_Printing.png} (100%)
 rename manual/de/figures/{Help_Pref_Quotes.png => Pref_Quotes.png} (100%)
 rename manual/de/figures/{Help_Pref_Register.png => Pref_Register.png} (100%)
 rename manual/de/figures/{Help_Pref_RegisterDefaults.png => Pref_RegisterDefaults.png} (100%)
 rename manual/de/figures/{Help_Pref_Reports.png => Pref_Reports.png} (100%)
 rename manual/de/figures/{Help_Pref_Sched.png => Pref_Sched.png} (100%)
 rename manual/de/figures/{Help_Pref_Windows.png => Pref_Windows.png} (100%)
 rename manual/de/figures/{Help_Reconcile_Screen.png => Reconcile_Screen.png} (100%)
 rename manual/de/figures/{Help_Report_Screen.png => Report_Screen.png} (100%)
 rename manual/de/figures/{Help_Reset_Warnings.png => Reset_Warnings.png} (100%)
 rename manual/de/figures/{Help_Scheduled_Transactions.png => Scheduled_Transactions.png} (100%)
 rename manual/de/figures/{Help_Style_Choose.png => Style_Choose.png} (100%)
 rename manual/de/figures/{Help_Style_New.png => Style_New.png} (100%)
 rename manual/de/figures/{Help_Tool_LotsBus.png => Tool_LotsBus.png} (100%)
 rename manual/de/figures/{Help_Tool_LotsStk.png => Tool_LotsStk.png} (100%)
 rename manual/de/figures/{Help_Tool_Lots_h_double_arrow.png => Tool_Lots_h_double_arrow.png} (100%)
 rename manual/de/figures/{Help_Tool_Lots_v_double_arrow.png => Tool_Lots_v_double_arrow.png} (100%)
 create mode 100644 manual/de/figures/Tools_SinceLastRun.png
 rename manual/de/figures/{Help_Trans_Assoc_Dialog.png => Trans_Assoc_Dialog.png} (100%)
 rename manual/de/figures/{Help_Trans_Assoc_Symbols.png => Trans_Assoc_Symbols.png} (100%)
 rename manual/de/figures/{Help_TxRptOpt_Screen.png => TxRptOpt_Screen.png} (100%)
 delete mode 100644 manual/de/figures/summarybar-selector.png
 rename manual/de/{Help_legal.xml => legal.xml} (100%)
 rename manual/de/{Help_para-assist-intro.xml => para-assist-intro.xml} (100%)
 rename manual/de/{Help_tips-appendix.xml => tips-appendix.xml} (100%)
 rename manual/de/{Help_txf-categories.xml => txf-categories.xml} (100%)
 rename manual/it/figures/{Help_AccountReg_Screen.png => AccountReg_Screen.png} (100%)
 rename manual/it/figures/{Help_AccountTree_Screen.png => AccountTree_Screen.png} (100%)
 rename manual/it/figures/{Help_Pref_AccntPeriod.png => Pref_AccntPeriod.png} (100%)
 rename manual/it/figures/{Help_Pref_Accnts.png => Pref_Accnts.png} (100%)
 rename manual/it/figures/{Help_Pref_Business.png => Pref_Business.png} (100%)
 rename manual/it/figures/{Help_Pref_DateTime.png => Pref_DateTime.png} (100%)
 rename manual/it/figures/{Help_Pref_General.png => Pref_General.png} (100%)
 rename manual/it/figures/{Help_Pref_OnlineBanking.png => Pref_OnlineBanking.png} (100%)
 rename manual/it/figures/{Help_Pref_Printing.png => Pref_Printing.png} (100%)
 rename manual/it/figures/{Help_Pref_Register.png => Pref_Register.png} (100%)
 rename manual/it/figures/{Help_Pref_RegisterDefaults.png => Pref_RegisterDefaults.png} (100%)
 rename manual/it/figures/{Help_Pref_Reports.png => Pref_Reports.png} (100%)
 rename manual/it/figures/{Help_Pref_Sched.png => Pref_Sched.png} (100%)
 rename manual/it/figures/{Help_Pref_Windows.png => Pref_Windows.png} (100%)
 rename manual/it/figures/{Help_Report_Screen.png => Report_Screen.png} (100%)
 rename manual/pt/{Help_ch_Account-Actions.xml => ch_Account-Actions.xml} (99%)
 rename manual/pt/{Help_ch_Business.xml => ch_Business.xml} (100%)
 rename manual/pt/{Help_ch_Customize.xml => ch_Customize.xml} (98%)
 rename manual/pt/{Help_ch_GUIMenus.xml => ch_GUIMenus.xml} (99%)
 rename manual/pt/{Help_ch_GettingHelp.xml => ch_GettingHelp.xml} (100%)
 rename manual/pt/{Help_ch_GettingStarted.xml => ch_GettingStarted.xml} (100%)
 rename manual/pt/{Help_ch_Intro.xml => ch_Intro.xml} (100%)
 rename manual/pt/{Help_ch_Reports.xml => ch_Reports.xml} (99%)
 rename manual/pt/{Help_ch_Tools_Assistants.xml => ch_Tools_Assistants.xml} (99%)
 rename manual/pt/{Help_ch_Transactions.xml => ch_Transactions.xml} (99%)
 rename manual/pt/{Help_chartofaccts.xml => chartofaccts.xml} (100%)
 rename manual/pt/{Help_chtacctseg.xml => chtacctseg.xml} (100%)
 rename manual/pt/{Help_fdl-appendix.xml => fdl-appendix.xml} (100%)
 rename manual/pt/figures/{Help_AccountReg_Screen.png => AccountReg_Screen.png} (100%)
 rename manual/pt/figures/{Help_AccountTree_Screen.png => AccountTree_Screen.png} (100%)
 rename manual/pt/figures/{Help_Pref_AccntPeriod.png => Pref_AccntPeriod.png} (100%)
 rename manual/pt/figures/{Help_Pref_Accnts.png => Pref_Accnts.png} (100%)
 rename manual/pt/figures/{Help_Pref_Business.png => Pref_Business.png} (100%)
 rename manual/pt/figures/{Help_Pref_DateTime.png => Pref_DateTime.png} (100%)
 rename manual/pt/figures/{Help_Pref_General.png => Pref_General.png} (100%)
 rename manual/pt/figures/{Help_Pref_OnlineBanking.png => Pref_OnlineBanking.png} (100%)
 rename manual/pt/figures/{Help_Pref_Printing.png => Pref_Printing.png} (100%)
 rename manual/pt/figures/{Help_Pref_Register.png => Pref_Register.png} (100%)
 rename manual/pt/figures/{Help_Pref_RegisterDefaults.png => Pref_RegisterDefaults.png} (100%)
 rename manual/pt/figures/{Help_Pref_Reports.png => Pref_Reports.png} (100%)
 rename manual/pt/figures/{Help_Pref_Sched.png => Pref_Sched.png} (100%)
 rename manual/pt/figures/{Help_Pref_Windows.png => Pref_Windows.png} (100%)
 rename manual/pt/figures/{Help_TxRptOpt_Screen.png => TxRptOpt_Screen.png} (100%)
 rename manual/pt/{Help_legal.xml => legal.xml} (100%)
 rename manual/pt/{Help_tips-appendix.xml => tips-appendix.xml} (100%)
 rename manual/pt/{Help_txf-categories.xml => txf-categories.xml} (100%)



More information about the gnucash-changes mailing list