gnucash-docs master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Dec 18 18:33:32 EST 2022


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/ef85a2d2 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/821747e3 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/85f6edbc (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/3f3b58fb (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/fbe9a867 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/14169306 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/309118a0 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e06cc9da (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/66e5c3d4 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/1c596f2a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/72e0eb84 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e0e67368 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/85716124 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/b513056e (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/18551f46 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/5f964dd0 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/afa8cbec (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/e479538a (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/0d30e928 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/9a2083be (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/7a108b11 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/2f410033 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/62327bb2 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/540f0cef (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/a5ab6b40 (commit)



commit ef85a2d210ef5c71ce97f7036fb6dec19471956b
Merge: a5ab6b40 821747e3
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Dec 18 15:33:15 2022 -0800

    Merge branch 'maint'

diff --cc C/guide/ch_invest.xml
index c5fcb918,c0154306..1c1b148f
--- a/C/guide/ch_invest.xml
+++ b/C/guide/ch_invest.xml
@@@ -842,7 -792,7 +792,7 @@@ Incom
                    <note>
                      <para>If the <guibutton>Get Online Quotes</guibutton> button is not highlighted, and it is not tickable,
                        then the &app-fq; package is not installed.
-                       See the section on <xref linkend="invest-stockprice-auto-install3"/>.
 -                      See the chapter <ulink url="&url-docs;C/gnucash-help/finance-quote.html">Setting Up the Quote Retrieval</ulink> in the manual.
++                      See the chapter <ulink url="&url-docs;C/gnucash-manual/finance-quote.html">Setting Up the Quote Retrieval</ulink> in the manual.
                      </para>
                    </note>
  
@@@ -1355,83 -1267,11 +1267,81 @@@
          be installed in order to activate this feature.
        </para>
  
-       <para>To determine if the <application>Perl</application> module &app-fq;
-         is already installed on your system, type <command>perldoc Finance::Quote</command> in a
-         terminal window and check to see if there is any documentation available. If you see the
-         documentation, then the module is installed, if you do not see the documentation, then it
-         has not been installed.
+       <para>See the chapter
 -        <ulink url="&url-docs;C/gnucash-help/finance-quote.html">Setting Up the Quote Retrieval</ulink>
++        <ulink url="&url-docs;C/gnucash-manual/finance-quote.html">Setting Up the Quote Retrieval</ulink>
+         in the manual.
        </para>
  
 +      <sect3 id="invest-stockprice-auto-install3">
 +        <title>Installing &app-fq;</title>
 +        <para>The process of installing &app-fq; depends on the system. </para>
 +
 +        <para>On &lin; and BSD it's usually simplest to use the package manager, but those seldom keep up with the latest &app-fq; releases. If you need a newer version than your package manager provides, use the following procedure with <filename>gnc-fq-update</filename></para>
 +        <procedure>
 +          <title>Installing &app-fq; on &lin; with <filename>gnc-fq-update</filename></title>
 +          <step><simpara>Close &app;.</simpara></step>
 +          <step><simpara>Run the command <command>which gnc-fq-update</command> to check <filename>gnc-fq-update</filename> program is in your PATH environment
 +            variable.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote>
 +          </simpara>
 +            <substeps><step id="gnc-fq-update-not-found">
 +                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is 
 +                installed.</simpara>
 +                </step>
 +            </substeps>
 +          </step>
 +          <step><simpara>Run the command <command>sudo gnc-fq-update</command> or <command>su -c gnc-fq-update</command> in order to run it with root privilege.
 +            It depends on your distribution.
 +          If <filename>gnc-fq-update</filename> is not in your PATH, specify full path of <filename>gnc-fq-update</filename>
 +            instead, which is found by <xref linkend="gnc-fq-update-not-found" />.</simpara>
 +            <para>
 +              This will launch a <application>Perl</application> <acronym><ulink url="https://www.cpan.org/">CPAN</ulink></acronym><footnote>
 +                <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
 +              module internally. When you launch the CPAN module for the first time, you must setup and configure it. However, on the most systems if you accept the default settings
 +              or answer the first question <computeroutput>Are you ready for manual
 +              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully. 
 +              </para>
 +          </step>
 +          
 +          <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
 +        </procedure>
 +
 +
 +        <procedure>
 +          <title>Installing &app-fq; on &mac;</title>
 +          <step><simpara>Close &app;.</simpara></step>
 +          <step><simpara>Install Xcode if it is not installed.</simpara>
 +              <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
 +          </step>
 +          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
 +              <para>You can run it from the dmg or copy it to the same
 +                folder to which you copied &app;.
 +                It will open a Terminal window and run a script for you
 +                which will ask lots of questions. Accept the default for each unless you know what
 +                you’re doing.
 +            </para>
 +          </step>
 +        </procedure>
 +
 +        <procedure>
 +          <title>Installing &app-fq; on &win;</title>
 +          <step><simpara>Close &app;.</simpara></step>
 +          <step><simpara>Run <menuchoice>
 +                               <guimenu>Start</guimenu>
 +                               <guisubmenu>&app;</guisubmenu>
 +                               <guimenuitem>Install Online Price Retrieval</guimenuitem></menuchoice>.
 +            </simpara>
 +          </step>
 +        </procedure>
 +
 +        <note>
 +          <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
 +            mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the &app; IRC
 +            channel on irc.gnome.org. You can also leave out this step and manually update your
 +            stock prices.
 +          </para>
 +        </note>
 +      </sect3>
 +
        <sect3 id="invest-stockprice-auto-configure3">
          <title>Configuring Securities for Online Quotes</title>
  
@@@ -1470,37 -1293,11 +1363,11 @@@
  
        <sect3 id="invest-stockprice-auto-scheduler">
          <title>Configuring for Getting Online Quotes Periodically</title>
-         
-         <para>You have to register the <command>gnucash-cli</command> with a scheduler in order to get Online Quotes automatically and periodically.
-           The method depends on your OS. For example, suppose you want to update
-           your file on 16:00 on every Friday.
-         </para>
  
-         <procedure>
-           <title>Register <command>gnucash-cli</command> with <application>cron</application> on &lin; and &mac;</title>
-           <step><simpara>Run <command>crontab -e</command>.</simpara></step>
-           <step><para>Add the following line to your crontab:
-             <informalexample>
-               <screen>0 16 * * 5 gnucash-cli --quotes get <replaceable>${HOME}/gnucash-filename</replaceable> > /dev/null 2>&1</screen>
-             </informalexample></para>
-           </step>
-         </procedure>
- 
-         <procedure>
-           <title>Register <command>gnucash-cli</command> with Task Scheduler on &win;</title>
-           <step><simpara>Select <menuchoice><guimenu>Start</guimenu><guisubmenu>Windows Administrative Tools</guisubmenu><guimenuitem>Task Scheduler</guimenuitem></menuchoice>.</simpara></step>
-           <step><simpara>Select <guimenuitem>Create Task</guimenuitem>.</simpara></step>
-           <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
-         </procedure>
- 
-         <para>See <ulink url="&url-docs-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
-           and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
-         </para>
- 
-         <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and
-           require several hours after the exchange closes before being available. If
-           <acronym>NAV</acronym>s are downloaded before the current days <acronym>NAV</acronym>s are
-           determined, yesterday’s <acronym>NAV</acronym>s are retrieved.
+         <para>After you have verified the proper fetching of Online Quotes for your commodities, 
+          you can tell your operating system to fetch the quotes periodically. See the section
 -        <ulink url="&url-docs;C/gnucash-help/finance-quote-scheduler.html">Configuring for Getting Quotes Periodically</ulink>
++        <ulink url="&url-docs;C/gnucash-manual/finance-quote-scheduler.html">Configuring for Getting Quotes Periodically</ulink>
+         in the manual.
          </para>
        </sect3>
      </sect2>
@@@ -3291,9 -2974,8 +3044,8 @@@
          </figure>
  
          <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-           <ulink
- url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-manual/tool-lots.html">
-           Lots in Account </ulink> for details of the Lots in Account screen elements.
 -          <ulink url="&url-docs;/C/gnucash-help/tool-lots.html">Lots in Account</ulink>
++          <ulink url="&url-docs;/C/gnucash-manual/tool-lots.html">Lots in Account</ulink>
+           for details of the Lots in Account screen elements.
          </para>
        </sect3>
  
diff --cc de/guide/ch_invest.xml
index aa0562b3,2a1a89f9..f1dfb091
--- a/de/guide/ch_invest.xml
+++ b/de/guide/ch_invest.xml
@@@ -2200,13 -2200,11 +2200,11 @@@ Einnahme
              </mediaobject>
            </screenshot>
          </figure>
- <!--  Link to future (soon!) new Help section
-         <para>Refer to the <ulink
- url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-manual/tool-lots.html">
-             Help Manual, Chapter 8 Tools & Assistants, Lots in Account
-             </ulink> for details of the Lots in Account screen elements.
+         <!-- Fixme: Title still untranslated? -->
 -        <para>Refer to the <ulink url="&url-docs;de/gnucash-help/tool-lots.html"> Manual:
++        <para>Refer to the <ulink url="&url-docs;de/gnucash-manual/tool-lots.html"> Manual:
+             Kapitel 8. Assistenten und ähnliche Werkzeuge; Lose in Konto</ulink>
+             für die Details von <quote>Lose in Konto</quote>-Fenstern.
          </para>
- -->
        </sect3>
  
        <sect3 id="invest-sellProcedure">
diff --cc it/guide/index.docbook
index 9fe43865,f3b7d701..3e42d8a9
--- a/it/guide/index.docbook
+++ b/it/guide/index.docbook
@@@ -10171,8 -10180,8 +10180,8 @@@ Entrat
              </figure>
  
              <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-               <ulink url="https://www.gnucash.org/docs/v2.6/C/gnucash-manual/tool-lots.html"> Lots in
-               Account </ulink> for details of the Lots in Account screen elements.
 -              <ulink url="&url-docs-it;help/tool-lots.html">Lots in
++              <ulink url="&url-docs-it;manual/tool-lots.html">Lots in
+               Account</ulink> for details of the Lots in Account screen elements.
              </para>
            </sect3>
  
diff --cc it/guide/it.po
index 4562e6fb,f777ef32..6774e409
--- a/it/guide/it.po
+++ b/it/guide/it.po
@@@ -2459,9 -2459,9 +2459,9 @@@ msgstr "Supporto alle valute multiple m
  msgid "Enhanced <acronym>QIF</acronym> import."
  msgstr "Migliorata l’importazione di file <acronym>QIF</acronym>"
  
 -#: C/gnucash-guide.xml:340(para)
 +#: C/index.docbook:340(para)
  msgid ""
- "See <ulink url=\"http://wiki.gnucash.org/wiki/"
+ "See <ulink url=\"&url-wiki;"
  "Release_Schedule#Release_Schedule_for_2.6.x_releases\">Current Series Release Schedule</ulink> for detailed lists of "
  "improvements made in this series."
  msgstr ""
@@@ -2919,9 -2919,9 +2919,9 @@@ msgstr "
  "semplice per installarlo consiste nell’inserire il CD della "
  "distribuzione e seguire le istruzioni riportate."
  
 -#: C/gnucash-guide.xml:660(para)
 +#: C/index.docbook:660(para)
  msgid ""
- "The <ulink url=\"http://www.gnucash.org/\"><citetitle><application>GnuCash</"
+ "The <ulink url=\"&url-www;\"><citetitle><application>GnuCash</"
  "application> home page</citetitle></ulink> contains detailed instructions on "
  "how to install <application>GnuCash</application> in the event your current "
  "distribution does not include it or you want to install a different version. "
@@@ -3886,9 -3886,9 +3886,9 @@@ msgstr "
  "<guibutton>Stop</guibutton> e <guibutton>Stampa</guibutton> come se si "
  "stesse utilizzando un normalissimo browser web."
  
 -#: C/gnucash-guide.xml:581(para)
 +#: C/index.docbook:581(para)
  msgid ""
- "The <ulink url=\"http://www.gnucash.org\"><citetitle>GnuCash</citetitle></"
+ "The <ulink url=\"&url-www;\"><citetitle>GnuCash</citetitle></"
  "ulink> web site contains helpful information about the program and about any "
  "updates to it. It also contains links to the <application>GnuCash</"
  "application> mailing lists for developers and users, and you can search the "
@@@ -3912,10 -3912,10 +3912,10 @@@ msgstr "
  "<citetitle>lista dell’utente di &appname;</citetitle></ulink>, "
  "e sicuramente qualcuno tenterà di rispondere."
  
 -#: C/gnucash-guide.xml:594(para)
 +#: C/index.docbook:594(para)
  msgid ""
  "The most updated <guilabel>GnuCash FAQ</guilabel> is also located on the "
- "<ulink url=\"http://wiki.gnucash.org/wiki/FAQ\"><citetitle>GnuCash FAQ "
+ "<ulink url=\"&url-wiki-faq;\"><citetitle>GnuCash FAQ "
  "website</citetitle></ulink>, and contains answers to the popular questions."
  msgstr ""
  "L’ultima versione della <guilabel>FAQ di &appname;</guilabel> è anche "
@@@ -4018,9 -4018,9 +4018,9 @@@ msgstr "Salvare i dati
  msgid "Follow these steps to save the file under your preferred name:"
  msgstr "Seguire i passi seguenti per salvare il file con un nome preferito:"
  
 -#: C/gnucash-guide.xml:652(para)
 +#: C/index.docbook:652(para)
  msgid ""
- "Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</"
+ "Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save As…</"
  "guimenuitem></menuchoice> from the <emphasis>Menubar</emphasis> or select "
  "the <guibutton>Save</guibutton><emphasis>Toolbar</emphasis> button. "
  "<application>GnuCash</application> will bring up the save window."
@@@ -4107,10 -4107,10 +4107,10 @@@ msgstr "
  "esistenti, l’estensione non verrà cambiata. Quindi se viene aperto un "
  "file esistente denominato <filename>ilmiovecchiofile</filename>, questo nome "
  "non cambierà se il file viene salvato. Usare il comando <guimenuitem>Salva "
- "come...</guimenuitem> e dare al file un nuovo nome per salvarlo con l’"
+ "come…</guimenuitem> e dare al file un nuovo nome per salvarlo con l’"
  "estensione <filename>.gnucash</filename>."
  
 -#: C/gnucash-guide.xml:708(para)
 +#: C/index.docbook:708(para)
  msgid ""
  "Select the path where the file will be saved by browsing the tree in the "
  "lower panes."
@@@ -4463,9 -4463,9 +4463,9 @@@ msgstr "
  "La ripetizione del file di log permette di recuperare ogni transazione che "
  "ha variato il saldo immesso dall’ultimo salvataggio, incluse quelle "
  "create dalle transazioni pianificate e dalle funzioni per l’impresa "
- "(fatture, ricevute, ecc...)."
+ "(fatture, ricevute, ecc…)."
  
 -#: C/gnucash-guide.xml:897(para)
 +#: C/index.docbook:897(para)
  msgid ""
  "Changes to the scheduled transactions, invoices or bills themselves are NOT "
  "recovered, and their transactions that were recovered may not be properly "
@@@ -5551,9 -5551,9 +5551,9 @@@ msgstr "
  "scegliendo l’opzione <guilabel>conti comuni</guilabel> nell’"
  "assistente per l’impostazione di una nuova struttura dei conti "
  "(<menuchoice><guimenu>Operazioni</guimenu><guimenuitem>Nuova struttura "
- "conti...</guimenuitem></menuchoice>)."
+ "conti…</guimenuitem></menuchoice>)."
  
 -#: C/gnucash-guide.xml:352(phrase)
 +#: C/index.docbook:352(phrase)
  msgid "Default income accounts"
  msgstr "Conti standard per le entrate"
  
@@@ -5610,10 -5610,10 +5610,10 @@@ msgstr "
  "pagare, con cadenza mensile, dei servizi quali affitto, telefono ed "
  "elettricità. È inoltre indispensabile fare acquisti almeno di alimentari. "
  "Per ora non è necessario sapere quanto denaro si ha in banca, quanto si deve "
- "pagare per la carta di credito ecc... Si vuole, per ora, solo realizzare la "
+ "pagare per la carta di credito ecc… Si vuole, per ora, solo realizzare la "
  "struttura che contiene tutti questi conti."
  
 -#: C/gnucash-guide.xml:403(para)
 +#: C/index.docbook:403(para)
  msgid ""
  "Your <guilabel>assets</guilabel> would be the bank savings and checking "
  "account. Your <guilabel>liabilities</guilabel> are the credit card. Your "
@@@ -5631,9 -5631,9 +5631,9 @@@ msgstr "
  "anche una <guilabel>entrata</guilabel> sotto forma di stipendio, e delle "
  "<guilabel>uscite</guilabel> identificabili come spese varie in negozi, "
  "affitto, elettricità, telefono e tasse (statali, assistenza sanitaria "
- "ecc...) che gravano sullo stipendio."
+ "ecc…) che gravano sullo stipendio."
  
 -#: C/gnucash-guide.xml:414(title)
 +#: C/index.docbook:414(title)
  msgid "The Basic Top Level Accounts"
  msgstr "I conti base di livello principale"
  
@@@ -5680,10 -5680,10 +5680,10 @@@ msgstr "
  "<menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Nuova pagina dei "
  "conti</guimenuitem></menuchoice> dal menu: verrà aperta una scheda "
  "denominata <guilabel>Conti</guilabel>. Selezionare quindi "
- "<menuchoice><guimenu>Operazioni</guimenu><guimenuitem>Nuovo conto...</"
+ "<menuchoice><guimenu>Operazioni</guimenu><guimenuitem>Nuovo conto…</"
  "guimenuitem></menuchoice> dal menu."
  
 -#: C/gnucash-guide.xml:432(para)
 +#: C/index.docbook:432(para)
  msgid "Now you are ready to build this basic starting account structure"
  msgstr "Si è ora pronti per costruire questa semplice struttura dei conti"
  
@@@ -5779,12 -5779,12 +5779,12 @@@ msgstr "
  "utile quando si considera un gruppo di conti appartenenti a una stessa "
  "categoria (come i conti per le tasse in questo esempio)."
  
 -#: C/gnucash-guide.xml:514(para)
 +#: C/index.docbook:514(para)
  msgid ""
  "Instead of selecting <menuchoice><guimenu>Actions</guimenu><guimenuitem>New "
- "Account...</guimenuitem></menuchoice> from the menu, you can alternatively "
+ "Account…</guimenuitem></menuchoice> from the menu, you can alternatively "
  "create a new sub-account of an account by right clicking on the main "
- "account’s name and selecting the <guilabel>New Account...</guilabel> entry. "
+ "account’s name and selecting the <guilabel>New Account…</guilabel> entry. "
  "This will open a dialog similar to the one depicted in <xref linkend=\"accts-"
  "examples-toplevel2\"/> where the new sub-account will be already set as a "
  "child of the main account."
@@@ -7374,15 -7374,15 +7374,15 @@@ msgstr "
  "Dato che non è ancora stato creato il conto <emphasis>Uscite:Internet</"
  "emphasis>, &app; ne richiederà la creazione."
  
 -#: C/gnucash-guide.xml:857(para)
 +#: C/index.docbook:857(para)
  msgid ""
- "Then you right click on your transaction and select <guilabel>Schedule...</"
+ "Then you right click on your transaction and select <guilabel>Schedule…</"
  "guilabel>"
  msgstr ""
  "Fare clic poi con il tasto destro sulla transazione e selezionare "
- "<guilabel>Pianifica...</guilabel>"
+ "<guilabel>Pianifica…</guilabel>"
  
 -#: C/gnucash-guide.xml:868(phrase) C/gnucash-guide.xml:872(para)
 +#: C/index.docbook:868(phrase) C/index.docbook:872(para)
  msgid "Step two creating scheduled transaction from the ledger"
  msgstr "Passo 2: creazione della transazione pianificata dal libro mastro"
  
@@@ -7786,10 -7786,10 +7786,10 @@@ msgstr "
  "in scadenza o se deve essere inserita una transazione pianificata, potrebbe "
  "essere visualizzata la finestra <guilabel>Dall’ultimo avvio</guilabel> "
  "che riassume le operazioni pendenti relative alle transazioni pianificate "
- "(<guilabel>Promemoria</guilabel>, <guilabel>Da creare</guilabel> ecc... una "
+ "(<guilabel>Promemoria</guilabel>, <guilabel>Da creare</guilabel> ecc… una "
  "descrizione di ogni opzioni è fornita nel manuale di &app;):"
  
 -#: C/gnucash-guide.xml:1191(phrase) C/gnucash-guide.xml:1194(para)
 +#: C/index.docbook:1191(phrase) C/index.docbook:1194(para)
  msgid "Scheduled transaction popup reminder"
  msgstr "Finestra di promemoria per la transazione pianificata"
  
@@@ -7818,10 -7818,10 +7818,10 @@@ msgstr "
  "<guilabel>Da creare</guilabel>, se si controlla nel registro del conto "
  "bancario, si noterà che la transazione è stata creata:"
  
 -#: C/gnucash-guide.xml:1207(para)
 +#: C/index.docbook:1207(para)
  msgid ""
  "If you enable the <guilabel>Review created transactions</guilabel> option in "
- "the lower right of the <guilabel>Since Last Run...</guilabel> window, "
+ "the lower right of the <guilabel>Since Last Run…</guilabel> window, "
  "<application>GnuCash</application> will open, after pressing <guibutton>Ok</"
  "guibutton>, the register tab of each account where the scheduled "
  "transactions were entered automatically."
@@@ -12453,10 -12453,10 +12453,10 @@@ msgstr "
  "<emphasis>Creazione del nuovo titolo</emphasis> - per utilizzare una nuova "
  "azione, è necessario creare l’azione come una nuova commodity"
  
 -#: C/gnucash-guide.xml:705(para)
 +#: C/index.docbook:705(para)
  msgid ""
  "<emphasis>Select Security/Currency</emphasis> - Click on the "
- "<guibutton>Select ...</guibutton> button next to the <guilabel>security/"
+ "<guibutton>Select …</guibutton> button next to the <guilabel>security/"
  "currency</guilabel> line. We must change the security from the default (your "
  "default currency) to this specific stock. This will bring up the "
  "<guilabel>Select Security</guilabel> dialog."
@@@ -12489,17 -12489,17 +12489,17 @@@ msgstr "
  msgid "Select Security Window"
  msgstr "Finestra di scelta del titolo"
  
 -#: C/gnucash-guide.xml:742(para)
 +#: C/index.docbook:742(para)
  msgid ""
- "<emphasis>Create the Security</emphasis> - Click on the <guibutton>New...</"
+ "<emphasis>Create the Security</emphasis> - Click on the <guibutton>New…</"
  "guibutton> button and enter the appropriate information for this stock on "
  "the new form <guilabel>New Security</guilabel>."
  msgstr ""
  "<emphasis>Creare il titolo</emphasis> - premere il pulsante "
- "<guibutton>Nuovo...</guibutton> e inserire le informazioni appropriate per "
+ "<guibutton>Nuovo…</guibutton> e inserire le informazioni appropriate per "
  "l’azione nel modulo <guilabel>Nuovo titolo</guilabel>."
  
 -#: C/gnucash-guide.xml:751(para)
 +#: C/index.docbook:751(para)
  msgid "The <guilabel>Full name:</guilabel> is <quote>Amazon.com</quote>."
  msgstr "Il <guilabel>Nome completo:</guilabel> è <quote>Amazon.com</quote>."
  
@@@ -12865,15 -12865,15 +12865,15 @@@ msgstr "
  msgid "Security"
  msgstr "Titolo"
  
 -#: C/gnucash-guide.xml:1029(para)
 +#: C/index.docbook:1029(para)
  msgid ""
- "The name of the commodity, must be chosen from the <guibutton>Select...</"
+ "The name of the commodity, must be chosen from the <guibutton>Select…</"
  "guibutton> list"
  msgstr ""
  "Il nome della commodity, deve essere scelto dall’elenco che compare "
- "premendo il pulsante <guibutton>Seleziona...</guibutton>."
+ "premendo il pulsante <guibutton>Seleziona…</guibutton>."
  
 -#: C/gnucash-guide.xml:1035(guilabel)
 +#: C/index.docbook:1035(guilabel)
  msgid "Currency"
  msgstr "Valuta"
  
@@@ -13139,11 -13139,11 +13139,11 @@@ msgstr "
  "Se non ci si sente sicuri nell’esecuzione di questi passaggi, è "
  "possibile contattare la lista di discussione degli utenti di "
  "&app; (<email>gnucash-user at gnucash.org</email>) "
- "per chiedere aiuto o andare nell canale IRC di &app; "
- "su irc.gnome.org. È anche possibile saltare questi passaggi e "
+ "per chiedere aiuto o andare nell su "
+ "<ulink url='&url-irc;'>#gnucash canale IRC di &srv-irc;</ulink>. È anche possibile saltare questi passaggi e "
  "aggiornare manualmente i prezzi delle proprie azioni."
  
 -#: C/gnucash-guide.xml:1229(title)
 +#: C/index.docbook:1229(title)
  msgid "Configuring Securities for Online Quotes"
  msgstr "Impostare i titoli per le quotazioni online"
  
@@@ -14219,10 -14219,10 +14219,10 @@@ msgstr "
  "non si desidererà tracciare questa diminuzione dato che non si avrà l’"
  "intenzione di rivenderlo e non si dovranno pagare delle imposte per la "
  "svalutazione dell’abito. Quindi, per questo esempio, l’acquisto "
- "di un nuovo abito dovrebbe essere registrato come una semplice uscita...i "
+ "di un nuovo abito dovrebbe essere registrato come una semplice uscita…i "
  "soldi spesi sono andati (!)."
  
 -#: C/gnucash-guide.xml:48(para)
 +#: C/index.docbook:48(para)
  msgid ""
  "Asset appreciation occurs when something you own increases in value over "
  "time. When you own an asset which has increased in value, the difference "
@@@ -14850,9 -14850,9 +14850,9 @@@ msgstr "
  "per le valutazioni in Canada) e dato che la fattoria era anche un caseificio "
  "per cui erano possibili alcune particolari deduzioni. La morale di questa "
  "storia è che mentre qui è stato mostrato in modo semplice, la tassazione può "
- "divenire molto complicata..."
+ "divenire molto complicata…"
  
 -#: C/gnucash-guide.xml:16(title)
 +#: C/index.docbook:16(title)
  msgid "Multiple Currencies"
  msgstr "Valute multiple"
  
@@@ -16878,9 -16878,9 +16878,9 @@@ msgstr "
  "<emphasis>Costo originale</emphasis> - è l’importo di denaro con cui è "
  "stato acquistato il bene. Sono inclusi in esso tutti i costi necessari a "
  "rendere utilizzabile per i propri scopi il bene. Per esempio: spedizione, "
- "costi di installazione, addestramenti speciali ecc..."
+ "costi di installazione, addestramenti speciali ecc…"
  
 -#: C/gnucash-guide.xml:65(para)
 +#: C/index.docbook:65(para)
  msgid ""
  "<emphasis>Salvage value</emphasis> - this is the value that you estimate the "
  "asset can be sold for at the end of it’s useful life (to you)."
@@@ -17639,10 -17639,10 +17639,10 @@@ msgstr "
  "quelle di un singolo individuo. Le imprese devono gestire i clienti (che "
  "sono debitori di denaro), i fornitori o venditori (che sono creditori), i "
  "libri paga dei dipendenti, una legislazione delle imposte più complessa, "
- "ecc... &app; offre delle funzioni dedicate "
+ "ecc… &app; offre delle funzioni dedicate "
  "all’impresa per venire incontro a queste necessità."
  
 -#: C/gnucash-guide.xml:28(para)
 +#: C/index.docbook:28(para)
  msgid ""
  "Accounts Receivable (A/R) are used by businesses to record sales for which "
  "they are not immediately paid. Accounts Payable (A/P) record bills that they "
@@@ -17927,10 -17927,10 +17927,10 @@@ msgstr "
  "<menuchoice><guimenu>Impresa</guimenu><guisubmenu>Cliente</"
  "guisubmenu><guimenuitem>Nuovo cliente</guimenuitem></menuchoice>. Compilare "
  "le informazioni richieste quali il nome della società, l’indirizzo, il "
- "numero di telefono e di fax, ecc... Qui sotto è riportata una lista di altre "
+ "numero di telefono e di fax, ecc… Qui sotto è riportata una lista di altre "
  "opzioni:"
  
 -#: C/gnucash-guide.xml:184(para)
 +#: C/index.docbook:184(para)
  msgid ""
  "<guilabel>Identification - Customer Number</guilabel> - can be any number by "
  "which you would like to refer to this customer. You may leave it blank and a "
@@@ -18713,10 -18713,10 +18713,10 @@@ msgid "
  "To do so, see the <xref linkend=\"bus-ar-invoicechange\"/>."
  msgstr ""
  "È possibile modificare l’aspetto della fattura inserendo, per esempio, "
- "il logo della società ecc... Per le istruzioni su come farlo, vedere la "
+ "il logo della società ecc… Per le istruzioni su come farlo, vedere la "
  "<xref linkend=\"bus-ar-invoicechange\"/>."
  
 -#: C/gnucash-guide.xml:755(para)
 +#: C/index.docbook:755(para)
  msgid ""
  "Invoices can also be printed from the main window by selecting "
  "<menuchoice><guimenu>Reports</guimenu><guisubmenu>Business Reports</"
@@@ -19398,10 -19398,10 +19398,10 @@@ msgstr "
  "<menuchoice><guimenu>Impresa</guimenu><guisubmenu>Venditore</"
  "guisubmenu><guimenuitem>Nuovo venditore</guimenuitem></menuchoice>. "
  "Completare poi le informazioni generali relative al venditore quali il nome "
- "della società, l’indirizzo, il numero di telefono e di fax ecc... Di "
+ "della società, l’indirizzo, il numero di telefono e di fax ecc… Di "
  "seguito è riportato un elenco delle altre voci disponibili:"
  
 -#: C/gnucash-guide.xml:116(para)
 +#: C/index.docbook:116(para)
  msgid ""
  "<guilabel>Identification - Vendor Number</guilabel> - can be any number by "
  "which you would like to refer to this vendor. You may leave it blank and a "
@@@ -22089,11 -22089,11 +22089,11 @@@ msgstr "
  "probabilemente verrà reso più semplice o flessibile (spesso <quote>semplice</"
  "quote> non è compatibile con <quote>flessibile</quote>)."
  
 -#: C/gnucash-guide.xml:164(para)
 +#: C/index.docbook:164(para)
  msgid ""
  "If <application>Python</application> (other languages are avaialble) is not "
- "your thing then post a request to <ulink url=\"https://lists.gnucash.org/"
- "mailman/listinfo/gnucash-user\"><citetitle>GnuCash user list</citetitle></"
+ "your thing then post a request to <ulink url="
+ "\"&url-mail-li;gnucash-user\"><citetitle>GnuCash user list</citetitle></"
  "ulink>, with an example of your downloaded <acronym>CSV</acronym>, and "
  "someone may write you a <application>Python</application> script to do the "
  "translation."
@@@ -22576,17 -22576,15 +22576,15 @@@ msgstr "
  "preparato (non ce ne sono molti, ma ce n’è uno per il formato "
  "<acronym>CSV</acronym> in lavorazione);"
  
 -#: C/gnucash-guide.xml:100(para)
 +#: C/index.docbook:100(para)
  msgid ""
- "Install an <acronym>XSLT</acronym> processor such as Saxon (http://saxon."
- "sourceforge.net/) or Xalan-J (http://xml.apache.org/). Any conforming "
- "processor will do, really..."
+ "Install an <acronym>XSLT</acronym> processor such as Saxon (%url-saxon;) or Xalan-J (%url-xalan;). Any conforming "
+ "processor will do, really…"
  msgstr ""
- "installare un processore <acronym>XSLT</acronym> come Saxon (http://saxon."
- "sourceforge.net/) o Xalan-J (http://xml.apache.org/). Comunque qualsiasi "
- "processore simile funzionerà...;"
+ "installare un processore <acronym>XSLT</acronym> come Saxon (%url-saxon;) o Xalan-J (%url-xalan;). Comunque qualsiasi "
+ "processore simile funzionerà…;"
  
 -#: C/gnucash-guide.xml:105(para)
 +#: C/index.docbook:105(para)
  msgid ""
  "Run the work file and the stylesheet through the processor according to the "
  "processor’s instructions."
@@@ -22619,9 -22617,9 +22617,9 @@@ msgstr "
  "Scheme o una nuova routine in C per eseguire la trasformazione. Chiunque "
  "conosca o abbia voglia di imparare il linguaggio <acronym>XML</acronym> può "
  "cimentarsi in questa operazione: sinceramente, niente di più difficile che "
- "scrivere una pagina web...."
+ "scrivere una pagina web…."
  
 -#: C/gnucash-guide.xml:122(para)
 +#: C/index.docbook:122(para)
  #, fuzzy
  msgid ""
  "Anyhow, I just wanted this tidbit to be captured somewhere permanently. The "
@@@ -22663,21 -22661,21 +22661,21 @@@ msgid "Q: Are there mailing lists for <
  msgstr ""
  "D: Ci sono delle liste di discussione dedicate a &app;?"
  
 -#: C/gnucash-guide.xml:26(para)
 +#: C/index.docbook:26(para)
  msgid ""
- "A: Yes. Go to <ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-"
- "user\">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> and "
- "<ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-devel"
- "\">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> to "
+ "A: Yes. Go to <ulink url=\"&url-mail-li;gnucash-"
+ "user\">gnucash-user</ulink> and "
+ "<ulink url=\"&url-mail-li;gnucash-devel"
+ "\">gnucash-devel</ulink> to "
  "subscibe."
  msgstr ""
- "R: Sì! qui: <ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-"
- "user\">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> e "
- "<ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-devel"
- "\">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> per "
+ "R: Sì! qui: <ulink url=\"&url-mail-li;gnucash-"
+ "user\">gnucash-user</ulink> e "
+ "<ulink url=\"gnucash-devel"
+ "\">gnucash-devel</ulink> per "
  "iscriverti."
  
 -#: C/gnucash-guide.xml:30(title)
 +#: C/index.docbook:30(title)
  msgid "Q: Is there a searchable archive for the mailing lists?"
  msgstr ""
  "D: esiste la possibilità di cercare un argomento nell’archivio delle "
@@@ -22703,16 -22701,16 +22701,16 @@@ msgid "
  msgstr ""
  "D: Esistono altri mezzi per ottenere aiuto riguardo &app;?"
  
 -#: C/gnucash-guide.xml:36(para)
 +#: C/index.docbook:36(para)
  msgid ""
- "A: Yes. Many of the developers hang out on icq in the #gnucash discussion on "
- "irc.gnome.org. Also, there is a wiki online at <ulink url=\"&url-wiki;\"/>."
+ "A: Yes. Many of the developers hang out on icq in the on "
+ "<ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. Also, there is a wiki online at <ulink url=\"&url-wiki;\"/>."
  msgstr ""
  "R: Sì. La maggior parte dei programmatori si ritrovano su ICQ nella "
- "discussione #gnucash su irc.gnome.org. È anche disponibile un wiki qui: "
+ "discussione su <ulink url='&url-irc;'>#gnucash canale di &srv-irc;</ulink>. È anche disponibile un wiki qui: "
  "<ulink url=\"h&url-wiki;\"/>."
  
 -#: C/gnucash-guide.xml:41(title)
 +#: C/index.docbook:41(title)
  msgid "General Information"
  msgstr "Informazioni generali"
  
@@@ -23151,9 -23149,9 +23149,9 @@@ msgid "
  msgstr ""
  "R: Questa è una bella domanda; dovresti consultare il tuo commercialista. Il "
  "modo in cui trattare le tasse dipende fortemente dalla loro tipologia e da "
- "come tu vuoi trattarle... In alcuni casi sono spese, in altri sono debiti."
+ "come tu vuoi trattarle… In alcuni casi sono spese, in altri sono debiti."
  
 -#: C/gnucash-guide.xml:14(title)
 +#: C/index.docbook:14(title)
  #, fuzzy
  msgid "Contributed Account Trees"
  msgstr "Emissione sul conto"
diff --cc it/manual/it.po
index 004d9286,124f8d29..f25f8deb
--- a/it/manual/it.po
+++ b/it/manual/it.po
@@@ -472,11 -472,11 +472,11 @@@ msgstr "<emphasis role=\"bold\">Lista d
  msgid "<emphasis role=\"bold\">Development List </emphasis><email>gnucash-devel at gnucash.org</email> - Discussion of issues related to the design and development of <application>GnuCash</application> and submission of patches."
  msgstr "<emphasis role=\"bold\">Lista degli sviluppatori </emphasis><email>gnucash-devel at gnucash.org</email>: vengono discusse le questioni riguardanti la progettazione e lo sviluppo di &app;, e la presentazione di patch."
  
- #: C/index.docbook:133(para)
- msgid "You can chat live with the developers on IRC! Join them on #gnucash at irc.gnome.org. Much more at the <ulink url=\"&url-www;\"><application>GnuCash</application> web site </ulink> including links to WIKI and Bugzilla !!"
- msgstr "È anche possibile utilizzare la chat di IRC e discutere in diretta con gli sviluppatori! Unisciti a loro su #gnucash at irc.gnome.org. Altre risorse sono disponibili sul <ulink url=\"&url-www;\"> sito di &app;</ulink> come i collegamenti al WIKI e a Bugzilla."
+ #: C/gnucash-help.xml:133(para)
+ msgid "You can chat live with the developers on IRC! Join them on <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. Much more at the <ulink url=\"&url-www;\"><application>GnuCash</application> web site </ulink> including links to WIKI and Bugzilla !!"
+ msgstr "È anche possibile utilizzare la chat di IRC e discutere in diretta con gli sviluppatori! Unisciti a loro su <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. Altre risorse sono disponibili sul <ulink url=\"&url-www;\"> sito di &app;</ulink> come i collegamenti al WIKI e a Bugzilla."
  
 -#: C/gnucash-help.xml:20(title)
 +#: C/index.docbook:20(title)
  msgid "Getting Started"
  msgstr "Per iniziare"
  
@@@ -4248,11 -4248,11 +4248,11 @@@ msgstr "Spostarsi in questa cartella, a
  msgid "After installation is complete, you should run the <quote>gnc-fq-dump</quote> test program, in the same directory, distributed with <application>GnuCash</application> to test if <application>Finance::Quote</application> is installed and working properly."
  msgstr "Quando l’installazione è terminata, eseguire il programma di test <quote>gnc-fq-dump</quote>, nella stessa cartella, distribuito con &app; per verificare se <application>Finance::Quote</application> è installato e funziona correttamente."
  
- #: C/index.docbook:476(para)
- msgid "If you feel uncomfortable about performing any of these steps, please either email the <application>GnuCash</application>-user mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the <application>GnuCash</application> IRC channel on irc.gnome.org. You can also leave out this step and manually update your stock prices."
- msgstr "Se non ci si sente sicuri nell’esecuzione di questi passaggi, è possibile contattare la lista di discussione degli utenti di &app; (<email>gnucash-user at gnucash.org</email>) per chiedere aiuto o andare nell canale IRC di &app; su irc.gnome.org. È anche possibile saltare questi passaggi e aggiornare manualmente i prezzi delle proprie azioni."
+ #: C/gnucash-help.xml:476(para)
+ msgid "If you feel uncomfortable about performing any of these steps, please either email the <application>GnuCash</application>-user mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the <application>GnuCash</application> <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. You can also leave out this step and manually update your stock prices."
+ msgstr "Se non ci si sente sicuri nell’esecuzione di questi passaggi, è possibile contattare la lista di discussione degli utenti di &app; (<email>gnucash-user at gnucash.org</email>) per chiedere aiuto o andare nell <ulink url='&url-irc;'>#gnucash canale IRC di &srv-irc;</ulink>. È anche possibile saltare questi passaggi e aggiornare manualmente i prezzi delle proprie azioni."
  
 -#: C/gnucash-help.xml:483(para)
 +#: C/index.docbook:483(para)
  msgid "Create the Account for the mutual fund or stock with it listed in the <guilabel>Security/Currency</guilabel> field, as described above."
  msgstr "Creare il conto per il fondo comune o per le azioni impostando il campo <guilabel>titolo/valuta</guilabel>, come descritto nel seguito."
  
diff --cc ru/guide/ch_invest.xml
index 3214f1f3,49f932d8..e1a86ee1
--- a/ru/guide/ch_invest.xml
+++ b/ru/guide/ch_invest.xml
@@@ -3232,9 -3232,8 +3232,8 @@@ Incom
          </figure>
  
          <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-           <ulink
- url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-manual/tool-lots.html">
-           Lots in Account </ulink> for details of the Lots in Account screen elements.
 -          <ulink url="&url-docs;C/gnucash-help/tool-lots.html">Lots in Account</ulink>
++          <ulink url="&url-docs;C/gnucash-manual/tool-lots.html">Lots in Account</ulink>
+           for details of the Lots in Account screen elements.
          </para>
        </sect3>
  

commit 821747e31d79121c07b3dbb9652d4a3f8dad260e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Dec 17 17:07:02 2022 -0800

    Release Documentation for GnuCash 4.13

diff --git a/NEWS b/NEWS
index c2c2e31e..3ce018d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,30 @@
 Version History
 ---------------
+ 4.13  - 18 December 2022
+        o Bug 798620 - Unable to build docs on Mageia Cauldron
+        o Bug 798623 - ENG. Typo "documenation"
+        o Bug 798624 - Document how to check if GnuCash is running when
+                       updating quotes
+        o Bug 798645 - screens instead of WINDOWS
+        o Bug 798665 - New: ENG. Typo: Unnecessary determiner "a"
+                       in 2.6.1. Migrating financial data.
+        o Bug 798674 - Broken link on Chapter 17. Python Bindings
+        o Manual:de: Account_Actions: Tippfehler-Korrektur
+        o Review URLs and replace them by entities in all parts and languages excepting in comments or FDL appendix
+        o manual, ch_Finance-Quote: fix broken entities
+        o gnc-gui-struct.dtd: fix some mistakes and add entities for menuitems and menuchoice.
+        o Update url-irc to "irc://irc.gimp.net/gnucash" see the email announcement
+        o Partial Modernization of Manual:C:Business: Differentiation of admonitions and improvement of lists
+        o Manual:C: Convert CSV assistant into <procedure>
+        o Multi-split csv elaboration
+        o Update app-fq-vers to "1.53"
+        o Replace "Online Quote Setup" instructions in Guide by links to the manual chapter.
+        O Enhance bookinfos by subtitle and titleabbrev;drop "Help" from manual. Adding titleabbrev allows yelp to display the version in its titlebar
+        o Guide:C: Fix image declarations: Some were not properly scaled and others didn't appear in the List of Figures.
+        o Replace all hardcoded width="510[px]" by "&img-w;" for for both components in all languages
+        o Ensure our documentation is also found when gnucash is run in KDE
+        o Restore draft status in gnc-docbook.dtd.
+        o New and Updated Translations: German
  4.12  - 25 September 2022
         o Major revision of the Online Quote Retrieval (Finance::Quote) section.
         o Enumerate figure files in CMakeLists so that invalid references will
diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 578941b4..9bedb5c9 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -35,7 +35,7 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
   1. a) Publication - should only be changed by the release manager!
 -->
 <!ENTITY series-stable "4">
-<!ENTITY vers-stable "&series-stable;.12">
+<!ENTITY vers-stable "&series-stable;.13">
 <!ENTITY series-unstable "master">
 <!ENTITY vers-unstable "">
 <!ENTITY app-fq-vers "1.53">
@@ -46,7 +46,7 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
             Replace them after olink setup               -->
 <!ENTITY url-docs-draft "https://code.gnucash.org/docs/">  <!-- used while developing and for the API-docs -->
 <!ENTITY url-docs-release "https://www.gnucash.org/docs/v&series-stable;/">  <!-- used on release -->
-<!ENTITY url-docs "&url-docs-draft;">
+<!ENTITY url-docs "&url-docs-release;">
 
 <!--
   1. b) Publication - Translators can add transliterations
diff --git a/guide/C/index.docbook b/guide/C/index.docbook
index e4b4ddac..a393c469 100644
--- a/guide/C/index.docbook
+++ b/guide/C/index.docbook
@@ -80,6 +80,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/guide/de/index.docbook b/guide/de/index.docbook
index 5d021464..a9dd3701 100644
--- a/guide/de/index.docbook
+++ b/guide/de/index.docbook
@@ -89,6 +89,15 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors </para>
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/guide/it/index.docbook b/guide/it/index.docbook
index dc97e945..f3b7d701 100644
--- a/guide/it/index.docbook
+++ b/guide/it/index.docbook
@@ -130,6 +130,15 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors </para>
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/guide/ja/index.docbook b/guide/ja/index.docbook
index 0975b16e..5ac798bb 100644
--- a/guide/ja/index.docbook
+++ b/guide/ja/index.docbook
@@ -86,6 +86,15 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial and Concepts Guide 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors </para>
+          <para role="publisher">&appname; Documentation Team
+          </para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial and Concepts Guide 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/guide/pt/index.docbook b/guide/pt/index.docbook
index 01a71da5..32cfba3f 100644
--- a/guide/pt/index.docbook
+++ b/guide/pt/index.docbook
@@ -78,9 +78,17 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos 4.13</revnumber>
+        <date>18 de dezembro de 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.12</revnumber>
-        <date>25 de Setembro de 2022</date>
+        <date>25 de setembro de 2022</date>
         <revdescription>
           <para role="author">Multiple authors</para>
           <para role="publisher">&appname; Documentation Team</para>
@@ -96,7 +104,7 @@
       </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.10</revnumber>
-        <date>27 de Março de 2022</date>
+        <date>27 de março de 2022</date>
         <revdescription>
           <para role="author">Multiple authors</para>
           <para role="publisher">&appname; Documentation Team</para>
@@ -104,7 +112,7 @@
       </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.9</revnumber>
-        <date>19 de Dezembro de 2021</date>
+        <date>19 de dezembro de 2021</date>
         <revdescription>
           <para role="author">Multiple authors</para>
           <para role="publisher">&appname; Documentation Team</para>
@@ -112,7 +120,7 @@
       </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.7</revnumber>
-        <date>26 de Setembro de 2021</date>
+        <date>26 de setembro de 2021</date>
         <revdescription>
           <para role="author">Multiple authors</para>
           <para role="publisher">&appname; Documentation Team</para>
@@ -120,7 +128,7 @@
       </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.6</revnumber>
-        <date>27 de Junho de 2021</date>
+        <date>27 de junho de 2021</date>
         <revdescription>
           <para role="author">Multiple authors</para>
           <para role="publisher">&appname; Documentation Team</para>
@@ -128,14 +136,14 @@
       </revision>
       <revision>
         <revnumber>&appname; Tutorial e guia de conceitos 4.5</revnumber>
-        <date>28 de Março de 2021</date>
+        <date>28 de março de 2021</date>
         <revdescription>
           <para role="author">Multiple authors</para>
           <para role="publisher">&appname; Documentation Team</para>
         </revdescription>
       </revision>
       <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.4</revnumber>
-      <date>28 de Dezembro de 2020</date>
+      <date>28 de dezembro de 2020</date>
       <revdescription>
         <para role="author">Multiple authors
         </para>
@@ -144,7 +152,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.3</revnumber>
-      <date>27 de Dezembro de 2020</date>
+      <date>27 de dezembro de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -153,7 +161,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.2</revnumber>
-      <date>27 de Setembro de 2020</date>
+      <date>27 de setembro de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -162,7 +170,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.1</revnumber>
-      <date>26 de Julho de 2020</date>
+      <date>26 de julho de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -171,7 +179,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos 4.0</revnumber>
-      <date>28 de Junho de 2020</date>
+      <date>28 de junho de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -180,7 +188,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.11</revnumber>
-      <date>28 de Junho de 2020</date>
+      <date>28 de junho de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -189,7 +197,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.10</revnumber>
-      <date>11 de Abril de 2020</date>
+      <date>11 de abril de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -198,7 +206,7 @@
         </para>
       </revdescription>
       </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.9</revnumber>
-      <date>29 de Março de 2020</date>
+      <date>29 de março de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -206,8 +214,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.8</revnumber>
-      <date>29 de Dezembro de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.8</revnumber>
+        <date>29 de dezembro de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -215,8 +225,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.7</revnumber>
-      <date>8 de Setembro de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.7</revnumber>
+        <date>8 de setembro de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -224,8 +236,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.6</revnumber>
-      <date>30 de Junho de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.6</revnumber>
+        <date>30 de junho de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -233,8 +247,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.1</revnumber>
-      <date>28 de Abril de 2018</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.1</revnumber>
+        <date>28 de abril de 2018</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -242,8 +258,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v3.0</revnumber>
-      <date>1 de Abril de 2018</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v3.0</revnumber>
+        <date>1 de abril de 2018</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -251,8 +269,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.20</revnumber>
-      <date>1 de Abril de 2018</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.20</revnumber>
+        <date>1 de abril de 2018</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -260,8 +280,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.16</revnumber>
-      <date>26 de Março de 2017</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.16</revnumber>
+        <date>26 de março de 2017</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -269,8 +291,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.8</revnumber>
-      <date>27 de Setembro de 2015</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.8</revnumber>
+        <date>27 de setembro de 2015</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -278,8 +302,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.7</revnumber>
-      <date>28 de Junho de 2015</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.7</revnumber>
+        <date>28 de junho de 2015</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -287,8 +313,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.3</revnumber>
-      <date>30 de Março de 2014</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.3</revnumber>
+        <date>30 de março de 2014</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -296,8 +324,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.2</revnumber>
-      <date>2 de Março de 2014</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.2</revnumber>
+        <date>2 de março de 2014</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -305,8 +335,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.1</revnumber>
-      <date>26 de Janeiro de 2014</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.1</revnumber>
+        <date>26 de janeiro de 2014</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -314,8 +346,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.6.0</revnumber>
-      <date>29 de Dezembro de 2013</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.6.0</revnumber>
+        <date>29 de dezembro de 2013</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -323,8 +357,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.4.2</revnumber>
-      <date>17 de Novembro de 2012</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.4.2</revnumber>
+        <date>17 de novembro de 2012</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -332,8 +368,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.4.1</revnumber>
-      <date>1 de Julho de 2011</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.4.1</revnumber>
+        <date>1 de julho de 2011</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -341,8 +379,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.3.16</revnumber>
-      <date>de Novembro de 7, 2010</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.3.16</revnumber>
+        <date>de novembro de 7, 2010</date>
       <revdescription>
         <para role="author">Jon Lapham
         </para>
@@ -356,8 +396,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v2.0.0</revnumber>
-      <date>Julho de 2006</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v2.0.0</revnumber>
+        <date>julho de 2006</date>
       <revdescription>
         <para role="author">Jon Lapham
         </para>
@@ -371,8 +413,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v1.8.3</revnumber>
-      <date>Agosto de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v1.8.3</revnumber>
+        <date>agosto de 2003</date>
       <revdescription>
         <para role="author">Jon Lapham
         </para>
@@ -380,8 +424,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v1.8.2</revnumber>
-      <date>Agosto de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v1.8.2</revnumber>
+        <date>agosto de 2003</date>
       <revdescription>
         <para role="author">Jon Lapham
         </para>
@@ -389,8 +435,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v1.8.1</revnumber>
-      <date>Maio de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v1.8.1</revnumber>
+        <date>maio de 2003</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -398,8 +446,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; Tutorial e guia de conceitos v1.8.0</revnumber>
-      <date>Janeiro de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; Tutorial e guia de conceitos v1.8.0</revnumber>
+        <date>janeiro de 2003</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -407,8 +457,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.5</revnumber> <date>Junho de
-      2002</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; User Guide v1.6.5</revnumber>
+        <date>junho de 2002</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -416,8 +468,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>&appname; User Guide v1.6.0</revnumber> <date>Outubro de
-      2001</date>
+      </revision>
+      <revision>
+        <revnumber>&appname; User Guide v1.6.0</revnumber>
+        <date>outubro de 2001</date>
       <revdescription>
         <para role="author">Carol Champagne
         </para>
diff --git a/manual/C/index.docbook b/manual/C/index.docbook
index db464aa4..57cb73fa 100644
--- a/manual/C/index.docbook
+++ b/manual/C/index.docbook
@@ -43,6 +43,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/manual/de/index.docbook b/manual/de/index.docbook
index 414e781d..f4ff3ba0 100644
--- a/manual/de/index.docbook
+++ b/manual/de/index.docbook
@@ -59,6 +59,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/manual/it/index.docbook b/manual/it/index.docbook
index 4c263ea8..1f5450df 100644
--- a/manual/it/index.docbook
+++ b/manual/it/index.docbook
@@ -209,6 +209,14 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>&appname; Help Manual 4.13</revnumber>
+        <date>18 December 2022</date>
+        <revdescription>
+          <para role="author">Multiple authors</para>
+          <para role="publisher">&appname; Documentation Team</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>&appname; Help Manual 4.12</revnumber>
         <date>25 September 2022</date>
diff --git a/manual/pt/index.docbook b/manual/pt/index.docbook
index 399b62c4..846f2ad2 100644
--- a/manual/pt/index.docbook
+++ b/manual/pt/index.docbook
@@ -46,9 +46,17 @@
     </authorgroup>
 
     <revhistory>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.13</revnumber>
+        <date>18 de dezembro de 2022</date>
+        <revdescription>
+          <para role="author">Múltiplos autores</para>
+          <para role="publisher">Equipa de documentação do &appname;</para>
+        </revdescription>
+      </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.12</revnumber>
-        <date>25 de Setembor de 2022</date>
+        <date>25 de setembro de 2022</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
           <para role="publisher">Equipa de documentação do &appname;</para>
@@ -64,7 +72,7 @@
       </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.10</revnumber>
-        <date>27 de Marcha de 2022</date>
+        <date>27 de março de 2022</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
           <para role="publisher">Equipa de documentação do &appname;</para>
@@ -72,7 +80,7 @@
       </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.9</revnumber>
-        <date>19 de Dezembro de 2021</date>
+        <date>19 de dezembro de 2021</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
           <para role="publisher">Equipa de documentação do &appname;</para>
@@ -80,7 +88,7 @@
       </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.8</revnumber>
-        <date>28 de septembro de 2021</date>
+        <date>28 de setembro de 2021</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
           <para role="publisher">Equipa de documentação do &appname;</para>
@@ -88,7 +96,7 @@
       </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.7</revnumber>
-        <date>26 de septembro de 2021</date>
+        <date>26 de setembro de 2021</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
           <para role="publisher">Equipa de documentação do &appname;</para>
@@ -104,14 +112,15 @@
       </revision>
       <revision>
         <revnumber>Manual de ajuda do &appname; v4.5</revnumber>
-        <date>28 de marcha de 2021</date>
+        <date>28 de março marcha de 2021</date>
         <revdescription>
           <para role="author">Múltiplos autores</para>
           <para role="publisher">Equipa de documentação do &appname;</para>
         </revdescription>
       </revision>
-      <revision> <revnumber>Manual de ajuda do &appname; v4.4</revnumber> <date>28 de
-      decembro de 2020</date>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.4</revnumber>
+        <date>28 de dezembro de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -119,8 +128,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v4.3</revnumber> <date>27 de
-      decembro de 2020</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.3</revnumber>
+        <date>27 de dezembro de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -128,8 +139,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v4.2</revnumber> <date>27 de
-      septembro de 2020</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.2</revnumber>
+        <date>27 de setembro de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -137,8 +150,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v4.1</revnumber> <date>26 de
-      julio de 2020</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v4.1</revnumber>
+        <date>26 de julio de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -155,8 +170,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.11</revnumber> <date>28 de
-      junho de 2020</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.11</revnumber>
+        <date>28 de junho de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -164,8 +181,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.10</revnumber> <date>11 de
-      abril de 2020</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.10</revnumber>
+        <date>11 de abril de 2020</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -173,8 +192,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.8</revnumber> <date>29 de
-      dezembro de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.8</revnumber>
+        <date>29 de dezembro de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -182,8 +203,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.7</revnumber> <date>8 de
-      septembro de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.7</revnumber>
+        <date>8 de setembro de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -191,8 +214,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.6</revnumber> <date>31 de
-      junho de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.6</revnumber>
+        <date>31 de junho de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -200,8 +225,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.5</revnumber> <date>31 de
-      março de 2019</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.5</revnumber>
+        <date>31 de março de 2019</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -209,8 +236,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.1</revnumber> <date>24 de
-      abril de 2018</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.1</revnumber>
+        <date>24 de abril de 2018</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -218,8 +247,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v3.0</revnumber> <date>1 de
-      abril de 2018</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v3.0</revnumber>
+        <date>1 de abril de 2018</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -227,8 +258,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.20</revnumber> <date>1 de
-      abril de 2018</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.20</revnumber>
+        <date>1 de abril de 2018</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -236,8 +269,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.8</revnumber> <date>27 de
-      setembro de 2015</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.8</revnumber>
+        <date>27 de setembro de 2015</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -245,8 +280,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.7</revnumber> <date>28 de
-      junho de 2015</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.7</revnumber>
+        <date>28 de junho de 2015</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -254,8 +291,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.3</revnumber> <date>30 de
-      março de 2014</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.3</revnumber>
+        <date>30 de março de 2014</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -263,8 +302,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.2</revnumber> <date>2 de
-      março de 2014</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.2</revnumber>
+        <date>2 de março de 2014</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -272,8 +313,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.1</revnumber> <date>26 de
-      janeiro de 2014</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.1</revnumber>
+        <date>26 de janeiro de 2014</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -281,8 +324,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.6.0</revnumber> <date>29 de
-      dezembro de 2013</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.6.0</revnumber>
+        <date>29 de dezembro de 2013</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -290,8 +335,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.4.2</revnumber> <date>17 de
-      novembro de 2012</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.4.2</revnumber>
+        <date>17 de novembro de 2012</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -299,8 +346,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.4.1</revnumber> <date>1 de
-      julho de 2011</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.4.1</revnumber>
+        <date>1 de julho de 2011</date>
       <revdescription>
         <para role="author">Múltiplos autores
         </para>
@@ -308,8 +357,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.3.16</revnumber> <date>de
-      novembro de 7, 2010</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.3.16</revnumber>
+        <date>de novembro de 7, 2010</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -320,8 +371,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.0.2</revnumber> <date>de
-      março de 2007</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.0.2</revnumber>
+        <date>de março de 2007</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -329,8 +382,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v2.0.0</revnumber> <date>de
-      julho de 2006</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v2.0.0</revnumber>
+        <date>de julho de 2006</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -338,8 +393,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v1.8.3</revnumber> <date>Agosto
-      de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v1.8.3</revnumber>
+        <date>Agosto de 2003</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -347,8 +404,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v1.8.2</revnumber> <date>Agosto
-      de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v1.8.2</revnumber>
+        <date>Agosto de 2003</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -356,8 +415,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v1.8.1</revnumber> <date>Maio
-      de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v1.8.1</revnumber>
+        <date>Maio de 2003</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -365,8 +426,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual de ajuda do &appname; v1.8.0</revnumber>
-      <date>Janeiro de 2003</date>
+      </revision>
+      <revision>
+        <revnumber>Manual de ajuda do &appname; v1.8.0</revnumber>
+        <date>Janeiro de 2003</date>
       <revdescription>
         <para role="author">Chris Lyttle
         </para>
@@ -374,8 +437,10 @@
         <para role="publisher">Equipa de documentação do &appname;
         </para>
       </revdescription>
-      </revision> <revision> <revnumber>Manual do utilizador do &appname;</revnumber> <date>de junho
-      de 2002</date>
+      </revision>
+      <revision>
+        <revnumber>Manual do utilizador do &appname;</revnumber>
+        <date>de junho de 2002</date>
       <revdescription>
         <para role="author">Programadores e documentadores do &appname;
         </para>

commit 85f6edbc37d60113aaccf23b307fdc301ada173d
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Dec 17 17:13:59 2022 -0800

    [pt transactions] Fix broken image href.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 347fd420..d07fe60f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.10)
 # We don't actually use C, but GNUInstallDirs doesn't work if we don't
 # specify a language.
 project (gnucash-docs
-    VERSION 4.12
+    VERSION 4.13
     LANGUAGES C)
 
 set (PACKAGE_NAME GnuCash Docs)
diff --git a/manual/pt/ch_Transactions.xml b/manual/pt/ch_Transactions.xml
index 04256eee..d8bbec88 100644
--- a/manual/pt/ch_Transactions.xml
+++ b/manual/pt/ch_Transactions.xml
@@ -85,7 +85,7 @@ Translators:
             </imageobject>
 
             <imageobject role="fo">
-              <imagedata fileref="figures/split_transaction.png"
+              <imagedata fileref="figures/icons/split_transaction.png"
                        srccredit="Pedro Albuquerque"/>
             </imageobject>
           </mediaobject>

commit 3f3b58fb6ecff4eba7a4cd5e1fb48badce8daee8
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Dec 14 00:10:51 2022 +0100

    Manual:de: Account_Actions: Tippfehler-Korrektur

diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 08b51267..9b93cf4d 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -194,7 +194,7 @@
 <!ENTITY % gmi.rep.ass-lia.ass-chr "<guimenuitem><accel>A</accel>ktiva-Diagramm</guimenuitem>">
 <!ENTITY % gmi.rep.ass-lia.ass-pie "<guimenuitem>A<accel>k</accel>tiva Tortendiagramm</guimenuitem>">
 <!ENTITY % gmi.rep.ass-lia.bal-for "<guimenuitem><accel>S</accel>aldo-Vorhersage</guimenuitem>">
-<!ENTITY % gmi.rep.ass-lia.bal-she "<guimenuitem><accel>B</accel>ilanze</guimenuitem>">
+<!ENTITY % gmi.rep.ass-lia.bal-she "<guimenuitem><accel>B</accel>ilanz</guimenuitem>">
 <!ENTITY % gmi.rep.ass-lia.bal-she-egu "<guimenuitem>B<accel>i</accel>lanze (mit <quote>eguile</quote>)</guimenuitem>">
 <!ENTITY % gmi.rep.ass-lia.gen-jour "<guimenuitem><accel>H</accel>auptbuch Journal</guimenuitem>">
 <!ENTITY % gmi.rep.ass-lia.gen-led "<guimenuitem><accel>J</accel>ournal</guimenuitem>">
diff --git a/manual/de/ch_Account-Actions.xml b/manual/de/ch_Account-Actions.xml
index b50d4d7d..d2ee026f 100644
--- a/manual/de/ch_Account-Actions.xml
+++ b/manual/de/ch_Account-Actions.xml
@@ -31,7 +31,7 @@
   </para>
 
   <sect1 id="acct-types">
-    <title>Arten von &app; Konten</title>
+    <title>Arten von &app;-Konten</title>
 
     <para>&app; unterstützt eine Anzahl verschiedener Kontoarten. Es wird empfohlen, dass Sie aus der
       folgenden Liste der Kontoarten jeweils die passende Kontoart auswählen.
@@ -51,7 +51,7 @@
     </para>
 
     <table frame="topbot" id="TypeAccounts">
-      <title>Arten von &app; Konten.</title>
+      <title>Arten von &app;-Konten.</title>
 <!-- FIXME source: Table completely restructured -->
       <tgroup align="left" cols="4">
         <colspec colname="c1"></colspec>
@@ -288,8 +288,8 @@
             </entry>
 
             <entry namest="c3">
-              <para>Die Kontoart Kreditkarte kommt für die Konten zu zum Einsatz die, im Gegensatz zu normalen
-                Bankkonten, häufig im Minus sind. Diese Kontoart kann sowohl für Kreditkarten die
+              <para>Die Kontoart Kreditkarte kommt für die Konten zum Einsatz, die im Gegensatz zu normalen
+                Bankkonten häufig im Minus sind. Diese Kontoart kann sowohl für Kreditkarten die
                 eine gleitende Kreditlinie erlauben (z. B. VISA, oder MasterCard) als auch bei
                 Karten, die keine laufenden Guthaben zulassen (z. B. American Express), verwendet
                 werden.
@@ -546,7 +546,7 @@
         Kontonummern zunächst die Ziffern zu verwenden. Reichen die nicht aus, können Sie auch die
         Buchstaben <quote>a</quote> bis <quote>z</quote> benutzen. &app; kann Sie bei der
         Nummerierung Ihre Konten unterstützen. Verwenden Sie hierfür den Assistenten &mc.ed.acc-renum;
-        zu Hilfe. Ein Beispiel ist in <xref linkend="chart-renumber" /> beschrieben
+        zu Hilfe. Ein Beispiel ist in <xref linkend="chart-renumber" /> beschrieben.
       </para>
     </tip>
 <!-- FIXME Is this section still valid? -->
@@ -567,8 +567,8 @@
     <tip>
       <para>Sie können den Assistenten später erneut ausführen. Hierfür gehen Sie im Menü zu &mc.fi.new; 
         falls Sie eine neue Datei erstellen wollen. Wenn Sie den Assistenten innerhalb der geöffneten Datei
-        laufen lassen wollen, benutzen Sie stattdessen &mc.ac.act-hier; wenn das Kontenhierarchie-
-        Register angezeigt wird.
+        laufen lassen wollen, benutzen Sie stattdessen &mc.ac.act-hier; wenn das Kontenhierarchie-Register
+        angezeigt wird.
       </para>
     </tip>
 
@@ -812,7 +812,7 @@
             <term><guilabel>Anfangsbestand</guilabel></term>
 
             <listitem>
-              <para>In dieses Feld der vierten Spalte können Sie bei Bedarf einen Anfangsbestand eintragen indem Sie
+              <para>In dieses Feld der vierten Spalte können Sie bei Bedarf einen Anfangsbestand eintragen, indem Sie
                 diesen in die Zelle eingeben. Weiterhin wird hier von &app; ein Hinweis eingetragen,
                 ob dieses Konto in einer vorhanden Kontostruktur schon existiert und somit nicht neu
                 angelegt wird.
@@ -840,20 +840,20 @@
       </step>
     </procedure>
 
-    <para>Sie haben nun eine Struktur der Konten in Ihrer &app; Kontenübersicht.
+    <para>Sie haben nun eine Struktur der Konten in Ihrer &app;-Kontenübersicht.
     </para>
   </sect1>
 
   <sect1 id="chart-edit">
     <title>Kontenplan bearbeiten</title>
 
-    <para>Wenn Sie Ihren aktuellen Kontenplan modifizieren möchten so können Sie das mit dem Menüeintrag
+    <para>Wenn Sie Ihren aktuellen Kontenplan modifizieren möchten, so können Sie das mit dem Menüeintrag
       &mc.ed.acc-edit;
       durchführen oder Sie betätigen die <guibutton>Bearbeiten</guibutton>-Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> der <quote>Kontenübersicht</quote>.
     </para>
 
-    <para>Es öffnet sich der Dialog <guilabel>Konto bearbeiten</guilabel> in dessem unteren Bereich das
+    <para>Es öffnet sich der Dialog <guilabel>Konto bearbeiten</guilabel>, in dessem unteren Bereich das
       Auswahlfeld <guilabel>Übergeordnetes Konto</guilabel> Ihnen die Möglichkeit bietet, ein
       Konto an eine beliebige Stelle in der Kontenhierarchie zu bewegen.
     </para>
@@ -1018,7 +1018,7 @@
           <term><guilabel>Auswählen…</guilabel></term>
 
           <listitem>
-            <para>Wenn Sie diese Schaltfläche betätigen öffnet sich ein weiterer Dialog in dem Sie eine Währung
+            <para>Wenn Sie diese Schaltfläche betätigen, öffnet sich ein weiterer Dialog in dem Sie eine Währung
               oder ein Wertpapier für dieses Konto auswählen können.
               <note>
                 <para>Werden mit dem Konto <guilabel>Aktien</guilabel> oder <guilabel>Investmentfonds</guilabel>
@@ -1730,12 +1730,15 @@
 
     <tip>
       <para>Es empfiehlt sich, dass Sie vor dem Löschen eines Kontos die &app;-Datei speichern. Habe Sie aus
-        Versehen ein Konto gelöscht, so können Sie mit dem Befehl &mc.fi.rev; sich aus der Bedrouille
+        Versehen ein Konto gelöscht, so können Sie sich mit dem Befehl &mc.fi.rev; aus der Bedrouille
         befreien. &app; bietet Ihnen dann in einem Dialog an, ob Sie die Änderungen
         verwerfen möchten und die Datei erneut laden wollen.
       </para>
     </tip>
 
+<!-- Verbesserungsvorschlag: Fallunterscheidung in Liste verwandeln.
+     Entweder einfach in <itemizedlist> 
+     oder mit der jeweiligen Bedingung als <term> einer <variablelist> -->
     <para>Entfernen Sie ein Konto, welches weder ein Unterkonto noch Buchungen enthält, so wird das Löschen
       sofort ausgeführt. Wollen Sie aber ein Konto löschen, das <emphasis>mehrere</emphasis>
       Unterkonten enthält, dann werden Sie mit einem Warnhinweis darauf aufmerksam gemacht.
@@ -2654,7 +2657,7 @@
       <procedure>
         <title>Schritte des Exportdialogs</title>
 
-        <para>Die Funktion der Steuerelemente jedes Schritts sind nachstehend beschrieben bzw. werden als Tooltip
+        <para>Die Funktion der Steuerelemente jedes Schritts sind nachstehend beschrieben, bzw. werden als Tooltip
           in dem Assistenten angezeigt.
         </para>
 

commit fbe9a867bbad456e7e8f19b01d0114cc39de9b4a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Dec 7 07:10:37 2022 +0100

    Bug 798674 - Broken link on Chapter 17. Python Bindings

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 3660ab64..578941b4 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -44,9 +44,8 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY date "25 September 2022">
 <!-- Fixme: a dirty hack to reference the other document
             Replace them after olink setup               -->
-<!ENTITY url-docs-top "https://www.gnucash.org/docs/">  <!-- also used for API -->
-<!ENTITY url-docs-draft "https://code.gnucash.org/docs/">  <!-- used while developing -->
-<!ENTITY url-docs-release "&url-docs-top;v&series-stable;/">  <!-- used on release -->
+<!ENTITY url-docs-draft "https://code.gnucash.org/docs/">  <!-- used while developing and for the API-docs -->
+<!ENTITY url-docs-release "https://www.gnucash.org/docs/v&series-stable;/">  <!-- used on release -->
 <!ENTITY url-docs "&url-docs-draft;">
 
 <!--
@@ -110,8 +109,8 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY url-bug-search "https://bugs.gnucash.org/query.cgi">
 <!ENTITY url-bug-browse "https://bugs.gnucash.org/describecomponents.cgi">
 
-<!ENTITY url-doc-api-main "&url-docs-top;MAINT/">
-<!ENTITY url-doc-api-mast "&url-docs-top;MASTER/">
+<!ENTITY url-doc-api-main "&url-docs-draft;MAINT/">
+<!ENTITY url-doc-api-mast "&url-docs-draft;MASTER/">
 <!-- Fixme: a dirty hack to reference the other document
             Replace them after olink setup
      append {guide|help}/<html-page>                      -->

commit 1416930611caf3d2643a1c9c6c8a9c0e500f28d0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Dec 5 08:40:27 2022 +0100

    Review URLs and replace them by entities in all parts and languages
    
    Exceptions: in comments or FDL appendix

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index 3ad6bb5a..3660ab64 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -61,10 +61,12 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY app-aqb "<application>AqBanking</application>">
 <!ENTITY app-aoo "<application>Apache OpenOffice</application>">
 <!ENTITY app-fq "<application>Finance::Quote</application>">
+<!ENTITY app-gfa "<application>Gnucash for Android</application>">
 <!ENTITY app-lo "<application>LibreOffice</application>">
 <!ENTITY app-perl "<application>Perl</application>">
 <!ENTITY app-py "<application>Python</application>">
-<!ENTITY app-gfa "<application>Gnucash for Android</application>">
+<!ENTITY app-saxon "<application>Saxon</application>">
+<!ENTITY app-xalan "<application>Xalan-J</application>">
 <!ENTITY app-xcode "<application>Xcode</application>">
 
   <!-- Operating Systems (3 letters), Bundles: -->
@@ -104,6 +106,7 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 
 <!ENTITY url-bug-wiki "https://wiki.gnucash.org/wiki/Bugzilla">  <!-- The wiki page explaining the usage of bugzilla -->
 <!ENTITY url-bug-start "https://bugs.gnucash.org/">
+<!ENTITY url-bug-show "&url-bug-start;show_bug.cgi?id=">  <!-- Append the desired ID -->
 <!ENTITY url-bug-search "https://bugs.gnucash.org/query.cgi">
 <!ENTITY url-bug-browse "https://bugs.gnucash.org/describecomponents.cgi">
 
@@ -159,22 +162,36 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY url-av "https://www.alphavantage.co/"> <!-- A F::Q source, which requires registration -->
 <!ENTITY url-ap-dev "https://developer.apple.com/">
 <!ENTITY url-cpan "https://www.cpan.org/">  <!-- Comprehensive Perl Archive Network -->
+<!ENTITY url-fints "https://www.hbci-zka.de/">
+<!ENTITY url-fsf "https://www.fsf.org/">
 <!ENTITY url-gh "https://github.com/"> <!-- we want to reference our libs, too.  -->
 <!ENTITY url-gh-we "&url-gh;Gnucash/"> <!-- Our project page -->
 <!ENTITY url-gh-gc "&url-gh-we;gnucash/"> <!-- Our program repo -->
 <!ENTITY url-gh-gc-maint "&url-gh-gc;tree/maint/"> <!-- Programs Maint branch, append the desired path -->
 <!ENTITY url-gh-gc-maint-txf-hlp "&url-gh-gc-maint;libgnucash/tax/"> <!-- Append the desired country and file -->
+<!ENTITY url-gnome "https://www.gnome.org/">  <!-- Append the desired topic -->
 <!ENTITY url-gnome-dev "https://developer.gnome.org/">  <!-- Append the desired topic -->
 <!ENTITY url-gnu "https://www.gnu.org/"> <!-- Append the desired topic -->
 <!ENTITY url-gpl "&url-gnu;copyleft/gpl.html">
+<!ENTITY url-mysql "https://www.mysql.com/">
 <!ENTITY url-laws-de "https://www.gesetze-im-internet.de/"> <!-- Append the desired law and § -->
+<!ENTITY url-lw-de "https://linuxwiki.de/"> <!-- Append the desired topic -->
+<!ENTITY url-mysql "https://www.mysql.com/">
+<!ENTITY url-ofx "https://financialdataexchange.org//ofx"> <!-- Redirect of www.ofx.net -->
+<!ENTITY url-openhbci "https://openhbci.sourceforge.net/"> 
+<!ENTITY url-pgsql "https://www.postgresql.org/">
 <!ENTITY url-repo "https://repology.org/project/"> <!-- The packaging hub, append the desired project -->
+<!ENTITY url-saxon "https://saxon.sourceforge.net/"> <!-- XSLT and XQuery processor @ sourceforge -->
+<!ENTITY url-sqlite "https://www.sqlite.org/">
 <!ENTITY url-wp-de "https://de.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-wp-en "https://en.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-wp-it "https://it.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-wp-ja "https://ja.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-wp-pt "https://pt.wikipedia.org/wiki/">  <!-- Append the desired topic -->
 <!ENTITY url-wp-ru "https://ru.wikipedia.org/wiki/">  <!-- Append the desired topic -->
+<!-- Fixme: In April 2012, the XML project was retired
+  For more information, please explore the Attic [http://attic.apache.org/]. -->
+<!ENTITY url-xalan "https://xml.apache.org/"> <!-- XSLT and XQuery processor @ apache -->
 <!ENTITY url-yh-fin "https://finance.yahoo.com/">  <!-- Append the desired topic -->
 <!ENTITY url-yh-hlp "https://help.yahoo.com/">  <!-- Append the desired topic -->
 
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 2b1fc22e..ef1f454a 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -525,7 +525,7 @@
       <title>&app; Website</title>
 
       <para>The <ulink
-      url="&url-www;"><citetitle>&appname;</citetitle></ulink> website
+      url="&url-www;"><citetitle>&appname; website</citetitle></ulink>
         contains helpful information about the program and about any updates to it. It also contains
         links to other online resources.
       </para>
@@ -535,7 +535,7 @@
       <title id="wiki.title">&app; Wiki</title>
 
       <para>An immense amount of less-formal documentation, both of &app; itself and its maintenance and
-        development may be found in the <ulink url="&url-wiki;">&app; Wiki</ulink>.
+        development may be found in the <ulink url="&url-wiki;">&appname; Wiki</ulink>.
       </para>
     </sect2>
         
@@ -566,10 +566,10 @@
     url="mailto:gnucash-user at gnucash.org">user
         mailing list</ulink>. If you prefer a web forum-like presentation, you can use it via
         <ulink
-    url="http://gnucash.1415818.n4.nabble.com/GnuCash-User-f1415819.html">Nabble</ulink>.
+    url="&url-mail-nabble;">Nabble</ulink>.
         One must
         <ulink
-    url="https://lists.gnucash.org/mailman/listinfo/gnucash-user">subscribe</ulink>
+    url="%url-mail-li;gnucash-user">subscribe</ulink>
         before posting, even if using Nabble.
       </para>
 
@@ -594,7 +594,7 @@
         </itemizedlist>
       </para>
 
-      <para>The <ulink url="http://www.gnucash.org">&app; website </ulink> has more details on these channels.
+      <para>The <ulink url="&url-www;">&appname; website </ulink> has more details on these channels.
         You will also find pointers there to additional useful resources such as the &app; wiki and
         bug tracking system.
       </para>
@@ -618,7 +618,7 @@
     <para>Installation of &app; is usually simple.
     </para>
 
-    <para>The <ulink url="http://www.gnucash.org/download.phtml"><citetitle>&app; download
+    <para>The <ulink url="&url-www;download.phtml"><citetitle>&app; download
       page</citetitle></ulink> contains detailed instructions on how to install &app; for each
       operating system supported.
     </para>
diff --git a/guide/de/ch_basics.xml b/guide/de/ch_basics.xml
index c5166905..c02048e9 100644
--- a/guide/de/ch_basics.xml
+++ b/guide/de/ch_basics.xml
@@ -777,26 +777,26 @@
         <guibutton>Drucken</guibutton>-Schaltfläche wie in einem Standard- Web-Browser.
       </para>
 
-      <para>Die <ulink url="http://www.gnucash.org"><citetitle>&appname;</citetitle></ulink> Website enthält
+      <para>Die <ulink url="&url-www;">&appname; Website</ulink> enthält
         hilfreiche Informationen über das Programm und über mögliche Aktualisierungen. Sie
         enthält ferner Verknüpfungen zu den
-        <ulink url="https://lists.gnucash.org/mailman/listinfo"><citetitle>&appname;
+        <ulink url="&url-mail-li;"><citetitle>&appname;
         Mailinglisten</citetitle></ulink> für Entwickler und Nutzer und Sie können die
-        <ulink url="http://lists.gnucash.org/pipermail/gnucash-de/"><citetitle>Archive der
+        <ulink url="&url-mail-ar;gnucash-de/"><citetitle>Archive der
         deutschsprachigen &app; Mailinglisten</citetitle></ulink> nach Diskussionen über bestimmte
         Themen durchsuchen. Falls Sie keine Antwort auf Ihre Frage finden, können Sie diese an die
         englischsprachige
-        <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-user"><citetitle>&appname;-user</citetitle></ulink>
+        <ulink url="&url-mail-li;gnucash-user"><citetitle>&appname;-user</citetitle></ulink>
         oder die deutschsprachige
-        <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-de"><citetitle>&appname;-de</citetitle></ulink>
+        <ulink url="&url-mail-li;gnucash-de"><citetitle>&appname;-de</citetitle></ulink>
         Mailingliste richten, und jemand von der Liste wird versuchen, Ihnen eine Antwort zu geben.
       </para>
 
-      <para>Die aktuellste <guilabel>&appname; FAQ</guilabel> befindet sich auf der
-        <ulink url="http://wiki.gnucash.org/wiki/FAQ"><citetitle>&appname; FAQ
-        Website</citetitle></ulink> und enthält Antworten auf die häufigsten Fragen. Auch eine
-        <ulink url="http://wiki.gnucash.org/wiki/De/GnuCash"><citetitle>deutschsprachige
-        Wiki</citetitle></ulink> gibt es.
+      <para>Die aktuellste <guilabel>&appname; FAQ</guilabel> befinde sich unter
+        <ulink url="&url-wiki-faq;"><citetitle>&appname;
+        FAQ</citetitle></ulink> und enthält Antworten auf die häufigsten Fragen. Auch eine partielle
+        <ulink url="url-wiki-faq-de"><citetitle>deutschsprachige
+        HGF</citetitle></ulink> gibt es.
       </para>
     </sect2>
 
diff --git a/guide/de/ch_currency.xml b/guide/de/ch_currency.xml
index 7e823938..5aa68095 100644
--- a/guide/de/ch_currency.xml
+++ b/guide/de/ch_currency.xml
@@ -156,11 +156,10 @@
     <sect2 id="currency_acct_user2">
       <title>Benutzerdefinierte Währungen</title>
 
-      <para>Wenn wir über Währungen reden, meinen wir normalerweise staatlich gesicherte Währungen (oder noch
+      <para>Wenn wir über Währungen reden, meinen wir normalerweise staatlich gesicherte Währungen —oder noch
         genauer, gemäß internationalem Standard
-        <ulink
-      url="http://en.wikipedia.org/wiki/ISO_4217">ISO 4217</ulink> definierte
-        Währungen). &app; erlaubt es Ihnen nicht, eigene Währungen zu schaffen. Wenn Sie
+        <ulink url="&url-wp-de;ISO_4217">ISO 4217</ulink> definierte
+        Währungen. &app; erlaubt es Ihnen nicht, eigene Währungen zu schaffen. Wenn Sie
         nicht-<acronym>ISO</acronym>-Währungen beobachten wollen, können Sie einen von zwei
         Workarounds nutzen, abhängig davon, welcher Ihre Bedürfnisse besser erfüllt.
       </para>
diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index 23542782..2a1a89f9 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -2200,13 +2200,11 @@ Einnahmen
             </mediaobject>
           </screenshot>
         </figure>
-<!--  Link to future (soon!) new Help section
-        <para>Refer to the <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html">
-            Help Manual, Chapter 8 Tools & Assistants, Lots in Account
-            </ulink> for details of the Lots in Account screen elements.
+        <!-- Fixme: Title still untranslated? -->
+        <para>Refer to the <ulink url="&url-docs;de/gnucash-help/tool-lots.html"> Manual:
+            Kapitel 8. Assistenten und ähnliche Werkzeuge; Lose in Konto</ulink>
+            für die Details von <quote>Lose in Konto</quote>-Fenstern.
         </para>
--->
       </sect3>
 
       <sect3 id="invest-sellProcedure">
diff --git a/guide/de/ch_oview.xml b/guide/de/ch_oview.xml
index 584b812e..21c73106 100644
--- a/guide/de/ch_oview.xml
+++ b/guide/de/ch_oview.xml
@@ -280,7 +280,7 @@
       <itemizedlist>
         <listitem>
           <para><emphasis>Doppelte Buchführung:</emphasis> Jede Transaktion muss ein Konto belasten und einem
-            anderen einen gleichen Betrag gutschreiben. Dies stellt die <quote>Bruttobilanz</quote>
+            anderen den gleichen Betrag gutschreiben. Dies stellt die <quote>Bruttobilanz</quote>
             sicher, dass die Konten stets ausgeglichen sind - dass die Differenz zwischen Einnahmen
             und Ausgaben genau gleich der Summe aller Bank-, Bar-, Aktien- und anderer Guthaben ist.
           </para>
@@ -326,7 +326,7 @@
       </primary>
     </indexterm>
 
-    <para>Ziel dieses Handbuchs ist es, Ihnen zu helfen, Zeit zu sparen. Es versetzt Sie in die Lage, schnell
+    <para>Ziel dieses Dokuments ist es, Ihnen zu helfen, Zeit zu sparen. Es versetzt Sie in die Lage, schnell
       mit &app; arbeiten zu können.
     </para>
 
@@ -373,8 +373,8 @@
       Informationen in diesem Kapitel vertraut machen, um es für sich lauffähig zu machen:
       <itemizedlist>
         <listitem>
-          <para><xref linkend="chapter_oview"></xref> - (Dieses Kapitel gibt einen allgemeinen Überblick über
-            &app;)
+          <para><xref linkend="chapter_oview"></xref> - gibt einen allgemeinen Überblick über
+            &app;
           </para>
         </listitem>
 
@@ -541,10 +541,8 @@
       <title>&app; Wiki</title>
 
       <para>Eine umfangreiche weniger formale Dokumentation, sowohl von &app; selbst als auch der Pflege und
-        Entwicklung von &app;kann man im <ulink url="https://wiki.gnucash.org/wiki"> &app;Wiki
-        (en)</ulink> finden; die Seite mit
-        <ulink
-     url="https://wiki.gnucash.org/wiki/FAQ">Häufig gestellten Fragen (en) </ulink>
+        Entwicklung von &app; kann man im <ulink url="&url-wiki-de;">&appname;-Wiki</ulink> finden; die Seite mit
+        <ulink url="&url-wiki-faq;">Häufig gestellten Fragen (en)</ulink>
         sollte immer dann die erste Anlaufstelle sein, wenn man auf Schwierigkeiten bei der Nutzung
         von &app; stößt.
       </para>
@@ -557,14 +555,12 @@
         Mailing-Liste
       </bridgehead>
 
-      <para>Die erste Quelle der Nutzer Unterstützung ist die
-        <ulink url="mailto:gnucash-de at gnucash.org">Mailingliste User-DE</ulink>. Wenn Sie eine
+      <para>Die erste Quelle der Unterstützung für Nutzer ist die
+        <ulink url="mailto:gnucash-de at gnucash.org">deutschsprachige Mailingliste</ulink>. Wenn Sie eine
         Web-Forum ähnliche Darstellung bevorzugen, können Sie sie via
-        <ulink
-    url="http://gnucash.1415818.n4.nabble.com/GnuCash-User-f1415819.html">Nabble</ulink>
+        <ulink url="&url-mail-nabble;">Nabble</ulink>
         nutzen. um einen Beitrag zu veröffentlichen, muss man auf
-        <ulink
-    url="https://lists.gnucash.org/mailman/listinfo/gnucash-de">Gnucash-de</ulink>
+        <ulink url="&url-mail-li;gnucash-de">&appname;-de</ulink>
         eingeschrieben sein.
       </para>
 
@@ -576,11 +572,10 @@
         anderen Dingen beschäftigt und natürlich nicht immer an ihren Computern. Loggen Sie sich
         ein, stellen Ihre Frage und bleiben Sie eingeloggt; es kann mehrere Stunden dauern, bis
         Ihre Frage bemerkt und darauf geantwortet wird. Um nachzusehen, ob Sie etwas verpasst haben,
-        <ulink
-    url="https://code.gnucash.org/logs">prüfen Sie die IRC Protokolle</ulink>.
+        <ulink url="&url-logs-irc;">prüfen Sie die IRC-Protokolle</ulink>.
       </para>
 
-      <para>Auf der <ulink url="http://www.gnucash.org">&app; Webseite </ulink> finden Sie weitere Einzelheiten
+      <para>Auf der <ulink url="&url-www;">&app; Webseite</ulink> finden Sie weitere Einzelheiten
         zu diesen Kanälen. Sie werden dort auch Hinweise zu weiteren nützlichen Ressourcen, wie
         das &app; wiki und das Fehlerverfolgungssystem, finden.
       </para>
@@ -599,7 +594,7 @@
     <para>Die Installation von &app; ist normalerweise sehr einfach.
     </para>
 
-    <para>Die <ulink url="http://www.gnucash.org/download.phtml"><citetitle>&app;
+    <para>Die <ulink url="&url-www;download.phtml"><citetitle>&app;
       Download-Seite</citetitle></ulink> enthält ausführliche Anweisungen, wie &app; auf den
       unterstützten Systemen installiert wird.
     </para>
diff --git a/guide/de/glossary.xml b/guide/de/glossary.xml
index 71f1824e..78adf5c5 100644
--- a/guide/de/glossary.xml
+++ b/guide/de/glossary.xml
@@ -38,7 +38,7 @@
           </listitem>
         </itemizedlist>
       </para>
-      <glossseealso><ulink url="https://linuxwiki.de/AqBanking"><citetitle>linuxwiki.de/AqBanking</citetitle></ulink></glossseealso>
+      <glossseealso><ulink url="&url-lw-de;AqBanking"><citetitle>linuxwiki.de/AqBanking</citetitle></ulink></glossseealso>
     </glossdef>
   </glossentry>
 <!-- B -->
@@ -126,7 +126,7 @@
       <para>FinTS ist die Weiterentwicklung des 1996 erstmals vom ZKA (Zentraler Kreditausschuss)
         veröffentlichten deutschen Online-Banking Standards HBCI und löste dieses 2004 ab.
       </para>
-      <glossseealso><ulink url="http://www.hbci-zka.de/"><citetitle>FinTS
+      <glossseealso><ulink url="&url-fints;"><citetitle>FinTS
       Homepage</citetitle></ulink></glossseealso> <glossseealso otherterm="hbci"></glossseealso>
     </glossdef>
   </glossentry>
@@ -138,7 +138,7 @@
         Stallman mit dem Zweck gegründet wurde, freie Software zu fördern. Haupt Projekte sind das
         GNU/&lin; Operating System und der GNOME Desktop.
       </para>
-      <glossseealso><ulink url="http://www.fsf.org/"><citetitle>Free Software Foundation
+      <glossseealso><ulink url="&url-fsf;"><citetitle>Free Software Foundation
       Homepage</citetitle></ulink></glossseealso>
     </glossdef>
   </glossentry>
@@ -157,7 +157,7 @@
       <para>Benutzerfreundliche und komplett freie Arbeitsumgebung, geschrieben in C und basierend auf dem GIMP
         Toolkit. Spezielle Richtlinien zur Software-Ergonomie sollen Zugangsbarrieren minimieren.
       </para>
-      <glossseealso><ulink url="http://www.gnome.org/"><citetitle>GNOME
+      <glossseealso><ulink url="&url-gnome;"><citetitle>GNOME
       Homepage</citetitle></ulink></glossseealso> <glossseealso otherterm="gnu"></glossseealso>
     </glossdef>
   </glossentry>
@@ -169,7 +169,7 @@
         entwickeln. Haupt Sponsor ist die Free Software Foundation.
       </para>
       <glossseealso otherterm="fsf"></glossseealso>
-      <glossseealso><ulink url="http://www.gnu.org/"><citetitle>GNU
+      <glossseealso><ulink url="&url-gnu;"><citetitle>GNU
       Homepage</citetitle></ulink></glossseealso>
     </glossdef>
   </glossentry>
@@ -266,7 +266,7 @@
       </para>
       <glossseealso><ulink url="&url-wp-de;MySQL"><citetitle>Wikipedia
       MySQL</citetitle></ulink></glossseealso>
-      <glossseealso><ulink url="http://www.mysql.de"><citetitle>Deutsche MySQL
+      <glossseealso><ulink url="&url-mysql;de/"><citetitle>Deutsche MySQL
       Homepage</citetitle></ulink></glossseealso>
     </glossdef>
   </glossentry>
@@ -279,7 +279,7 @@
         Betrieben und Verbrauchern über das Internet. Es hat mittlerweile das QIF-Format als
         wichtigstes Format abgelöst.
       </para>
-      <glossseealso><ulink url="http://www.ofx.net/"><citetitle>OFX
+      <glossseealso><ulink url="&url-ofx;"><citetitle>OFX
       Homepage</citetitle></ulink></glossseealso> <glossseealso otherterm="qif"></glossseealso>
     </glossdef>
   </glossentry>
@@ -287,11 +287,11 @@
   <glossentry id="openhbci">
     <glossterm>OpenHBCI</glossterm>
     <glossdef>
-      <para>OpenHBCI ist eine Open-Source-Implementierung des deutschen HBCI Protokolls. Die Entwicklung wurde
+      <para>OpenHBCI war eine Open-Source-Implementierung des deutschen HBCI Protokolls. Die Entwicklung wurde
         im Jahre 2004 eingestellt. Nachfolger ist
         <glossterm linkend="aqbanking">AqBanking</glossterm>
       </para>
-      <glossseealso><ulink url="http://openhbci.sourceforge.net/deutsch.html"><citetitle>openHBCI</citetitle></ulink></glossseealso>
+      <glossseealso><ulink url="&url-openhbci;deutsch.html"><citetitle>openHBCI</citetitle></ulink></glossseealso>
     </glossdef>
   </glossentry>
 <!-- P -->
@@ -301,7 +301,7 @@
       <para>Sehr komplexes und leistungsfähiges Open-Source-Datenbanksystem. Es unterstützt die SQL92 und
         SQL99 Standards und darüberhinaus bietet es eine Reihe eigener Erweiterungen an.
       </para>
-      <glossseealso><ulink url="http://www.postgresql.org/"><citetitle>Postgres
+      <glossseealso><ulink url="&url-pgsql;"><citetitle>Postgres
       Homepage</citetitle></ulink></glossseealso>
       <glossseealso><ulink url="http://www.postgres.de/"><citetitle>Deutsche Postgres
       Homepage</citetitle></ulink></glossseealso> <glossseealso otherterm="sql"></glossseealso>
@@ -313,7 +313,7 @@
     <glossdef>
       <para>Quicken Interchange Format ist ein offenes Format der amerikanischen Firma Intuit, die mit der
         Finanzsoftware Quicken 1988 eine marktbeherrschende Stellung erlangte. Galt QIF längere
-        Zeit aus Quasi Standard, wird es seit 2005 von Quicken nicht mehr unterstützt und von OFX
+        Zeit aus Quasi-Standard, wird es seit 2005 von Quicken nicht mehr unterstützt und von OFX
         abgelöst.
       </para>
 
@@ -321,7 +321,7 @@
         führen.
       </para>
       <glossseealso>
-      <ulink url="http://web.intuit.com/support/quicken/docs/d_qif.html"><citetitle>QIF
+      <ulink url="&url-wp-en;Quicken_Interchange_Format"><citetitle>QIF
       Spezifikation</citetitle></ulink> </glossseealso>
       <glossseealso otherterm="ofx"></glossseealso>
     </glossdef>
@@ -361,7 +361,7 @@
         speichert seine Daten in einer einzigen portablen Datei. SQLite benötigt keine
         Konfiguration, keine Benutzerverwaltung und keinen Server.
       </para>
-      <glossseealso> <ulink url="http://www.sqlite.org/"><citetitle>SQLite3
+      <glossseealso> <ulink url="&url-sqlite;/"><citetitle>SQLite
       Homepage</citetitle></ulink> </glossseealso>
     </glossdef>
   </glossentry>
diff --git a/guide/it/index.docbook b/guide/it/index.docbook
index 486b168e..dc97e945 100644
--- a/guide/it/index.docbook
+++ b/guide/it/index.docbook
@@ -922,7 +922,7 @@
 
         <para>Ogni capitolo segue uno schema molto semplice. Inizia con la discussione dei <quote>concetti</quote>
           che introducono l’argomento e la terminologia adottata nel capitolo stesso. In
-          seguito c’è una sezione <quote>come fare per...</quote> che descrive la procedura
+          seguito c’è una sezione <quote>come fare per…</quote> che descrive la procedura
           da adottare nel programma per mettere in atto i concetti riportati nella sezione
           precedente; infine una sezione <quote>in pratica</quote> conclude il capitolo e fornisce
           dettagliati esempi di applicazione.
@@ -931,7 +931,7 @@
         <para>I neofiti troveranno le sezioni sui <quote>concetti</quote> molto utili dato che forniscono una
           guida su come tenere correttamente traccia delle proprie finanze e introducono ai concetti
           di contabilità e alla terminologia finanziaria. Gli utenti più esperti potranno invece
-          saltare direttamente alle sezioni sul <quote>come fare per...</quote> per imparare subito
+          saltare direttamente alle sezioni sul <quote>come fare per…</quote> per imparare subito
           le procedure descritte passo passo. Le sezioni <quote>in pratica</quote> forniscono delle
           lezioni sull’utilizzo del programma presentando degli esempi pratici. Iniziando con
           la creazione di un progetto nel <xref linkend="chapter_basics"/>, ogni capitolo successivo
@@ -1111,8 +1111,8 @@
           <title>&app; Wiki</title>
 
           <para>An immense amount of less-formal documentation, both of &app; itself and its maintenance and
-            development may be found in the <ulink url="https://wiki.gnucash.org/wiki">&app;
-            Wiki</ulink>; the <ulink url="https://wiki.gnucash.org/wiki/FAQ">Frequently Asked
+            development may be found in the <ulink url="&url-wiki;">&appname;
+            Wiki</ulink>; the <ulink url="&url-wiki-faq;">Frequently Asked
             Questions</ulink> page should be a first stop whenever you encounter difficulty using
             &app;.
           </para>
@@ -1127,9 +1127,9 @@
 
           <para>The primary source of user support is the <ulink url="mailto:gnucash-user at gnucash.org">user mailing
             list</ulink>. If you prefer a web forum-like presentation, you can use it via
-            <ulink url="http://gnucash.1415818.n4.nabble.com/GnuCash-User-f1415819.html">Nabble</ulink>.
+            <ulink url="&url-mail-nabble;">Nabble</ulink>.
             One must
-            <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-user">subscribe</ulink>
+            <ulink url="&url-mail-li;gnucash-user">subscribe</ulink>
             before posting, even if using Nabble.
           </para>
 
@@ -1889,7 +1889,7 @@
             <listitem>
               <para>Selezionare
                 <menuchoice>
-                  <guimenu>File</guimenu><guimenuitem>Salva come...</guimenuitem>
+                  <guimenu>File</guimenu><guimenuitem>Salva come…</guimenuitem>
                 </menuchoice>
                 dalla <emphasis>barra del menu</emphasis> oppure premere il pulsante
                 <guibutton>Salva</guibutton> sulla <emphasis>barra degli strumenti</emphasis>. &app;
@@ -1954,7 +1954,7 @@
                       &app;. per i file già esistenti, l’estensione non verrà cambiata.
                       Quindi se viene aperto un file esistente denominato
                       <filename>ilmiovecchiofile</filename>, questo nome non cambierà se il file
-                      viene salvato. Usare il comando <guimenuitem>Salva come...</guimenuitem> e
+                      viene salvato. Usare il comando <guimenuitem>Salva come…</guimenuitem> e
                       dare al file un nuovo nome per salvarlo con l’estensione
                       <filename>.gnucash</filename>.
                     </para>
@@ -2193,7 +2193,7 @@
 
           <para>La ripetizione del file di log permette di recuperare ogni transazione che ha variato il saldo
             immesso dall’ultimo salvataggio, incluse quelle create dalle transazioni
-            pianificate e dalle funzioni per l’impresa (fatture, ricevute, ecc...).
+            pianificate e dalle funzioni per l’impresa (fatture, ricevute, ecc…).
           </para>
 
           <warning>
@@ -3125,7 +3125,7 @@ Translators:
             <guilabel>conti comuni</guilabel> nell’assistente per l’impostazione di una
             nuova struttura dei conti (
             <menuchoice>
-              <guimenu>Operazioni</guimenu><guimenuitem>Nuova struttura conti...</guimenuitem>
+              <guimenu>Operazioni</guimenu><guimenuitem>Nuova struttura conti…</guimenuitem>
             </menuchoice>
             ).
           </para>
@@ -3201,7 +3201,7 @@ Translators:
             possedere una carta di credito (Visa) e di pagare, con cadenza mensile, dei servizi
             quali affitto, telefono ed elettricità. È inoltre indispensabile fare acquisti almeno
             di alimentari. Per ora non è necessario sapere quanto denaro si ha in banca, quanto si
-            deve pagare per la carta di credito ecc... Si vuole, per ora, solo realizzare la
+            deve pagare per la carta di credito ecc… Si vuole, per ora, solo realizzare la
             struttura che contiene tutti questi conti.
           </para>
 
@@ -3211,7 +3211,7 @@ Translators:
             credito (non si hanno ancora a disposizione gli importi per essi, ma si sa che
             esistono). Si ha anche una <guilabel>entrata</guilabel> sotto forma di stipendio, e
             delle <guilabel>uscite</guilabel> identificabili come spese varie in negozi, affitto,
-            elettricità, telefono e tasse (statali, assistenza sanitaria ecc...) che gravano sullo
+            elettricità, telefono e tasse (statali, assistenza sanitaria ecc…) che gravano sullo
             stipendio.
           </para>
         </sect2>
@@ -3235,7 +3235,7 @@ Translators:
             nuova struttura dei conti</guilabel>. Premere il pulsante <guibutton>Annulla dato che
             non si intende utilizzare una delle strutture predefinite; verr selezionare
             VisualizzaNuova pagina dei conti dal menu: verrConti. Selezionare quindi OperazioniNuovo
-            conto... dal menu.</guibutton>
+            conto… dal menu.</guibutton>
           </para>
 
           <para>Si è ora pronti per costruire questa semplice struttura dei conti
@@ -3326,11 +3326,11 @@ Translators:
           <tip>
             <para>In vece di selezionare
               <menuchoice>
-                <guimenu>Operazioni</guimenu><guimenuitem>Nuovo conto...</guimenuitem>
+                <guimenu>Operazioni</guimenu><guimenuitem>Nuovo conto…</guimenuitem>
               </menuchoice>
               dal menu, è anche possibile creare un nuovo sottoconto di un conto facendo un clic
               con il tasto destro del mouse sul nome del conto principale e selezionando la voce
-              <guilabel>Nuovo conto...</guilabel> nel menu che comparirà. Verrà così aperta una
+              <guilabel>Nuovo conto…</guilabel> nel menu che comparirà. Verrà così aperta una
               finestra simile a quella rappresentata in <xref linkend="accts-examples-toplevel2"/> e
               in cui il nuovo conto sarà già impostato come sottoconto del conto principale.
             </para>
@@ -4532,7 +4532,7 @@ Translators:
             </para>
           </note>
 
-          <para>Fare clic poi con il tasto destro sulla transazione e selezionare <guilabel>Pianifica...</guilabel>
+          <para>Fare clic poi con il tasto destro sulla transazione e selezionare <guilabel>Pianifica…</guilabel>
           </para>
 
           <screenshot id="txns-sxn-ledger-2">
@@ -4907,7 +4907,7 @@ Translators:
             transazione pianificata, potrebbe essere visualizzata la finestra
             <guilabel>Dall’ultimo avvio</guilabel> che riassume le operazioni pendenti
             relative alle transazioni pianificate (<guilabel>Promemoria</guilabel>, <guilabel>Da
-            creare</guilabel> ecc... una descrizione di ogni opzioni è fornita nel manuale di
+            creare</guilabel> ecc… una descrizione di ogni opzioni è fornita nel manuale di
             &app;):
           </para>
 
@@ -4935,7 +4935,7 @@ Translators:
           <para>È possibile fare clic nella colonna <guilabel>Stato</guilabel> per modificare lo stato della
             transazione pianificata, se necessario. Fare poi clic sul pulsante
             <guibutton>Ok</guibutton> per chiudere la finestra <guilabel>Dall’ultimo
-            avvio...</guilabel> e applicare le eventuali modifiche. Selezionare
+            avvio…</guilabel> e applicare le eventuali modifiche. Selezionare
             <guilabel>Annulla</guilabel> per scartare le operazioni impostate.
           </para>
 
@@ -4946,7 +4946,7 @@ Translators:
 
           <tip>
             <para>Abilitando l’opzione <guilabel>Controlla le transazioni create</guilabel> nella parte
-              inferiore destra della finestra <guilabel>Dall’ultimo avvio...</guilabel>, &app;
+              inferiore destra della finestra <guilabel>Dall’ultimo avvio…</guilabel>, &app;
               aprirà, dopo aver premuto il pulsante <guibutton>Ok</guibutton>, la scheda del
               registro di ogni conto in cui sono state inserite automaticamente le transazioni
               pianificate.
@@ -6461,7 +6461,7 @@ Translators:
             l’applicazione di riconciliazione fornita da &app;. Evidenziare il conto della
             carta di credito e selezionare
             <menuchoice>
-              <guimenu>Operazioni</guimenu><guimenuitem>Riconcilia...</guimenuitem>
+              <guimenu>Operazioni</guimenu><guimenuitem>Riconcilia…</guimenuitem>
             </menuchoice>
             . Questa procedura di riconciliazione è descritta dettagliatamnete in
             <xref linkend="txns-reconcile1"/>, ma comunque ne verrà descritto il processo anche
@@ -7094,7 +7094,7 @@ The simple case for when  PMT == 0 gives the solution:
 
         <para>Come esempio, si assuma di avere €60.000 nel proprio conto bancario e si supponga di acquistare
           una casa di valore pari a €150.000. Il mutuo applica un APR del 6% e ha dei costi
-          amministrativi (ad esempio costi di chiusura ecc...) del 3%. Si decida di versare
+          amministrativi (ad esempio costi di chiusura ecc…) del 3%. Si decida di versare
           €50.000 e di chiedere in prestito i restanti €103.000, che rimarranno €100.000 dopo
           il pagamento dei costi di chiusura (3% di €100.000).
         </para>
@@ -8770,7 +8770,7 @@ Entrate
 
               <note>
                 <para>Be sure to first select Account Type <emphasis>Stock </emphasis> or <emphasis>Mutual Fund</emphasis>
-                  so that the <guilabel>Select...</guilabel> button brings up the list of securites
+                  so that the <guilabel>Select…</guilabel> button brings up the list of securites
                   rather than currencies.
                 </para>
               </note>
@@ -8778,7 +8778,7 @@ Entrate
               <itemizedlist>
                 <listitem>
                   <para><emphasis>Selezionare Titolo/valuta</emphasis> - premere il pulsante <guibutton>Seleziona
-                    ...</guibutton> alla fine della riga del campo
+                    …</guibutton> alla fine della riga del campo
                     <guilabel>Titolo/valuta</guilabel>. Occorre cambiare il titolo dal valore
                     predefinito (la valuta predefinita) a quello dell’azione. Verrà quindi
                     aperta la finestra di <guilabel>Selezione del titolo</guilabel>.
@@ -8817,7 +8817,7 @@ Entrate
                 </listitem>
 
                 <listitem>
-                  <para><emphasis>Creare il titolo</emphasis> - premere il pulsante <guibutton>Nuovo...</guibutton> e
+                  <para><emphasis>Creare il titolo</emphasis> - premere il pulsante <guibutton>Nuovo…</guibutton> e
                     inserire le informazioni appropriate per l’azione nel modulo
                     <guilabel>Nuovo titolo</guilabel>.
                   </para>
@@ -9134,7 +9134,7 @@ Entrate
 
               <listitem>
                 <para>Il nome della commodity, deve essere scelto dall’elenco che compare premendo il pulsante
-                  <guibutton>Seleziona...</guibutton>.
+                  <guibutton>Seleziona…</guibutton>.
                 </para>
               </listitem>
             </varlistentry>
@@ -10171,8 +10171,8 @@ Entrate
             </figure>
 
             <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-              <ulink url="https://www.gnucash.org/docs/v2.6/C/gnucash-help/tool-lots.html"> Lots in
-              Account </ulink> for details of the Lots in Account screen elements.
+              <ulink url="&url-docs-it;help/tool-lots.html">Lots in
+              Account</ulink> for details of the Lots in Account screen elements.
             </para>
           </sect3>
 
@@ -11674,7 +11674,7 @@ Entrate
           </listitem>
 
           <listitem>
-            <para>Click the Save Report Configuration or Save Report Configuration As... button
+            <para>Click the Save Report Configuration or Save Report Configuration As… button
             </para>
           </listitem>
         </itemizedlist>
@@ -11683,7 +11683,7 @@ Entrate
         </para>
 
         <para>The first time you save a report with a name that has not already been saved, you can use either the
-          Save Report Configuration or the Save Report Configuration As... button. You can modify
+          Save Report Configuration or the Save Report Configuration As… button. You can modify
           the report name before saving it.
         </para>
 
@@ -12540,7 +12540,7 @@ Entrate
           abito che si è appena acquistato perderà valore, non si desidererà tracciare questa
           diminuzione dato che non si avrà l’intenzione di rivenderlo e non si dovranno
           pagare delle imposte per la svalutazione dell’abito. Quindi, per questo esempio,
-          l’acquisto di un nuovo abito dovrebbe essere registrato come una semplice uscita...i
+          l’acquisto di un nuovo abito dovrebbe essere registrato come una semplice uscita…i
           soldi spesi sono andati (!).
         </para>
 
@@ -13126,7 +13126,7 @@ Entrate
           ottenuto la proprietà prima del 1971 (in cui è stabilita una data critica per le
           valutazioni in Canada) e dato che la fattoria era anche un caseificio per cui erano
           possibili alcune particolari deduzioni. La morale di questa storia è che mentre qui è
-          stato mostrato in modo semplice, la tassazione può divenire molto complicata...
+          stato mostrato in modo semplice, la tassazione può divenire molto complicata…
         </para>
       </sect1>
     </chapter>
@@ -13301,7 +13301,7 @@ Entrate
             RewardMiles. This is pretty straightforward—when you create the new
             <emphasis>LoyaltyGroupRewardMiles</emphasis> account, just set the account type to
             <guilabel>Stock</guilabel> or <guilabel>Mutual Fund</guilabel>, click the
-            <guibutton>Select...</guibutton> button next to the
+            <guibutton>Select…</guibutton> button next to the
             <guilabel>Security/currency:</guilabel> box, and click <guibutton>New</guibutton> to
             define a new security of type <guilabel>FUND</guilabel>.
           </para>
@@ -14201,7 +14201,7 @@ Income:Investments:Dividend:Boom:0694.HK (HKD)
         <para>Le necessità contabili di un’impresa sono evidentemente differenti da quelle di un singolo
           individuo. Le imprese devono gestire i clienti (che sono debitori di denaro), i fornitori
           o venditori (che sono creditori), i libri paga dei dipendenti, una legislazione delle
-          imposte più complessa, ecc... &app; offre delle funzioni dedicate all’impresa per
+          imposte più complessa, ecc… &app; offre delle funzioni dedicate all’impresa per
           venire incontro a queste necessità.
         </para>
 
@@ -14291,7 +14291,7 @@ Basic A/R and A/P Account Hierarchy:
    -Accounts Receivable
    -Checking
 -Expenses
-  ...(as required)
+  …(as required)
 -Income
    -Sales
 -Liabilities
@@ -15261,7 +15261,7 @@ Basic A/R and A/P Account Hierarchy:
 
             <note>
               <para>È possibile modificare l’aspetto della fattura inserendo, per esempio, il logo della società
-                ecc... Per le istruzioni su come farlo, vedere la
+                ecc… Per le istruzioni su come farlo, vedere la
                 <xref linkend="bus-ar-invoicechange"/>.
               </para>
             </note>
@@ -17299,7 +17299,7 @@ Translators:
             <para><emphasis>Costo originale</emphasis> - è l’importo di denaro con cui è stato acquistato il
               bene. Sono inclusi in esso tutti i costi necessari a rendere utilizzabile per i propri
               scopi il bene. Per esempio: spedizione, costi di installazione, addestramenti speciali
-              ecc...
+              ecc…
             </para>
           </listitem>
 
@@ -18427,7 +18427,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
       <para>This is a glossary of common terms used in &app;. Some entries here are taken from
         <ulink url="&url-wp-en;Main_Page">Wikipedia</ulink>.
       </para>
-<!-- ... -->
+<!-- … -->
       <glossentry id="gnc-gl_account">
         <glossterm>Conto</glossterm>
         <glossdef>
@@ -18890,7 +18890,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
           </para>
         </glossdef>
       </glossentry>
-<!-- ... -->
+<!-- … -->
     </glossary>
 <!--
       (Do not remove this comment block.)
@@ -18964,7 +18964,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
 
         <para>I file dei dati <acronym>XML</acronym> creati da &app; possono essere trasformati facilmente in
           quasi tutti gli altri formati di file di dati (es. <acronym>QIF</acronym>,
-          <acronym>CSV</acronym>...), se si ha familiarità con <acronym>XSLT</acronym>. I file dei
+          <acronym>CSV</acronym>…), se si ha familiarità con <acronym>XSLT</acronym>. I file dei
           dati creati da &app; sono <acronym>XML</acronym> <quote>well-formed</quote> e possono
           essere quindi <quote>dati in pasto</quote> a un parser <acronym>XSLT</acronym> con un
           foglio di stile associato. Questo permette di trasformare il file in qualsiasi formato che
@@ -19023,10 +19023,10 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
           </listitem>
 
           <listitem>
-            <para>installare un processore <acronym>XSLT</acronym> come Saxon
-              (<ulink url="http://saxon.sourceforge.net/"/>) o Xalan-J
-              (<ulink url="http://xml.apache.org/"/>). Comunque qualsiasi processore simile
-              funzionerà...;
+            <para>installare un processore <acronym>XSLT</acronym> come
+              <ulink url="%url-saxon;">%app-saxon;</ulink>>) o
+              <ulink url="&url-xalan;">%app-xalan;</ulink>. Comunque qualsiasi processore simile
+              funzionerà…;
             </para>
           </listitem>
 
@@ -19048,7 +19048,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
         <para>Il beneficio risiede nel fatto che non è necessario scrivere un modulo in Scheme o una nuova
           routine in C per eseguire la trasformazione. Chiunque conosca o abbia voglia di imparare
           il linguaggio <acronym>XML</acronym> può cimentarsi in questa operazione: sinceramente,
-          niente di più difficile che scrivere una pagina web....
+          niente di più difficile che scrivere una pagina web….
         </para>
 
         <para>Anyhow, I just wanted this tidbit to be captured somewhere permanently. The process works on 2.6.14
@@ -19082,7 +19082,7 @@ MEC-0071,,000013,,,,VAT,tax,Expenses:VAT,1,4.35,,,,no,,,,,,,
 
           <para>Il file di formato per gli assegni è utilizzato per indicare a &app; come stampare uno o più
             assegni in un foglio di carta. Questo file descrive dapprima la disposizione generale
-            della pagina (numero di assegni, orientazione, ecc...) e poi descrive
+            della pagina (numero di assegni, orientazione, ecc…) e poi descrive
             l’impaginazione delle singole voci per ogni assegno. Il file è organizzato nel
             tipico formato a chiave e valore utilizzato dalla maggior parte delle applicazioni
             &lin;. Le coppie di chiave e valore sono raggruppate in sezioni che iniziano con il nome
diff --git a/guide/it/it.po b/guide/it/it.po
index c0f6f42a..f777ef32 100644
--- a/guide/it/it.po
+++ b/guide/it/it.po
@@ -2461,12 +2461,12 @@ msgstr "Migliorata l’importazione di file <acronym>QIF</acronym>"
 
 #: C/gnucash-guide.xml:340(para)
 msgid ""
-"See <ulink url=\"http://wiki.gnucash.org/wiki/"
+"See <ulink url=\"&url-wiki;"
 "Release_Schedule#Release_Schedule_for_2.6.x_releases\">Current Series Release Schedule</ulink> for detailed lists of "
 "improvements made in this series."
 msgstr ""
 "Consultare il collegamento per un elenco "
-"<ulink url=\"http://wiki.gnucash.org/wiki/"
+"<ulink url=\"&url-wiki;"
 "Release_Schedule#Release_Schedule_for_2.6.x_releases\">Pianificazione del rilascio di corrente</ulink> "
 "dettagliato dei miglioramenti introdotti in questa serie."
 
@@ -2566,7 +2566,7 @@ msgstr ""
 "Ogni capitolo segue uno schema molto semplice. Inizia con la discussione dei "
 "<quote>concetti</quote> che introducono l’argomento e la terminologia "
 "adottata nel capitolo stesso. In seguito c’è una sezione <quote>come "
-"fare per...</quote> che descrive la procedura da adottare nel programma per "
+"fare per…</quote> che descrive la procedura da adottare nel programma per "
 "mettere in atto i concetti riportati nella sezione precedente; infine una "
 "sezione <quote>in pratica</quote> conclude il capitolo e fornisce "
 "dettagliati esempi di applicazione."
@@ -2587,7 +2587,7 @@ msgstr ""
 "che forniscono una guida su come tenere correttamente traccia delle proprie "
 "finanze e introducono ai concetti di contabilità e alla terminologia "
 "finanziaria. Gli utenti più esperti potranno invece saltare direttamente "
-"alle sezioni sul <quote>come fare per...</quote> per imparare subito le "
+"alle sezioni sul <quote>come fare per…</quote> per imparare subito le "
 "procedure descritte passo passo. Le sezioni <quote>in pratica</quote> "
 "forniscono delle lezioni sull’utilizzo del programma presentando degli "
 "esempi pratici. Iniziando con la creazione di un progetto nel <xref linkend="
@@ -2921,13 +2921,13 @@ msgstr ""
 
 #: C/gnucash-guide.xml:660(para)
 msgid ""
-"The <ulink url=\"http://www.gnucash.org/\"><citetitle><application>GnuCash</"
+"The <ulink url=\"&url-www;\"><citetitle><application>GnuCash</"
 "application> home page</citetitle></ulink> contains detailed instructions on "
 "how to install <application>GnuCash</application> in the event your current "
 "distribution does not include it or you want to install a different version. "
 "You can also read the README file in the source code."
 msgstr ""
-"La pagina principale di <ulink url=\"http://www.gnucash.org/"
+"La pagina principale di <ulink url=\"&url-www;"
 "\"><citetitle>&app;</citetitle></ulink> contiene "
 "istruzioni dettagliate su come installare &app; "
 "nel caso che non sia già presente nella propria distribuzione &lin; o su "
@@ -3888,7 +3888,7 @@ msgstr ""
 
 #: C/gnucash-guide.xml:581(para)
 msgid ""
-"The <ulink url=\"http://www.gnucash.org\"><citetitle>GnuCash</citetitle></"
+"The <ulink url=\"&url-www;\"><citetitle>GnuCash</citetitle></"
 "ulink> web site contains helpful information about the program and about any "
 "updates to it. It also contains links to the <application>GnuCash</"
 "application> mailing lists for developers and users, and you can search the "
@@ -3896,7 +3896,7 @@ msgid ""
 "\"><citetitle>archives of <application>GnuCash</application> mailing lists</"
 "citetitle></ulink> for discussions on a particular topic. If you don’t find "
 "the answers you are looking for, you can post your question to the <ulink "
-"url=\"https://lists.gnucash.org/mailman/listinfo/gnucash-user"
+"url=\"&url-mail-li;gnucash-user"
 "\"><citetitle>GnuCash user list</citetitle></ulink>, and someone on the list "
 "will attempt to answer you."
 msgstr ""
@@ -3915,7 +3915,7 @@ msgstr ""
 #: C/gnucash-guide.xml:594(para)
 msgid ""
 "The most updated <guilabel>GnuCash FAQ</guilabel> is also located on the "
-"<ulink url=\"http://wiki.gnucash.org/wiki/FAQ\"><citetitle>GnuCash FAQ "
+"<ulink url=\"&url-wiki-faq;\"><citetitle>GnuCash FAQ "
 "website</citetitle></ulink>, and contains answers to the popular questions."
 msgstr ""
 "L’ultima versione della <guilabel>FAQ di &appname;</guilabel> è anche "
@@ -4020,12 +4020,12 @@ msgstr "Seguire i passi seguenti per salvare il file con un nome preferito:"
 
 #: C/gnucash-guide.xml:652(para)
 msgid ""
-"Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</"
+"Choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save As…</"
 "guimenuitem></menuchoice> from the <emphasis>Menubar</emphasis> or select "
 "the <guibutton>Save</guibutton><emphasis>Toolbar</emphasis> button. "
 "<application>GnuCash</application> will bring up the save window."
 msgstr ""
-"Selezionare <menuchoice><guimenu>File</guimenu><guimenuitem>Salva come...</"
+"Selezionare <menuchoice><guimenu>File</guimenu><guimenuitem>Salva come…</"
 "guimenuitem></menuchoice> dalla <emphasis>barra del menu</emphasis> oppure "
 "premere il pulsante <guibutton>Salva</guibutton> sulla <emphasis>barra degli "
 "strumenti</emphasis>. &app; presenterà la "
@@ -4098,7 +4098,7 @@ msgid ""
 "of <application>GnuCash</application>. For already existing files, the "
 "extension will never be changed. So if you open an existing file named "
 "<filename>Myoldfile</filename>, that name won’t be changed if the file is "
-"saved. You might use the <guimenuitem>Save As...</guimenuitem> command and "
+"saved. You might use the <guimenuitem>Save As…</guimenuitem> command and "
 "give the file a new name in order to have it saved with the extension "
 "<filename>.gnucash</filename>."
 msgstr ""
@@ -4107,7 +4107,7 @@ msgstr ""
 "esistenti, l’estensione non verrà cambiata. Quindi se viene aperto un "
 "file esistente denominato <filename>ilmiovecchiofile</filename>, questo nome "
 "non cambierà se il file viene salvato. Usare il comando <guimenuitem>Salva "
-"come...</guimenuitem> e dare al file un nuovo nome per salvarlo con l’"
+"come…</guimenuitem> e dare al file un nuovo nome per salvarlo con l’"
 "estensione <filename>.gnucash</filename>."
 
 #: C/gnucash-guide.xml:708(para)
@@ -4463,7 +4463,7 @@ msgstr ""
 "La ripetizione del file di log permette di recuperare ogni transazione che "
 "ha variato il saldo immesso dall’ultimo salvataggio, incluse quelle "
 "create dalle transazioni pianificate e dalle funzioni per l’impresa "
-"(fatture, ricevute, ecc...)."
+"(fatture, ricevute, ecc…)."
 
 #: C/gnucash-guide.xml:897(para)
 msgid ""
@@ -5543,7 +5543,7 @@ msgid ""
 "Below are the standard <guilabel>Income</guilabel> and <guilabel>Expense</"
 "guilabel> accounts after selecting <guilabel>Common Accounts</guilabel> in "
 "the assistant for creating a new Account Hierarchy "
-"(<menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy..."
+"(<menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy…"
 "</guimenuitem></menuchoice>)."
 msgstr ""
 "Qui sotto vengono mostrati i conti standard per le <guilabel>entrate</"
@@ -5551,7 +5551,7 @@ msgstr ""
 "scegliendo l’opzione <guilabel>conti comuni</guilabel> nell’"
 "assistente per l’impostazione di una nuova struttura dei conti "
 "(<menuchoice><guimenu>Operazioni</guimenu><guimenuitem>Nuova struttura "
-"conti...</guimenuitem></menuchoice>)."
+"conti…</guimenuitem></menuchoice>)."
 
 #: C/gnucash-guide.xml:352(phrase)
 msgid "Default income accounts"
@@ -5610,7 +5610,7 @@ msgstr ""
 "pagare, con cadenza mensile, dei servizi quali affitto, telefono ed "
 "elettricità. È inoltre indispensabile fare acquisti almeno di alimentari. "
 "Per ora non è necessario sapere quanto denaro si ha in banca, quanto si deve "
-"pagare per la carta di credito ecc... Si vuole, per ora, solo realizzare la "
+"pagare per la carta di credito ecc… Si vuole, per ora, solo realizzare la "
 "struttura che contiene tutti questi conti."
 
 #: C/gnucash-guide.xml:403(para)
@@ -5631,7 +5631,7 @@ msgstr ""
 "anche una <guilabel>entrata</guilabel> sotto forma di stipendio, e delle "
 "<guilabel>uscite</guilabel> identificabili come spese varie in negozi, "
 "affitto, elettricità, telefono e tasse (statali, assistenza sanitaria "
-"ecc...) che gravano sullo stipendio."
+"ecc…) che gravano sullo stipendio."
 
 #: C/gnucash-guide.xml:414(title)
 msgid "The Basic Top Level Accounts"
@@ -5667,7 +5667,7 @@ msgid ""
 "<menuchoice><guimenu>View</guimenu><guimenuitem>New Accounts Page</"
 "guimenuitem></menuchoice> from the menu: the <guilabel>Accounts</guilabel> "
 "tab will open. Finally select <menuchoice><guimenu>Actions</"
-"guimenu><guimenuitem>New Account...</guimenuitem></menuchoice>."
+"guimenu><guimenuitem>New Account…</guimenuitem></menuchoice>."
 msgstr ""
 "Si parta da un un nuovo file vuoto di &app; "
 "selezionando <menuchoice><guimenu>File</guimenu><guimenuitem>Nuovo file</"
@@ -5680,7 +5680,7 @@ msgstr ""
 "<menuchoice><guimenu>Visualizza</guimenu><guimenuitem>Nuova pagina dei "
 "conti</guimenuitem></menuchoice> dal menu: verrà aperta una scheda "
 "denominata <guilabel>Conti</guilabel>. Selezionare quindi "
-"<menuchoice><guimenu>Operazioni</guimenu><guimenuitem>Nuovo conto...</"
+"<menuchoice><guimenu>Operazioni</guimenu><guimenuitem>Nuovo conto…</"
 "guimenuitem></menuchoice> dal menu."
 
 #: C/gnucash-guide.xml:432(para)
@@ -5782,18 +5782,18 @@ msgstr ""
 #: C/gnucash-guide.xml:514(para)
 msgid ""
 "Instead of selecting <menuchoice><guimenu>Actions</guimenu><guimenuitem>New "
-"Account...</guimenuitem></menuchoice> from the menu, you can alternatively "
+"Account…</guimenuitem></menuchoice> from the menu, you can alternatively "
 "create a new sub-account of an account by right clicking on the main "
-"account’s name and selecting the <guilabel>New Account...</guilabel> entry. "
+"account’s name and selecting the <guilabel>New Account…</guilabel> entry. "
 "This will open a dialog similar to the one depicted in <xref linkend=\"accts-"
 "examples-toplevel2\"/> where the new sub-account will be already set as a "
 "child of the main account."
 msgstr ""
 "In vece di selezionare <menuchoice><guimenu>Operazioni</"
-"guimenu><guimenuitem>Nuovo conto...</guimenuitem></menuchoice> dal menu, è "
+"guimenu><guimenuitem>Nuovo conto…</guimenuitem></menuchoice> dal menu, è "
 "anche possibile creare un nuovo sottoconto di un conto facendo un clic con "
 "il tasto destro del mouse sul nome del conto principale e selezionando la "
-"voce <guilabel>Nuovo conto...</guilabel> nel menu che comparirà. Verrà così "
+"voce <guilabel>Nuovo conto…</guilabel> nel menu che comparirà. Verrà così "
 "aperta una finestra simile a quella rappresentata in <xref linkend=\"accts-"
 "examples-toplevel2\"/> e in cui il nuovo conto sarà già impostato come "
 "sottoconto del conto principale."
@@ -7376,11 +7376,11 @@ msgstr ""
 
 #: C/gnucash-guide.xml:857(para)
 msgid ""
-"Then you right click on your transaction and select <guilabel>Schedule...</"
+"Then you right click on your transaction and select <guilabel>Schedule…</"
 "guilabel>"
 msgstr ""
 "Fare clic poi con il tasto destro sulla transazione e selezionare "
-"<guilabel>Pianifica...</guilabel>"
+"<guilabel>Pianifica…</guilabel>"
 
 #: C/gnucash-guide.xml:868(phrase) C/gnucash-guide.xml:872(para)
 msgid "Step two creating scheduled transaction from the ledger"
@@ -7777,16 +7777,16 @@ msgstr ""
 msgid ""
 "From now on, when <application>GnuCash</application> is launched and a "
 "scheduled transaction is scheduled or need to be entered, you may see a "
-"<guilabel>Since Last Run...</guilabel> window summarizing the scheduled "
+"<guilabel>Since Last Run…</guilabel> window summarizing the scheduled "
 "transactions operations (<guilabel>Reminder</guilabel>, <guilabel>To-Create</"
-"guilabel> etc... a better description of each option can be found in the "
+"guilabel> etc… a better description of each option can be found in the "
 "<application>GnuCash</application> manual):"
 msgstr ""
 "D’ora in poi, quando si avvia &app; e se è "
 "in scadenza o se deve essere inserita una transazione pianificata, potrebbe "
 "essere visualizzata la finestra <guilabel>Dall’ultimo avvio</guilabel> "
 "che riassume le operazioni pendenti relative alle transazioni pianificate "
-"(<guilabel>Promemoria</guilabel>, <guilabel>Da creare</guilabel> ecc... una "
+"(<guilabel>Promemoria</guilabel>, <guilabel>Da creare</guilabel> ecc… una "
 "descrizione di ogni opzioni è fornita nel manuale di &app;):"
 
 #: C/gnucash-guide.xml:1191(phrase) C/gnucash-guide.xml:1194(para)
@@ -7797,14 +7797,14 @@ msgstr "Finestra di promemoria per la transazione pianificata"
 msgid ""
 "You can click on the <guilabel>Status</guilabel> column to change the "
 "scheduled transaction status if needed. Then just click on <guibutton>Ok</"
-"guibutton> to close the <guilabel>Since Last Run...</guilabel> window and to "
+"guibutton> to close the <guilabel>Since Last Run…</guilabel> window and to "
 "apply the pending operations. Select <guibutton>Cancel</guibutton> to skip "
 "entering in the ledger the pending operations."
 msgstr ""
 "È possibile fare clic nella colonna <guilabel>Stato</guilabel> per "
 "modificare lo stato della transazione pianificata, se necessario. Fare poi "
 "clic sul pulsante <guibutton>Ok</guibutton> per chiudere la finestra "
-"<guilabel>Dall’ultimo avvio...</guilabel> e applicare le eventuali "
+"<guilabel>Dall’ultimo avvio…</guilabel> e applicare le eventuali "
 "modifiche. Selezionare <guilabel>Annulla</guilabel> per scartare le "
 "operazioni impostate."
 
@@ -7821,14 +7821,14 @@ msgstr ""
 #: C/gnucash-guide.xml:1207(para)
 msgid ""
 "If you enable the <guilabel>Review created transactions</guilabel> option in "
-"the lower right of the <guilabel>Since Last Run...</guilabel> window, "
+"the lower right of the <guilabel>Since Last Run…</guilabel> window, "
 "<application>GnuCash</application> will open, after pressing <guibutton>Ok</"
 "guibutton>, the register tab of each account where the scheduled "
 "transactions were entered automatically."
 msgstr ""
 "Abilitando l’opzione <guilabel>Controlla le transazioni create</"
 "guilabel> nella parte inferiore destra della finestra <guilabel>Dall’"
-"ultimo avvio...</guilabel>, &app; aprirà, dopo "
+"ultimo avvio…</guilabel>, &app; aprirà, dopo "
 "aver premuto il pulsante <guibutton>Ok</guibutton>, la scheda del registro "
 "di ogni conto in cui sono state inserite automaticamente le transazioni "
 "pianificate."
@@ -9629,7 +9629,7 @@ msgid ""
 "account to this document. This is done using <application>GnuCash</"
 "application>’s built-in reconciliation application. Highlight the credit "
 "card account and click on <menuchoice><guimenu>Actions</"
-"guimenu><guimenuitem>Reconcile...</guimenuitem></menuchoice>. This "
+"guimenu><guimenuitem>Reconcile…</guimenuitem></menuchoice>. This "
 "reconciliation procedure is described in detail in the <xref linkend=\"txns-"
 "reconcile1\"/>, but we will step through the process here as well. For this "
 "example, let’s assume that the credit card statement is dated May 1st, with "
@@ -9641,7 +9641,7 @@ msgstr ""
 "può essere fatto utilizzando l’applicazione di riconciliazione fornita "
 "da &app;. Evidenziare il conto della carta di "
 "credito e selezionare <menuchoice><guimenu>Operazioni</"
-"guimenu><guimenuitem>Riconcilia...</guimenuitem></menuchoice>. Questa "
+"guimenu><guimenuitem>Riconcilia…</guimenuitem></menuchoice>. Questa "
 "procedura di riconciliazione è descritta dettagliatamnete in <xref linkend="
 "\"txns-reconcile1\"/>, ma comunque ne verrà descritto il processo anche qui. "
 "Per questo esempio, si assuma che l’estratto conto della carta di "
@@ -10044,7 +10044,7 @@ msgid ""
 "<application>GnuCash</application> has a number of predefined loan account "
 "hierarchies available, including Car Loans and Home Mortgage Loans. To "
 "access these predefined account structures, click on "
-"<menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy...</"
+"<menuchoice><guimenu>Actions</guimenu><guimenuitem>New Account Hierarchy…</"
 "guimenuitem></menuchoice> and select the loan types in which you are "
 "interested."
 msgstr ""
@@ -10569,7 +10569,7 @@ msgstr ""
 "Come esempio, si assuma di avere €60.000 nel proprio conto bancario e si "
 "supponga di acquistare una casa di valore pari a €150.000. Il mutuo applica "
 "un APR del 6% e ha dei costi amministrativi (ad esempio costi di chiusura "
-"ecc...) del 3%. Si decida di versare €50.000 e di chiedere in prestito i "
+"ecc…) del 3%. Si decida di versare €50.000 e di chiedere in prestito i "
 "restanti €103.000, che rimarranno €100.000 dopo il pagamento dei costi di "
 "chiusura (3% di €100.000)."
 
@@ -12386,7 +12386,7 @@ msgid ""
 "As an example, let’s assume that you currently own 100 shares of Amazon "
 "stock. First, create the stock account AMZN by selecting the "
 "<guilabel>Stock</guilabel> account and click on the menu "
-"<menuchoice><guimenu>Actions</guimenu><guimenu>New Account...</guimenu></"
+"<menuchoice><guimenu>Actions</guimenu><guimenu>New Account…</guimenu></"
 "menuchoice>. The New Account dialog will appear, follow the steps, in the "
 "sequence below to setup your new stock account."
 msgstr ""
@@ -12456,13 +12456,13 @@ msgstr ""
 #: C/gnucash-guide.xml:705(para)
 msgid ""
 "<emphasis>Select Security/Currency</emphasis> - Click on the "
-"<guibutton>Select ...</guibutton> button next to the <guilabel>security/"
+"<guibutton>Select …</guibutton> button next to the <guilabel>security/"
 "currency</guilabel> line. We must change the security from the default (your "
 "default currency) to this specific stock. This will bring up the "
 "<guilabel>Select Security</guilabel> dialog."
 msgstr ""
 "<emphasis>Selezionare Titolo/valuta</emphasis> - premere il pulsante "
-"<guibutton>Seleziona ...</guibutton> alla fine della riga del campo "
+"<guibutton>Seleziona …</guibutton> alla fine della riga del campo "
 "<guilabel>Titolo/valuta</guilabel>. Occorre cambiare il titolo dal valore "
 "predefinito (la valuta predefinita) a quello dell’azione. Verrà quindi "
 "aperta la finestra di <guilabel>Selezione del titolo</guilabel>."
@@ -12491,12 +12491,12 @@ msgstr "Finestra di scelta del titolo"
 
 #: C/gnucash-guide.xml:742(para)
 msgid ""
-"<emphasis>Create the Security</emphasis> - Click on the <guibutton>New...</"
+"<emphasis>Create the Security</emphasis> - Click on the <guibutton>New…</"
 "guibutton> button and enter the appropriate information for this stock on "
 "the new form <guilabel>New Security</guilabel>."
 msgstr ""
 "<emphasis>Creare il titolo</emphasis> - premere il pulsante "
-"<guibutton>Nuovo...</guibutton> e inserire le informazioni appropriate per "
+"<guibutton>Nuovo…</guibutton> e inserire le informazioni appropriate per "
 "l’azione nel modulo <guilabel>Nuovo titolo</guilabel>."
 
 #: C/gnucash-guide.xml:751(para)
@@ -12867,11 +12867,11 @@ msgstr "Titolo"
 
 #: C/gnucash-guide.xml:1029(para)
 msgid ""
-"The name of the commodity, must be chosen from the <guibutton>Select...</"
+"The name of the commodity, must be chosen from the <guibutton>Select…</"
 "guibutton> list"
 msgstr ""
 "Il nome della commodity, deve essere scelto dall’elenco che compare "
-"premendo il pulsante <guibutton>Seleziona...</guibutton>."
+"premendo il pulsante <guibutton>Seleziona…</guibutton>."
 
 #: C/gnucash-guide.xml:1035(guilabel)
 msgid "Currency"
@@ -14210,7 +14210,7 @@ msgid ""
 "recently bought will certainly depreciate, you would not want to track this "
 "depreciation since you have no intention of reselling the clothes and there "
 "is no tax implications to the depreciation on clothing. So, for this "
-"example, the purchase of new clothes should be recorded as a pure expense... "
+"example, the purchase of new clothes should be recorded as a pure expense… "
 "you spent the money, and it is gone."
 msgstr ""
 "I beni consumabili (es: il cibo, il carburante per l’auto, o la carta "
@@ -14219,7 +14219,7 @@ msgstr ""
 "non si desidererà tracciare questa diminuzione dato che non si avrà l’"
 "intenzione di rivenderlo e non si dovranno pagare delle imposte per la "
 "svalutazione dell’abito. Quindi, per questo esempio, l’acquisto "
-"di un nuovo abito dovrebbe essere registrato come una semplice uscita...i "
+"di un nuovo abito dovrebbe essere registrato come una semplice uscita…i "
 "soldi spesi sono andati (!)."
 
 #: C/gnucash-guide.xml:48(para)
@@ -14840,7 +14840,7 @@ msgid ""
 "a critical <quote>Valuation Day</quote> date in Canada) and due to it being "
 "a dairy farm, with some really peculiar resulting deductions. The point of "
 "this story is that while the presentation here is fairly simple, taxation "
-"often gets terribly complicated..."
+"often gets terribly complicated…"
 msgstr ""
 "Chris Browne ha una storia da raccontare relativa a quando era un "
 "professionista della preparazione delle tasse; una famiglia che aveva "
@@ -14850,7 +14850,7 @@ msgstr ""
 "per le valutazioni in Canada) e dato che la fattoria era anche un caseificio "
 "per cui erano possibili alcune particolari deduzioni. La morale di questa "
 "storia è che mentre qui è stato mostrato in modo semplice, la tassazione può "
-"divenire molto complicata..."
+"divenire molto complicata…"
 
 #: C/gnucash-guide.xml:16(title)
 msgid "Multiple Currencies"
@@ -15096,14 +15096,14 @@ msgstr "Valute definite dall’utente"
 msgid ""
 "Usually when we talk about currencies, we mean government-backed currencies "
 "(or more precisely, currencies defined in the international standard called "
-"<ulink url=\"http://en.wikipedia.org/wiki/ISO_4217\">ISO 4217</ulink>). "
+"<ulink url=\"&url-wp-en;ISO_4217\">ISO 4217</ulink>). "
 "<application>GnuCash</application> does not allow you to create your own "
 "currencies. If you want to track non-<acronym>ISO</acronym> currencies, you "
 "can use either of two workarounds, depending on which fits your needs better."
 msgstr ""
 "Generalmente parlando, per valuta si intendono le valute che ogni governo "
 "utilizza (o più precisamente, le valute definite dallo standard "
-"internazionale chimato <ulink url=\"http://en.wikipedia.org/wiki/"
+"internazionale chimato <ulink url=\"&url-wp-en;"
 "ISO_4217\">ISO 4217</ulink>). &app; non permette "
 "di creare una propria valuta. Per tracciare le valute non <acronym>ISO</"
 "acronym>, è possibile utilizzare due stratagemmi in funzione dell’uso "
@@ -15127,7 +15127,7 @@ msgid ""
 "guilabel>, called RewardMiles. This is pretty straightforward–when you "
 "create the new <emphasis>LoyaltyGroupRewardMiles</emphasis> account, just "
 "set the account type to <guilabel>Stock</guilabel> or <guilabel>Mutual Fund</"
-"guilabel>, click the <guibutton>Select...</guibutton> button next to the "
+"guilabel>, click the <guibutton>Select…</guibutton> button next to the "
 "<guilabel>Security/currency:</guilabel> box, and click <guibutton>New</"
 "guibutton> to define a new security of type <guilabel>FUND</guilabel>."
 msgstr ""
@@ -15136,7 +15136,7 @@ msgstr ""
 "metodo è molto semplice: dopo aver creato il nuovo conto "
 "<emphasis>GruppoRegaliFedeltà</emphasis> del tipo <guilabel>Azione</"
 "guilabel> o <guilabel>Fondo comune</guilabel>, premere il pulsante "
-"<guibutton>Seleziona...</guibutton> vicino al campo <guilabel>Titolo/Valuta</"
+"<guibutton>Seleziona…</guibutton> vicino al campo <guilabel>Titolo/Valuta</"
 "guilabel>, e fare clic sul pulsante <guibutton>Nuovo</guibutton> per "
 "definire un nuovo titolo di tipo <guilabel>FUND</guilabel>."
 
@@ -16878,7 +16878,7 @@ msgstr ""
 "<emphasis>Costo originale</emphasis> - è l’importo di denaro con cui è "
 "stato acquistato il bene. Sono inclusi in esso tutti i costi necessari a "
 "rendere utilizzabile per i propri scopi il bene. Per esempio: spedizione, "
-"costi di installazione, addestramenti speciali ecc..."
+"costi di installazione, addestramenti speciali ecc…"
 
 #: C/gnucash-guide.xml:65(para)
 msgid ""
@@ -17639,7 +17639,7 @@ msgstr ""
 "quelle di un singolo individuo. Le imprese devono gestire i clienti (che "
 "sono debitori di denaro), i fornitori o venditori (che sono creditori), i "
 "libri paga dei dipendenti, una legislazione delle imposte più complessa, "
-"ecc... &app; offre delle funzioni dedicate "
+"ecc… &app; offre delle funzioni dedicate "
 "all’impresa per venire incontro a queste necessità."
 
 #: C/gnucash-guide.xml:28(para)
@@ -17927,7 +17927,7 @@ msgstr ""
 "<menuchoice><guimenu>Impresa</guimenu><guisubmenu>Cliente</"
 "guisubmenu><guimenuitem>Nuovo cliente</guimenuitem></menuchoice>. Compilare "
 "le informazioni richieste quali il nome della società, l’indirizzo, il "
-"numero di telefono e di fax, ecc... Qui sotto è riportata una lista di altre "
+"numero di telefono e di fax, ecc… Qui sotto è riportata una lista di altre "
 "opzioni:"
 
 #: C/gnucash-guide.xml:184(para)
@@ -18208,7 +18208,7 @@ msgid ""
 "you entered in the <guilabel>New Customer</guilabel> window for this "
 "customer, start to type it in this field and <application>GnuCash</"
 "application> will try auto complete it for you. Else, press the "
-"<guibutton>Select...</guibutton> button to access the <guilabel>Find "
+"<guibutton>Select…</guibutton> button to access the <guilabel>Find "
 "Customer</guilabel> window described in <xref linkend=\"bus-ar-custfind2\"/"
 ">. Highlight the customer you are looking for with a click in the search "
 "results, then press the <guibutton>Select</guibutton> button."
@@ -18218,7 +18218,7 @@ msgstr ""
 "impresa</emphasis> inserito nella finestra per il <guilabel>Nuovo cliente</"
 "guilabel>, è sufficiente iniziare a scriverlo in questo campo e "
 "&app; tenterà di completarlo. Altrimenti, premere "
-"il pulsante <guibutton>Seleziona...</guibutton> per accedere alla finestra "
+"il pulsante <guibutton>Seleziona…</guibutton> per accedere alla finestra "
 "di <guilabel>Trova cliente</guilabel> descritta in <xref linkend=\"bus-ar-"
 "custfind2\"/>. Evidenziare il cliente che si stava cercando con un clic nei "
 "risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -18231,7 +18231,7 @@ msgid ""
 "you remember the <emphasis>job name</emphasis> you entered in the "
 "<guilabel>New Job</guilabel> window for this job, start to type it in this "
 "field and <application>GnuCash</application> will try auto complete it for "
-"you. Else, press the <guibutton>Select...</guibutton> button to access the "
+"you. Else, press the <guibutton>Select…</guibutton> button to access the "
 "<guilabel>Find Job</guilabel> window. This window is the same to the one "
 "described in <xref linkend=\"bus-ar-custfind2\"/>. Highlight the job you are "
 "looking for with a click in the search results, then press the "
@@ -18243,7 +18243,7 @@ msgstr ""
 "inserito nella finestra per il <guilabel>Nuovo lavoro</guilabel>, è "
 "possibile iniziare a scriverlo in questo campo e &app; "
 "tenterà di completarlo. Altrimenti, premere il pulsante "
-"<guibutton>Seleziona...</guibutton> per accedere alla finestra di "
+"<guibutton>Seleziona…</guibutton> per accedere alla finestra di "
 "<guilabel>Trova lavoro</guilabel> descritta in <xref linkend=\"bus-ar-"
 "custfind2\"/>. Evidenziare il lavoro che si stava cercando con un clic nei "
 "risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -18713,7 +18713,7 @@ msgid ""
 "To do so, see the <xref linkend=\"bus-ar-invoicechange\"/>."
 msgstr ""
 "È possibile modificare l’aspetto della fattura inserendo, per esempio, "
-"il logo della società ecc... Per le istruzioni su come farlo, vedere la "
+"il logo della società ecc… Per le istruzioni su come farlo, vedere la "
 "<xref linkend=\"bus-ar-invoicechange\"/>."
 
 #: C/gnucash-guide.xml:755(para)
@@ -18849,7 +18849,7 @@ msgid ""
 "is created. If you remember the <emphasis>company name</emphasis> you "
 "entered in the <guilabel>New Customer</guilabel> window for this customer, "
 "start to type it in this field and <application>GnuCash</application> will "
-"try auto complete it for you. Else, press the <guibutton>Select...</"
+"try auto complete it for you. Else, press the <guibutton>Select…</"
 "guibutton> button to access the <guilabel>Find Customer</guilabel> window "
 "described in <xref linkend=\"bus-ar-custfind2\"/>. Highlight the customer "
 "you are looking for with a click in the search results, then press the "
@@ -18860,7 +18860,7 @@ msgstr ""
 "dell’impresa</emphasis> inserito nella finestra per il <guilabel>Nuovo "
 "cliente</guilabel> per questo cliente è possibile iniziare a scriverlo in "
 "questo campo e &app; tenterà di completarlo. "
-"Altrimenti, premere il pulsante <guibutton>Seleziona...</guibutton> per "
+"Altrimenti, premere il pulsante <guibutton>Seleziona…</guibutton> per "
 "accedere alla finestra di <guilabel>Trova cliente</guilabel> descritta in "
 "<xref linkend=\"bus-ar-custfind2\"/>. Evidenziare il cliente che si stava "
 "cercando con un clic nei risultati della ricerca, poi premere il pulsante "
@@ -18957,7 +18957,7 @@ msgid ""
 "you. If you remember the <emphasis>company name</emphasis> you entered in "
 "the <guilabel>New Customer</guilabel> window for this customer, start to "
 "type it in this field and <application>GnuCash</application> will try auto "
-"complete it for you. Else, press the <guibutton>Select...</guibutton> button "
+"complete it for you. Else, press the <guibutton>Select…</guibutton> button "
 "to access the <guilabel>Find Customer</guilabel> window described in <xref "
 "linkend=\"bus-ar-custfind2\"/>. Highlight the customer you are looking for "
 "with a click in the search results, then press the <guibutton>Select</"
@@ -18967,7 +18967,7 @@ msgstr ""
 "pagato. Se si ricorda il <emphasis>nome dell’impresa</emphasis>, è "
 "sufficiente iniziare a scriverlo in questo campo e &app; "
 "tenterà di completarlo. Altrimenti, premere il pulsante "
-"<guibutton>Seleziona...</guibutton> per accedere alla finestra di "
+"<guibutton>Seleziona…</guibutton> per accedere alla finestra di "
 "<guilabel>Trova cliente</guilabel> descritta in <xref linkend=\"bus-ar-"
 "custfind2\"/>. Evidenziare il cliente che si stava cercando con un clic nei "
 "risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -18978,7 +18978,7 @@ msgid ""
 "<guilabel>Payment Information - Invoice</guilabel> - the invoice for which "
 "payment was received. If you remember the <emphasis>invoice ID</emphasis>, "
 "start to type it in this field and <application>GnuCash</application> will "
-"try auto complete it for you. Else, press the <guibutton>Select...</"
+"try auto complete it for you. Else, press the <guibutton>Select…</"
 "guibutton> button to access the <guilabel>Find Invoice</guilabel> window "
 "described in <xref linkend=\"bus-ar-invoicefind2\"/>. Highlight the invoice "
 "you are looking for with a click in the search results, then press the "
@@ -18988,7 +18988,7 @@ msgstr ""
 "cui è stato ricevuto il pagamento. Se si ricorda l’<emphasis>ID "
 "fattura</emphasis>, è sufficiente iniziare a scriverlo in questo campo e "
 "&app; tenterà di completarlo. Altrimenti, premere "
-"il pulsante <guibutton>Seleziona...</guibutton> per accedere alla finestra "
+"il pulsante <guibutton>Seleziona…</guibutton> per accedere alla finestra "
 "di <guilabel>Trova fattura</guilabel> descritta in <xref linkend=\"bus-ar-"
 "invoicefind2\"/>. Evidenziare la fattura che si stava cercando con un clic "
 "nei risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -19398,7 +19398,7 @@ msgstr ""
 "<menuchoice><guimenu>Impresa</guimenu><guisubmenu>Venditore</"
 "guisubmenu><guimenuitem>Nuovo venditore</guimenuitem></menuchoice>. "
 "Completare poi le informazioni generali relative al venditore quali il nome "
-"della società, l’indirizzo, il numero di telefono e di fax ecc... Di "
+"della società, l’indirizzo, il numero di telefono e di fax ecc… Di "
 "seguito è riportato un elenco delle altre voci disponibili:"
 
 #: C/gnucash-guide.xml:116(para)
@@ -19623,7 +19623,7 @@ msgid ""
 "remember the <emphasis>company name</emphasis> you entered in the "
 "<guilabel>New Vendor</guilabel> window for this vendor, start to type it in "
 "this field and <application>GnuCash</application> will try auto complete it "
-"for you. Else, press the <guibutton>Select...</guibutton> button to access "
+"for you. Else, press the <guibutton>Select…</guibutton> button to access "
 "the <guilabel>Find Vendor</guilabel> window described in <xref linkend=\"bus-"
 "ap-vendorfind2\"/>. Highlight the vendor you are looking for with a click in "
 "the search results, then press the <guibutton>Select</guibutton> button."
@@ -19633,7 +19633,7 @@ msgstr ""
 "impresa</emphasis> inserito nella finestra per il <guilabel>Nuovo venditore</"
 "guilabel>, è sufficiente iniziare a scriverlo in questo campo e "
 "&app; tenterà di completarlo. Altrimenti, premere "
-"il pulsante <guibutton>Seleziona...</guibutton> per accedere alla finestra "
+"il pulsante <guibutton>Seleziona…</guibutton> per accedere alla finestra "
 "di <guilabel>Trova venditore</guilabel> descritta in <xref linkend=\"bus-ap-"
 "vendorfind2\"/>. Evidenziare il venditore che si stava cercando con un clic "
 "nei i risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -19646,7 +19646,7 @@ msgid ""
 "<emphasis>job name</emphasis> you entered in the <guilabel>New Job</"
 "guilabel> window for this job, start to type it in this field and "
 "<application>GnuCash</application> will try auto complete it for you. Else, "
-"press the <guibutton>Select...</guibutton> button to access the "
+"press the <guibutton>Select…</guibutton> button to access the "
 "<guilabel>Find Job</guilabel> window. This window is very similar to the one "
 "described in <xref linkend=\"bus-ap-vendorfind2\"/>. Highlight the job you "
 "are looking for with a click in the search results, then press the "
@@ -19658,7 +19658,7 @@ msgstr ""
 "inserito nella finestra per il <guilabel>Nuovo lavoro</guilabel>, è "
 "possibile iniziare a scriverlo in questo campo e &app; "
 "tenterà di completarlo. Altrimenti, premere il pulsante "
-"<guibutton>Seleziona...</guibutton> per accedere alla finestra di "
+"<guibutton>Seleziona…</guibutton> per accedere alla finestra di "
 "<guilabel>Trova lavoro</guilabel> descritta in <xref linkend=\"bus-ap-"
 "vendorfind2\"/>. Evidenziare il lavoro che si stava cercando con un clic nei "
 "risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -19999,7 +19999,7 @@ msgid ""
 msgstr ""
 "Per modificare un <guilabel>lavoro venditore</guilabel> esistente, andare in "
 "<menuchoice><guimenu>Impresa</guimenu><guisubmenu>Venditore</"
-"guisubmenu><guimenuitem>Trova lavoro...</guimenuitem></menuchoice>. "
+"guisubmenu><guimenuitem>Trova lavoro…</guimenuitem></menuchoice>. "
 "Selezionare poi il lavoro desiderato dalla lista dei risultati della ricerca "
 "e premere il pulsante <guibutton>Visualizza/modifica lavoro</guibutton>."
 
@@ -20015,7 +20015,7 @@ msgid ""
 msgstr ""
 "Per selezionare le ricevute associate a un determinato lavoro, utilizzare "
 "l’applicazione <menuchoice><guimenu>Impresa</"
-"guimenu><guisubmenu>Venditore</guisubmenu><guimenuitem>Trova lavoro...</"
+"guimenu><guisubmenu>Venditore</guisubmenu><guimenuitem>Trova lavoro…</"
 "guimenuitem></menuchoice>. Selezionare il lavoro desiderato dall’"
 "elenco dei risultati di ricerca e premere il pulsante <guibutton>Visualizza "
 "fatture</guibutton>; verrà mostrata una finestra con l’elenco delle "
@@ -20041,7 +20041,7 @@ msgid ""
 "pay. If you remember the <emphasis>company name</emphasis> you entered in "
 "the <guilabel>New Vendor</guilabel> window for this vendor, start to type it "
 "in this field and <application>GnuCash</application> will try auto complete "
-"it for you. Else, press the <guibutton>Select...</guibutton> button to "
+"it for you. Else, press the <guibutton>Select…</guibutton> button to "
 "access the <guilabel>Find Vendor</guilabel> window described in <xref "
 "linkend=\"bus-ap-vendorfind2\"/>. Highlight the vendor you are looking for "
 "with a click in the search results, then press the <guibutton>Select</"
@@ -20051,7 +20051,7 @@ msgstr ""
 "che si intende pagare. Se si ricorda il <emphasis>nome dell’impresa</"
 "emphasis>, è sufficiente iniziare a scriverlo in questo campo e "
 "&app; tenterà di completarlo. Altrimenti, premere "
-"il pulsante <guibutton>Seleziona...</guibutton> per accedere alla finestra "
+"il pulsante <guibutton>Seleziona…</guibutton> per accedere alla finestra "
 "di <guilabel>Trova venditore</guilabel> descritta in <xref linkend=\"bus-ap-"
 "vendorfind2\"/>. Evidenziare il venditore che si stava cercando con un clic "
 "nei i risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -20062,7 +20062,7 @@ msgid ""
 "<guilabel>Payment Information - Bill</guilabel> - the bill you wish to pay. "
 "If you remember the <emphasis>bill ID</emphasis>, start to type it in this "
 "field and <application>GnuCash</application> will try auto complete it for "
-"you. Else, press the <guibutton>Select...</guibutton> button to access the "
+"you. Else, press the <guibutton>Select…</guibutton> button to access the "
 "<guilabel>Find Bill</guilabel> window described in <xref linkend=\"bus-ap-"
 "billfind2\"/>. Highlight the bill you are looking for with a click in the "
 "search results, then press the <guibutton>Select</guibutton> button in the "
@@ -20072,7 +20072,7 @@ msgstr ""
 "si intende pagare. Se si ricorda l’<emphasis>ID ricevuta</emphasis>, è "
 "sufficiente iniziare a scriverlo in questo campo e &app; "
 "tenterà di completarlo. Altrimenti, premere il pulsante "
-"<guibutton>Seleziona...</guibutton> per accedere alla finestra di "
+"<guibutton>Seleziona…</guibutton> per accedere alla finestra di "
 "<guilabel>Trova ricevuta</guilabel> descritta in <xref linkend=\"bus-ap-"
 "billfind2\"/>. Evidenziare la ricevuta che si stava cercando con un clic nei "
 "risultati della ricerca, poi premere il pulsante <guibutton>Seleziona</"
@@ -22092,15 +22092,15 @@ msgstr ""
 #: C/gnucash-guide.xml:164(para)
 msgid ""
 "If <application>Python</application> (other languages are avaialble) is not "
-"your thing then post a request to <ulink url=\"https://lists.gnucash.org/"
-"mailman/listinfo/gnucash-user\"><citetitle>GnuCash user list</citetitle></"
+"your thing then post a request to <ulink url="
+"\"&url-mail-li;gnucash-user\"><citetitle>GnuCash user list</citetitle></"
 "ulink>, with an example of your downloaded <acronym>CSV</acronym>, and "
 "someone may write you a <application>Python</application> script to do the "
 "translation."
 msgstr ""
 "Se non si ha dimestichezza con <application>Python</application> (esistono "
 "altri linguaggi), è possibile inviare una richiesta alla <ulink url="
-"\"https://lists.gnucash.org/mailman/listinfo/gnucash-user\"><citetitle>lista "
+"\"&url-mail-li;gnucash-user\"><citetitle>lista "
 "dell’utente di &appname;</citetitle>, con un esempio del proprio file "
 "<acronym>CSV</acronym> scaricato, e probabilmente qualcuno si preoccuperà di "
 "scrivere uno script di <application>Python</application> per la sua "
@@ -22460,7 +22460,7 @@ msgstr ""
 msgid ""
 "The <application>GnuCash</application><acronym>XML</acronym> data file can "
 "be transformed to almost any other data format (e.g., <acronym>QIF</"
-"acronym>, <acronym>CSV</acronym>...) quite easily if one is familiar with "
+"acronym>, <acronym>CSV</acronym>…) quite easily if one is familiar with "
 "<acronym>XSLT</acronym>. The <application>GnuCash</application> data file is "
 "well-formed <acronym>XML</acronym>, and it can therefore be run through an "
 "<acronym>XSLT</acronym> parser with an associated stylesheet. This allows "
@@ -22470,7 +22470,7 @@ msgstr ""
 "I file dei dati <acronym>XML</acronym> creati da &app; "
 "possono essere trasformati facilmente in quasi tutti gli altri "
 "formati di file di dati (es. <acronym>QIF</acronym>, <acronym>CSV</"
-"acronym>...), se si ha familiarità con <acronym>XSLT</acronym>. I file dei "
+"acronym>…), se si ha familiarità con <acronym>XSLT</acronym>. I file dei "
 "dati creati da &app; sono <acronym>XML</acronym> "
 "<quote>well-formed</quote> e possono essere quindi <quote>dati in pasto</"
 "quote> a un parser <acronym>XSLT</acronym> con un foglio di stile associato. "
@@ -22578,13 +22578,11 @@ msgstr ""
 
 #: C/gnucash-guide.xml:100(para)
 msgid ""
-"Install an <acronym>XSLT</acronym> processor such as Saxon (http://saxon."
-"sourceforge.net/) or Xalan-J (http://xml.apache.org/). Any conforming "
-"processor will do, really..."
+"Install an <acronym>XSLT</acronym> processor such as Saxon (%url-saxon;) or Xalan-J (%url-xalan;). Any conforming "
+"processor will do, really…"
 msgstr ""
-"installare un processore <acronym>XSLT</acronym> come Saxon (http://saxon."
-"sourceforge.net/) o Xalan-J (http://xml.apache.org/). Comunque qualsiasi "
-"processore simile funzionerà...;"
+"installare un processore <acronym>XSLT</acronym> come Saxon (%url-saxon;) o Xalan-J (%url-xalan;). Comunque qualsiasi "
+"processore simile funzionerà…;"
 
 #: C/gnucash-guide.xml:105(para)
 msgid ""
@@ -22613,13 +22611,13 @@ msgid ""
 "Benefits are that you don’t need to write a Scheme module or a new C routine "
 "to do this transformation. Anyone who knows or can learn <acronym>XML</"
 "acronym> and <acronym>XSLT</acronym> can perform this task. Not much harder, "
-"really, than writing a Web page...."
+"really, than writing a Web page…."
 msgstr ""
 "Il beneficio risiede nel fatto che non è necessario scrivere un modulo in "
 "Scheme o una nuova routine in C per eseguire la trasformazione. Chiunque "
 "conosca o abbia voglia di imparare il linguaggio <acronym>XML</acronym> può "
 "cimentarsi in questa operazione: sinceramente, niente di più difficile che "
-"scrivere una pagina web...."
+"scrivere una pagina web…."
 
 #: C/gnucash-guide.xml:122(para)
 #, fuzzy
@@ -22665,16 +22663,16 @@ msgstr ""
 
 #: C/gnucash-guide.xml:26(para)
 msgid ""
-"A: Yes. Go to <ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-"
-"user\">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> and "
-"<ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-devel"
-"\">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> to "
+"A: Yes. Go to <ulink url=\"&url-mail-li;gnucash-"
+"user\">gnucash-user</ulink> and "
+"<ulink url=\"&url-mail-li;gnucash-devel"
+"\">gnucash-devel</ulink> to "
 "subscibe."
 msgstr ""
-"R: Sì! qui: <ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-"
-"user\">http://lists.gnucash.org/mailman/listinfo/gnucash-user</ulink> e "
-"<ulink url=\"http://lists.gnucash.org/mailman/listinfo/gnucash-devel"
-"\">http://lists.gnucash.org/mailman/listinfo/gnucash-devel</ulink> per "
+"R: Sì! qui: <ulink url=\"&url-mail-li;gnucash-"
+"user\">gnucash-user</ulink> e "
+"<ulink url=\"gnucash-devel"
+"\">gnucash-devel</ulink> per "
 "iscriverti."
 
 #: C/gnucash-guide.xml:30(title)
@@ -23151,7 +23149,7 @@ msgid ""
 msgstr ""
 "R: Questa è una bella domanda; dovresti consultare il tuo commercialista. Il "
 "modo in cui trattare le tasse dipende fortemente dalla loro tipologia e da "
-"come tu vuoi trattarle... In alcuni casi sono spese, in altri sono debiti."
+"come tu vuoi trattarle… In alcuni casi sono spese, in altri sono debiti."
 
 #: C/gnucash-guide.xml:14(title)
 #, fuzzy
@@ -23341,7 +23339,7 @@ msgstr ""
 "Il file di formato per gli assegni è utilizzato per indicare a "
 "&app; come stampare uno o più assegni in un "
 "foglio di carta. Questo file descrive dapprima la disposizione generale "
-"della pagina (numero di assegni, orientazione, ecc...) e poi descrive "
+"della pagina (numero di assegni, orientazione, ecc…) e poi descrive "
 "l’impaginazione delle singole voci per ogni assegno. Il file è "
 "organizzato nel tipico formato a chiave e valore utilizzato dalla maggior "
 "parte delle applicazioni &lin;. Le coppie di chiave e valore sono "
@@ -25341,14 +25339,12 @@ msgstr ""
 msgid ""
 "If your document contains nontrivial examples of program code, we recommend "
 "releasing these examples in parallel under your choice of free software "
-"license, such as the <ulink url=\"http://www.gnu.org/copyleft/"
-"gpl.html\"> GNU General Public License</ulink>, to permit their use in free "
+"license, such as the <ulink url=\"&url-gpl;\">GNU General Public License</ulink>, to permit their use in free "
 "software."
 msgstr ""
 "Se il proprio documento contiene esempi di programmazione non immediati, se "
 "ne raccomanda il rilascio con una licenza di software libero a propria "
-"scelta, quale la <ulink url=\"http://www.gnu.org/copyleft/gpl."
-"html\"> GNU General Public License</ulink>, per permetterne l’utilizzo "
+"scelta, quale la <ulink url=\"&url-gpl;\"> GNU General Public License</ulink>, per permetterne l’utilizzo "
 "nel software libero."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
diff --git a/guide/ja/ch_oview.xml b/guide/ja/ch_oview.xml
index 78554420..516dc3b0 100644
--- a/guide/ja/ch_oview.xml
+++ b/guide/ja/ch_oview.xml
@@ -596,7 +596,7 @@ class="registered">Quicken</trademark>Interchange
     </para>
 
     <para>使用しているディストリビューションが&app;を含んでいないか、または異なったバージョンの&app;をインストールしたい場合に備えて、<ulink
-url="http://www.gnucash.org/"><citetitle>&app;ホームページ</citetitle></ulink>にはどのように&app;をインストールするかに関する細かい手順が書かれています。
+url="&url-www;"><citetitle>&appname;ホームページ</citetitle></ulink>にはどのように&app;をインストールするかに関する細かい手順が書かれています。
       ソースコードのREADMEファイルを読むこともできます。
     </para>
   </sect1>
diff --git a/guide/pt/appendixa.xml b/guide/pt/appendixa.xml
index 80f21dbe..66048182 100644
--- a/guide/pt/appendixa.xml
+++ b/guide/pt/appendixa.xml
@@ -134,8 +134,8 @@
 
       <listitem>
         <para>Instale um processador <acronym>XSLT</acronym> tal como o
-          <ulink url="http://saxon.sourceforge.net/">Saxon</ulink> ou o
-          <ulink url="http://xml.apache.org/">Xalan-J</ulink>. Qualquer processador normalizado
+          <ulink url="&url-saxon;">Saxon</ulink> ou o
+          <ulink url="&url-xalan;">Xalan-J</ulink>. Qualquer processador normalizado
           serve, realmente...
         </para>
       </listitem>
diff --git a/guide/pt/ch_basics.xml b/guide/pt/ch_basics.xml
index 134f4084..c74aa7f3 100644
--- a/guide/pt/ch_basics.xml
+++ b/guide/pt/ch_basics.xml
@@ -589,19 +589,18 @@
         padrão.
       </para>
 
-      <para>A <ulink
-      url="http://www.gnucash.org"><citetitle>página web do &appname;</citetitle></ulink>
+      <para>A <ulink url="&url-www;"><citetitle>página web do &appname;</citetitle></ulink>
         contém informação útil sobre o programa e suas actualizações. Também contém
         ligações às listas de correio do &app; para utilizadores e programadores e permite a
         procura nos <ulink url="https://lists.gnucash.org/cgi-bin/namazu.cgi"><citetitle>arquivos
         das listas de correio do &app;</citetitle></ulink> por discussões sobre um tópico
         específico. Se não encontrar as respostas que procura, pode perguntar na
-        <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-user"> lista de utilizadores
+        <ulink url="&url-mail-li;gnucash-user"> lista de utilizadores
         do &appname;</ulink> e alguém nessa lista tentará responder-lhe.
       </para>
 
       <para>As <guilabel>FAQ do &appname;</guilabel> mais actualizadas estão localizadas em
-        <ulink url="http://wiki.gnucash.org/wiki/FAQ"> Faq do &appname;</ulink> e contêm respostas
+        <ulink url="&url-wiki-faq;">Faq do &appname;</ulink> e contêm respostas
         às perguntas mais frequentes.
       </para>
     </sect2>
diff --git a/guide/pt/ch_oview.xml b/guide/pt/ch_oview.xml
index 13ba8df2..a45f08af 100644
--- a/guide/pt/ch_oview.xml
+++ b/guide/pt/ch_oview.xml
@@ -483,7 +483,7 @@
     <para>A instalação do &app; é simples.
     </para>
 
-    <para>A <ulink url="http://www.gnucash.org/download.phtml"><citetitle>página de transferência do
+    <para>A <ulink url="&url-www;download.phtml"><citetitle>página de transferência do
       &app;</citetitle></ulink> contém instruções detalhadas sobre a instalação do &app; em
       cada sistema operativo suportado.
     </para>
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index ea108cb9..49f932d8 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -3232,9 +3232,8 @@ Income
         </figure>
 
         <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-          <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html">
-          Lots in Account </ulink> for details of the Lots in Account screen elements.
+          <ulink url="&url-docs;C/gnucash-help/tool-lots.html">Lots in Account</ulink>
+          for details of the Lots in Account screen elements.
         </para>
       </sect3>
 
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index b7b1c3da..3116eca1 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -621,10 +621,10 @@
 
       <para>Огромное количество неформальной документации, как о
         &app;, так и о его поддержке и разработки можно найти
-        в <ulink url="https://wiki.gnucash.org/wiki">&app; Wiki (english)</ulink>; Если вы
+        в <ulink url="&url-wiki;">&appname; Wiki (english)</ulink>; Если вы
         сталкнетесь с трудностями при использовании &app;,
         то посетите пожалуйста одной из первых страницу
-        <ulink url="https://wiki.gnucash.org/wiki/FAQ">Часто задаваемые
+        <ulink url="&url-wiki-faq;">Часто задаваемые
         вопросы (english)</ulink>.
       </para>
     </sect2>
@@ -641,10 +641,10 @@
         рассылки (english)</ulink>. Если вы предпочитаете читать
         список рассылки в виде веб-форума, вы можете
         сделать это при помощи
-        <ulink url="http://gnucash.1415818.n4.nabble.com/GnuCash-User-f1415819.html">Nabble</ulink>.
+        <ulink url="&url-mail-nabble;">Nabble</ulink>.
         Для того чтобы участвовать в списке рассылки и
         задавать вопросы, вам необходимо сначала
-        <ulink url="https://lists.gnucash.org/mailman/listinfo/gnucash-user">подписаться</ulink>
+        <ulink url="%url-mail-li;gnucash-user">подписаться</ulink>
         на него.
       </para>
 
@@ -663,7 +663,7 @@
         <ulink url="&url-logs-irc;">IRC протоколы</ulink>.
       </para>
 
-      <para>На <ulink url="http://www.gnucash.org">&app; странице</ulink> вы найдете
+      <para>На <ulink url="&url-www;">&app; странице</ulink> вы найдете
         более подробную информацию об этих каналах. Вы
         также найдете там ссылки на другие полезные
         ресурсы, например на такие как &app; wiki и система
@@ -678,7 +678,7 @@
     <para>Установить &app; обычно довольно просто.
     </para>
 
-    <para>На странице <ulink url="http://www.gnucash.org/download.phtml"><citetitle>Скачать
+    <para>На странице <ulink url="&url-www;download.phtml"><citetitle>Скачать
       &app;</citetitle></ulink> вы найдете подробное описание по
       установке &app; для каждой поддерживаемой
       операционной системы.
diff --git a/manual/de/ch_Account-Actions.xml b/manual/de/ch_Account-Actions.xml
index 19a2ef15..b50d4d7d 100644
--- a/manual/de/ch_Account-Actions.xml
+++ b/manual/de/ch_Account-Actions.xml
@@ -2371,8 +2371,8 @@
                 <para>Mit Auswahl dieser Option öffnet sich ein kleines Eingabefenster in dem Sie einen <quote>regulären
                   Ausdruck</quote><footnote>
                     <para>Für weitere Informationen können Sie den Artikel
-                      <ulink url="https://de.wikipedia.org/wiki/Regul%C3%A4rer_Ausdruck">Regulärer
-                      Ausdruck</ulink> im Wikipedia lesen.
+                      <ulink url="&url-wp-de;Regul%C3%A4rer_Ausdruck">Regulärer
+                      Ausdruck</ulink> in der Wikipedia lesen.
                     </para>
                   </footnote>, auch als <foreignphrase><abbrev>RegEx</abbrev></foreignphrase> bekannt, eingeben können.
                 </para>
diff --git a/manual/de/ch_Customize.xml b/manual/de/ch_Customize.xml
index 71df70fd..3f3f4936 100644
--- a/manual/de/ch_Customize.xml
+++ b/manual/de/ch_Customize.xml
@@ -707,7 +707,7 @@ Translators:
                     <footnote>
                       <para>Diese praktisch unbenutzte Option wird in Gnucah 5.0 entfernt, da sich das reguläre Zeitformat aus
                         den Regionaleinstellungen ergibt. (Siehe
-                        <ulink url="https://bugs.gnucash.org/show_bug.cgi?id=798297"/>)
+                        <ulink url="&url-bug-show;798297"/>)
                       </para>
                     </footnote>
                   </para>
@@ -2202,7 +2202,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
             <tip>
 <!-- Translators: Check your government's rules on electronic accounting and adjust the recommendation -->
 <!-- In some contries like DE ... -->
-              <para>Will man die <ulink url="https://wiki.gnucash.org/wiki/De/Projekte#GoBD"> Grund­sät­ze zur
+              <para>Will man die <ulink url="&url-wiki-de;Projekte#GoBD"> Grund­sät­ze zur
                 ord­nungs­mä­ßi­gen Füh­rung und Auf­be­wah­rung von Bü­chern,
                 Auf­zeich­nun­gen und Un­ter­la­gen in elek­tro­ni­scher Form so­wie zum
                 Da­ten­zu­griff (GoDB)</ulink> ansatzweise erfüllen, sollte man 1 wählen.
diff --git a/manual/de/ch_Transactions.xml b/manual/de/ch_Transactions.xml
index 2a44fb8b..d13fee16 100644
--- a/manual/de/ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -3148,7 +3148,7 @@ Translators:
 
       <note>
         <para>Die hier abgebildeten Farben sind die Standardwerte für &app;, die in
-          <ulink url="https://github.com/Gnucash/gnucash/blob/maint/gnucash/gnucash-fallback-310.css">gnucash-fallback-310.css</ulink>.
+          <ulink url="&url-gh-gc-maint;gnucash/gnucash-fallback-310.css">gnucash-fallback-310.css</ulink>.
           Wenn die gtk-3.0-CSS-Dateien geändert wurden, können unterschiedliche Farben auftreten.
         </para>
       </note>
diff --git a/manual/it/index.docbook b/manual/it/index.docbook
index aaf1e7f8..4c263ea8 100644
--- a/manual/it/index.docbook
+++ b/manual/it/index.docbook
@@ -719,7 +719,7 @@
       <para>There are several online channels you can access for more assistance.
       </para>
 
-      <para><application>GnuCash</application> has several mailing lists:
+      <para>&app; has several mailing lists:
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">Lista degli utenti</emphasis><email>gnucash-user at gnucash.org</email>: è
@@ -740,9 +740,9 @@
       <para>Or you can chat live with the developers on IRC. Join them on <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
       </para>
 
-      <para>The <ulink url="http://www.gnucash.org"><application>GnuCash</application> web site</ulink> has
+      <para>The <ulink url="&url-www;">&appname; web site</ulink> has
         more details on these channels. You will also find pointers there to additional useful
-        resources such as the <application>GnuCash</application> wiki and bug tracking system.
+        resources such as the &app; wiki and bug tracking system.
       </para>
     </sect1>
   </chapter>
@@ -800,14 +800,14 @@
             <para><guilabel>Import my QIF files:</guilabel> Runs the <guilabel>Import QIF Files</guilabel> assistant
               (see <xref linkend="import-qif"/>). Select this option if you already have Quicken
               files (<filename>.qif</filename> files) from another financial application and wish to
-              import them into <application>GnuCash</application>.
+              import them into &app;.
             </para>
           </listitem>
 
           <listitem>
-            <para><guilabel>Open the new user tutorial:</guilabel> Opens the <application>GnuCash</application>
+            <para><guilabel>Open the new user tutorial:</guilabel> Opens the &app;
               Tutorial and Concepts Guide. Select this option if you are completely new to
-              <application>GnuCash</application> and accounting concepts.
+              &app; and accounting concepts.
             </para>
           </listitem>
         </itemizedlist>
@@ -1451,7 +1451,7 @@
 
       <tip>
         <para>Imported transactions might need to be <emphasis role="strong">reconciled</emphasis>. This process
-          is described in the <application>GnuCash</application> Tutorial and Concepts guide.
+          is described in the &app; Tutorial and Concepts guide.
         </para>
       </tip>
     </sect1>
@@ -1828,7 +1828,7 @@
 
                   <entry namest="c3">
                     <para>Starts the <acronym>CSV</acronym> Account file import process. The file to import must be in the
-                      same format as the one exported by <application>GnuCash</application>.
+                      same format as the one exported by &app;.
                     </para>
                   </entry>
                 </row>
@@ -2063,7 +2063,7 @@
                   </entry>
 
                   <entry namest="c3">
-                    <para>Exports your account hierarchy to a new <application>GnuCash</application>file. Does not export
+                    <para>Exports your account hierarchy to a new &app;file. Does not export
                       data.
                     </para>
                   </entry>
@@ -4560,7 +4560,7 @@
 
                   <entry namest="c3">
                     <para>Starts the <acronym>CSV</acronym> Account file import process. The file to import must be in the
-                      same format as the one exported by <application>GnuCash</application>.
+                      same format as the one exported by &app;.
                     </para>
                   </entry>
                 </row>
@@ -4786,7 +4786,7 @@
                   </entry>
 
                   <entry namest="c3">
-                    <para>Exports your account hierarchy to a new <application>GnuCash</application>file. Does not export
+                    <para>Exports your account hierarchy to a new &app;file. Does not export
                       data.
                     </para>
                   </entry>
@@ -6435,7 +6435,7 @@
 
                   <entry namest="c3">
                     <para>Starts the <acronym>CSV</acronym> Account file import process. The file to import must be in the
-                      same format as the one exported by <application>GnuCash</application>.
+                      same format as the one exported by &app;.
                     </para>
                   </entry>
                 </row>
@@ -6702,7 +6702,7 @@
                   </entry>
 
                   <entry namest="c3">
-                    <para>Exports your account hierarchy to a new <application>GnuCash</application>file. Does not export
+                    <para>Exports your account hierarchy to a new &app;file. Does not export
                       data.
                     </para>
                   </entry>
@@ -9984,10 +9984,10 @@
 
               <note>
                 <para>If you feel uncomfortable about performing any of these steps, please either email the
-                  <application>GnuCash</application>-user mailing list
+                  &app;-user mailing list
                   (<email>gnucash-user at gnucash.org</email>) for help or come to the
-                  <application>GnuCash</application> <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. More information
-                  is available on the <application>GnuCash</application> Wiki FAQ for example
+                  <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. More information
+                  is available on the &app; Wiki FAQ for example
                   <ulink url="&url-wiki-faq;#Q:_How_do_I_fix_a_.22system_error.22_or_.22unknown_error.22_when_getting_stock_quotes.3F"/>
                   You can also leave out this step and manually update your stock prices.
                 </para>
@@ -10141,7 +10141,7 @@
           need to create an opening balance in a <guilabel>Stock</guilabel> or <guilabel>Mutual
           Fund</guilabel> account. It is used to record the beginning balance for an account. This
           allows it to be used for two different scenarios. If using
-          <application>GnuCash</application> for the first time to record transactions, it can be
+          &app; for the first time to record transactions, it can be
           used as a beginning balance. If the accounts in use are closed at the end of a period and
           new accounts are created, it is used to close and carry balances forward.
         </para>
@@ -10557,9 +10557,9 @@
         insolute.
       </para>
 
-      <para>The reconciling process in <application>GnuCash</application> involves two dialogs: the
+      <para>The reconciling process in &app; involves two dialogs: the
         <xref linkend="tool-reconcile"/> dialog followed by the <xref linkend="rec-win"/> window.
-        They provide access to various <application>GnuCash</application> functions to make it easy
+        They provide access to various &app; functions to make it easy
         to enter and update account information during the reconciliation.
       </para>
 
@@ -10684,7 +10684,7 @@
         </note>
 
         <para>The <guilabel>Reconcile</guilabel> dialog is where the actual process of matching your statement to
-          <application>GnuCash</application> data takes place on a per transaction basis.
+          &app; data takes place on a per transaction basis.
         </para>
 
         <para>The <guilabel>Reconcile</guilabel> dialog is composed by a <emphasis>toolbar</emphasis> and three
@@ -10694,7 +10694,7 @@
 
         <note>
           <para>If you enabled the option <guilabel>Use formal accounting labels</guilabel> in the
-            <guilabel>Accounts</guilabel> section of the <application>GnuCash</application>
+            <guilabel>Accounts</guilabel> section of the &app;
             preferences, you will see <guilabel>Debits</guilabel> and <guilabel>Credits</guilabel>
             panes instead of <guilabel>Funds In</guilabel> and <guilabel>Funds Out</guilabel> panes.
           </para>
@@ -10895,7 +10895,7 @@ Translators:
 
     <para>A <emphasis>transaction</emphasis> represents the movement of money from one account to another
       account. Whenever you spend or receive money, or transfer money between accounts, that is a
-      transaction. In <application>GnuCash</application> transactions always involve at least two
+      transaction. In &app; transactions always involve at least two
       accounts.
     </para>
 
@@ -11000,7 +11000,7 @@ Translators:
           <guimenu>Actions</guimenu> <guimenuitem>Transfer...</guimenuitem>
         </menuchoice>
         or its shortcut or by pressing the <guibutton>Transfer</guibutton> icon from the account
-        register tab, serves two purposes in <application>GnuCash</application>:
+        register tab, serves two purposes in &app;:
         <itemizedlist>
           <listitem>
             <para>A way to create a simple (i.e. two-split) transaction between arbitrary accounts.
@@ -11089,7 +11089,7 @@ Translators:
 
         <para>The <guilabel>Currency Transfer</guilabel> pane is used to collect the needed information to enter
           the amount of the <guilabel>Transfer To</guilabel> split. You may enter either a price or
-          an amount and <application>GnuCash</application> will compute the other. If you have
+          an amount and &app; will compute the other. If you have
           Online Price Retrieval installed (see <xref linkend="Online-price-setup"/>) you can use
           the <guilabel>Fetch Rate</guilabel> button to retrieve a current quote.
         </para>
@@ -11124,7 +11124,7 @@ Translators:
 
           <listitem>
             <para>Enter the price/exchange rate or the amount in the numeric entry corresponding to radio button you
-              selected. <application>GnuCash</application> will calculate the other amount for you
+              selected. &app; will calculate the other amount for you
               when you exit the field. If it's enabled you can use the <guilabel>Fetch
               Rate</guilabel> button to retrieve a current quote.
             </para>
@@ -11184,7 +11184,7 @@ Translators:
         </para>
 
         <note>
-          <para>When working on transactions in <application>GnuCash</application>, be aware that the
+          <para>When working on transactions in &app;, be aware that the
             <keycap function="enter">Enter</keycap> key and the <keycap function="tab">Tab</keycap>
             key behave differently, and perform different actions.
           </para>
@@ -11209,7 +11209,7 @@ Translators:
               the arrows to select the correct month and year for the transaction then select the
               date. Selecting the icon once more will close the date selection calendar. It is also
               possible to type in the date or part of the date and let
-              <application>GnuCash</application> fill the rest.
+              &app; fill the rest.
             </para>
           </listitem>
 
@@ -11250,7 +11250,7 @@ Translators:
               account also to be a placeholder account so that it doesn't display here.
             </para>
 
-            <para>When typing, <application>GnuCash</application> will fill in available accounts as you type. For
+            <para>When typing, &app; will fill in available accounts as you type. For
               example, if you have <emphasis>Equity</emphasis> and <emphasis>Expenses</emphasis>
               top-level accounts, typing <keycap>E</keycap> will fill in
               <emphasis role="bold">Equity</emphasis> because it sorts before
@@ -11510,8 +11510,8 @@ Translators:
         last two will be <guilabel>Credit</guilabel> and <guilabel>Debit</guilabel> respectively if
         you've enabled <guilabel>Use formal accounting labels</guilabel> in the
         <guilabel>Accounts</guilabel> tab of <guilabel>Preferences</guilabel>). Enter any two and
-        <application>GnuCash</application> will calculate the other for you; if you enter 3 and the
-        result doesn't balance <application>GnuCash</application> will ask which one to change to
+        &app; will calculate the other for you; if you enter 3 and the
+        result doesn't balance &app; will ask which one to change to
         make the split balance.
       </para>
 
@@ -11690,7 +11690,7 @@ Translators:
     <sect1 id="trans-stts">
       <title>Setting the reconcile status (<guilabel>R</guilabel> field) of a transaction</title>
 
-      <para>In the <application>GnuCash</application> register there is a column named <guilabel>R</guilabel>.
+      <para>In the &app; register there is a column named <guilabel>R</guilabel>.
         This field indicates the status of a transaction. Possible values are:
       </para>
 
@@ -12166,7 +12166,7 @@ Translators:
 
     <para>The accounting needs of a business are quite different from that of a person. Businesses have
       customers that owe money, vendors which are owed money, employee payroll, more complex tax
-      laws, etc. <application>GnuCash</application> offers business oriented features to facilitate
+      laws, etc. &app; offers business oriented features to facilitate
       these needs.
     </para>
 
@@ -12190,7 +12190,7 @@ Translators:
     <sect1 id="busnss-ar-setup1">
       <title>Initial Setup</title>
 
-      <para>To set up <application>GnuCash</application> to handle accounts receivable and accounts payable for
+      <para>To set up &app; to handle accounts receivable and accounts payable for
         a company the following preliminary steps must be done.
       </para>
 
@@ -12200,7 +12200,7 @@ Translators:
         <para>There are many different ways to set up a business account hierarchy. You can start with the
           Business Accounts setup which is available from the New Account Hierarchy assistant, or
           you could build one manually. To access the prebuilt Business Accounts, start
-          <application>GnuCash</application> and click on
+          &app; and click on
           <menuchoice>
             <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
           </menuchoice>
@@ -12295,7 +12295,7 @@ Translators:
             </para>
 
             <para>If you set up Tax on Purchases and Tax on Sales as subaccounts of Liabilities:Tax then the net tax
-              will be rolled up and can be seen in the <application>GnuCash</application> Accounts
+              will be rolled up and can be seen in the &app; Accounts
               tab.
             </para>
 
@@ -12309,7 +12309,7 @@ Translators:
         <title>Company Registration</title>
 
         <para>After you have built the account structure and defined your tax tables, register the
-          <application>GnuCash</application> file as belonging to your company by filling in the
+          &app; file as belonging to your company by filling in the
           data requested in the <xref linkend="business-book-options"/> accessible from the
           <menuchoice>
             <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
@@ -12329,7 +12329,7 @@ Translators:
       <sect2 id="busnss_setup_pref">
         <title>Business Preferences</title>
 
-        <para>Set options on the Business tab of the <application>GnuCash</application> preferences, which is
+        <para>Set options on the Business tab of the &app; preferences, which is
           accessed via
           <menuchoice>
             <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
@@ -12350,7 +12350,7 @@ Translators:
         </para>
 
         <note>
-          <para>As of <application>GnuCash</application> 2.6.7, Billing terms are only partially supported. Date due
+          <para>As of &app; 2.6.7, Billing terms are only partially supported. Date due
             is calculated but discount amount is not.
           </para>
 
@@ -12465,10 +12465,10 @@ Translators:
     <sect1 id="busnss-ar-components1">
       <title>Crediti correnti</title>
 
-      <para><application>GnuCash</application> has an integrated accounts receivable system.
+      <para>&app; has an integrated accounts receivable system.
       </para>
 
-      <para>To use <application>GnuCash</application>’s integrated accounts receivable system, you must first
+      <para>To use &app;’s integrated accounts receivable system, you must first
         set up <emphasis>Accounts Receivable</emphasis> accounts of type
         <emphasis>A/Receivable</emphasis> under <emphasis>Assets</emphasis> to accrue income you're
         owed. It is within this account that the integrated A/R system will place transactions,
@@ -12502,7 +12502,7 @@ Translators:
 
       <para>The transactions generated by the A/R system are recorded within the <emphasis>Accounts
         Receivable</emphasis> account. You generally do not work directly with this account. You
-        generally work with the four integrated <application>GnuCash</application> A/R application
+        generally work with the four integrated &app; A/R application
         components available through the
         <menuchoice>
           <guimenu>Business</guimenu> <guisubmenu>Customer</guisubmenu>
@@ -12606,7 +12606,7 @@ Translators:
             </para>
 
             <note>
-              <para>All invoices will be denominated in this currency and <application>GnuCash</application> will
+              <para>All invoices will be denominated in this currency and &app; will
                 require an Accounts Receivable account in this currency.
               </para>
             </note>
@@ -12632,7 +12632,7 @@ Translators:
           <listitem>
             <para><guilabel>Billing Information - Credit Limit</guilabel> - stores the maximum credit you are willing
               to extend to the customer. This field is for your reference purposes only.
-              <application>GnuCash</application> does not use the value.
+              &app; does not use the value.
             </para>
           </listitem>
 
@@ -12681,7 +12681,7 @@ Translators:
           <listitem>
             <para><guilabel>Shipping Address</guilabel> - records the customer’s shipping address if it is different
               from the billing address. The shipping address is for your reference.
-              <application>GnuCash</application> does not use the value.
+              &app; does not use the value.
             </para>
           </listitem>
         </itemizedlist>
@@ -12703,7 +12703,7 @@ Translators:
         <para>If many customers match the search criteria you provide, the search can be refined by running an
           additional search within the current results. The current result set is searched when the
           <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          <application>GnuCash</application> selects this option for you after you run the initial
+          &app; selects this option for you after you run the initial
           search.
         </para>
 
@@ -12728,11 +12728,11 @@ Translators:
       <title>Fatture</title>
 
       <para>An invoice is the paperwork you send to a customer to request payment for products or services
-        rendered. <application>GnuCash</application> can generate and track invoices.
+        rendered. &app; can generate and track invoices.
       </para>
 
       <para>A credit note is the paperwork you send to a customer to correct products or services rendered that
-        were incorrectly invoiced. <application>GnuCash</application> can generate and track credit
+        were incorrectly invoiced. &app; can generate and track credit
         notes via the same menu entries as invoices.
       </para>
 
@@ -12741,7 +12741,7 @@ Translators:
           and to keep the text easier to read it will refer only to invoices. You can apply it
           equally to credit notes. Only where the behaviour of credit notes differs from invoices
           this will be explicitly mentioned. Credit notes were introduced starting with
-          <application>GnuCash</application> stable release 2.6.0.
+          &app; stable release 2.6.0.
         </para>
       </note>
 
@@ -12780,7 +12780,7 @@ Translators:
             <para><guilabel>Billing Information - Customer</guilabel> - the customer who is to receive this invoice.
               If you remember the <emphasis>company name</emphasis> you entered in the <guilabel>New
               Customer</guilabel> window for this customer, start to type it in this field and
-              <application>GnuCash</application> will try auto complete it for you. Else, press the
+              &app; will try auto complete it for you. Else, press the
               <guibutton>Select...</guibutton> button to access the <guilabel>Find
               Customer</guilabel> window described in <xref linkend="busnss-ar-custfind2"/>.
               Highlight the customer you are looking for with a click in the search results, then
@@ -12792,7 +12792,7 @@ Translators:
             <para><guilabel>Billing Information - Job</guilabel> (optional) - associates the new invoice with a
               customer job (see <xref linkend="busnss-ar-jobs1"/>). If you remember the
               <emphasis>job name</emphasis> you entered in the <guilabel>New Job</guilabel> window
-              for this job, start to type it in this field and <application>GnuCash</application>
+              for this job, start to type it in this field and &app;
               will try auto complete it for you. Else, press the <guibutton>Select...</guibutton>
               button to access the <guilabel>Find Job</guilabel> window. This window is the same to
               the one described in <xref linkend="busnss-ar-custfind2"/>. Highlight the job you are
@@ -13070,7 +13070,7 @@ Translators:
           </para>
         </note>
 
-        <para>One of the design goals in <application>GnuCash</application>’s Account Receivable system was to
+        <para>One of the design goals in &app;’s Account Receivable system was to
           allow different processes to get to the same state, so you can reach an invoice from
           different directions based on the way you think about the problem:
         </para>
@@ -13153,7 +13153,7 @@ Translators:
       <sect2 id="busnss-ar-invoicestarting2">
         <title>Assign Starting Invoice Number</title>
 
-        <para>By default, <application>GnuCash</application> starts with invoice number 1 and increments from
+        <para>By default, &app; starts with invoice number 1 and increments from
           there. You can manually type an invoice number into the text box each time you create an
           invoice, but this gets tiring and sooner or later leads to duplicate numbers.
         </para>
@@ -13203,7 +13203,7 @@ Translators:
           <para><guilabel>Owner Info - Customer</guilabel> - the customer for whom the job is created. If you
             remember the <emphasis>company name</emphasis> you entered in the <guilabel>New
             Customer</guilabel> window for this customer, start to type it in this field and
-            <application>GnuCash</application> will try auto complete it for you. Else, press the
+            &app; will try auto complete it for you. Else, press the
             <guibutton>Select...</guibutton> button to access the <guilabel>Find Customer</guilabel>
             window described in <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you
             are looking for with a click in the search results, then press the
@@ -13287,7 +13287,7 @@ Translators:
           <para><guilabel>Payment Information - Customer</guilabel> - the customer who paid you. If you remember the
             <emphasis>company name</emphasis> you entered in the <guilabel>New Customer</guilabel>
             window for this customer, start to type it in this field and
-            <application>GnuCash</application> will try auto complete it for you. Else, press the
+            &app; will try auto complete it for you. Else, press the
             <guibutton>Select...</guibutton> button to access the <guilabel>Find Customer</guilabel>
             window described in <xref linkend="busnss-ar-custfind2"/>. Highlight the customer you
             are looking for with a click in the search results, then press the
@@ -13298,7 +13298,7 @@ Translators:
         <listitem>
           <para><guilabel>Payment Information - Invoice</guilabel> - the invoice for which payment was received. If
             you remember the <emphasis>invoice ID</emphasis>, start to type it in this field and
-            <application>GnuCash</application> will try auto complete it for you. Else, press the
+            &app; will try auto complete it for you. Else, press the
             <guibutton>Select...</guibutton> button to access the <guilabel>Find Invoice</guilabel>
             window described in <xref linkend="busnss-ar-invoicefind2"/>. Highlight the invoice you
             are looking for with a click in the search results, then press the
@@ -13342,7 +13342,7 @@ Translators:
         <title>Over Payments or Pre-Payments</title>
 
         <para>If a customer overpays an invoice or pays for goods or services before they have been invoiced,
-          Process Payment for the total amount received. <application>GnuCash</application> will
+          Process Payment for the total amount received. &app; will
           then keep track of the over-payment (or pre-payment) in the A/R account and you can use
           the residual when paying the next invoice.
         </para>
@@ -13351,7 +13351,7 @@ Translators:
       <sect2 id="busnss-ar-partpay2">
         <title>Partial Payments</title>
 
-        <para>Partial payments are possible too. Select the invoice to pay. <application>GnuCash</application>
+        <para>Partial payments are possible too. Select the invoice to pay. &app;
           will automatically suggest that invoice's remaining balance as payment amount. Simply
           adjust that amount to what you want to pay.
         </para>
@@ -13367,7 +13367,7 @@ Translators:
 
         <para>The usual way to do this is to process a payment for the invoice to a <emphasis>BadDebt</emphasis>
           account. Such an account would be an expense account. However, in
-          <application>GnuCash</application>, you can't process a payment for an invoice directly to
+          &app;, you can't process a payment for an invoice directly to
           an expense account, so it takes two steps:
         </para>
 
@@ -13411,7 +13411,7 @@ Translators:
 
           <listitem>
             <para>Open the account register for your A/R account. For this invoice there should now be one payment
-              transaction. If you are using <application>GnuCash</application> 2.6.0 - 2.6.4 there
+              transaction. If you are using &app; 2.6.0 - 2.6.4 there
               will also be one lot link transaction <link linkend="busnss-ar-baddeb-lot">(1)</link>.
             </para>
           </listitem>
@@ -13429,7 +13429,7 @@ Translators:
         </para>
 
         <note id="busnss-ar-baddeb-lot">
-          <para>(1): <application>GnuCash</application> versions 2.6.0 to 2.6.4 created lot link transactions which
+          <para>(1): &app; versions 2.6.0 to 2.6.4 created lot link transactions which
             show in the A/R account register. This came with its own set of subtle issues. It is
             recommended to upgrade to the latest (or at least 2.6.6) version, which fixes a lot of
             small problems. Version 2.6.5 had a flaw in the logic cleaning up the lot links. Once
@@ -13531,13 +13531,13 @@ ________________________________________________________________________________
     <sect1 id="busnss-ap-components1">
       <title>Debiti correnti</title>
 
-      <para><application>GnuCash</application> has an integrated accounts payable system. As with
+      <para>&app; has an integrated accounts payable system. As with
         <emphasis>Accounts Receivable</emphasis> you must have an <emphasis>Accounts
         Payable</emphasis> account set up under <emphasis>Liabilities</emphasis> for each currency
         in which you will issue invoices. The <emphasis>Accounts Payable</emphasis> accounts accrue
         the amounts you owe to others, so bills credit these accounts and payments and credit memos
         debit these accounts. Generally you do not directly work with this account but use the four
-        integrated <application>GnuCash</application> A/P application components. The A/P components
+        integrated &app; A/P application components. The A/P components
         are available from the
         <menuchoice>
           <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu>
@@ -13632,7 +13632,7 @@ ________________________________________________________________________________
 
             <note>
               <para>All Bills and Credit Notes will be denominated in this currency and
-                <application>GnuCash</application> will require an Accounts Payable account in this
+                &app; will require an Accounts Payable account in this
                 currency.
               </para>
             </note>
@@ -13709,7 +13709,7 @@ ________________________________________________________________________________
         <para>If many vendors match the search criteria you provide, the search can be refined by running an
           additional search within the current results. The current result set is searched when the
           <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          <application>GnuCash</application> selects this option for you after you run the initial
+          &app; selects this option for you after you run the initial
           search.
         </para>
 
@@ -13735,12 +13735,12 @@ ________________________________________________________________________________
     <sect1 id="busnss-ap-bills1">
       <title>Ricevute</title>
 
-      <para>A bill is a request for payment you receive from a vendor. <application>GnuCash</application> can
+      <para>A bill is a request for payment you receive from a vendor. &app; can
         track bills.
       </para>
 
       <para>A credit note is the document you receive from a vendor to correct products or services rendered
-        that you were incorrectly charged for on a bill. <application>GnuCash</application> can
+        that you were incorrectly charged for on a bill. &app; can
         generate and track credit notes via the same menu entries as bills.
       </para>
 
@@ -13755,7 +13755,7 @@ ________________________________________________________________________________
       <sect2 id="busnss-ap-billnew2">
         <title>Nuovo</title>
 
-        <para>When you receive a bill from a vendor and want to enter it into <application>GnuCash</application>,
+        <para>When you receive a bill from a vendor and want to enter it into &app;,
           you must create a new bill. To create a new bill use the
           <menuchoice>
             <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New
@@ -13786,7 +13786,7 @@ ________________________________________________________________________________
             <para><guilabel>Billing Info - Vendor</guilabel> - the issuing vendor. If you remember the
               <emphasis>company name</emphasis> you entered in the <guilabel>New Vendor</guilabel>
               window for this vendor, start to type it in this field and
-              <application>GnuCash</application> will try auto complete it for you. Else, press the
+              &app; will try auto complete it for you. Else, press the
               <guibutton>Select...</guibutton> button to access the <guilabel>Find Vendor</guilabel>
               window described in <xref linkend="busnss-ap-vendorfind2"/>. Highlight the vendor you
               are looking for with a click in the search results, then press the
@@ -13798,7 +13798,7 @@ ________________________________________________________________________________
             <para><guilabel>Billing Info - Job</guilabel> (optional) - associates a vendor job (see
               <xref linkend="busnss-ap-jobs1"/>) with this bill. If you remember the <emphasis>job
               name</emphasis> you entered in the <guilabel>New Job</guilabel> window for this job,
-              start to type it in this field and <application>GnuCash</application> will try auto
+              start to type it in this field and &app; will try auto
               complete it for you. Else, press the <guibutton>Select...</guibutton> button to access
               the <guilabel>Find Job</guilabel> window. This window is very similar to the one
               described in <xref linkend="busnss-ap-vendorfind2"/>. Highlight the job you are
@@ -14124,7 +14124,7 @@ ________________________________________________________________________________
           <para><guilabel>Payment Information - Vendor</guilabel> - the vendor you wish to pay. If you remember the
             <emphasis>company name</emphasis> you entered in the <guilabel>New Vendor</guilabel>
             window for this vendor, start to type it in this field and
-            <application>GnuCash</application> will try auto complete it for you. Else, press the
+            &app; will try auto complete it for you. Else, press the
             <guibutton>Select...</guibutton> button to access the <guilabel>Find Vendor</guilabel>
             window described in <xref linkend="busnss-ap-vendorfind2"/>. Highlight the vendor you
             are looking for with a click in the search results, then press the
@@ -14135,7 +14135,7 @@ ________________________________________________________________________________
         <listitem>
           <para><guilabel>Payment Information - Bill</guilabel> - the bill you wish to pay. If you remember the
             <emphasis>bill ID</emphasis>, start to type it in this field and
-            <application>GnuCash</application> will try auto complete it for you. Else, press the
+            &app; will try auto complete it for you. Else, press the
             <guibutton>Select...</guibutton> button to access the <guilabel>Find Bill</guilabel>
             window described in <xref linkend="busnss-ap-billfind2"/>. Highlight the bill you are
             looking for with a click in the search results, then press the
@@ -14180,7 +14180,7 @@ ________________________________________________________________________________
         <title>Over Payments or Pre-Payments</title>
 
         <para>If you wish to overpay an invoice or pay for goods or services before they have been invoiced,
-          Process Payment for the total amount payed. <application>GnuCash</application> will then
+          Process Payment for the total amount payed. &app; will then
           keep track of the over-payment (or pre-payment) in the A/P account and you can use the
           residual in the future.
         </para>
@@ -14189,7 +14189,7 @@ ________________________________________________________________________________
       <sect2 id="busnss-ap-partpay2">
         <title>Partial Payments</title>
 
-        <para>You may wish to partially pay a bill. Select the bill to pay. <application>GnuCash</application>
+        <para>You may wish to partially pay a bill. Select the bill to pay. &app;
           will automatically suggest that bill's remaining balance as payment amount. Simply adjust
           that amount to what you want to pay.
         </para>
@@ -14199,7 +14199,7 @@ ________________________________________________________________________________
     <sect1 id="busnss-emply">
       <title>Employees</title>
 
-      <para><application>GnuCash</application> can help your company by tracking employees. You can register a
+      <para>&app; can help your company by tracking employees. You can register a
         <xref linkend="busnss-emplynew"/>, <xref linkend="busnss-emplyedit"/> existing employees,
         create <xref linkend="busnss-emply-newvchr"/> and <xref linkend="busnss-emply-editvchr"/>.
       </para>
@@ -14302,7 +14302,7 @@ ________________________________________________________________________________
 
             <note>
               <para>All expense vouchers and credit notes for this employee will be denominated in this currency and
-                <application>GnuCash</application> will require an Accounts Payable account in this
+                &app; will require an Accounts Payable account in this
                 currency.
               </para>
             </note>
@@ -14340,7 +14340,7 @@ ________________________________________________________________________________
         <para>If many employees match the search criteria you provide, the search can be refined by running an
           additional search within the current results. The current result set is searched when the
           <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          <application>GnuCash</application> selects this option for you after you run the initial
+          &app; selects this option for you after you run the initial
           search.
         </para>
 
@@ -14402,7 +14402,7 @@ ________________________________________________________________________________
             </para>
 
             <tip>
-              <para>The field supports auto-completion so if you start typing <application>GnuCash</application> will
+              <para>The field supports auto-completion so if you start typing &app; will
                 try to complete the text automatically using existing employees name. You can also
                 press the button <guibutton>Select...</guibutton> to open the
                 <link linkend="busnss-emplyedit">Find Employee</link> window.
@@ -14428,7 +14428,7 @@ ________________________________________________________________________________
             </para>
 
             <tip>
-              <para>The field supports auto-completion so if you start typing <application>GnuCash</application> will
+              <para>The field supports auto-completion so if you start typing &app; will
                 try to complete the text automatically using existing Customer name. You can also
                 press the button <guibutton>Select...</guibutton> to open the
                 <link linkend="busnss-ar-custfind2">Find Customer</link> window.
@@ -14443,12 +14443,12 @@ ________________________________________________________________________________
 
             <note>
               <para>you can type in this field only if there is one or more job registered in
-                <application>GnuCash</application> belonging to the selected Customer.
+                &app; belonging to the selected Customer.
               </para>
             </note>
 
             <tip>
-              <para>The field supports auto-completion so if you start typing <application>GnuCash</application> will
+              <para>The field supports auto-completion so if you start typing &app; will
                 try to complete the text automatically using existing Customer name. You can also
                 press the button <guibutton>Select...</guibutton> to open the
                 <link linkend="busnss-ar-custfind2">Find Customer</link> window.
@@ -14479,7 +14479,7 @@ ________________________________________________________________________________
         <para>If many expense vouchers match the search criteria you provide, the search can be refined by running
           an additional search within the current results. The current result set is searched when
           the <guilabel>Refine Current Search</guilabel> radio button is selected. In fact,
-          <application>GnuCash</application> selects this option for you after you run the initial
+          &app; selects this option for you after you run the initial
           search.
         </para>
 
@@ -14532,7 +14532,7 @@ ________________________________________________________________________________
     <sect1 id="tool-find">
       <title>Find</title>
 
-      <para>The <application>GnuCash</application> <emphasis>Find</emphasis> assistant can be used to
+      <para>The &app; <emphasis>Find</emphasis> assistant can be used to
         <link linkend="tool-find-txn">find transactions</link> or to perform
         <link linkend="tool-find-bsnss">business related</link> research on your data file.
       </para>
@@ -14541,7 +14541,7 @@ ________________________________________________________________________________
         <title>Find Transaction</title>
 
         <para><guilabel>Find Transaction</guilabel> is used to search for transactions in
-          <application>GnuCash</application> and display the results in a register window. To open
+          &app; and display the results in a register window. To open
           the <guilabel>Find Transaction</guilabel> dialog in <guilabel>Split Search</guilabel>
           mode, you can type the keyboard shortcut
           <keycombo>
@@ -14658,7 +14658,7 @@ ________________________________________________________________________________
             <guimenu> Reports</guimenu><guimenuitem>Account Report</guimenuitem>
           </menuchoice>
           . The Account Report has limited formatting options but, like all
-          <application>GnuCash</application> reports, being in html format, can be copied and pasted
+          &app; reports, being in html format, can be copied and pasted
           into a spreadsheet for further formatting. Alternatively, the Account Report can be
           exported to an html file, and the html file may be opened in a spreadsheet.
         </para>
@@ -15604,7 +15604,7 @@ ________________________________________________________________________________
             <guibutton>Reconcile</guibutton> <guibutton>is</guibutton>
             <guibutton>Reconciled</guibutton>, and finally selecting <guilabel>Search for items
             where</guilabel> <guibutton>any criteria are met</guibutton>. In either case,
-            <application>GnuCash</application> will show you exactly the same set of transactions.
+            &app; will show you exactly the same set of transactions.
           </para>
         </sect3>
       </sect2>
@@ -15726,7 +15726,7 @@ ________________________________________________________________________________
           </para>
 
           <tip>
-            <para>Aside the results, <application>GnuCash</application> gives you some buttons to manage the
+            <para>Aside the results, &app; gives you some buttons to manage the
               highlighted result.
             </para>
           </tip>
@@ -19352,7 +19352,7 @@ ________________________________________________________________________________
       <title>Editor prezzi</title>
 
       <note>
-        <para><application>GnuCash</application> uses the term <emphasis role="Italic">commodity</emphasis> to
+        <para>&app; uses the term <emphasis role="Italic">commodity</emphasis> to
           mean anything that it counts: Currencies, securities (i.e intangible assets like stock or
           mutual fund shares and bonds), or tangible assets like trucks and computers. When valuing
           one commodity in terms of another it uses the term <emphasis role="Italic">Exchange
@@ -19821,7 +19821,7 @@ ________________________________________________________________________________
       <sect2 id="tool-close-book-workings">
         <title>How It Works</title>
 
-        <para><application>GnuCash</application> closes books by creating one transaction per currency for income
+        <para>&app; closes books by creating one transaction per currency for income
           accounts, and one transaction per currency for expense accounts. The transactions all use
           the date selected by the user, and each transaction may contain any number of splits. Each
           split moves the balance out of one income or expense account. The last split in each
@@ -19833,7 +19833,7 @@ ________________________________________________________________________________
           <guilabel>Description:</guilabel> entry.
         </para>
 
-        <para>The fact that <application>GnuCash</application> just uses transactions to close the books makes it
+        <para>The fact that &app; just uses transactions to close the books makes it
           very simple to undo a book closing: just delete the closing transactions.
         </para>
       </sect2>
@@ -19851,7 +19851,7 @@ ________________________________________________________________________________
 
         <para>Note that closing the books in <application>GnuCash </application> is unnecessary. You do not need
           to zero out your income and expense accounts at the end of each financial period.
-          <application>GnuCash</application>’s built-in reports automatically handle concepts like
+          &app;’s built-in reports automatically handle concepts like
           retained earnings between two different financial periods.
         </para>
 
@@ -19873,7 +19873,7 @@ ________________________________________________________________________________
     <sect1 id="tool-lots">
       <title>Lots in Account</title>
 
-      <para><application>GnuCash</application> uses <emphasis>lots</emphasis> in 2 ways:
+      <para>&app; uses <emphasis>lots</emphasis> in 2 ways:
       </para>
 
       <itemizedlist>
@@ -20290,7 +20290,7 @@ ________________________________________________________________________________
           </itemizedlist>
 
           <para>See Tutorial and Concepts Guide,
-            <ulink url="https://www.gnucash.org/docs/v2.6/C/gnucash-guide/invest-sell1.html#invest-sellLots">
+            <ulink url="&url-docs-it;guide/invest-sell1.html#invest-sellLots">
             Automatic Calculation of Capital Gain or Loss Using Lots</ulink> for more details.
           </para>
         </sect3>
@@ -20555,7 +20555,7 @@ ________________________________________________________________________________
     <sect1 id="report-config">
       <title>Configuring Reports and Charts</title>
 
-      <para><application>GnuCash</application> reports have many configuration options. First, run the original
+      <para>&app; reports have many configuration options. First, run the original
         report itself. Then, access the report options with the <guibutton>Options</guibutton>
         button on the toolbar.
       </para>
@@ -20737,7 +20737,7 @@ ________________________________________________________________________________
     <sect1 id="report-classes">
       <title>Reports Listed By Class</title>
 
-      <para><application>GnuCash</application> has classified the main types of reports into major classes.
+      <para>&app; has classified the main types of reports into major classes.
         These are all available under the Reports menu.
       </para>
 
@@ -22040,7 +22040,7 @@ ________________________________________________________________________________
 
               <listitem>
                 <para><guilabel>Rate of Gain:</guilabel> Total Gain / Money In * 100 (from
-                  <application>GnuCash</application> 2.6.1 onwards)
+                  &app; 2.6.1 onwards)
                 </para>
               </listitem>
 
@@ -22206,7 +22206,7 @@ ________________________________________________________________________________
             </para>
 
             <para>The Asset Barchart report displays bars that present the value of all assets in a
-              <application>GnuCash</application> file over time. By default, the report shows all
+              &app; file over time. By default, the report shows all
               accounts in <emphasis>Accounts Receivable</emphasis>, <emphasis>Current
               Assets</emphasis>, <emphasis>Fixed Assets</emphasis>, <emphasis>Investments</emphasis>
               and Special Accounts (if they exist) and it displays monthly bars for the current
@@ -22242,7 +22242,7 @@ ________________________________________________________________________________
             <para>By default the report includes all <emphasis>asset</emphasis> accounts and sub-accounts, as well as
               <emphasis>Imbalance</emphasis> and <emphasis>Orphan</emphasis> Special accounts in
               whatever currencies or commodities may be present. The report's base currency is the
-              default currency of the <application>GnuCash</application> file but if the file has
+              default currency of the &app; file but if the file has
               data for multiple currencies, then it can be changed to another currency.
             </para>
 
@@ -23441,8 +23441,8 @@ make doc
       <title>Impostare le preferenze</title>
 
       <para>The <guilabel>GnuCash Preferences</guilabel> window allows you to customize your
-        <application>GnuCash</application> session by setting several options. From the
-        <application>GnuCash</application> menu select
+        &app; session by setting several options. From the
+        &app; menu select
         <menuchoice>
           <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
         </menuchoice>
@@ -23457,7 +23457,7 @@ make doc
         and as such are common to all users. So <guilabel>GnuCash Preferences</guilabel> settings
         are individual to each user who uses a given file and any changes made by one user will not
         affect other users of that file. Also, a given user's preferences will be common to all
-        files that that user opens with <application>GnuCash</application>.
+        files that that user opens with &app;.
       </para>
 
       <tip>
@@ -23554,7 +23554,7 @@ make doc
 
               <listitem>
                 <para><guilabel>Include non-currency totals:</guilabel> if this option is selected,
-                  <application>GnuCash</application> will include in the
+                  &app; will include in the
                   <emphasis>Summarybar</emphasis> a total for non-currency items (for instance
                   number of shares).
                 </para>
@@ -23760,7 +23760,7 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Notify when due:</guilabel> Lets you set whether you want to be notified at
-                  <application>GnuCash</application> startup of when a bill is soon to be due.
+                  &app; startup of when a bill is soon to be due.
                 </para>
               </listitem>
 
@@ -23915,14 +23915,14 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Display "Tip of the Day" dialog:</guilabel> This option displays or hides the
-                  <guilabel>Tip of the Day</guilabel> screen when <application>GnuCash</application>
+                  <guilabel>Tip of the Day</guilabel> screen when &app;
                   is started.
                 </para>
               </listitem>
 
               <listitem>
                 <para><guilabel>Show splash screen:</guilabel> With this option you can enable or disable the
-                  visualization of the startup screen while <application>GnuCash</application> is
+                  visualization of the startup screen while &app; is
                   starting up.
                 </para>
               </listitem>
@@ -23933,7 +23933,7 @@ make doc
                   <menuchoice>
                     <guimenu>File</guimenu> <guimenuitem>New File</guimenuitem>
                   </menuchoice>
-                  is selected from the <application>GnuCash</application> menu.
+                  is selected from the &app; menu.
                 </para>
               </listitem>
 
@@ -23974,7 +23974,7 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Display negative amounts in red:</guilabel> If you turn off this option,
-                  <application>GnuCash</application> will display negative numbers in black.
+                  &app; will display negative numbers in black.
                 </para>
               </listitem>
 
@@ -24004,13 +24004,13 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Compress files:</guilabel> This option determines whether the
-                  <application>GnuCash</application> data file will be compressed or not.
+                  &app; data file will be compressed or not.
                 </para>
               </listitem>
 
               <listitem>
                 <para><guilabel>Show auto-save confirmation question:</guilabel> If this option is enabled,
-                  <application>GnuCash</application> will show you a confirmation screen each time
+                  &app; will show you a confirmation screen each time
                   the auto-save process is started.
                 </para>
               </listitem>
@@ -24186,7 +24186,7 @@ make doc
                   charged $101.50 plus Interac fees. If you manually entered that $100, the amounts
                   won’t match. You should set this to whatever is the maximum such fee in your
                   area (in units of your local currency), so the transaction will be recognized as a
-                  match by <application>GnuCash</application>.
+                  match by &app;.
                 </para>
               </listitem>
 
@@ -24204,7 +24204,7 @@ make doc
             </para>
 
             <note>
-              <para>This section is shown only if <application>GnuCash</application> is compiled with Aqbanking and
+              <para>This section is shown only if &app; is compiled with Aqbanking and
                 <acronym>HBCI</acronym> support.
               </para>
             </note>
@@ -24217,14 +24217,14 @@ make doc
               </listitem>
 
               <listitem>
-                <para><guilabel>Remember PIN:</guilabel> Enable this option if you want <application>GnuCash</application>
+                <para><guilabel>Remember PIN:</guilabel> Enable this option if you want &app;
                   to remember the PIN you enter for online banking authentication.
                 </para>
               </listitem>
 
               <listitem>
                 <para><guilabel>Verbose debug messages:</guilabel> Enable this option if you want
-                  <application>GnuCash</application> to show more information about the online
+                  &app; to show more information about the online
                   banking operations.
                 </para>
               </listitem>
@@ -24370,7 +24370,7 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Use system theme colors:</guilabel> If selected, the system color theme will be applied to
-                  register windows. Otherwise the original <application>GnuCash</application>
+                  register windows. Otherwise the original &app;
                   register color will be used.
                 </para>
               </listitem>
@@ -24384,13 +24384,13 @@ make doc
 
               <listitem>
                 <para><guilabel>Draw horizontal lines between rows:</guilabel> If selected,
-                  <application>GnuCash</application> will draw a horizontal line between each row.
+                  &app; will draw a horizontal line between each row.
                 </para>
               </listitem>
 
               <listitem>
                 <para><guilabel>Draw vertical lines between columns:</guilabel> If selected,
-                  <application>GnuCash</application> will draw a vertical line between the cells in
+                  &app; will draw a vertical line between the cells in
                   each row.
                 </para>
               </listitem>
@@ -24583,8 +24583,8 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Run when data file opened:</guilabel> If selected, the <guilabel>Since Last Run</guilabel>
-                  screen will appear on <application>GnuCash</application> start-up (or rather when
-                  <application>GnuCash</application> opens the file).
+                  screen will appear on &app; start-up (or rather when
+                  &app; opens the file).
                 </para>
               </listitem>
             </itemizedlist>
@@ -24648,7 +24648,7 @@ make doc
             <itemizedlist>
               <listitem>
                 <para><guilabel>Save window size and position:</guilabel> If selected, next time
-                  <application>GnuCash</application> starts will re-use the windows size and
+                  &app; starts will re-use the windows size and
                   position configured in the last run.
                 </para>
               </listitem>
@@ -24713,12 +24713,12 @@ make doc
           <guimenu>File</guimenu> <guimenuitem>Properties</guimenuitem>
         </menuchoice>
         menu item is used to set or modify choices that affect how a specific
-        <application>GnuCash</application> file (also referred to as a Book) operates. Selecting
+        &app; file (also referred to as a Book) operates. Selecting
         this menu item brings up the <guilabel>Book Options</guilabel> dialog. This dialog also
         appears in situations where you are importing transactions into a new book, with the title
         <guilabel>New Book Options</guilabel>. It is automatically raised in these 'new book'
         situations because these settings can affect how imported data are converted to
-        <application>GnuCash</application> transactions and so should be considered and set before
+        &app; transactions and so should be considered and set before
         your first import (specifically, the <xref linkend="num-action-book-option"/> setting).
       </para>
 
@@ -24743,7 +24743,7 @@ make doc
         initially insensitive but becomes sensitive when any setting is set or changed. Selecting it
         saves the setting(s) for the book but keeps the <guilabel>Book Options</guilabel> dialog
         open. Typically, the changes are reflected in the affected areas of
-        <application>GnuCash</application> as soon as the button is pressed, so it can be used to
+        &app; as soon as the button is pressed, so it can be used to
         'see' the effect of a given option without having to re-open the dialog. The
         <guibutton>Apply</guibutton> button is not sensitive on the dialog if it appears during
         transaction import (that is, 'new book') situations. The <guibutton>OK</guibutton> button
@@ -24810,15 +24810,15 @@ make doc
           </para>
 
           <warning>
-            <para>Initial setup of <application>GnuCash</application>: It is expected that, after careful
+            <para>Initial setup of &app;: It is expected that, after careful
               consideration of the consequences, this option will be set when a new
-              <application>GnuCash</application> file is created and not changed thereafter (see
+              &app; file is created and not changed thereafter (see
               next warning). For this reason, a preference is provided (see
               <link linkend="prefs-general">Setting Preferences - General </link>) that can
               establish an initial default setting for new files, so that if you will have more than
               one file, it is easier to set them all up consistently. You may wish to set up a test
               file and experiment with the two settings to understand the differences before
-              establishing your first real <application>GnuCash</application> file.
+              establishing your first real &app; file.
             </para>
           </warning>
 
@@ -24841,7 +24841,7 @@ make doc
               data display/reporting/exporting determines which field is displayed as number.
             </para>
 
-            <para>There is no reason to avoid changing this option for an existing <application>GnuCash</application>
+            <para>There is no reason to avoid changing this option for an existing &app;
               file if you understand the implications. If you elect to make this change, it should
               probably be done between accounting periods with the understanding that number data
               prior to the date the option is changed will be displayed/reported/exported
@@ -24861,7 +24861,7 @@ make doc
             <para>This option is only available in <application>GnuCash </application> version 2.6 or later. If a
               <application>GnuCash </application> file from an earlier version is opened in version
               2.6 or later, and this feature is not used, this feature will not prevent the file
-              from being opened in the earlier version of <application>GnuCash</application>.
+              from being opened in the earlier version of &app;.
               However, if the option is set, the file will not be able to be opened by the earlier
               version, even if the option is set back to its original setting. A warning dialog will
               be displayed from the earlier version. Do not set this option if you want to open the
@@ -24883,7 +24883,7 @@ make doc
         <title>Business Book Options Tab</title>
 
         <para>The <guilabel>Business</guilabel> tab allows you to enter values that are in turn used by the
-          business features of <application>GnuCash</application>:
+          business features of &app;:
         </para>
 
         <variablelist>
@@ -24970,7 +24970,7 @@ make doc
         </variablelist>
 
         <note>
-          <para>None of the above values is required to use <application>GnuCash</application> but, if given, will
+          <para>None of the above values is required to use &app; but, if given, will
             be used throughout the program. (f.e. in reports, invoices etc...)
           </para>
         </note>
@@ -24981,7 +24981,7 @@ make doc
 
         <para>The <guilabel>Counters</guilabel> tab allows you to set the 'previous' value for each number
           indicated: Bill, Customer, Employee, etc. These counters are used by the
-          <xref linkend="chapter_busnss"/> of <application>GnuCash</application>.
+          <xref linkend="chapter_busnss"/> of &app;.
         </para>
 
         <para>The number entered here will be incremented when the various business features calculate a value for
@@ -25003,7 +25003,7 @@ make doc
         </para>
 
         <note>
-          <para>For historical reasons <application>GnuCash</application> accepts multiple format specifiers
+          <para>For historical reasons &app; accepts multiple format specifiers
             although they all yield the same end result. You can choose "li", "lli" or I64i".
           </para>
         </note>
@@ -25907,9 +25907,9 @@ make doc
         you should be cautioned that you will need to manually change each one if you do so, which
         could be quite tedious. The tax categories are unique for each Income Tax Entity Type, so
         changing the type will make all previously assigned categories invalid. It is assumed (and
-        highly recommended) that each <application>GnuCash</application> file is for only one tax
+        highly recommended) that each &app; file is for only one tax
         entity and this is where you specify its type of tax entity. You should not keep, for
-        example, personal and partnership accounts mixed in one <application>GnuCash</application>
+        example, personal and partnership accounts mixed in one &app;
         file if you plan to use the Income Tax Reporting features.
       </para>
 
@@ -26051,7 +26051,7 @@ make doc
         </itemizedlist>
 
         <para>Does not accept the dates outside of the tax year. This is a problem for the last payment that is
-          due Jan 15. <application>GnuCash</application> changes the the date of the last payment to
+          due Jan 15. &app; changes the the date of the last payment to
           Dec 31 for the export unless the "Do not use special date processing" option is selected
           in the report options display tab. The user will have to adjust for this after import. The
           date only matters if you have to compute the penalty.
@@ -26091,7 +26091,7 @@ make doc
           information left blank (to be separately added in the tax software). The code can be
           assigned to either a short-, long-, or mixed-term gain/loss income account and the
           security sales transaction should be entered as illustrated in Section 8.7, Selling
-          Shares, of the <application>GnuCash</application> Tutorial and Concepts Guide. The report
+          Shares, of the &app; Tutorial and Concepts Guide. The report
           uses the transaction split of the gain/loss account to find one or more other splits in
           the same transaction with negative share quantities. For each of these found, it generates
           a detailed <acronym>TXF</acronym> output record with the quantity sold, the name of the
@@ -26101,7 +26101,7 @@ make doc
           report will fetch the same data, and re-output it, for each transaction split set to a
           gain/loss income account within the same transaction. For this reason, there should be no
           more than one gain/loss account entered per transaction to use this tax reporting code
-          properly. (Note that no amounts are used from <application>GnuCash</application>’s
+          properly. (Note that no amounts are used from &app;’s
           lot-tracking; a future enhancement is expected to use this data to provide capital gain
           reporting).
         </para>

commit 309118a02804faca2ec6b982bb5efe32733ae9a4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Dec 7 05:59:55 2022 +0100

    Minor fixes on PR #293

diff --git a/manual/de/ch_Account-Actions.xml b/manual/de/ch_Account-Actions.xml
index ef963356..19a2ef15 100644
--- a/manual/de/ch_Account-Actions.xml
+++ b/manual/de/ch_Account-Actions.xml
@@ -573,12 +573,12 @@
     </tip>
 
     <figure pgwide="1">
-      <title>Der Assistent <quote>Neuen Kontoplan erstellen</quote></title><screenshot>
+      <title>Der Assistent <quote>Neuen Kontoplan erstellen</quote></title>
+      <screenshot>
         <mediaobject>
           <imageobject role="html">
             <imagedata fileref="figures/AccountTreeCreate.png" srccredit="Christian Wehling" width="&img-w;" />
           </imageobject>
-
           <imageobject role="fo">
             <imagedata fileref="figures/AccountTreeCreate.png" srccredit="Christian Wehling" />
           </imageobject>
@@ -849,7 +849,7 @@
 
     <para>Wenn Sie Ihren aktuellen Kontenplan modifizieren möchten so können Sie das mit dem Menüeintrag
       &mc.ed.acc-edit;
-      durchführen oder Sie betätigen die <guibutton>Bearbeiten</guibutton> Schaltfläche in der
+      durchführen oder Sie betätigen die <guibutton>Bearbeiten</guibutton>-Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> der <quote>Kontenübersicht</quote>.
     </para>
 
@@ -908,7 +908,7 @@
 <!-- FIXME source: changed content from "account edit" -->
     <para>Wollen Sie stattdessen ein <emphasis>vorhandenes Konto bearbeiten</emphasis>, wählen Sie
       &mc.ed.acc-edit;
-      oder klicken die <guibutton>Bearbeiten</guibutton> Schaltfläche in der
+      oder klicken die <guibutton>Bearbeiten</guibutton>-Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> des Fensters <quote>Konten</quote> an, woraufhin sich der
       Dialog <guilabel>Konto bearbeiten</guilabel> öffnet.
     </para>
@@ -1653,7 +1653,7 @@
 
                 <listitem>
                   <para>Die Vergabe einer Kontofarbe kann Ihnen dabei helfen, die Kontenhierarchie optisch übersichtlicher
-                    zu gestalten. Betätigen Sie die <guilabel>farbige</guilabel> Schaltfläche um
+                    zu gestalten. Betätigen Sie die <guilabel>farbige</guilabel>-Schaltfläche um
                     eine Farbepalette zu öffnen und eine Farbe auszuwählen. Mit dem Knopf
                     <guilabel>Voreinstellung</guilabel> wird eine vorherige Farbwahl wieder auf die
                     Standardfarbe <guilabel>grau</guilabel> zurückgesetzt.
@@ -1724,7 +1724,7 @@
     <title>Konto löschen</title>
 <!-- FIXME source: new behavior, it open a new dialog "account delete" -->
     <para>Wenn Sie ein Konto löschen wollen, dann können Sie dies in der Kontenhierarchie mit
-      &mc.ed.acc-del; vornehmen oder Sie betätigen die <guibutton>Löschen</guibutton> Schaltfläche in der
+      &mc.ed.acc-del; vornehmen oder Sie betätigen die <guibutton>Löschen</guibutton>-Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> des Fensters <quote>Konten</quote>.
     </para>
 
@@ -1952,7 +1952,7 @@
     <tip>
       <para>Das Fenster <guilabel>Abgleichen</guilabel> wird aus der Kontohierarchie oder dem Buchungsfenster
         aufgerufen, indem Sie im Menü &mc.ac.rec; auswählen oder Sie verwenden die
-        <guibutton>Abgleichen</guibutton> Schaltfläche in der
+        <guibutton>Abgleichen</guibutton>-Schaltfläche in der
         <guilabel>Werkzeugleiste</guilabel>.
       </para>
     </tip>
@@ -2475,8 +2475,7 @@
         <title><guilabel>Konten jetzt importieren</guilabel></title>
 
         <para>Der Dateiname und Pfad der zu importierenden Datei wird angezeigt. Um die Kontenstruktur jetzt
-          endgültig zu importieren betätigen Sie die <guibutton>Anwenden</guibutton>
-          Schaltfläche.
+          endgültig zu importieren betätigen Sie die <guibutton>Anwenden</guibutton>-Schaltfläche.
         </para>
 
         <para>Nach einer kurzen Zeit, in der die Daten verarbeitet werden, öffnet sich der Dialog
@@ -2738,8 +2737,7 @@
           <title><guilabel>Datei jetzt exportieren…</guilabel></title>
 
           <para>Der Dateiname und Pfad der zu exportierenden Datei und die Anzahl der zu exportierenden Konten wird
-            angezeigt. Um den Export fortzusetzen betätigen Sie die <guibutton>Anwenden</guibutton>
-            Schaltfläche.
+            angezeigt. Um den Export fortzusetzen betätigen Sie die <guibutton>Anwenden</guibutton>-Schaltfläche.
           </para>
         </step>
 
diff --git a/manual/de/ch_Customize.xml b/manual/de/ch_Customize.xml
index d1c22f99..71df70fd 100644
--- a/manual/de/ch_Customize.xml
+++ b/manual/de/ch_Customize.xml
@@ -2136,14 +2136,14 @@ Scrolling to older transactions is not possible. If you want to see all entries
     <xi:include href="para-assist-buttons.xml"/>
 
     <tip>
-      <para>Sobald Sie die <guibutton>Anwenden</guibutton> Schaltfläche betätigen, werden die Änderungen in
+      <para>Sobald Sie die <guibutton>Anwenden</guibutton>-Schaltfläche betätigen, werden die Änderungen in
         den betroffenen Bereichen von &app; widergespiegelt, so dass Sie die Auswirkung einer
         bestimmten Einstellung sofort sehen können, ohne den Dialog erneut öffnen zu müssen.
       </para>
     </tip>
 
     <note>
-      <para>Die <guibutton>Anwenden</guibutton> Schaltfläche ist im Dialog nicht sensitiv, wenn er während
+      <para>Die <guibutton>Anwenden</guibutton>-Schaltfläche ist im Dialog nicht sensitiv, wenn er während
         eines Buchungsimport in ein <emphasis>neues Buch</emphasis> angezeigt wird.
       </para>
     </note>
@@ -2878,8 +2878,8 @@ Scrolling to older transactions is not possible. If you want to see all entries
                   <listitem>
                     <para>Verwenden Sie die Schaltfläche <guibutton>Durchsuchen</guibutton>, um eine Grafik, wie z.B. Ihr
                       Logo oder Lieblingsbriefpapier, auszuwählen, das als Hintergrund in den
-                      Berichten verwendet wird. Mit der <guibutton>Zurücksetzen</guibutton>-
-                      Schaltfläche können Sie Ihre Auswahl wieder zurücknehmen.
+                      Berichten verwendet wird. Mit der <guibutton>Zurücksetzen</guibutton>-Schaltfläche
+                      können Sie Ihre Auswahl wieder zurücknehmen.
                     </para>
                   </listitem>
                 </varlistentry>
diff --git a/manual/de/ch_Transactions.xml b/manual/de/ch_Transactions.xml
index f7a2c2b1..2a44fb8b 100644
--- a/manual/de/ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -238,7 +238,7 @@ Translators:
       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.
+          abrufen</guibutton>-Schaltfläche betätigen.
         </para>
       </note>
 
@@ -393,11 +393,10 @@ Translators:
         <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Ist die Buchung
           <quote>ausgeglichen</quote> wird durch Drücken der
           &kc.enter; Taste, Betätigung der
-          <guibutton>Eingabe</guibutton> Schaltfläche in der <emphasis> Werkzeugleiste </emphasis>
+          <guibutton>Eingabe</guibutton>-Schaltfläche in der <emphasis> Werkzeugleiste </emphasis>
           oder mit
           &mc.tr.ent;
-          die Buchung abgeschlossen. Durch Anklicken der <guibutton>Abbrechen</guibutton>
-          Schaltfläche oder mit
+          die Buchung abgeschlossen. Durch Anklicken der <guibutton>Abbrechen</guibutton>-Schaltfläche oder mit
           &mc.tr.cnl;
           wird die Buchung gelöscht.
         </para>
@@ -412,7 +411,7 @@ Translators:
 
       <step>
         <para>Um zu einer leeren Buchung am Ende des Kontobuchs zu wechseln, klicken Sie die
-          <guibutton>Neu</guibutton> Schaltfläche in der <emphasis>Werkzeugleiste</emphasis> an
+          <guibutton>Neu</guibutton>-Schaltfläche in der <emphasis>Werkzeugleiste</emphasis> an
           oder wählen Sie
           &mc.ac.blk-tr;
           .
@@ -736,13 +735,13 @@ Translators:
     <para>Zur Änderung einer Buchung müssen Sie nur den zu ändernden Buchungsteil auswählen. Sobald Sie
       die Änderungen vorgenommen haben, drücken Sie entweder die
       &kc.enter; Taste, betätigen die
-      <guibutton>Eingeben</guibutton> Schaltfläche oder den Menübefehl
+      <guibutton>Eingeben</guibutton>-Schaltfläche oder den Menübefehl
       &mc.tr.ent;
       , und der Cursor springt automatisch zur nächsten Zeile bzw. zur nächsten Buchung.
     </para>
 
     <para>Um für die Bearbeitung eine detailliertere Ansicht die Buchung zu erhalten, betätigen Sie die
-      <guibutton>Vollständig</guibutton> Schaltfläche in der <emphasis>Werkzeugleiste</emphasis>
+      <guibutton>Vollständig</guibutton>-Schaltfläche in der <emphasis>Werkzeugleiste</emphasis>
       oder wählen Sie
       &mc.ac.spt-tr;
       .
@@ -753,7 +752,7 @@ Translators:
     <title>Buchung löschen</title>
 
     <para>Soll eine Buchung aus dem Kontobuch entfernt werden, wählen Sie die Buchung aus und drücken Sie
-      entweder die <guibutton>Löschen</guibutton> Schaltfläche in der
+      entweder die <guibutton>Löschen</guibutton>-Schaltfläche in der
       <emphasis>Werkzeugleiste</emphasis> oder verwendenen Sie
       &mc.tr.del;
       . Es öffnet sich ein Dialogfenster, um das Löschen zu bestätigen, sofern die Einstellung
@@ -971,7 +970,7 @@ Translators:
     </para>
 
     <para>Wählen Sie die gewünschte Buchung im Kontobuch betätigen entweder die
-      <guibutton>Springen</guibutton> Schaltfläche oder wählen
+      <guibutton>Springen</guibutton>-Schaltfläche oder wählen
       &mc.ac.jump;
       im Menü um zugehörigen Gegenkonto in einem neuen Fenster zu öffnen. Wenn die Buchung mehr
       als ein Konto berührt, müssen Sie zuerst alle Buchungsteile anzeigen und das Gegenkonto, zu
@@ -1092,7 +1091,7 @@ Translators:
 
       <para>Die <emphasis>Werkzeugleiste</emphasis> des Fensters enthält drei Schaltflächen um terminierte
         Buchungen neu zu erstellen, zu bearbeiten und zu löschen. Die <guibutton>Neu</guibutton>
-        und <guibutton>Bearbeiten</guibutton> Schaltflächen öffnen den <guilabel>Terminierte
+        und <guibutton>Bearbeiten</guibutton>-Schaltflächen öffnen den <guilabel>Terminierte
         Buchungen bearbeiten</guilabel> Assistenten. <guibutton>Löschen</guibutton> entfernt die
         ausgewählte Buchung. Die gleichen Möglichkeiten sind im Menü
         &gm.sx;
@@ -1812,7 +1811,7 @@ Translators:
           <term><guilabel>QIF Dateien laden</guilabel></term>
 
           <listitem>
-            <para>Klicken Sie auf die <guibutton>Start</guibutton> Schaltfläche, und die Datei wird analysiert und
+            <para>Klicken Sie auf die <guibutton>Start</guibutton>-Schaltfläche, und die Datei wird analysiert und
               geladen. Wenn Fehler oder Warnungen auftreten, müssen Sie eventuell die Datei
               entfernen, sie bearbeiten und erneut importieren. Wenn keine Fehler auftreten, klicken
               Sie auf <guibutton>Weiter</guibutton>.
@@ -1875,8 +1874,8 @@ Translators:
               die erforderlichen Kontenstrukturen angelegt. Erstellte Konten werden durch Aktivieren
               des Kontrollkästchens in der Spalte <guilabel>Neu</guilabel> gekennzeichnet.
               Zugewiesene Konten können bearbeitet werden, indem Sie die entsprechende Zeile
-              auswählen und und Sie auf die <guibutton>&app;-Konten ändern…</guibutton>
-              Schaltfläche klicken, um den Dialog zur Auswahl des Kontos aufzurufen.
+              auswählen und und Sie auf die <guibutton>&app;-Konten ändern…</guibutton>-Schaltfläche
+             klicken, um den Dialog zur Auswahl des Kontos aufzurufen.
             </para>
           </listitem>
         </varlistentry>
@@ -2015,7 +2014,7 @@ Translators:
       <para>&mc.fi.imp.OFX;
         öffnet einen Dateiauswahldialog. Navigieren Sie zu der Datei, die Sie importieren möchten,
         wählen Sie eine Datei mit der entsprechenden Erweiterung (.ofx oder .qfx), und drücken Sie
-        dann die <guibutton>Importieren</guibutton> Schaltfläche.
+        dann die <guibutton>Importieren</guibutton>-Schaltfläche.
       </para>
 
       <para>&app; öffnet dann das Dialogfeld <guilabel>Konto auswählen</guilabel>, um ein Konto aus Ihrer
@@ -2604,7 +2603,7 @@ Translators:
             <para>Wenn Sie mit allen Importeinstellungen zufrieden sind,
               <link linkend="trans-import-csv-save">speichern</link> sie die Konfiguration, wenn Sie
               die gleichen Einstellungen wieder verwenden wollen, und danach drücken Sie die
-              <guibutton>Weiter</guibutton> Schaltfläche.
+              <guibutton>Weiter</guibutton>-Schaltfläche.
             </para>
           </listitem>
         </varlistentry>
@@ -2653,7 +2652,7 @@ Translators:
 
           <listitem>
             <para>&app; zeigt eine Zusammenfassung der importierten Daten an. Klicken Sie auf die
-              <guibutton>Schließen</guibutton> Schaltfläche, um den Assistenten zu beenden.
+              <guibutton>Schließen</guibutton>-Schaltfläche, um den Assistenten zu beenden.
             </para>
           </listitem>
         </varlistentry>
@@ -2715,7 +2714,7 @@ Translators:
 
       <para>Aus dem &app; Menü öffnet sich ein Dateiauswahldialog. Navigieren Sie zu der MT940-, MT942- oder
         DTAUS-Datei, die Sie importieren möchten, und klicken Sie dann auf die Schaltfläche
-        Schaltfläche <guibutton>Importieren</guibutton>. Bei dem ersten Import von Daten eines
+        <guibutton>Importieren</guibutton>. Bei dem ersten Import von Daten eines
         bestimmten Kontos aus der Importdatei wird &app; einen Kontoauswahldialog anzeigen, in dem
         Sie ein geeignetes Konto auswählen müssen, in das die Transaktionen in der Datei
         importiert werden sollen. &app; ordnet die Kontobeschreibung in der Importdatei dem
@@ -4221,7 +4220,7 @@ Translators:
             <keycombo action="click">
               <mousebutton>Button1</mousebutton>
             </keycombo>
-            die <guibutton>Anwenden</guibutton> Schaltfläche.
+            die <guibutton>Anwenden</guibutton>-Schaltfläche.
           </para>
         </listitem>
       </varlistentry>

commit e06cc9da0ff7d9ed193a0ed655cd3d574715739b
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Dec 3 20:56:51 2022 +0100

    manual, ch_Finance-Quote: fix broken entities

diff --git a/manual/C/ch_Finance-Quote.xml b/manual/C/ch_Finance-Quote.xml
index 5267a494..449c7092 100644
--- a/manual/C/ch_Finance-Quote.xml
+++ b/manual/C/ch_Finance-Quote.xml
@@ -96,7 +96,7 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
       <title>On &win;</title>
 
       <step>
-        <para>Under &win; run the program &mc.start.win-install-fq; to run. This will
+        <para>Under &win; run the program &mc.winOS.inst-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
@@ -242,7 +242,7 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Run &mc.start.win-install-fq;. This is a small utility that installs &app-fq; for you.
+        <simpara>Run &mc.winOS.inst-fq;. This is a small utility that installs &app-fq; for you.
         </simpara>
       </step>
     </procedure>
@@ -340,7 +340,7 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       <abstract>
         <para>This program installs or updates the &app-fq; software module along with its dependencies.
           <note>
-            <para>Windows users are generally better off using the update-tool &mc.start.win-install-fq;.
+            <para>Windows users are generally better off using the update-tool &mc.winOS.inst-fq;.
             </para>
           </note>
         </para>

commit 66e5c3d42ba4e4359f4abe052f66fd2344c0af92
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sun Oct 30 16:31:34 2022 +0100

    L10N:de: manual: Using the GUI entries for menu items and key
    combinations

diff --git a/manual/de/ch_Account-Actions.xml b/manual/de/ch_Account-Actions.xml
index da43ca8d..ef963356 100644
--- a/manual/de/ch_Account-Actions.xml
+++ b/manual/de/ch_Account-Actions.xml
@@ -94,10 +94,8 @@
             </entry>
 
             <entry namest="c3" nameend="c4">
-              <para>Die Auswertung<menuchoice>
-                  <guimenu>Be<accel>r</accel>ichte</guimenu><guisubmenu><accel>A</accel>ktiva &
-                  Passiva</guisubmenu><guimenuitem><accel>B</accel>ilanz</guimenuitem>
-                </menuchoice>gibt Ihnen eine Ãœbersicht zu jedem beliebigen <emphasis>Stichtag</emphasis>.
+              <para>Die Auswertung &mc.rep.ass-lia.bal-she; gibt Ihnen eine Ãœbersicht zu
+                jedem beliebigen <emphasis>Stichtag</emphasis>.
               </para>
             </entry>
           </row>
@@ -359,12 +357,9 @@
 
             <entry namest="c3" nameend="c4">
               <para>Bei Bedarf können Sie auf der nächsten Kontoebene die Unterscheidung zwischen
-                steuerpflichtig/-frei, bzw. steuerabzugsfähig oder nicht, einfügen. Die Auswertung<menuchoice>
-                  <guimenu>Be<accel>r</accel>ichte</guimenu><guisubmenu>Aufwand &
-                  <accel>E</accel>rtrag</guisubmenu><guimenuitem>Gewi<accel>n</accel>n- und
-                  Verlustrechnung</guimenuitem>
-                </menuchoice>gibt Ihnen eine Übersicht für jeden beliebigen <emphasis>Zeitraum</emphasis> wie z.B. das
-                Geschäftsjahr.
+                steuerpflichtig/-frei, bzw. steuerabzugsfähig oder nicht, einfügen. Die Auswertung
+                &mc.rep.inc-exp.pro-los; gibt Ihnen eine Übersicht für jeden beliebigen
+                <emphasis>Zeitraum</emphasis> wie z.B. das Geschäftsjahr.
               </para>
             </entry>
           </row>
@@ -550,10 +545,8 @@
         vermeiden um eine Eindeutigkeit zu erzielen. Es bietet sich an, bei der Festlegung der
         Kontonummern zunächst die Ziffern zu verwenden. Reichen die nicht aus, können Sie auch die
         Buchstaben <quote>a</quote> bis <quote>z</quote> benutzen. &app; kann Sie bei der
-        Nummerierung Ihre Konten unterstützen. Verwenden Sie hierfür den Assistenten<menuchoice>
-          <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem>Unterkonten neu
-          <accel>n</accel>ummerieren…</guimenuitem>
-        </menuchoice>zu Hilfe. Ein Beispiel ist in <xref linkend="chart-renumber" /> beschrieben
+        Nummerierung Ihre Konten unterstützen. Verwenden Sie hierfür den Assistenten &mc.ed.acc-renum;
+        zu Hilfe. Ein Beispiel ist in <xref linkend="chart-renumber" /> beschrieben
       </para>
     </tip>
 <!-- FIXME Is this section still valid? -->
@@ -572,18 +565,10 @@
     </para>
 
     <tip>
-      <para>Sie können den Assistenten später erneut ausführen. Hierfür gehen Sie im Menü zu<menuchoice>
-          <shortcut>
-          <keycombo>
-            <keycap>Strg</keycap><keycap>N</keycap>
-          </keycombo>
-          </shortcut> <guimenu><accel>D</accel>atei</guimenu> <guimenuitem><accel>N</accel>eue
-          Datei</guimenuitem>
-        </menuchoice>falls Sie eine neue Datei erstellen wollen. Wenn Sie den Assistenten innerhalb der geöffneten Datei
-        laufen lassen wollen, benutzen Sie stattdessen<menuchoice>
-          <guimenu><accel>A</accel>ktionen</guimenu><guimenuitem>Konten<accel>h</accel>ierachie
-          hinzufügen</guimenuitem>
-        </menuchoice>wenn das Kontenhierarchie- Register angezeigt wird.
+      <para>Sie können den Assistenten später erneut ausführen. Hierfür gehen Sie im Menü zu &mc.fi.new; 
+        falls Sie eine neue Datei erstellen wollen. Wenn Sie den Assistenten innerhalb der geöffneten Datei
+        laufen lassen wollen, benutzen Sie stattdessen &mc.ac.act-hier; wenn das Kontenhierarchie-
+        Register angezeigt wird.
       </para>
     </tip>
 
@@ -676,10 +661,7 @@
 
         <para><note>
             <para>Dieser Dialogschritt wird <emphasis>nicht</emphasis> angezeigt, wenn Sie den Assistenten in der
-              Kontenansicht einer bestehen &app;-Datei mit dem Menüpunkt<menuchoice>
-                <guimenu><accel>A</accel>ktionen</guimenu><guimenuitem>Konten<accel>h</accel>ierachie
-                hinzufügen</guimenuitem>
-              </menuchoice>starten.
+              Kontenansicht einer bestehen &app;-Datei mit dem Menüpunkt &mc.ac.act-hier; starten.
             </para>
           </note>In diesem Schritt können Sie generelle Einstellungen für die &app;-Datei vornehmen, die in der
           Datei gespeichert werden und somit für alle Benutzer gelten. Der Dialog wird ausführlich
@@ -696,9 +678,8 @@
 
         <para>Die Dropdown-Liste ist standardmäßig auf die Währung eingestellt, die in der Registerkarte
           <xref linkend="prefs-accounts"/> in den <guilabel>&appname; Einstellungen</guilabel>
-          eingestellt ist. Sie erreichen diesen Dialog im Menü<menuchoice>
-            <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
-          </menuchoice>. Wenn Sie stattdessen für Ihre Konten eine andere Standardwährung verwenden wollen, wählen Sie
+          eingestellt ist. Sie erreichen diesen Dialog im Menü &mc.ed.pref;. Wenn Sie stattdessen
+          für Ihre Konten eine andere Standardwährung verwenden wollen, wählen Sie
           diese aus der Liste aus.
         </para>
       </step>
@@ -867,14 +848,7 @@
     <title>Kontenplan bearbeiten</title>
 
     <para>Wenn Sie Ihren aktuellen Kontenplan modifizieren möchten so können Sie das mit dem Menüeintrag
-      <menuchoice>
-        <shortcut>
-        <keycombo>
-          <keycap>Strg</keycap><keycap>E</keycap>
-        </keycombo>
-        </shortcut> <guimenu><accel>B</accel>earbeiten</guimenu> <guimenuitem>Konto
-        <accel>b</accel>earbeiten</guimenuitem>
-      </menuchoice>
+      &mc.ed.acc-edit;
       durchführen oder Sie betätigen die <guibutton>Bearbeiten</guibutton> Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> der <quote>Kontenübersicht</quote>.
     </para>
@@ -926,24 +900,14 @@
     </abstract>
 
     <para>Um ein <emphasis>neues Konto anzulegen</emphasis> wählen Sie in der Kontenübersicht in dem Menü
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem>Neues
-        <accel>K</accel>onto…</guimenuitem>
-      </menuchoice>
+      &mc.ac.act-new;
       oder klicken auf die Schaltfläche <guibutton>Neu</guibutton> in der
       <guilabel>Werkzeugleiste</guilabel> und der Dialog <guilabel>Neues Konto</guilabel> wird
       geöffnet.
     </para>
 <!-- FIXME source: changed content from "account edit" -->
     <para>Wollen Sie stattdessen ein <emphasis>vorhandenes Konto bearbeiten</emphasis>, wählen Sie
-      <menuchoice>
-        <shortcut>
-        <keycombo>
-          <keycap>Strg</keycap><keycap>E</keycap>
-        </keycombo>
-        </shortcut> <guimenu><accel>B</accel>earbeiten</guimenu> <guimenuitem>Konto
-        <accel>b</accel>earbeiten</guimenuitem>
-      </menuchoice>
+      &mc.ed.acc-edit;
       oder klicken die <guibutton>Bearbeiten</guibutton> Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> des Fensters <quote>Konten</quote> an, woraufhin sich der
       Dialog <guilabel>Konto bearbeiten</guilabel> öffnet.
@@ -988,10 +952,7 @@
         verknüpfen falls es sich um ein Währungs-, Investmentfonds- oder Aktienkonto handelt.
         Weiterhin kann es als ein <xref linkend="acct-placeholder" />-Konto markiert werden und
         zusätzlich wird angezeigt, wenn es als <guilabel>Steuerrelevant</guilabel> gekennzeichnet
-        ist (was in dem<menuchoice>
-          <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>O</accel>ptionen
-          Steuerbericht</guimenuitem>
-        </menuchoice>-Dialog einzustellen ist).
+        ist (was in dem &mc.ed.tax-rep-opt;-Dialog einzustellen ist).
       </para>
 
       <figure pgwide="1">
@@ -1117,17 +1078,9 @@
           <listitem>
             <para><guilabel>Steuerrelevant</guilabel> bedeutet, dass das Konto ausgewählt wurde, um in einem
               Steuer-Bericht berücksichtigt zu werden. Dieses Kennzeichen wird hier nur angezeigt
-              und ist im Dialog <guilabel>Optionen Steuerbericht</guilabel> einzustellen (
-              <menuchoice>
-                <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>O</accel>ptionen
-                Steuerbericht</guimenuitem>
-              </menuchoice>
-              ). Der dazu gehörige Bericht ist im Menü
-              <menuchoice>
-                <guimenu>Be<accel>r</accel>ichte</guimenu><guimenuitem><accel>S</accel>teuer-Bericht
-                & Elster-Export</guimenuitem>
-              </menuchoice>
-              zu finden. Siehe auch <xref linkend="report-regional"/>.
+              und ist im Dialog <guilabel>Optionen Steuerbericht</guilabel> einzustellen (&mc.ed.tax-rep-opt;).
+              Der dazu gehörige Bericht ist im Menü &mc.rep.tax-xml; zu finden.
+              Siehe auch <xref linkend="report-regional"/>.
             </para>
           </listitem>
         </varlistentry>
@@ -1142,11 +1095,7 @@
               Wertpapier vor Jahren verkauft wurde.
             </para>
 
-            <para>Um diese Option zurückzusetzen, müssen Sie zunächst den
-              <menuchoice>
-                <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>F</accel>iltern
-                nach…</guimenuitem>
-              </menuchoice>
+            <para>Um diese Option zurückzusetzen, müssen Sie zunächst den &mc.vw.f-by;
               Dialog für den Kontenbaum öffnen und die Option <guilabel>Versteckte Konten
               anzeigen</guilabel> aktivieren. Auf diese Weise können Sie das Konto auswählen und
               diesen Dialog erneut öffnen.
@@ -1287,9 +1236,8 @@
       </figure>
 
       <para>Wenn Sie ihre &app;-Datei über einen längeren Zeitraum fortlaufend nutzen, können Sie mit Hilfe
-        des <xref linkend="tool-close-book" /> (<menuchoice>
-          <guimenu><accel>W</accel>erkzeug</guimenu><guimenuitem>Buch<accel>a</accel>bschluss</guimenuitem>
-        </menuchoice>) den Anfangsbestand automatisch berechnen lassen. Hierbei ist der Abschlußsaldo der vorherigen
+        des <xref linkend="tool-close-book" /> (&mc.to.cls-bok;) den Anfangsbestand automatisch
+        berechnen lassen. Hierbei ist der Abschlußsaldo der vorherigen
         Periode der Anfangsbestand der neuen Periode.
       </para>
 <!-- FIXME source: insert Link to "Guide" -->
@@ -1355,12 +1303,9 @@
   <sect1 id="chart-renumber">
     <title>Neunummerierung der Unterkonten</title>
 
-    <para>Verwenden Sie
-      <menuchoice>
-        <guimenu><accel>B</accel>earbeiten</guimenu> <guimenuitem>Unterkonten neu
-        <accel>n</accel>ummerieren…</guimenuitem>
-      </menuchoice>, um die Kontonummern für alle Unterkonten des aktuellen Kontos neu zu schreiben.
-      Sie haben zum Beispiel die folgende Kontostruktur:
+    <para>Verwenden Sie &mc.ed.acc-renum;, um die Kontonummern für alle Unterkonten
+      des aktuellen Kontos neu zu schreiben. Sie haben zum Beispiel die folgende
+      Kontostruktur:
     </para>
 
     <table frame="topbot" id="table-renumber1">
@@ -1676,11 +1621,7 @@
   <sect1 id="acct-cascade">
     <title>Kontoeigenschaften vererben</title>
 
-    <para>Mit dem Menübefehl
-      <menuchoice>
-        <guimenu><accel>B</accel>earbeiten</guimenu> <guimenuitem>Konto<accel>e</accel>igenschaften
-        vererben…</guimenuitem>
-      </menuchoice>
+    <para>Mit dem Menübefehl &mc.ed.acc-casc;
       in der Ansicht der Kontenhierarchie haben Sie die Möglichkeit, einige Eigenschaften auf das
       aktuell ausgewählte Konto und die dazugehörigen Unterkonten zu übertragen.
     </para>
@@ -1783,19 +1724,14 @@
     <title>Konto löschen</title>
 <!-- FIXME source: new behavior, it open a new dialog "account delete" -->
     <para>Wenn Sie ein Konto löschen wollen, dann können Sie dies in der Kontenhierarchie mit
-      <menuchoice>
-        <shortcut> <keycap>Entf</keycap> </shortcut> <guimenu><accel>B</accel>earbeiten</guimenu>
-        <guimenuitem>Konto <accel>l</accel>öschen…</guimenuitem>
-      </menuchoice>vornehmen oder Sie betätigen die <guibutton>Löschen</guibutton> Schaltfläche in der
+      &mc.ed.acc-del; vornehmen oder Sie betätigen die <guibutton>Löschen</guibutton> Schaltfläche in der
       <guilabel>Werkzeugleiste</guilabel> des Fensters <quote>Konten</quote>.
     </para>
 
     <tip>
       <para>Es empfiehlt sich, dass Sie vor dem Löschen eines Kontos die &app;-Datei speichern. Habe Sie aus
-        Versehen ein Konto gelöscht, so können Sie mit dem Befehl<menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu> <guimenuitem>Änderungen
-          ver<accel>w</accel>erfen</guimenuitem>
-        </menuchoice>sich aus der Bedrouille befreien. &app; bietet Ihnen dann in einem Dialog an, ob Sie die Änderungen
+        Versehen ein Konto gelöscht, so können Sie mit dem Befehl &mc.fi.rev; sich aus der Bedrouille
+        befreien. &app; bietet Ihnen dann in einem Dialog an, ob Sie die Änderungen
         verwerfen möchten und die Datei erneut laden wollen.
       </para>
     </tip>
@@ -2008,18 +1944,15 @@
         abgleichen, haben Sie die Möglichkeit, mit Hilfe des sich automatisch öffnenden
         <guilabel>Buchen</guilabel>-Dialogs eine Ãœberweisung zum Bezahlen der offenen Rechnung zu
         erfassen. Dieses Verhalten können Sie in den <guilabel>&app; Einstellungen</guilabel> im
-        Menü<menuchoice>
-          <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
-        </menuchoice>im Reiter <xref linkend="prefs-reg" /> durch betätigen des Kontrollkästchens
+        Menü &mc.ed.pref; im Reiter <xref linkend="prefs-reg" /> durch betätigen des Kontrollkästchens
         <guilabel>Automatische Kreditkartenbezahlung</guilabel> beeinflussen.
       </para>
     </note>
 
     <tip>
       <para>Das Fenster <guilabel>Abgleichen</guilabel> wird aus der Kontohierarchie oder dem Buchungsfenster
-        aufgerufen, indem Sie im Menü<menuchoice>
-          <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>A</accel>bgleichen…</guimenuitem>
-        </menuchoice>auswählen oder Sie verwenden die <guibutton>Abgleichen</guibutton> Schaltfläche in der
+        aufgerufen, indem Sie im Menü &mc.ac.rec; auswählen oder Sie verwenden die
+        <guibutton>Abgleichen</guibutton> Schaltfläche in der
         <guilabel>Werkzeugleiste</guilabel>.
       </para>
     </tip>
@@ -2110,10 +2043,8 @@
 
       <note>
         <para>Wenn Sie die Option <guilabel>Buchungsüberschriften aus Rechnungswesen</guilabel> in dem Abschnitt
-          <guilabel>Konten</guilabel> im &app; Menü<menuchoice>
-            <guimenu><accel>B</accel>earbeiten</guimenu>
-            <guimenuitem><accel>E</accel>instellungen</guimenuitem>
-          </menuchoice>aktiviert haben, werden die beiden Listenbereiche mit <guilabel>Soll</guilabel> und
+          <guilabel>Konten</guilabel> im &app; Menü &mc.ed.pref; aktiviert haben, werden die beiden
+          Listenbereiche mit <guilabel>Soll</guilabel> und
           <guilabel>Haben</guilabel> anstelle von <guilabel>Gutschrift</guilabel> und
           <guilabel>Belastung</guilabel> bezeichnet sein.
         </para>
@@ -2186,9 +2117,9 @@
       <tip>
         <para>Sie können alle Buchungen gleichzeit in einem der beiden Bereiche auswählen und als abgeglichen
           kennzeichnen, indem Sie auf eine Buchung im gewünschten Bereich klicken und dann die
-          Tastenkombination<keycombo action='simul'>
-            <keycap>Strg</keycap><keycap>A</keycap><keycap>Leertaste</keycap>
-          </keycombo>betätigen. Dies schaltet den Status des Abgleichs für alle Buchungen im Fensterbereich
+          Tastenkombination <keycombo action='simul'>
+            &kc.ctrl;<keycap>A</keycap>&kc.space;
+          </keycombo> betätigen. Dies schaltet den Status des Abgleichs für alle Buchungen im Fensterbereich
           gleichzeitig entweder auf markiert oder nicht markiert. Der Vorgang kann wiederholt
           werden, um den gewünschten Status für die Geschäftsvorgänge im Fensterbereich zu
           erreichen.
@@ -2270,17 +2201,10 @@
         geöffnet.
       </para>
 
-      <para>Wenn Sie den Abgleich bis zu einem späteren Zeitpunkt unterbechen wollen, wählen Sie im Menü<menuchoice>
-          <shortcut>
-          <keycombo>
-            <keycap>Strg</keycap><keycap>P</keycap>
-          </keycombo>
-          </shortcut>
-          <guimenu><accel>A</accel>bgleichen…</guimenu><guimenuitem><accel>U</accel>nterbrechen</guimenuitem>
-        </menuchoice>oder verwenden die Schaltfläche <guibutton>Unterbrechen</guibutton>. Zum Abbrechen des
-        Abgleichvorgangs verwenden Sie den Menüpunkt<menuchoice>
-          <guimenu><accel>A</accel>bgleichen…</guimenu><guimenuitem><accel>A</accel>bbrechen</guimenuitem>
-        </menuchoice>oder drücken Sie <guibutton>Abbrechen</guibutton>.
+      <para>Wenn Sie den Abgleich bis zu einem späteren Zeitpunkt unterbechen wollen, wählen Sie im Menü
+        &mc.rec.rec.pp; oder verwenden die Schaltfläche <guibutton>Unterbrechen</guibutton>. Zum Abbrechen des
+        Abgleichvorgangs verwenden Sie den Menüpunkt &mc.rec.rec.cnl; oder drücken Sie
+        <guibutton>Abbrechen</guibutton>.
       </para>
 <!-- FIXME source: delete sentence -->
       <para>Wählen Sie jeden nicht abgeglichenen Geschäftsvorgang, der sich auf dem Kontoauszug wiederfindet,
@@ -2289,14 +2213,7 @@
         gewählten Geschäftsvorgängen, bis am Ende der <guilabel>Schlusssaldo</guilabel> gleich
         dem <guilabel>abgeglichenem Saldo</guilabel> ist und die <guilabel>Differenz</guilabel> Null
         beträgt. Sobald dies erreicht ist, betätigen Sie die Schaltfläche
-        <guibutton>Fertig</guibutton> oder den Befehl<menuchoice>
-          <shortcut>
-          <keycombo>
-            <keycap>Strg</keycap><keycap>F</keycap>
-          </keycombo>
-          </shortcut>
-          <guimenu><accel>A</accel>bgleichen…</guimenu><guimenuitem><accel>F</accel>ertig</guimenuitem>
-        </menuchoice>um den Abgleich zu beenden.
+        <guibutton>Fertig</guibutton> oder den Befehl &mc.rec.rec.fin; um den Abgleich zu beenden.
       </para>
     </sect2>
   </sect1>
@@ -2611,10 +2528,8 @@
     <sect2 id="acct-export-xml">
       <title>Konten in ein neues &appname;-Buch exportieren</title>
 
-      <para>Mit dem Menüpunkt<menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu><guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem><accel>K</accel>onten
-          exportieren</guimenuitem>
-        </menuchoice>können Sie Ihre vollständige &app;-Kontenhierarchie in eine <acronym>XML</acronym>- oder
+      <para>Mit dem Menüpunkt &mc.fi.exp.acct; können Sie Ihre vollständige &app;-Kontenhierarchie
+        in eine <acronym>XML</acronym>- oder
         <acronym>SQLite3</acronym>-Datei oder auch in eine Datenbank exportieren. Mit dieser
         Funktion haben Sie die Möglichkeit z.B. am Ende eines Jahres einen Buchabschluss
         vorzunehmen und mit einer leeren &app;-Datei in das neue Jahr zu starten.
@@ -2698,9 +2613,8 @@
         </varlistentry>
       </variablelist>
 
-      <para>Die exportierte Datei kann über<menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu><guimenuitem>Ö<accel>f</accel>fnen</guimenuitem>
-        </menuchoice>in &app; geöffnet werden. Sie müssen dann noch für alle Konten manuell die Anfangsbestände
+      <para>Die exportierte Datei kann über &mc.fi.open; in &app; geöffnet werden. Sie müssen dann noch
+        für alle Konten manuell die Anfangsbestände
         eintragen.<tip>
           <para>Öffnen sie hierfür z.B. eine 2. Instanz von &app;, um die Schlussbilanz der alten Datei als
             Anfangsbestand in die neue Datei zu übertragen.
@@ -2718,10 +2632,8 @@
         Kontenstruktur zur Verfügung zu haben.
       </para>
 
-      <para>Hierzu wählen Sie im Menü<menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu><guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem>Konten<accel>h</accel>ierarchie
-          nach CSV exportieren…</guimenuitem>
-        </menuchoice>und es öffnet sich ein Dialog für die <guilabel>Export-Einstellungen</guilabel>.
+      <para>Hierzu wählen Sie im Menü &mc.fi.exp.acct-csv; und es öffnet sich ein Dialog für die
+        <guilabel>Export-Einstellungen</guilabel>.
       </para>
 
       <figure pgwide="1">
diff --git a/manual/de/ch_Business.xml b/manual/de/ch_Business.xml
index 75028688..f1013ccb 100644
--- a/manual/de/ch_Business.xml
+++ b/manual/de/ch_Business.xml
@@ -54,9 +54,7 @@
       <para>There are many different ways to set up a business account hierarchy. You can start with the
         Business Accounts setup which is available from the New Account Hierarchy assistant, or you
         could build one manually. To access the prebuilt Business Accounts, start &app; and click on
-        <menuchoice>
-          <guimenu>File</guimenu><guimenuitem>New File</guimenuitem>
-        </menuchoice>
+        &mc.fi.new;
         and proceed until you see the list of available accounts, select <emphasis>Business
         Accounts</emphasis>.
       </para>
@@ -105,18 +103,13 @@
 
       <para>The default tax table for new customers or new vendors can be specified in the <emphasis>Book
         Options </emphasis> window which can be accessed by
-        <menuchoice>
-          <guimenu>File</guimenu> <guisubmenu>Properties</guisubmenu>
-          <guimenuitem>Business</guimenuitem>
-        </menuchoice>
+        &mc.fi.new; <guilabel>Business</guilabel>
         tab.
       </para>
 
       <para>Tax Tables are maintained using the <emphasis>Sales Tax Table</emphasis> editor which is accessed
         via menu
-        <menuchoice>
-          <guimenu>Business</guimenu><guimenuitem>Sales Tax Table</guimenuitem>
-        </menuchoice>
+        &mc.bus.tax-tab;
         . The following fields should be entered:
       </para>
 
@@ -161,9 +154,7 @@
       <para>After you have built the account structure and defined your tax tables, register the &app; file as
         belonging to your company by filling in the data requested in the
         <xref linkend="business-book-options" /> accessible from the
-        <menuchoice>
-          <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
-        </menuchoice>
+        &mc.fi.new;
         menu item.
       </para>
     </sect2>
@@ -180,13 +171,9 @@
       <title>Business Preferences</title>
 
       <para>Set options on the Business tab of the &app; preferences, which is accessed via
-        <menuchoice>
-          <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-        </menuchoice>
+        &mc.ed.pref;
         (
-        <menuchoice>
-          <guimenu>GnuCash</guimenu><guimenuitem>Preferences</guimenuitem>
-        </menuchoice>
+        &mc.macOS.gc.pref;
         on &mac;). See <xref linkend="prefs-biz" />.
       </para>
     </sect2>
@@ -230,9 +217,7 @@
       </para>
 
       <para>Billing Terms are maintained using the Billing Terms Editor which is accessed via menu
-        <menuchoice>
-          <guimenu>Business</guimenu><guimenuitem>Billing Terms Editor</guimenuitem>
-        </menuchoice>
+        &mc.bus.bil-edit;
         . The following fields should be entered:
       </para>
 
@@ -357,9 +342,7 @@
     <para>The transactions generated by the A/R system are recorded within the <emphasis>Accounts
       Receivable</emphasis> account. You generally do not work directly with this account. You
       generally work with the four integrated &app; A/R application components available through the
-      <menuchoice>
-        <guimenu>Business</guimenu> <guisubmenu>Customer</guisubmenu>
-      </menuchoice>
+      &mc.bus.cus;
       sub-menu. These four components are:
     </para>
 
@@ -418,10 +401,7 @@
       <title>New</title>
 
       <para>To register a new customer, enter the menu
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu> <guimenuitem>New
-          Customer</guimenuitem>
-        </menuchoice>
+        &mc.bus.cus.new-cus;
         . Fill in customer information, such as Company Name, Address, Phone, Fax, etc. Below is a
         list of the other options:
       </para>
@@ -468,9 +448,7 @@
         <listitem>
           <para><guilabel>Billing Information - Terms</guilabel> - specifies the default billing terms for this
             customer. Billing terms must be preregistered using
-            <menuchoice>
-              <guimenu>Business</guimenu> <guimenuitem>Billing Terms Editor</guimenuitem>
-            </menuchoice>
+            &mc.bus.bil-edit;
             .
           </para>
         </listitem>
@@ -507,13 +485,9 @@
               <listitem>
                 <para><guilabel>Use Global</guilabel> means to use the setting made in the global preferences accessible
                   through
-                  <menuchoice>
-                    <guimenu>Edit</guimenu> <guimenuitem>Preferences</guimenuitem>
-                  </menuchoice>
+                  &mc.ed.pref;
                   (
-                  <menuchoice>
-                    <guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem>
-                  </menuchoice>
+                  &mc.macOS.gc.pref;
                   on &mac;).
                 </para>
               </listitem>
@@ -524,9 +498,7 @@
         <listitem>
           <para><guilabel>Billing Information - Tax Table</guilabel> - specifies a default tax table to apply to
             invoice line items. Tax tables must be registered from the
-            <menuchoice>
-              <guimenu>Business</guimenu> <guimenuitem>Tax Table Editor</guimenuitem>
-            </menuchoice>
+            &mc.bus.tax-tab;
             menu item.
           </para>
         </listitem>
@@ -544,10 +516,7 @@
       <title>Find and Edit</title>
 
       <para>To search for an existing customer, use the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu> <guimenuitem>Find
-          Customer</guimenuitem>
-        </menuchoice>
+        &mc.bus.cus.find-cus;
         window. You select a customer to <guilabel>View/Edit</guilabel> from the results of the
         search. This window is also used to look up customers when creating invoices and processing
         payments.
@@ -600,10 +569,7 @@
       <title>New</title>
 
       <para>To send an invoice to a customer you must first create a new invoice. To create an invoice use
-        <menuchoice>
-          <guimenu>Business</guimenu> <guisubmenu>Customer</guisubmenu><guimenuitem>New
-          Invoice</guimenuitem>
-        </menuchoice>
+        &mc.bus.cus.new-inv;
         . The New Invoice window must be filled in appropriately:
       </para>
 
@@ -684,10 +650,8 @@
         <note>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
-            override the calculated widths using the <guimenu>View</guimenu>><guimenuitem>Use as
-            Default Layout for Customer Documents</guimenuitem> and the calculated widths restored
-            as the default with <guimenu>View</guimenu>><guimenuitem>Reset Default Layout for
-            Customer Documents</guimenuitem>.
+            override the calculated widths using the &mc.vw.use-lay-cus; and the calculated widths restored
+            as the default with &mc.vw.res-lay-cus;.
           </para>
         </note>
       </para>
@@ -921,10 +885,7 @@
       <title>Find</title>
 
       <para>To find an existing invoice, use the
-        <menuchoice>
-          <guimenu>Business</guimenu> <guisubmenu>Customer</guisubmenu><guimenuitem>Find
-          Invoice</guimenuitem>
-        </menuchoice>
+        &mc.bus.cus.find-inv;
         menu item. From the results of the search, you can select an invoice to edit or view.
       </para>
 
@@ -960,9 +921,7 @@
       <title>Print</title>
 
       <para>After you post an invoice, you should print it and send it to your customer. To print an invoice use
-        <menuchoice>
-          <guimenu>File</guimenu> <guimenuitem>Print Invoice</guimenuitem>
-        </menuchoice>
+        &mc.fi.prin-inv;
         menu item.
       </para>
 
@@ -974,10 +933,7 @@
       </tip>
 
       <para>Invoices can also be printed from the main window by selecting
-        <menuchoice>
-          <guimenu>Reports</guimenu><guisubmenu>Business Reports</guisubmenu> <guimenuitem>Printable
-          Invoice</guimenuitem>
-        </menuchoice>
+        &mc.rep.bus.pnt-rep;
         from the main menu. The resulting report window states that no valid invoice is selected. To
         select the invoice to print:
       </para>
@@ -985,9 +941,7 @@
       <orderedlist>
         <listitem>
           <para>Use the <guibutton>Options</guibutton> <emphasis>Toolbar</emphasis> button or select
-            <menuchoice>
-              <guimenu>Edit</guimenu><guimenuitem>Report Options</guimenuitem>
-            </menuchoice>
+            &mc.ed.rep-opt;
             from the main menu.
           </para>
         </listitem>
@@ -1023,9 +977,7 @@
       </para>
 
       <para>You can change the starting invoice number if it is important you. Use
-        <menuchoice>
-          <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
-        </menuchoice>
+        &mc.fi.prop;
         , access the <guilabel>Counters</guilabel> tab, change the <guilabel>Invoice
         number</guilabel> value to be one less than your desired starting invoice number and click
         the <guibutton>OK</guibutton> button or the <guibutton>Apply</guibutton> button.
@@ -1043,10 +995,7 @@
     </para>
 
     <para>To use customer jobs, you must create them using the
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu> <guimenuitem>New
-        Job</guimenuitem>
-      </menuchoice>
+      &mc.bus.cus.new-job;
       menu item. You will see the <guilabel>New Job</guilabel> window. The editable fields are:
     </para>
 
@@ -1090,19 +1039,13 @@
     </itemizedlist>
 
     <para>To edit an existing customer job, use the
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu> <guimenuitem>Find
-        Job</guimenuitem>
-      </menuchoice>
+      &mc.bus.cus.find-job;
       menu item. Select the desired job in the search results, and click the <guilabel>View/Edit
       Job</guilabel> button.
     </para>
 
     <para>To select from the invoices and credit notes associated with a given job, use
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Customer</guisubmenu><guimenuitem>Find
-        Job</guimenuitem>
-      </menuchoice>
+      &mc.bus.cus.find-job;
       menu item. Select the desired job in the search results and click the <guilabel>View
       Invoices</guilabel> button. A window listing invoices and credit notes associated with this
       job appears. Select an invoice or credit note and click the <guilabel>View Invoice</guilabel>
@@ -1115,10 +1058,7 @@
 
     <para>Eventually, you will receive payment from your customers for outstanding invoices. To register these
       payments, use the Process Payment application found in
-      <menuchoice>
-        <guimenu>Business</guimenu> <guisubmenu>Customer</guisubmenu><guimenuitem>Process
-        Payment</guimenuitem>
-      </menuchoice>
+      &mc.bus.cus.pro-pay;
       .
     </para>
 
@@ -1292,18 +1232,14 @@
           register. This came with its own set of subtle issues. It is recommended to upgrade to the
           latest (or at least 2.6.6) version, which fixes a lot of small problems. Version 2.6.5 had
           a flaw in the logic cleaning up the lot links. Once upgraded, please run
-          <menuchoice>
-            <guimenu> Actions</guimenu><guimenuitem>Check & Repair</guimenuitem>
-          </menuchoice>
+          &mc.ac.chk-rep.acct;
           on your A/R and A/P accounts to clean up most of the lot link legacy. Don't forget to make
           a backup first just in case.
         </para>
 
         <para>Lots are used internally for relating payments to invoices. Lots themselves are invisible in the
           account registers. To see them you need to open the lot viewer, which can be found in
-          <menuchoice>
-            <guimenu>Actions</guimenu><guimenuitem>View lots </guimenuitem>
-          </menuchoice>
+          &mc.ac.vw-lots;
           while in any A/R or A/P account register. Select a lot to see the <emphasis>Splits in
           lot</emphasis>.
         </para>
@@ -1330,9 +1266,7 @@
     </para>
 
     <para>Use
-      <menuchoice>
-        <guimenu>File</guimenu><guimenuitem>Properties</guimenuitem>
-      </menuchoice>
+      &mc.fi.prop;
       to enter your Company information in the <guilabel>Business</guilabel> tab of the
       <guilabel>Book Options</guilabel> window. Some of the entered information is printed on the
       right side of invoices.
@@ -1340,9 +1274,7 @@
 
     <para>To add a customized background, heading banner or logo to invoices, modify the invoice style sheets.
       To do this, go to
-      <menuchoice>
-        <guimenu>Edit</guimenu> <guimenuitem>Style Sheets</guimenuitem>
-      </menuchoice>
+      &mc.ed.css;
       and select the <guibutton>New</guibutton> button in the <guilabel>Select HTML Style
       Sheet</guilabel> window that will appear.
     </para>
@@ -1395,9 +1327,7 @@
       credit these accounts and payments and credit memos debit these accounts. Generally you do not
       directly work with this account but use the four integrated &app; A/P application components.
       The A/P components are available from the
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu>
-      </menuchoice>
+      &mc.bus.ven;
       sub-menu.
     </para>
 
@@ -1445,10 +1375,7 @@
       <title>New</title>
 
       <para>To register a new vendor, select the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu> <guimenuitem>New
-          Vendor</guimenuitem>
-        </menuchoice>
+        &mc.bus.ven.new-ven;
         menu item. Fill in general information about the vendor, such as Company Name, Address,
         Phone, Fax, etc. Below is a list of the other options:
       </para>
@@ -1495,9 +1422,7 @@
         <listitem>
           <para><guilabel>Payment Information - Terms</guilabel> - specifies the default payment terms for this
             vendor. Payment terms must be preregistered using
-            <menuchoice>
-              <guimenu>Business</guimenu><guimenuitem>Billing Terms</guimenuitem>
-            </menuchoice>
+            &mc.bus.bil-edit;
             .
           </para>
         </listitem>
@@ -1522,13 +1447,9 @@
             <listitem>
               <para><guilabel>Use Global</guilabel> means to use the setting made in the global preferences accessible
                 through
-                <menuchoice>
-                  <guimenu>Edit</guimenu> <guimenuitem>Preferences</guimenuitem>
-                </menuchoice>
+                &mc.ed.pref;
                 (
-                <menuchoice>
-                  <guimenu>Gnucash</guimenu><guimenuitem>Preferences</guimenuitem>
-                </menuchoice>
+                &mc.macOS.gc.pref;
                 on &mac;).
               </para>
             </listitem>
@@ -1538,9 +1459,7 @@
         <listitem>
           <para><guilabel>Payment Information - Tax Table</guilabel> - specifies a default tax table to apply to
             bills from this vendor. Tax tables must be registered using the
-            <menuchoice>
-              <guimenu>Business</guimenu><guimenuitem>Tax Table</guimenuitem>
-            </menuchoice>
+            &mc.bus.tax-tab;
             menu item.
           </para>
         </listitem>
@@ -1551,10 +1470,7 @@
       <title>Find and Edit</title>
 
       <para>To search for an existing vendor, use the
-        <menuchoice>
-          <guimenu>Business</guimenu> <guisubmenu>Vendor</guisubmenu><guimenuitem>Find
-          Vendor</guimenuitem>
-        </menuchoice>
+        &mc.bus.ven.find-ven;
         window. You select a vendor to <guibutton>View/Edit</guibutton> from the results of the
         search. This window is also used to look up a vendor when entering bills and processing
         payments.
@@ -1608,10 +1524,7 @@
 
       <para>When you receive a bill from a vendor and want to enter it into &app;, you must create a new bill.
         To create a new bill use the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New
-          Bill</guimenuitem>
-        </menuchoice>
+        &mc.bus.ven.new-bil;
         menu item, and fill in the resulting window appropriately.
       </para>
 
@@ -1697,10 +1610,8 @@
         <note>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
-            override the calculated widths using the <guimenu>View</guimenu>><guimenuitem>Use as
-            Default Layout for Vendor Documents</guimenuitem> and the calculated widths restored as
-            the default with <guimenu>View</guimenu>><guimenuitem>Reset Default Layout for Vendor
-            Documents</guimenuitem>.
+            override the calculated widths using the &mc.vw.use-lay-ven; and the calculated widths restored as
+            the default with &mc.vw.res-lay-ven;.
           </para>
         </note>
       </para>
@@ -1859,10 +1770,7 @@
       <title>Find</title>
 
       <para>To find an existing bill, use the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>Find
-          Bill</guimenuitem>
-        </menuchoice>
+        &mc.bus.ven.find-bil;
         menu item. From the results of the search, you can select a bill to edit, or view.
       </para>
 
@@ -1889,9 +1797,7 @@
     </para>
 
     <para>To use vendor jobs, you must create them using the
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>New Job</guimenuitem>
-      </menuchoice>
+      &mc.bus.ven.new-job;
       menu item. You will see the <guilabel>New Job</guilabel> window. The editable fields are:
     </para>
 
@@ -1926,19 +1832,13 @@
     </itemizedlist>
 
     <para>To edit an existing vendor job, use the
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu> <guimenuitem>Find
-        Job</guimenuitem>
-      </menuchoice>
+      &mc.bus.ven.find-job;
       menu item. Select the desired job in the search results, and click the <guilabel>View/Edit
       Job</guilabel> button.
     </para>
 
     <para>To select from the bills and credit notes associated with a given job, use the
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu> <guimenuitem>Find
-        Job</guimenuitem>
-      </menuchoice>
+      &mc.bus.ven.find-job;
       menu item. Select the desired job in the search results and click the <guilabel>View
       Invoices</guilabel> button. A window listing bills and credit notes associated with this job
       appears. Select a bill or credit note and click the <guilabel>View Invoice</guilabel> button
@@ -1950,10 +1850,7 @@
     <title>Process Bill Payment</title>
 
     <para>Eventually, you need to pay your bills. To do so, use the Process Payment application found in
-      <menuchoice>
-        <guimenu>Business</guimenu><guisubmenu>Vendor</guisubmenu><guimenuitem>Process
-        Payment</guimenuitem>
-      </menuchoice>
+      &mc.bus.ven.pro-pay;
       .
     </para>
 
@@ -2067,10 +1964,7 @@
       <title>New Employee</title>
 
       <para>To register a new employee, select the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Employee</guisubmenu> <guimenuitem>New
-          Employee</guimenuitem>
-        </menuchoice>
+        &mc.bus.emp.new-emp;
         menu item. The <guilabel>New Employee</guilabel> window will open with two tabs:
       </para>
 
@@ -2133,9 +2027,7 @@
         <listitem>
           <para><guilabel>Payment Information - Terms</guilabel> (Optional) - specifies the default payment terms
             for this employee. Payment terms must be preregistered using
-            <menuchoice>
-              <guimenu>Business</guimenu><guimenuitem>Billing Terms</guimenuitem>
-            </menuchoice>
+            &mc.bus.bil-edit;
             .
           </para>
         </listitem>
@@ -2182,10 +2074,7 @@
       <title>Find and Edit</title>
 
       <para>To search for an existing employee, use the
-        <menuchoice>
-          <guimenu>Business</guimenu> <guisubmenu>Employee</guisubmenu><guimenuitem>Find
-          Employee...</guimenuitem>
-        </menuchoice>
+        &mc.bus.emp.find-emp;
         menu. You select an employee to <guibutton>View/Edit</guibutton> from the results of the
         search. This window is also used to look up an employee when entering voucher and processing
         payments.
@@ -2221,10 +2110,7 @@
       <title>New Expense Voucher/Credit Note</title>
 
       <para>To register a new expense voucher/ Credit Note, select the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Employee</guisubmenu> <guimenuitem>New Expense
-          Voucher...</guimenuitem>
-        </menuchoice>
+        &mc.bus.emp.new-exp-vou;
         menu item. The <guilabel>New Expense Voucher</guilabel> window will open. You can enter the
         following data:
       </para>
@@ -2320,10 +2206,7 @@
       <title>Find Expense Voucher/Credit Note</title>
 
       <para>To search for an existing Expense Voucher, use the
-        <menuchoice>
-          <guimenu>Business</guimenu> <guisubmenu>Employee</guisubmenu><guimenuitem>Find Expense
-          Voucher...</guimenuitem>
-        </menuchoice>
+        &mc.bus.emp.find-exp-vou;
         menu item. You select an Expense Voucher to <guibutton>View/Edit</guibutton> from the
         results of the search. This window is also used to look up an expense voucher when entering
         vouchers and processing payments.
@@ -2365,10 +2248,8 @@
         <note>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
-            override the calculated widths using the <guimenu>View</guimenu>><guimenuitem>Use as
-            Default Layout for Employee Documents</guimenuitem> and the calculated widths restored
-            as the default with <guimenu>View</guimenu>><guimenuitem>Reset Default Layout for
-            Employee Documents</guimenuitem>.
+            override the calculated widths using the &mc.vw.use-lay-emp; and the calculated widths restored
+            as the default with &mc.vw.res-lay-emp;.
           </para>
         </note>
       </para>
diff --git a/manual/de/ch_Customize.xml b/manual/de/ch_Customize.xml
index 38c1a27e..d1c22f99 100644
--- a/manual/de/ch_Customize.xml
+++ b/manual/de/ch_Customize.xml
@@ -44,13 +44,9 @@ Translators:
 
     <para>Im Fenster <guilabel>&appname;-Einstellungen</guilabel> können Sie das Verhalten Ihrer &app;
       Sitzung anpassen, indem Sie verschiedene Optionen einstellen. Wählen Sie aus dem &app; Menü
-      <menuchoice>
-        <guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem><accel>E</accel>instellungen</guimenuitem>
-      </menuchoice>
+      &mc.ed.pref;
       (
-      <menuchoice>
-        <guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem>
-      </menuchoice>
+      &mc.macOS.gc.pref;
       bei &mac;). Das Fenster <guilabel>&appname;-Einstellungen</guilabel> wird geöffnet. Wählen
       Sie auf der linken Seite die gewünschte Kategorie und nehmen Sie rechts die gewünschten
       Änderungen vor. Die Einstellungen in diesem Dialog werden pro Benutzer festgelegt und nicht
@@ -93,7 +89,7 @@ Translators:
       <title>Buchführungsperioden</title>
 
       <figure id="prefs-acct-period-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die
+        <title>Die &app;-&gmi.ed.pref; für die
           <guilabel>Buchführungsperioden</guilabel></title><screenshot id="Prefer_Accounting-Period">
           <mediaobject>
             <imageobject role="html">
@@ -222,7 +218,7 @@ Translators:
       <title>Konten</title>
 
       <figure id="prefs-acct-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Konten</guilabel></title><screenshot id="Prefer_Accounts">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Konten</guilabel></title><screenshot id="Prefer_Accounts">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Accnts.png" 
@@ -353,15 +349,7 @@ Translators:
 
           <listitem>
             <para>Mit dieser Option können Sie die Verwendung der Kontofarbe steuern, die unter
-              <menuchoice>
-                <shortcut>
-                <keycombo>
-                  <keycap>Strg</keycap><keycap>E</keycap>
-                </keycombo>
-                </shortcut><guimenu><accel>B</accel>earbeiten</guimenu><guimenuitem>Konto
-                <accel>b</accel>earbeiten</guimenuitem>
-              </menuchoice>
-              eingestellt wird.
+              &mc.ed.acc-edit; eingestellt wird.
             </para>
 
             <variablelist>
@@ -392,7 +380,7 @@ Translators:
       <title>Geschäft</title>
 
       <figure id="prefs-biz-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Geschäft</guilabel></title><screenshot id="Prefer_Business">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Geschäft</guilabel></title><screenshot id="Prefer_Business">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Business.png" 
@@ -508,17 +496,8 @@ Translators:
                     (<guilabel>Rechnungsausgang</guilabel> oder
                     <guilabel>Lieferantenrechnung</guilabel>) mit Brutto- oder Nettowerten arbeiten.
                     Gibt an, ob die Steuer standardmäßig in den Einträgen auf Rechnungen
-                    enthalten ist. Diese Einstellung wird in den Dialogen
-                    <menuchoice>
-                      <guimenu><accel>G</accel>eschäft</guimenu><guisubmenu><accel>K</accel>unden</guisubmenu><guimenuitem>
-                      <accel>N</accel>euer Kunde…</guimenuitem>
-                    </menuchoice>
-                    bzw.
-                    <menuchoice>
-                      <guimenu><accel>G</accel>eschäft</guimenu><guisubmenu><accel>L</accel>ieferant</guisubmenu><guimenuitem>
-                      <accel>N</accel>euer Lieferant…</guimenuitem>
-                    </menuchoice>
-                    verwendet.
+                    enthalten ist. Diese Einstellung wird in den Dialogen &mc.bus.cus.new-cus; bzw.
+                    &mc.bus.ven.new-ven; verwendet.
                   </para>
 
                   <note>
@@ -559,7 +538,7 @@ Translators:
       <title>Zahl, Datum, Zeit</title>
 
       <figure id="prefs-date-time-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für <guilabel>Zahl, Datum, Zeit</guilabel></title><screenshot id="Prefer_DateTime">
+        <title>Die &app;-&gmi.ed.pref; für <guilabel>Zahl, Datum, Zeit</guilabel></title><screenshot id="Prefer_DateTime">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_DateTime.png" 
@@ -744,7 +723,7 @@ Translators:
       <title>Allgemein</title>
 
       <figure id="prefs-general-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für alles <guilabel>Allgemein</guilabel>e</title><screenshot id="Prefer_General">
+        <title>Die &app;-&gmi.ed.pref; für alles <guilabel>Allgemein</guilabel>e</title><screenshot id="Prefer_General">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_General.png" 
@@ -800,16 +779,7 @@ Translators:
 
                 <listitem>
                   <para>Diese Option startet den Assistenten <guilabel>Neuen Kontenplan einrichten</guilabel>, wenn der
-                    Eintrag
-                    <menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>N</keycap>
-                      </keycombo>
-                      </shortcut> <guimenu><accel>D</accel>atei</guimenu>
-                      <guimenuitem><accel>N</accel>eue Datei</guimenuitem>
-                    </menuchoice>
-                    aus dem Menü ausgewählt wird.
+                    Eintrag &mc.fi.new; aus dem Menü ausgewählt wird.
                   </para>
                 </listitem>
               </varlistentry>
@@ -1022,7 +992,7 @@ Translators:
       <title>Import</title>
 
       <figure id="prefs-import-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für den <guilabel>Import</guilabel></title><screenshot id="Prefer_Import">
+        <title>Die &app;-&gmi.ed.pref; für den <guilabel>Import</guilabel></title><screenshot id="Prefer_Import">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Import.png"
@@ -1234,7 +1204,7 @@ Translators:
       <title>Onlinebanking</title>
 
       <figure id="prefs-online-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Onlinebanking</guilabel></title><screenshot id="Prefer_OnlineBanking">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Onlinebanking</guilabel></title><screenshot id="Prefer_OnlineBanking">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_OnlineBanking.png"
@@ -1323,7 +1293,7 @@ Translators:
       <title>Online Kurse</title>
 
       <figure id="prefs-quotes-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> die <guilabel>Online Kurse</guilabel></title><screenshot id="Prefer-online-quotes">
+        <title>Die &app;-&gmi.ed.pref; die <guilabel>Online Kurse</guilabel></title><screenshot id="Prefer-online-quotes">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Quotes.png"
@@ -1374,7 +1344,7 @@ Translators:
       <title>Drucken</title>
 
       <figure id="prefs-printing-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Drucken</guilabel></title><screenshot id="Prefer_Printing">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Drucken</guilabel></title><screenshot id="Prefer_Printing">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Printing.png"
@@ -1442,7 +1412,7 @@ Translators:
       <title>Kontobuch</title>
 
       <figure id="prefs-reg-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für das <guilabel>Kontobuch</guilabel></title><screenshot id="Prefer_Register">
+        <title>Die &app;-&gmi.ed.pref; für das <guilabel>Kontobuch</guilabel></title><screenshot id="Prefer_Register">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Register.png"
@@ -1476,12 +1446,12 @@ Translators:
 
                 <listitem>
                   <para>Wenn ausgewählt, wird der Cursor auf eine neue leere Buchung am Ende des Kontobuchs bewegt, nachdem
-                    der Benutzer die <keycap function="enter">Eingabetaste</keycap> drückt.
+                    der Benutzer die &kc.enter; drückt.
                     Andernfalls wird der Cursor eine Zeile nach unten bewegt.
                     <tip>
                       <para>Es wird empfohlen, innerhalb des Buchungssatzes mit den Tasten
                         <keycombo>
-                          <keycap function="shift"><optional>Umschalt</optional></keycap><keycap function="tab">Tab</keycap>
+                          &kc.opt-shift;<keycap function="tab">Tab</keycap>
                         </keycombo>
                         die Eingabemarkierung vor- und zurückzubewegen.
                       </para>
@@ -1514,7 +1484,7 @@ Translators:
                   </note>
 
                   <para>Wenn aktiviert, wird beim automatischen Ausfüllen der Buchung durch Drücken der
-                    <keycap function="tab">Tab</keycap>-Taste im Kontobuch der Cursor in das
+                    &kc.tab;-Taste im Kontobuch der Cursor in das
                     <guilabel>Buchen</guilabel> Feld springen. Ansonsten bewegt sich der
                     Eingabefokus in das Feld <guilabel>Soll</guilabel>/
                     <guilabel>Einzahlung</guilabel> oder <guilabel>Haben</guilabel>/
@@ -1659,7 +1629,7 @@ Translators:
       <title>Voreinstellungen Kontobuch</title>
 
       <figure id="prefs-reg-def-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> der <guilabel>Voreinstellungen
+        <title>Die &app;-&gmi.ed.pref; der <guilabel>Voreinstellungen
           Kontobuch</guilabel></title><screenshot id="Prefer_RegisterDefaults">
           <mediaobject>
             <imageobject role="html">
@@ -1788,7 +1758,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Berichte</title>
 
       <figure id="prefs-reports-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Berichte</guilabel></title><screenshot id="Prefer_Reports">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Berichte</guilabel></title><screenshot id="Prefer_Reports">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Reports.png"
@@ -1881,7 +1851,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Terminierte Buchungen</title>
 
       <figure id="prefs-sched-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für <guilabel>Terminierte Buchungen</guilabel></title><screenshot id="Prefer_ScheduledTransactions">
+        <title>Die &app;-&gmi.ed.pref; für <guilabel>Terminierte Buchungen</guilabel></title><screenshot id="Prefer_ScheduledTransactions">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Sched.png"
@@ -2000,7 +1970,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
       <title>Fenster</title>
 
       <figure id="prefs-windows-fig">
-        <title>Die &app;-<guimenuitem>Einstellungen</guimenuitem> für die <guilabel>Fenster</guilabel></title><screenshot id="Prefer_Windows">
+        <title>Die &app;-&gmi.ed.pref; für die <guilabel>Fenster</guilabel></title><screenshot id="Prefer_Windows">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/Pref_Windows.png"
@@ -2137,15 +2107,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
   <sect1 id="book-options">
     <title>Buch Einstellungen</title>
 
-    <para>Die
-      <menuchoice>
-        <shortcut>
-        <keycombo>
-          <keycap>Alt</keycap><keycap function="enter">Eingabe</keycap>
-        </keycombo>
-        </shortcut>
-        <guimenu><accel>D</accel>atei</guimenu><guimenuitem><accel>E</accel>igenschaften</guimenuitem>
-      </menuchoice>
+    <para>Die &mc.fi.prop;
       können dazu genutzt werden, um Optionen festzulegen oder zu ändern, die sich auf die
       Funktionsweise einer bestimmten &app; Datei (auch als Buch bezeichnet) beziehen. Wenn Sie
       diesen Menüpunkt auswählen, wird der Dialog <guilabel>Buch-Optionen</guilabel> aufgerufen.
@@ -2422,10 +2384,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
 
       <para>Auf dem Reiter <guilabel>Geschäft</guilabel> können Sie Werte eingeben, die vornehmlich von den
         Geschäftsfunktionen von &app; verwendet werden. Sinnvoll ist es in diesem Zusammenhang,
-        wenn Sie unter
-        <menuchoice>
-          <guimenu><accel>G</accel>eschäft</guimenu><guimenuitem>USt.-<accel>S</accel>teuertabelle…</guimenuitem>
-        </menuchoice>
+        wenn Sie unter &mc.bus.tax-tab;
         die Tabelle ihrer Verkaufssteuern definieren. Aber auch in einigen privaten Berichten kann
         es sich gut machen, z.B. als <quote>Firmenname</quote> seinen Namen einzusetzen:
       </para>
@@ -2636,12 +2595,8 @@ Scrolling to older transactions is not possible. If you want to see all entries
 
     <para>&app; verfügt über mehrere Standardformatvorlagen für Berichte. Diese Stilvorlagen können mit
       dem <acronym>HTML</acronym>-Stilvorlagen Editor an Ihre Bedürfnisse angepasst oder um neue
-      Vorlagen ergänzt werden. Um den Editor aufzurufen, gehen Sie im Menü zu
-      <menuchoice>
-        <guimenu><accel>B</accel>earbeiten</guimenu>
-        <guimenuitem>Stil<accel>v</accel>orlagen</guimenuitem>
-      </menuchoice>
-      . Es stehen diese Vorlagen zur Verfügung:
+      Vorlagen ergänzt werden. Um den Editor aufzurufen, gehen Sie im Menü zu &mc.ed.css;. Es
+      stehen diese Vorlagen zur Verfügung:
       <itemizedlist>
         <listitem>
           <para><guilabel>Voreinstellung</guilabel>, als Standardvorgabe
@@ -3430,12 +3385,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
      localized taxtable describe the options, which your report requires.  -->
     <para>The <guilabel>Income Tax Information</guilabel> dialog is used to set Tax Report Options. The
       settings on accounts in this dialog are used by the <acronym>TXF</acronym> Export function in
-      reports to select the accounts for export. To access this dialog go to
-      <menuchoice>
-        <guimenu><accel>E</accel>dit</guimenu> <guimenuitem>Ta<accel>x</accel> Report
-        Options</guimenuitem>
-      </menuchoice>
-      .
+      reports to select the accounts for export. To access this dialog go to &mc.ed.tax-rep-opt;.
     </para>
 
     <tip>
@@ -3444,11 +3394,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
         arrow and select <guilabel>Tax Info</guilabel> check box). The <guilabel>Tax Info</guilabel>
         column will display the Form/Schedule and tax category (e.g., <guilabel>Schedule D Dividend,
         cap gain distrib.</guilabel>) assigned to an account, if any. Alternatively, it will display
-        the following error messages which can be corrected through
-        <menuchoice>
-          <guimenu>Edit</guimenu> <guimenuitem>Tax Report Options</guimenuitem>
-        </menuchoice>
-        :
+        the following error messages which can be corrected through &mc.ed.tax-rep-opt;:
         <itemizedlist>
           <listitem>
             <para>Tax-related but has no tax code
@@ -3759,11 +3705,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
       Kontrollkästchen mit den Bezeichnungen <guilabel>Antwort speichern und nicht wieder
       anzeigen</guilabel> und <guilabel>Antwort speichern und in dieser Sitzung nicht wieder
       anzeigen </guilabel> erlauben das Deaktivieren der Warnungen. Mit dem Menüeintrag
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>W</accel>arnungen
-        zurücksetzen…</guimenuitem>
-      </menuchoice>
-      öffnet sich ein Dialog, der die von Ihnen deaktivierten Warnung auflistet.
+      &mc.ac.res-warn; öffnet sich ein Dialog, der die von Ihnen deaktivierten Warnung auflistet.
     </para>
 
     <figure id="reset-warning-fig">
@@ -3865,9 +3807,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <listitem>
           <para>Wenn Sie eine andere als die automatisch gewählte Übersetzung verwenden möchten, können Sie
             unter
-            <menuchoice>
-              <guimenu>System Settings</guimenu><guimenuitem>Language and Region</guimenuitem>
-            </menuchoice>
+            &mc.macOS.sys.gen.lang;
             eine andere Sprache einstellen.
           </para>
         </listitem>
@@ -3877,10 +3817,7 @@ Scrolling to older transactions is not possible. If you want to see all entries
         <term>&win;</term>
 
         <listitem>
-          <para><menuchoice>
-              <guimenu>Start</guimenu><guisubmenu>Einstellungen</guisubmenu><guisubmenu>Zeit &
-              Sprache</guisubmenu><guimenuitem>Region</guimenuitem>
-            </menuchoice>
+          <para>&mc.winOS.pref.lang.local;
             und stellen dann das Gebietsschema ein.
           </para>
         </listitem>
diff --git a/manual/de/ch_Finance-Quote.xml b/manual/de/ch_Finance-Quote.xml
index 5cc262c0..cc8e54a5 100644
--- a/manual/de/ch_Finance-Quote.xml
+++ b/manual/de/ch_Finance-Quote.xml
@@ -99,7 +99,7 @@ This is perl 5, version 30, subversion 0 (v5.30.0) built for x86_64-linux-gnu-th
       <title>Unter &win;</title>
 
       <step>
-        <para>Unter &win; führen Sie das Programm &mc.start.win-install-fq; aus. Dies
+        <para>Unter &win; führen Sie das Programm &mc.winOS.inst-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
@@ -246,7 +246,7 @@ SYNOPSIS
       </step>
 
       <step>
-        <simpara>Führen Sie &mc.start.win-install-fq; aus. Dies ist ein kleines Hilfsprogramm,
+        <simpara>Führen Sie &mc.winOS.inst-fq; aus. Dies ist ein kleines Hilfsprogramm,
           das &app-fq; für Sie installiert.
         </simpara>
       </step>
@@ -270,7 +270,7 @@ SYNOPSIS
 
       <step>
         <simpara>Öffnen Sie ein <application>CMD</application>- oder <application>Powershell
-          </application>-Fenster: Klicken Sie auf <guimenu>Start</guimenu>
+          </application>-Fenster: Klicken Sie auf &gm.win;
           und geben Sie entweder <userinput>cmd</userinput> oder <userinput>powershell</userinput>
           ein und wählen Sie den entsprechenden Menüpunkt. Das muss nicht als Administrator ausgeführt werden.
         </simpara>
@@ -348,7 +348,7 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
           die Abhängigkeiten zu weiteren Softwarepaketen auf.
           <note>
             <para>Windows-Benutzer sind im Allgemeinen besser beraten, wenn sie das Update-Tool
-              &mc.start.win-install-fq; ausführen.
+              &mc.winOS.inst-fq; ausführen.
             </para>
           </note>
         </para>
@@ -487,7 +487,7 @@ BEGIN failed--compilation aborted at (eval 303) line 1.
       Fensters vor dem <quote>-</quote> angezeigt wird.
       <tip>
         <para>Der Dateiname ist auch in der Liste der zuletzt geöffneten Dateien im
-          <guimenu>Datei</guimenu>-Menü zu finden. Wenn Sie den Mauszeiger über dem Menüeintrag
+          &gm.file;-Menü zu finden. Wenn Sie den Mauszeiger über dem Menüeintrag
           mit der Nummer 1 in der Liste der zuletzt geöffneten Dateien platzieren, wird in der
           <guilabel>Statusleiste</guilabel> die vollständige Dateibezeichnung angezeigt.
         </para>
@@ -544,15 +544,13 @@ gnucash-cli --quotes get &user-datafile; > /dev/null 2>&1</screen>
 
         <step>
           <simpara>Wählen Sie
-            <menuchoice>
-              <guimenu>Start</guimenu><guisubmenu>Systemsteuerung</guisubmenu><guimenuitem>Aufgabenplanung</guimenuitem>
-            </menuchoice>
+            &mc.winOS.sys.tasks;
             .
           </simpara>
         </step>
 
         <step>
-          <simpara>Klicken Sie auf <guimenuitem>Aufgabe erstellen</guimenuitem>.
+          <simpara>Klicken Sie auf &gmi.winOS.sys.task;.
           </simpara>
         </step>
 
diff --git a/manual/de/ch_GUIMenus.xml b/manual/de/ch_GUIMenus.xml
index 450afb7e..129deb85 100644
--- a/manual/de/ch_GUIMenus.xml
+++ b/manual/de/ch_GUIMenus.xml
@@ -156,21 +156,13 @@
 
     <tip>
       <para>Um eine zusätzliche Ansicht der Kontenübersicht zu öffnen, gehen Sie auf
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu> <guimenuitem>Neue
-          <accel>K</accel>ontenübersicht</guimenuitem>
-        </menuchoice>
-        . Dadurch wird eine weitere Kontenübersicht im bestehenden Fenster geöffnet.
+        &mc.vw.new-page;. Dadurch wird eine weitere Kontenübersicht im bestehenden Fenster geöffnet.
       </para>
     </tip>
 
     <tip>
       <para>Um ein neues Fenster mit der Kontenübersicht zu öffnen, gehen Sie zu
-        <menuchoice>
-          <guimenu><accel>F</accel>enster</guimenu> <guimenuitem>Neues Fenster mit
-          <accel>S</accel>eite</guimenuitem>
-        </menuchoice>
-        .
+        &mc.win.page;.
       </para>
     </tip>
   </sect1>
@@ -194,7 +186,7 @@
     </para>
 
     <sect2 id="gui-window-file-menu">
-      <title><guimenu><accel>D</accel>atei</guimenu>-Menü</title>
+      <title>&gm.file;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-FileMenu">
         <title>Datei-Menü - Zugriff auf Datei- und Kontenoperation sowie Druckfunktion</title>
@@ -225,13 +217,7 @@
           <tbody>
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>N</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem><accel>N</accel>eue Datei</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.new;
                 </para>
               </entry>
 
@@ -244,13 +230,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>O</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem>Ö<accel>f</accel>fnen…</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.open;
                 </para>
               </entry>
 
@@ -262,9 +242,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>I</accel>mportieren</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.fi.imp;
                 </para>
               </entry>
 
@@ -276,7 +254,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>R</accel>echnungen importieren…</guimenuitem>
+                <para>&gmi.fi.imp.bill-inv;
                 </para>
               </entry>
 
@@ -289,7 +267,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>K</accel>onten importiern</guimenuitem>
+                <para>&gmi.fi.imp.acct-csv;
                 </para>
               </entry>
 
@@ -302,7 +280,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>B</accel>uchungen importieren von CSV…</guimenuitem>
+                <para>&gmi.fi.imp.tran-csv;
                 </para>
               </entry>
 
@@ -315,7 +293,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>K<accel>u</accel>rse aus CSV-Datei importieren…</guimenuitem>
+                <para>&gmi.fi.imp.pri-csv;
                 </para>
               </entry>
 
@@ -328,7 +306,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>K<accel>u</accel>nden und Lieferanten importieren …</guimenuitem>
+                <para>&gmi.fi.imp.cust-ven;
                 </para>
               </entry>
 
@@ -340,7 +318,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>Q</accel>IF-Datei importieren…</guimenuitem>
+                <para>&gmi.fi.imp.QIF;
                 </para>
               </entry>
 
@@ -352,7 +330,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Einträge aus <accel>L</accel>ogdatei einspielen…</guimenuitem>
+                <para>&gmi.fi.imp.repl;
                 </para>
               </entry>
 
@@ -365,7 +343,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>O</accel>FX/QFX importieren…</guimenuitem>
+                <para>&gmi.fi.imp.OFX;
                 </para>
               </entry>
 
@@ -377,7 +355,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>M</accel>T940 importieren</guimenuitem>
+                <para>&gmi.fi.imp.mt940;
                 </para>
               </entry>
 
@@ -389,7 +367,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>MT94<accel>2</accel> importieren</guimenuitem>
+                <para>&gmi.fi.imp.mt942;
                 </para>
               </entry>
 
@@ -401,7 +379,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>D</accel>TAUS importieren</guimenuitem>
+                <para>&gmi.fi.imp.dtaus;
                 </para>
               </entry>
 
@@ -422,7 +400,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>DTAUS importieren und <accel>s</accel>enden</guimenuitem>
+                <para>&gmi.fi.imp.dtaus-sen;
                 </para>
               </entry>
 
@@ -435,13 +413,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Umschalt</keycap><keycap>Strg</keycap><keycap>S</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem>Speichern <accel>u</accel>nter…</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.save_as;
                 </para>
               </entry>
 
@@ -458,9 +430,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guimenuitem>Änderungen ver<accel>w</accel>erfen</guimenuitem>
-                  </menuchoice>
+                <para>&gmi.fi.rev;
                 </para>
               </entry>
 
@@ -474,13 +444,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Umschalt</keycap><keycap>Strg</keycap><keycap>P</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem>Seite ein<accel>r</accel>ichten…</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.page;
                 </para>
               </entry>
 
@@ -492,9 +456,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.fi.exp;
                 </para>
               </entry>
 
@@ -506,7 +468,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guisubmenu>Konten<accel>h</accel>ierarchie nach CSV exportieren…</guisubmenu>
+                <para>&gmi.fi.exp.acct-csv;
                 </para>
               </entry>
 
@@ -519,7 +481,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guisubmenu><accel>B</accel>uchungen nach CSV exportieren…</guisubmenu>
+                <para>&gmi.fi.exp.tran-csv;
                 </para>
               </entry>
 
@@ -531,7 +493,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guisubmenu><accel>A</accel>ktives Kontobuch als CSV-Datei exportieren…</guisubmenu>
+                <para>&gmi.fi.exp.regi-csv;
                 </para>
               </entry>
 
@@ -543,7 +505,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guisubmenu><accel>K</accel>onten exportieren</guisubmenu>
+                <para>&gmi.fi.exp.acct;
                 </para>
               </entry>
 
@@ -555,13 +517,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Alt</keycap><keycap function="enter">Eingabe</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem><accel>E</accel>igenschaften</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.prop;
                 </para>
               </entry>
 
@@ -573,7 +529,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Zuletzt geöffnete Dateien</guimenuitem>
+                <para>&gmi.fi.mru;
                 </para>
               </entry>
 
@@ -585,13 +541,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>W</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem>S<accel>c</accel>hließen</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.cls;
                 </para>
               </entry>
 
@@ -608,13 +558,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>Q</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem><accel>B</accel>eenden</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.fi.quit;
                 </para>
               </entry>
 
@@ -629,7 +573,7 @@
     </sect2>
 
     <sect2 id="gui-window-edit-menu">
-      <title><guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
+      <title>&gm.edit;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-EditMenu">
         <title>Bearbeiten-Menü - Bearbeitungsfunktionen für Dateien und Konten sowie Einstellungen</title>
@@ -654,9 +598,7 @@
           <tbody>
             <row>
               <entry>
-                <para><menuchoice>
-                    <guimenuitem>Als <accel>Z</accel>ahlung zuweisen…</guimenuitem>
-                  </menuchoice>
+                <para>&gmi.ed.pay-asng;
                 </para>
               </entry>
 
@@ -668,9 +610,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guimenuitem>Zahlung bearbeiten</guimenuitem>
-                  </menuchoice>
+                <para>&gmi.ed.pay-edit;
                 </para>
               </entry>
 
@@ -682,13 +622,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>F</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem><accel>S</accel>uchen…</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.ed.find;
                 </para>
               </entry>
 
@@ -701,11 +635,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>E</accel>instellungen</guimenuitem> (
-                  <menuchoice>
-                    <guimenu>GnuCash</guimenu><guimenuitem>Einstellungen</guimenuitem>
-                  </menuchoice>
-                  bei &mac;).
+                <para>&gmi.ed.pref; (&mc.macOS.gc.pref; bei &mac;).
                 </para>
               </entry>
 
@@ -718,7 +648,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Stil<accel>v</accel>orlagen</guimenuitem>
+                <para>&gmi.ed.css;
                 </para>
               </entry>
 
@@ -730,7 +660,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>O</accel>ptionen Steuerbericht</guimenuitem>
+                <para>&gmi.ed.rep-opt;
                 </para>
               </entry>
 
@@ -746,7 +676,7 @@
     </sect2>
 
     <sect2 id="gui-window-view-menu">
-      <title><guimenu><accel>A</accel>nsicht</guimenu>-Menü</title>
+      <title>&gm.view;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ViewMenu">
         <title>Ansicht-Menü - Ändern der Ansicht der Kontenübersicht</title>
@@ -771,7 +701,7 @@
           <tbody>
             <row>
               <entry>
-                <para><guimenuitem><accel>W</accel>erkzeugleiste</guimenuitem>
+                <para>&gmi.vw.tbar;
                 </para>
               </entry>
 
@@ -783,7 +713,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>Z</accel>usammenfassungsleiste</guimenuitem>
+                <para>&gmi.vw.sum;
                 </para>
               </entry>
 
@@ -795,7 +725,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>S<accel>t</accel>atusleiste</guimenuitem>
+                <para>&gmi.vw.stat;
                 </para>
               </entry>
 
@@ -807,13 +737,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>R</keycap>
-                    </keycombo>
-                    </shortcut> <guimenuitem>Aktualisie<accel>r</accel>en</guimenuitem>
-                  </menuchoice>
+                <para>&mc-gmi.vw.ref;
                 </para>
               </entry>
 
@@ -825,7 +749,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Neue <accel>K</accel>ontenübersicht</guimenuitem>
+                <para>&gmi.vw.new-page;
                 </para>
               </entry>
 
@@ -840,7 +764,7 @@
     </sect2>
 
     <sect2 id="gui-window-actions-menu">
-      <title><guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
+      <title>&gm.act;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ActionsMenu">
         <title>Aktionen-Menü - Anlegen terminierter Buchungen, Überprüfen von Konten, Durchführen
@@ -872,10 +796,7 @@
           <tbody>
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>O</accel>nline
-                    Aktionen</guisubmenu><guimenuitem></guimenuitem>
-                  </menuchoice>
+                <para>&mc-gsm.ac.onli;
                 </para>
               </entry>
 
@@ -894,11 +815,7 @@
 
                 <important>
                   <para>Die Menüeinträge werden erst nach dem vollständigen Bearbeiten von
-                    <menuchoice>
-                      <guimenu><accel>W</accel>erkzeug</guimenu><guimenuitem><accel>O</accel>nlinebanking
-                      Einrichtung…</guimenuitem>
-                    </menuchoice>
-                    aktiviert.
+                    &mc.to.aqb; aktiviert.
                   </para>
                 </important>
 
@@ -911,7 +828,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>S</accel>aldenabfrage…</guimenuitem>
+                <para>&gmi.ac.onli.get-bal;
                 </para>
               </entry>
 
@@ -923,7 +840,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Abfrage Konto<accel>u</accel>msätze…</guimenuitem>
+                <para>&gmi.ac.onli.get-tr;
                 </para>
               </entry>
 
@@ -945,7 +862,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>SEPA <accel>E</accel>inzelüberweisung…</guimenuitem>
+                <para>&gmi.ac.onli.sepa-tr;
                 </para>
               </entry>
 
@@ -957,7 +874,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>I</accel>nterne Umbuchung…</guimenuitem>
+                <para>&gmi.ac.onli.int-tr;
                 </para>
               </entry>
 
@@ -988,7 +905,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Verlaufs<accel>f</accel>enster anzeigen</guimenuitem>
+                <para>&gmi.ac.onli.log;
                 </para>
               </entry>
 
@@ -1001,9 +918,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu>Term<accel>i</accel>nierte Buchungen</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.ac.scd;
                 </para>
               </entry>
 
@@ -1014,7 +929,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Terminierte Buchungen <accel>E</accel>ditor…</guimenuitem>
+                <para>&gmi.ac.scd.tr-ed;
                 </para>
               </entry>
 
@@ -1027,7 +942,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Seit <accel>l</accel>etztem Aufruf…</guimenuitem>
+                <para>&gmi.ac.scd.slr;
                 </para>
               </entry>
 
@@ -1040,7 +955,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>H</accel>ypothek & Darlehen Assistent…</guimenuitem>
+                <para>&gmi.ac.scd.loan;
                 </para>
               </entry>
 
@@ -1053,9 +968,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu>B<accel>u</accel>dget</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.ac.bgt;
                 </para>
               </entry>
 
@@ -1066,7 +979,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>N</accel>eues Budget</guimenuitem>
+                <para>&gmi.ac.bgt.new;
                 </para>
               </entry>
 
@@ -1078,7 +991,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Budget <accel>ö</accel>ffnen</guimenuitem>
+                <para>&gmi.ac.bgt.open;
                 </para>
               </entry>
 
@@ -1092,7 +1005,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Budget <accel>k</accel>opieren</guimenuitem>
+                <para>&gmi.ac.bgt.copy;
                 </para>
               </entry>
 
@@ -1107,7 +1020,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Budget <accel>l</accel>öschen</guimenuitem>
+                <para>&gmi.ac.bgt.del;
                 </para>
               </entry>
 
@@ -1121,7 +1034,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>W</accel>arnungen zurücksetzen…</guimenuitem>
+                <para>&gmi.ac.res-warn;
                 </para>
               </entry>
 
@@ -1143,7 +1056,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Seite umbe<accel>n</accel>ennen</guimenuitem>
+                <para>&gmi.ac.re-pg;
                 </para>
               </entry>
 
@@ -1158,7 +1071,7 @@
     </sect2>
 
     <sect2 id="gui-window-business-menu">
-      <title><guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
+      <title>&gm.bus;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-BusinessMenu">
         <title>Geschäft-Menü - &app;-Funktionen für Kleinunternehmen</title>
@@ -1189,9 +1102,7 @@
           <tbody>
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>K</accel>unde</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.bus.cus;
                 </para>
               </entry>
 
@@ -1203,7 +1114,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Kundenübersicht</guimenuitem>
+                <para>&gmi.bus.cus.o-view;
                 </para>
               </entry>
 
@@ -1215,7 +1126,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>N</accel>euer Kunde…</guimenuitem>
+                <para>&gmi.bus.cus.new-cus;
                 </para>
               </entry>
 
@@ -1227,7 +1138,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>K</accel>unde suchen…</guimenuitem>
+                <para>&gmi.bus.cus.find-cus;
                 </para>
               </entry>
 
@@ -1239,7 +1150,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>N<accel>e</accel>ue Rechnung…</guimenuitem>
+                <para>&gmi.bus.cus.new-inv;
                 </para>
               </entry>
 
@@ -1251,7 +1162,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>R</accel>echnung suchen…</guimenuitem>
+                <para>&gmi.bus.cus.find-inv;
                 </para>
               </entry>
 
@@ -1263,7 +1174,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Ne<accel>u</accel>er Auftrag…</guimenuitem>
+                <para>&gmi.bus.cus.new-job;
                 </para>
               </entry>
 
@@ -1275,7 +1186,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>uftrag suchen…</guimenuitem>
+                <para>&gmi.bus.cus.find-job;
                 </para>
               </entry>
 
@@ -1287,7 +1198,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>Z</accel>ahlung verarbeiten…</guimenuitem>
+                <para>&gmi.bus.cus.pro-pay;
                 </para>
               </entry>
 
@@ -1300,7 +1211,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Erinnerungen an <accel>f</accel>ällige Rechnungen</guimenuitem>
+                <para>&gmi.bus.cus.inv-due-rem;
                 </para>
               </entry>
 
@@ -1312,9 +1223,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>L</accel>ieferant</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.bus.ven;
                 </para>
               </entry>
 
@@ -1326,7 +1235,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Lieferantenübersicht</guimenuitem>
+                <para>&gmi.bus.ven.o-view;
                 </para>
               </entry>
 
@@ -1338,7 +1247,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>N</accel>euer Lieferant…</guimenuitem>
+                <para>&gmi.bus.ven.new-ven;
                 </para>
               </entry>
 
@@ -1350,7 +1259,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>L</accel>ieferant suchen…</guimenuitem>
+                <para>&gmi.bus.ven.find-ven;
                 </para>
               </entry>
 
@@ -1362,7 +1271,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>N<accel>e</accel>ue Lieferantenrechnung…</guimenuitem>
+                <para>&gmi.bus.ven.new-bil;
                 </para>
               </entry>
 
@@ -1374,7 +1283,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Lieferanten<accel>r</accel>echnung suchen…</guimenuitem>
+                <para>&gmi.bus.ven.find-bil;
                 </para>
               </entry>
 
@@ -1386,7 +1295,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Ne<accel>u</accel>er Auftrag…</guimenuitem>
+                <para>&gmi.bus.ven.new-job;
                 </para>
               </entry>
 
@@ -1398,7 +1307,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>uftrag suchen…</guimenuitem>
+                <para>&gmi.bus.ven.find-job;
                 </para>
               </entry>
 
@@ -1410,7 +1319,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>Z</accel>ahlung verarbeiten…</guimenuitem>
+                <para>&gmi.bus.ven.pro-pay;
                 </para>
               </entry>
 
@@ -1423,7 +1332,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Erinnerungen an <accel>f</accel>ällige Rechnungen</guimenuitem>
+                <para>&gmi.bus.ven.bil-due-rem;
                 </para>
               </entry>
 
@@ -1435,9 +1344,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>M</accel>itarbeiter</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.bus.emp;
                 </para>
               </entry>
 
@@ -1449,7 +1356,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Mitarbeiterüber<accel>s</accel>icht</guimenuitem>
+                <para>&gmi.bus.emp.o-view;
                 </para>
               </entry>
 
@@ -1461,7 +1368,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>N</accel>euer Mitarbeiter…</guimenuitem>
+                <para>&gmi.bus.emp.new-emp;
                 </para>
               </entry>
 
@@ -1474,7 +1381,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>M</accel>itarbeiter suchen…</guimenuitem>
+                <para>&gmi.bus.emp.find-emp;
                 </para>
               </entry>
 
@@ -1486,7 +1393,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Neue Auslagen<accel>e</accel>rstattung…</guimenuitem>
+                <para>&gmi.bus.emp.new-exp-vou;
                 </para>
               </entry>
 
@@ -1498,7 +1405,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>uslagenerstattung suchen…</guimenuitem>
+                <para>&gmi.bus.emp.find-exp-vou;
                 </para>
               </entry>
 
@@ -1510,7 +1417,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>Z</accel>ahlung verarbeiten…</guimenuitem>
+                <para>&gmi.bus.emp.pro-pay;
                 </para>
               </entry>
 
@@ -1523,7 +1430,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Verknüpfte Geschäftsdokumente</guimenuitem>
+                <para>&gmi.bus.link-doc;
                 </para>
               </entry>
 
@@ -1535,7 +1442,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>USt.-<accel>S</accel>teuertabelle…</guimenuitem>
+                <para>&gmi.bus.tax-tab;
                 </para>
               </entry>
 
@@ -1547,7 +1454,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Tabelle für <accel>Z</accel>ahlungsbedingungen</guimenuitem>
+                <para>&gmi.bus.bil-edit;
                 </para>
               </entry>
 
@@ -1562,7 +1469,7 @@
     </sect2>
 
     <sect2 id="gui-window-reports-menu">
-      <title><guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
+      <title>&gm.rep;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ReportsMenu">
         <title>Berichte-Menü - Zugriff auf &app; Berichte und Diagramme</title>
@@ -1594,9 +1501,7 @@
           <tbody>
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>A</accel>ktiva & Passiva</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.rep.ass-lia;
                 </para>
               </entry>
 
@@ -1607,7 +1512,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>ktiva-Diagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.ass-chr;
                 </para>
               </entry>
 
@@ -1618,7 +1523,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>A<accel>k</accel>tiva Tortendiagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.ass-pie;
                 </para>
               </entry>
 
@@ -1629,7 +1534,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>B</accel>ilanze</guimenuitem>
+                <para>&gmi.rep.ass-lia.bal-she;
                 </para>
               </entry>
 
@@ -1640,7 +1545,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>B<accel>i</accel>lanze (mit eguile)</guimenuitem>
+                <para>&gmi.rep.ass-lia.bal-she-egu;
                 </para>
               </entry>
 
@@ -1651,7 +1556,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>E</accel>rweitertes Portfolio</guimenuitem>
+                <para>&gmi.rep.ass-lia.adv-por;
                 </para>
               </entry>
 
@@ -1662,7 +1567,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>F</accel>remdkapitel-Diagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.lia-chr;
                 </para>
               </entry>
 
@@ -1673,7 +1578,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>H</accel>auptbuch Journal</guimenuitem>
+                <para>&gmi.rep.ass-lia.gen-jour;
                 </para>
               </entry>
 
@@ -1684,7 +1589,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>J</accel>ournal</guimenuitem>
+                <para>&gmi.rep.ass-lia.gen-led;
                 </para>
               </entry>
 
@@ -1695,7 +1600,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>K<accel>u</accel>rsdiagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.pri;
                 </para>
               </entry>
 
@@ -1706,7 +1611,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>R</accel>einvermögen-Balkendiagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.net-bar;
                 </para>
               </entry>
 
@@ -1717,7 +1622,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Rei<accel>n</accel>vermögen Liniendiagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.net-line;
                 </para>
               </entry>
 
@@ -1728,7 +1633,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>S</accel>aldo-Vorhersage</guimenuitem>
+                <para>&gmi.rep.ass-lia.bal-for;
                 </para>
               </entry>
 
@@ -1739,7 +1644,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>V</accel>erbindlichkeiten Tortendiagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.lia-pie;
                 </para>
               </entry>
 
@@ -1750,7 +1655,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>W</accel>ertpapierbestand</guimenuitem>
+                <para>&gmi.rep.ass-lia.inv-port;
                 </para>
               </entry>
 
@@ -1761,7 +1666,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Wer<accel>t</accel>papiere Tortendiagramm</guimenuitem>
+                <para>&gmi.rep.ass-lia.sec-pie;
                 </para>
               </entry>
 
@@ -1772,9 +1677,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu>Aufwand & <accel>E</accel>rtrag</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.rep.inc-exp;
                 </para>
               </entry>
 
@@ -1785,7 +1688,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>ufwand & Ertrags-Liniendiagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.inc-exp-line;
                 </para>
               </entry>
 
@@ -1796,7 +1699,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>A<accel>u</accel>fwand & Ertrags-Säulendiagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.inc-exp-bar;
                 </para>
               </entry>
 
@@ -1807,7 +1710,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Au<accel>f</accel>wendungen-Diagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.exp-chr;
                 </para>
               </entry>
 
@@ -1818,7 +1721,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Auf<accel>w</accel>endungen Tortendiagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.exp-pie;
                 </para>
               </entry>
 
@@ -1829,7 +1732,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>E</accel>igenkapital-Entwicklung</guimenuitem>
+                <para>&gmi.rep.inc-exp.equ-stat;
                 </para>
               </entry>
 
@@ -1840,7 +1743,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>E<accel>i</accel>nkommen- und Umsatzsteuererklärung</guimenuitem>
+                <para>&gmi.rep.inc-exp.inc-gst-stat;
                 </para>
               </entry>
 
@@ -1851,7 +1754,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>E<accel>r</accel>gebnisrechnung</guimenuitem>
+                <para>&gmi.rep.inc-exp.inc-stat;
                 </para>
               </entry>
 
@@ -1862,7 +1765,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Er<accel>t</accel>räge Tortendiagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.inc-pie;
                 </para>
               </entry>
 
@@ -1873,7 +1776,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Ertra<accel>g</accel>s-Diagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.inc-chr;
                 </para>
               </entry>
 
@@ -1884,7 +1787,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Gewi<accel>n</accel>n- und Verlustrechnung</guimenuitem>
+                <para>&gmi.rep.inc-exp.pro-los;
                 </para>
               </entry>
 
@@ -1895,7 +1798,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>K</accel>apitalfluss</guimenuitem>
+                <para>&gmi.rep.inc-exp.cash-flo;
                 </para>
               </entry>
 
@@ -1906,7 +1809,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Ka<accel>p</accel>italfluss-Diagramm</guimenuitem>
+                <para>&gmi.rep.inc-exp.cash-bar;
                 </para>
               </entry>
 
@@ -1917,7 +1820,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>R<accel>o</accel>hbilanz</guimenuitem>
+                <para>&gmi.rep.inc-exp.tri-bal;
                 </para>
               </entry>
 
@@ -1928,9 +1831,7 @@
 
             <row>
               <entry namest="c1">
-                <para><menuchoice>
-                    <guimenu><accel>B</accel>eispiele</guimenu><guisubmenu></guisubmenu>
-                  </menuchoice>
+                <para>&mc-gsm.rep.examp;
                 </para>
               </entry>
 
@@ -1941,7 +1842,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>ufwendungen pro Wochentag</guimenuitem>
+                <para>&gmi.rep.examp.exp-day;
                 </para>
               </entry>
 
@@ -1952,7 +1853,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>B</accel>eispielbericht</guimenuitem>
+                <para>&gmi.rep.examp.samp-rep;
                 </para>
               </entry>
 
@@ -1963,7 +1864,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>B<accel>e</accel>ispiel-Diagramme</guimenuitem>
+                <para>&gmi.rep.examp.samp-grap;
                 </para>
               </entry>
 
@@ -1974,7 +1875,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>D</accel>urchschnittlicher Kontostand</guimenuitem>
+                <para>&gmi.rep.examp.av-bal;
                 </para>
               </entry>
 
@@ -1985,7 +1886,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>E<accel>r</accel>träge pro Wochentag</guimenuitem>
+                <para>&gmi.rep.examp.inc-day;
                 </para>
               </entry>
 
@@ -1996,7 +1897,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>W</accel>illkommen zu &appname;</guimenuitem>
+                <para>&gmi.rep.examp.wel-gnc;
                 </para>
               </entry>
 
@@ -2007,9 +1908,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu>B<accel>u</accel>dget</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.rep.bgt;
                 </para>
               </entry>
 
@@ -2020,7 +1919,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>B</accel>udget-Bericht</guimenuitem>
+                <para>&gmi.rep.bgt.bgt-rep;
                 </para>
               </entry>
 
@@ -2034,7 +1933,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>B<accel>u</accel>dget-Bilanz</guimenuitem>
+                <para>&gmi.rep.bgt.bgt-bal;
                 </para>
               </entry>
 
@@ -2045,7 +1944,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Bu<accel>d</accel>get Diagramm</guimenuitem>
+                <para>&gmi.rep.bgt.bgt-chr;
                 </para>
               </entry>
 
@@ -2056,7 +1955,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Bud<accel>g</accel>et Einnahmeüberschussrechnung</guimenuitem>
+                <para>&gmi.rep.bgt.bgt-in-stat;
                 </para>
               </entry>
 
@@ -2067,7 +1966,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Budg<accel>e</accel>t Flow</guimenuitem>
+                <para>&gmi.rep.bgt.bgt-flow;
                 </para>
               </entry>
 
@@ -2081,7 +1980,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Budge<accel>t</accel> Gewinn- und Verlustrechnung</guimenuitem>
+                <para>&gmi.rep.bgt.bgt-p-r;
                 </para>
               </entry>
 
@@ -2093,9 +1992,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>E</accel>xperimentell</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.rep.exper;
                 </para>
               </entry>
 
@@ -2106,7 +2003,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>B</accel>ilanz (mehrspaltig)</guimenuitem>
+                <para>&gmi.rep.exper.bal-sht;
                 </para>
               </entry>
 
@@ -2117,7 +2014,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>E</accel>rgebnisrechnung (mehrspaltig)</guimenuitem>
+                <para>&gmi.rep.exper.inc-stat;
                 </para>
               </entry>
 
@@ -2128,9 +2025,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>G</accel>eschäft</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.rep.bus;
                 </para>
               </entry>
 
@@ -2141,7 +2036,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>A</accel>uftragsbericht</guimenuitem>
+                <para>&gmi.rep.bus.job-rep;
                 </para>
               </entry>
 
@@ -2152,7 +2047,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>A<accel>u</accel>stralische Rechnung mit Steuerangaben</guimenuitem>
+                <para>&gmi.rep.bus.aus-tax;
                 </para>
               </entry>
 
@@ -2163,7 +2058,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>D</accel>ruckbare Rechnung</guimenuitem>
+                <para>&gmi.rep.bus.pnt-rep;
                 </para>
               </entry>
 
@@ -2174,7 +2069,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>E</accel>infache Rechnung</guimenuitem>
+                <para>&gmi.rep.bus.easy-inv;
                 </para>
               </entry>
 
@@ -2185,7 +2080,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>E<accel>l</accel>egante Rechnung</guimenuitem>
+                <para>&gmi.rep.bus.fcy-inv;
                 </para>
               </entry>
 
@@ -2196,7 +2091,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>E<accel>n</accel>twicklung Forderungen</guimenuitem>
+                <para>&gmi.rep.bus.rec-age;
                 </para>
               </entry>
 
@@ -2207,7 +2102,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>En<accel>t</accel>wicklung Verbindlichkeiten</guimenuitem>
+                <para>&gmi.rep.bus.pay-rep;
                 </para>
               </entry>
 
@@ -2218,7 +2113,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>K</accel>undenbericht</guimenuitem>
+                <para>&gmi.rep.bus.cus-rep;
                 </para>
               </entry>
 
@@ -2229,7 +2124,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>Kundenüber<accel>s</accel>icht</guimenuitem>
+                <para>&gmi.rep.bus.cus-sum;
                 </para>
               </entry>
 
@@ -2240,7 +2135,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem>L<accel>i</accel>eferantenbericht</guimenuitem>
+                <para>&gmi.rep.bus.ven-rep;
                 </para>
               </entry>
 
@@ -2251,7 +2146,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>M</accel>itarbeiterbericht</guimenuitem>
+                <para>&gmi.rep.bus.emp-rep;
                 </para>
               </entry>
 
@@ -2262,7 +2157,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>Q</accel>uittung</guimenuitem>
+                <para>&gmi.rep.bus.receip;
                 </para>
               </entry>
 
@@ -2273,7 +2168,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>R</accel>echnung mit Steuerangaben</guimenuitem>
+                <para>&gmi.rep.bus.tax-inv;
                 </para>
               </entry>
 
@@ -2284,9 +2179,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <guisubmenu><accel>M</accel>ehrspaltig</guisubmenu><guimenuitem/>
-                  </menuchoice>
+                <para>&mc-gsm.rep.mul-col;
                 </para>
               </entry>
 
@@ -2297,7 +2190,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>B</accel>enutzerdefiniert Mehrspaltig</guimenuitem>
+                <para>&gmi.rep.mul-col.cus-mul-col;
                 </para>
               </entry>
 
@@ -2308,7 +2201,7 @@
 
             <row>
               <entry namest="c2">
-                <para><guimenuitem><accel>Ü</accel>bersicht</guimenuitem>
+                <para>&gmi.rep.mul-col.dash;
                 </para>
               </entry>
 
@@ -2319,7 +2212,7 @@
 
             <row>
               <entry namest="c1">
-                <para><guimenuitem>Ab<accel>g</accel>leichungsbericht</guimenuitem>
+                <para>&gmi.rep.rec-rep;
                 </para>
               </entry>
 
@@ -2330,7 +2223,7 @@
 
             <row>
               <entry namest="c1">
-                <para><guimenuitem>Bu<accel>c</accel>hungsbericht</guimenuitem>
+                <para>&gmi.rep.tr-rep;
                 </para>
               </entry>
 
@@ -2341,7 +2234,7 @@
 
             <row>
               <entry namest="c1">
-                <para><guimenuitem><accel>K</accel>ontenübersicht</guimenuitem>
+                <para>&gmi.rep.acct-sum;
                 </para>
               </entry>
 
@@ -2353,7 +2246,7 @@
 
             <row>
               <entry namest="c1">
-                <para><guimenuitem><accel>S</accel>teuer-Bericht & Elster Export</guimenuitem>
+                <para>&gmi.rep.tax-xml;
                 </para>
               </entry>
 
@@ -2365,19 +2258,19 @@
 
             <row>
               <entry namest="c1">
-                <para><guimenuitem><accel>Z</accel>ukünftig Terminierte Buchunge</guimenuitem>
+                <para>&gmi.rep.fut-tr-sum;
                 </para>
               </entry>
 
               <entry nameend="c3" namest="c2">
-                <para>Bericht mit einer Auflistung der zukünftigen Buchungen..
+                <para>Bericht mit einer Auflistung der zukünftigen Buchungen.
                 </para>
               </entry>
             </row>
 
             <row>
               <entry namest="c1">
-                <para><guimenuitem><accel>G</accel>espeicherte Berichtskonfigurationen</guimenuitem>
+                <para>&gmi.rep.saved-rep-conf;
                 </para>
               </entry>
 
@@ -2393,7 +2286,7 @@
     </sect2>
 
     <sect2 id="gui-window-tools-menu">
-      <title><guimenu><accel>W</accel>erkzeuge</guimenu>-Menü</title>
+      <title>&gm.tool;-Menü</title>
 
       <table pgwide="1" frame="topbot" id="GUI-Window-ToolsMenu">
         <title>Werkzeuge-Menü - Verschiedene Hilfsmittel und Editoren</title>
@@ -2418,7 +2311,7 @@
           <tbody>
             <row>
               <entry>
-                <para><guimenuitem><accel>O</accel>nlinebanking Einrichtung…</guimenuitem>
+                <para>&gmi.to.aqb;
                 </para>
               </entry>
 
@@ -2432,7 +2325,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>K</accel>urs-Datenbank</guimenuitem>
+                <para>&gmi.to.price;
                 </para>
               </entry>
 
@@ -2445,7 +2338,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>W</accel>ertpapier-Editor</guimenuitem>
+                <para>&gmi.to.sec;
                 </para>
               </entry>
 
@@ -2458,7 +2351,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>D</accel>arlehensrechner</guimenuitem>
+                <para>&gmi.to.loan;
                 </para>
               </entry>
 
@@ -2470,7 +2363,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Buch<accel>a</accel>bschluss</guimenuitem>
+                <para>&gmi.to.cls-bok;
                 </para>
               </entry>
 
@@ -2484,7 +2377,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem><accel>I</accel>mport-Zuordnungen Editor</guimenuitem>
+                <para>&gmi.to.imp-map;
                 </para>
               </entry>
 
@@ -2497,7 +2390,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Buchungs<accel>v</accel>erknüpfungen</guimenuitem>
+                <para>&gmi.to.link-doc;
                 </para>
               </entry>
 
@@ -2510,7 +2403,7 @@
 
             <row>
               <entry>
-                <para><guimenuitem>Hauptbuch <accel>J</accel>ournal</guimenuitem>
+                <para>&gmi.to.gen-jour;
                 </para>
               </entry>
 
@@ -2527,10 +2420,12 @@
 
     <sect2 id="gui-window-windows-menu">
       <title>&gm.win;-Menü</title>
-
+      
       <table pgwide="1" frame="topbot" id="GUI-Window-WindowsMenu">
         <title>Fenster-Menü</title>
 
+        <titleabbrev>&appname; - Fenster-Menü</titleabbrev>
+
         <tgroup cols="2">
           <thead>
             <row>
@@ -2613,7 +2508,7 @@
           <tbody>
             <row>
               <entry>
-                <para>&gmi.help.guide;
+                <para>&mc-gmi.help.guide;
                 </para>
               </entry>
 
@@ -2637,7 +2532,7 @@
 
             <row>
               <entry>
-                <para>&gmi.help.cont;
+                <para>&mc-gmi.help.cont;
                 </para>
               </entry>
 
@@ -2912,10 +2807,7 @@
       </para>
 <!-- FIXME source: moved from ch_Customize -->
       <para>Der Dialog <guilabel>Konten filtern nach…</guilabel> wird mit dem Menüpunkt
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu> <guimenuitem><accel>F</accel>ilter
-          nach…</guimenuitem>
-        </menuchoice>
+        &mc.vw.f-by;
         geöffnet und beeinflusst die Darstellung in den einzelnen geöffneten Fenstern der
         Kontenübersicht in der Art, dass die Auswahl der darzustellenden
         <emphasis>Zeilen</emphasis> Ihren Anforderungen angepasst wird.
@@ -3072,11 +2964,7 @@
       <para>Die <firstterm>Zusammenfassungsleiste</firstterm> der <guilabel>Kontenübersicht</guilabel> zeigt
         auf einen Blick das Eigenkapital und den Gewinn an. Wertpapierkonten hingegen zeigen
         Stückzahl und Devisenkonten deren Wert an. Die <emphasis>Zusammenfassungsleiste</emphasis>
-        kann im Menü
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>Z</accel>usammenfassungsleiste</guimenuitem>
-        </menuchoice>
-        ein- und ausgeblendet werden.
+        kann im Menü &mc.vw.sum; ein- und ausgeblendet werden.
       </para>
 
       <para>Möchten Sie die angezeigte Auswahl der <guilabel>Zusammenfassungsleiste</guilabel> umstellen, so
@@ -3118,8 +3006,7 @@
       <para>Die <firstterm>Statusleiste</firstterm> zeigt kurze Hilfetexte über den aktuell markierten
         Menüpunkt an. Es zeigt auch einen Fortschrittsbalken beim Öffnen oder Speichern einer
         &app; Datendatei oder beim Erzeugen von Berichten an. Die <emphasis>Statusleiste</emphasis>
-        kann ein- oder ausgeblendet werden, indem Sie den Punkt
-        <guimenuitem>Statusleiste</guimenuitem> im Menü <guimenu>Ansicht</guimenu> auswählen.
+        kann ein- oder ausgeblendet werden, indem Sie den Punkt &mc.vw.stat; auswählen.
       </para>
     </sect2>
 
@@ -3132,7 +3019,7 @@
       </para>
 
       <sect3 id="AccTree-file-menu">
-        <title>Kontenübersicht - <guimenu><accel>D</accel>atei</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.file;-Menü</title>
 
         <para>In den folgenden Tabelle werden die Einträge beschrieben, die ergänzend zu
           <xref linkend="gui-window-file-menu"/> verfügbar sind.
@@ -3167,13 +3054,7 @@
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>S</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>S</accel>peichern</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.fi.save;
                   </para>
                 </entry>
 
@@ -3185,13 +3066,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>P</keycap>
-                      </keycombo>
-                      </shortcut><guimenuitem><accel>D</accel>rucken…</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.fi.prin;
                   </para>
                 </entry>
 
@@ -3207,7 +3082,7 @@
       </sect3>
 
       <sect3 id="AccTree-edit-menu">
-        <title>Kontenübersicht - <guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.edit;-Menü</title>
 
         <para>In den folgenden Tabelle werden die Einträge beschrieben, die ergänzend zu
           <xref linkend="gui-window-edit-menu"/> verfügbar sind.
@@ -3237,13 +3112,7 @@
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>X</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>A</accel>usschneiden</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ed.cut;
                   </para>
                 </entry>
 
@@ -3255,13 +3124,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>C</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>K</accel>opieren</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ed.copy;
                   </para>
                 </entry>
 
@@ -3273,13 +3136,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>V</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>E<accel>i</accel>nfügen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ed.paste;
                   </para>
                 </entry>
 
@@ -3291,13 +3148,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>E</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Konto <accel>b</accel>earbeiten</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ed.acc-edit;
                   </para>
                 </entry>
 
@@ -3309,10 +3160,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut> <keycap>Entf</keycap> </shortcut> <guimenuitem>Konto
-                      <accel>l</accel>öschen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ed.acc-del;
                   </para>
                 </entry>
 
@@ -3324,13 +3172,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>I</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Konto <accel>s</accel>uchen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ed.acc-find;
                   </para>
                 </entry>
 
@@ -3343,7 +3185,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem>Konto<accel>e</accel>igenschaften übernehmen…</guimenuitem>
+                  <para>&gmi.ed.acc-casc;
                   </para>
                 </entry>
 
@@ -3362,7 +3204,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem>Unterkonten neu <accel>n</accel>ummerieren…</guimenuitem>
+                  <para>&gmi.ed.acc-renum;
                   </para>
                 </entry>
 
@@ -3381,7 +3223,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>K</accel>onto öffnen</guimenuitem>
+                  <para>&gmi.ed.acc-open;
                   </para>
                 </entry>
 
@@ -3393,7 +3235,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>U</accel>nterkonto öffnen</guimenuitem>
+                  <para>&gmi.ed.acc-open-sub;
                   </para>
                 </entry>
 
@@ -3409,7 +3251,7 @@
       </sect3>
 
       <sect3 id="AccTree-view-menu">
-        <title>Kontenübersicht - <guimenu><accel>A</accel>nsicht</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.view;-Menü</title>
 
         <para>In den folgenden Tabelle werden die Einträge beschrieben, die ergänzend zu
           <xref linkend="gui-window-view-menu"/> verfügbar sind.
@@ -3442,7 +3284,7 @@
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem><accel>F</accel>iltern nach…</guimenuitem>
+                  <para>&gmi.vw.f-by;
                   </para>
                 </entry>
 
@@ -3457,7 +3299,7 @@
       </sect3>
 
       <sect3 id="AccTree-actions-menu">
-        <title>Kontenübersicht - <guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.act;-Menü</title>
 
         <para>In den folgenden Tabelle werden die Einträge beschrieben, die ergänzend zu
           <xref linkend="gui-window-actions-menu"/> verfügbar sind.
@@ -3493,7 +3335,8 @@
             <tbody>
               <row>
                 <entry>
-                  <guimenuitem>Neues <accel>K</accel>onto…</guimenuitem>
+                  <para>&gmi.ac.act-new;
+                  </para>
                 </entry>
 
                 <entry nameend="c3" namest="c2">
@@ -3504,7 +3347,8 @@
 
               <row>
                 <entry>
-                  <guimenuitem>Konten<accel>h</accel>ierarchie hinzufügen…</guimenuitem>
+                  <para>&gmi.ac.act-hier;
+                  </para>
                 </entry>
 
                 <entry nameend="c3" namest="c2">
@@ -3515,13 +3359,7 @@
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>T</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>B</accel>uchen…</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ac.trf;
                   </para>
                 </entry>
 
@@ -3533,7 +3371,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>A</accel>bgleichen…</guimenuitem>
+                  <para>&gmi.ac.rec;
                   </para>
                 </entry>
 
@@ -3546,7 +3384,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>A</accel>utomatisch abgleichen…</guimenuitem>
+                  <para>&gmi.ac.au-clr;
                   </para>
                 </entry>
 
@@ -3559,7 +3397,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem>A<accel>k</accel>tienteilung…</guimenuitem>
+                  <para>&gmi.ac.stk-spt;
                   </para>
                 </entry>
 
@@ -3573,7 +3411,7 @@
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>P</accel>osten anzeigen…</guimenuitem>
+                  <para>&gmi.ac.vw-lots;
                   </para>
                 </entry>
 
@@ -3586,9 +3424,7 @@
 
               <row>
                 <entry align="left">
-                  <para><menuchoice>
-                      <guisubmenu>Überprü<accel>f</accel>en</guisubmenu><guimenuitem/>
-                    </menuchoice>
+                  <para>&mc-gsm.ac.chk-rep;
                   </para>
                 </entry>
 
@@ -3600,7 +3436,7 @@
 
               <row>
                 <entry namest="c2">
-                  <para><guimenuitem><accel>K</accel>onto überprüfen</guimenuitem>
+                  <para>&gmi.ac.chk-rep.acct;
                   </para>
                 </entry>
 
@@ -3613,7 +3449,7 @@
 
               <row>
                 <entry namest="c2">
-                  <para><guimenuitem><accel>U</accel>nterkonten überprüfen</guimenuitem>
+                  <para>&gmi.ac.chk-rep.sacct;
                   </para>
                 </entry>
 
@@ -3626,7 +3462,7 @@
 
               <row>
                 <entry namest="c2">
-                  <para><guimenuitem><accel>A</accel>lle überprüfen</guimenuitem>
+                  <para>&gmi.ac.chk-rep.all;
                   </para>
                 </entry>
 
@@ -3642,14 +3478,14 @@
       </sect3>
 
       <sect3 id="AccTree-business-menu">
-        <title>Kontenübersicht - <guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.bus;-Menü</title>
 
         <para>Die Menüeinträge entsprechen den Beschreibungen in <xref linkend="gui-window-business-menu" />.
         </para>
       </sect3>
 
       <sect3 id="AccTree-reports-menu">
-        <title>Kontenübersicht - <guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.rep;-Menü</title>
 
         <para>Die verfügbaren Berichte und Diagramme sind in <xref linkend="gui-window-reports-menu"></xref>
           aufgeführt. Jeder Bericht oder jedes Diagramm kann durch eine andere
@@ -3659,21 +3495,21 @@
       </sect3>
 
       <sect3 id="AccTree-tools-menu">
-        <title>Kontenübersicht - <guimenu><accel>W</accel>erkzeuge</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.tool;-Menü</title>
 
         <para>Alle Einträge in diesem Menü sind in <xref linkend="gui-window-tools-menu" /> beschrieben.
         </para>
       </sect3>
 
       <sect3 id="AccTree-windows-menu">
-        <title>Kontenübersicht - <guimenu><accel>F</accel>enster</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.win;-Menü</title>
 
         <para>Alle Einträge in diesem Menü sind in <xref linkend="gui-window-windows-menu" /> beschrieben.
         </para>
       </sect3>
 
       <sect3 id="AccTree-help-menu">
-        <title>Kontenübersicht - <guimenu><accel>H</accel>ilfe</guimenu>-Menü</title>
+        <title>Kontenübersicht - &gm.help;-Menü</title>
 
         <para>Alle Einträge in diesem Menü sind in <xref linkend="gui-window-help-menu" /> beschrieben.
         </para>
@@ -3686,10 +3522,7 @@
       <para>Das &app; Hauptfenster hat eine Reihe von Schaltflächen in der <emphasis>Werkzeugleiste</emphasis>
         um schnell auf einige allgemeine Funktionen zuzugreifen, die mit der jeweils aktiven
         Registerkarte interagieren. Die <emphasis>Werkzeugleiste</emphasis> kann unter
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>W</accel>erkzeugleiste</guimenuitem>
-        </menuchoice>
-        ein- oder ausgeblendet werden.
+        &mc.vw.tbar; ein- oder ausgeblendet werden.
       </para>
 
       <note>
@@ -3726,13 +3559,7 @@
           <tbody>
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>S</keycap>
-                    </keycombo>
-                    </shortcut> <guibutton>Speichern</guibutton>
-                  </menuchoice>
+                <para><guibutton>Speichern</guibutton>
                 </para>
               </entry>
 
@@ -3749,13 +3576,7 @@
 
             <row>
               <entry>
-                <para><menuchoice>
-                    <shortcut>
-                    <keycombo>
-                      <keycap>Strg</keycap><keycap>W</keycap>
-                    </keycombo>
-                    </shortcut> <guibutton>Schließen</guibutton>
-                  </menuchoice>
+                <para><guibutton>Schließen</guibutton>
                 </para>
               </entry>
 
@@ -3859,16 +3680,8 @@
       </para>
 
       <para>Um die Buchungsansicht für ein Konto zu öffnen, wählen Sie das Konto in der Kontenübersicht und
-        gehen Sie dann zu
-        <menuchoice>
-          <guimenu><accel>B</accel>earbeiten</guimenu> <guimenuitem><accel>K</accel>onto
-          öffnen</guimenuitem>
-        </menuchoice>
-        oder betätigen Sie die
-        <keycombo>
-          <keycap>Strg</keycap> <keycap>O</keycap>
-        </keycombo>
-        Schaltfläche . Dies öffnet ein neues Fenster mit dem gewähltem Kontenblatt. Das Drücken
+        gehen Sie dann zu &mc.ed.acc-open;
+        Schaltfläche. Dies öffnet ein neues Fenster mit dem gewähltem Kontenblatt. Das Drücken
         von <guibutton>Öffnen</guibutton> in der <emphasis>Werkzeugleiste</emphasis> im Fenster
         <emphasis>Kontenübersicht</emphasis> oder die Schaltfläche <guibutton>Springen</guibutton>
         im Fenster <emphasis>Kontenblatt</emphasis> sind weiter Möglichkeiten.
@@ -3898,7 +3711,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         <guilabel>Buchen</guilabel> und <guilabel>Saldo</guilabel>.
       </para>
 
-      <para>Sie können das Menü <guimenu>Ansicht</guimenu> verwenden, um das Erscheinungsbild der Liste zu
+      <para>Sie können das Menü &gm.view; verwenden, um das Erscheinungsbild der Liste zu
         verändert. Beispielsweise ist es möglich, die Anzahl der angezeigten Buchungen
         einzuschränken, eine andere Sortierreihenfolge zu verwenden oder den Anzeigestil zu
         ändern, um die Buchungen übersichtlicher darzustellen. Darüber hinaus gestattet die
@@ -3917,10 +3730,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         <guilabel>abgeglichener</guilabel> Saldo und ein <guilabel>vorraussichtliches
         Minimum</guilabel> angezeigt. Eine Ausnahme bilden Aktienkonten, hier erscheint stattdessen
         die Summe der Anteile und deren aktueller Wert. Die
-        <emphasis>Zusammenfassungsleiste</emphasis> kann im Menü
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>Z</accel>usammenfassung</guimenuitem>
-        </menuchoice>
+        <emphasis>Zusammenfassungsleiste</emphasis> kann im Menü &mc.vw.sum;
         ein- und ausgeblendet werden.
       </para>
     </sect2>
@@ -3933,9 +3743,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </para>
 
       <sect3 id="Trans-file-menu">
-        <title>Kontenblatt - <guimenu><accel>D</accel>atei</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.file;-Menü</title>
 
-        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf <guimenu>Datei</guimenu> klicken, wird das
+        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf &gm.file; klicken, wird das
           Menü mit den in <xref linkend="gui-window-file-menu"/> beschriebenen
           Auswahlmöglichkeiten geöffnet.
         </para>
@@ -3973,13 +3783,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>P</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Scheck<accel>s</accel> drucken…</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.fi.prin-ch;
                   </para>
                 </entry>
 
@@ -3992,13 +3796,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>W</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>S<accel>c</accel>hließen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.fi.cls;
                   </para>
                 </entry>
 
@@ -4013,9 +3811,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Trans-edit-menu">
-        <title>Kontenblatt - <guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.edit;-Menü</title>
 
-        <para>Die <emphasis>Menüleiste</emphasis> im Menü <guimenu>Bearbeiten</guimenu> umfasst neben den in
+        <para>Die <emphasis>Menüleiste</emphasis> im Menü &gm.edit; umfasst neben den in
           <xref linkend="gui-window-edit-menu"/> beschriebenen Einträge noch zusätzlich die
           folgenden Menpunkte.
         </para>
@@ -4043,7 +3841,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem>Als <accel>Z</accel>ahlung zuweisen…</guimenuitem>
+                  <para>&gmi.ed.pay-asng;
                   </para>
                 </entry>
 
@@ -4058,9 +3856,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Trans-view-menu">
-        <title>Kontenblatt - <guimenu><accel>A</accel>nsicht</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.view;-Menü</title>
 
-        <para>Das <guimenu>Ansicht</guimenu>-Menü in der <emphasis>Menüleiste</emphasis>
+        <para>Das &gm.view;-Menü in der <emphasis>Menüleiste</emphasis>
           <xref linkend="gui-window-view-menu"/> wird für die Buchungsansicht um die nachfolgenden
           Einträge ergänzt.
         </para>
@@ -4094,7 +3892,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem><accel>E</accel>inzeilig</guimenuitem>
+                  <para>&gmi.vw.bas-led;
                   </para>
                 </entry>
 
@@ -4109,7 +3907,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>A</accel>ktive vollständig</guimenuitem>
+                  <para>&gmi.vw.spl-led;
                   </para>
                 </entry>
 
@@ -4121,7 +3919,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>V</accel>ollständig</guimenuitem>
+                  <para>&gmi.vw.jour;
                   </para>
                 </entry>
 
@@ -4133,7 +3931,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>Z</accel>weizeilig</guimenuitem>
+                  <para>&gmi.vw.doub;
                   </para>
                 </entry>
 
@@ -4145,7 +3943,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>S</accel>ortieren nach…</guimenuitem>
+                  <para>&gmi.vw.s-by;
                   </para>
                 </entry>
 
@@ -4312,7 +4110,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Trans-transaction-menu">
-        <title>Kontenblatt - <guimenu>Buch<accel>u</accel>ng</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.trans;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="Trans-TransactionMenu">
           <title>Kontenblatt - Buchung-Menü - Zugriff auf Buchungswerkzeuge</title>
@@ -4341,7 +4139,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung auss<accel>c</accel>hneiden</guimenuitem>
+                  <para>&gmi.tr.cut;
                   </para>
                 </entry>
 
@@ -4353,7 +4151,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung <accel>k</accel>opieren</guimenuitem>
+                  <para>&gmi.tr.copy;
                   </para>
                 </entry>
 
@@ -4365,7 +4163,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung ein<accel>f</accel>ügen</guimenuitem>
+                  <para>&gmi.tr.paste;
                   </para>
                 </entry>
 
@@ -4377,7 +4175,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung dupli<accel>z</accel>ieren</guimenuitem>
+                  <para>&gmi.tr.dup;
                   </para>
                 </entry>
 
@@ -4389,7 +4187,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung <accel>l</accel>öschen</guimenuitem>
+                  <para>&gmi.tr.del;
                   </para>
                 </entry>
 
@@ -4401,7 +4199,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Andere Buchungs<accel>t</accel>eile löschen</guimenuitem>
+                  <para>&gmi.tr.rem;
                   </para>
                 </entry>
 
@@ -4413,7 +4211,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung ein<accel>g</accel>eben</guimenuitem>
+                  <para>&gmi.tr.ent;
                   </para>
                 </entry>
 
@@ -4425,7 +4223,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung <accel>a</accel>bbrechen</guimenuitem>
+                  <para>&gmi.tr.cnl;
                   </para>
                 </entry>
 
@@ -4437,7 +4235,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Buchung <accel>u</accel>ngültig machen</guimenuitem>
+                  <para>&gmi.tr.void;
                   </para>
                 </entry>
 
@@ -4449,7 +4247,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Ungültige Buchung <accel>w</accel>iederherstellen</guimenuitem>
+                  <para>&gmi.tr.un-void;
                   </para>
                 </entry>
 
@@ -4466,7 +4264,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Stornobuchung <accel>h</accel>inzufügen</guimenuitem>
+                  <para>&gmi.tr.add-rev;
                   </para>
                 </entry>
 
@@ -4478,7 +4276,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>V</accel>erknüpfung bearbeiten</guimenuitem>
+                  <para>&gmi.tr.man-doc-link;
                   </para>
                 </entry>
 
@@ -4490,7 +4288,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Verknüpfung öffnen</guimenuitem>
+                  <para>&gmi.tr.open-doc;
                   </para>
                 </entry>
 
@@ -4508,7 +4306,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Zur Rechnung springen</guimenuitem>
+                  <para>&gmi.tr.jump-inv;
                   </para>
                 </entry>
 
@@ -4528,9 +4326,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Trans-actions-menu">
-        <title>Kontenblatt - <guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.act;-Menü</title>
 
-        <para>Der Grundumfang des Menüs <guimenu>Aktionen</guimenu> in der <emphasis>Menüleiste</emphasis> ist
+        <para>Der Grundumfang des Menüs &gm.act; in der <emphasis>Menüleiste</emphasis> ist
           in <xref linkend="gui-window-actions-menu"/> beschrieben. Ergänzend stehen die folgenden
           Menüpunkte zur Verfügung.
         </para>
@@ -4566,13 +4364,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>Bild ab</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>L</accel>eere Buchung</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ac.blk-tr;
                   </para>
                 </entry>
 
@@ -4584,13 +4376,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>G</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Zu Datum <accel>g</accel>ehen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.ac.go-to;
                   </para>
                 </entry>
 
@@ -4602,7 +4388,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>M</accel>ehrteilige Buchung</guimenuitem>
+                  <para>&gmi.ac.spt-tr;
                   </para>
                 </entry>
 
@@ -4614,7 +4400,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Wech<accel>s</accel>elkurs bearbeiten…</guimenuitem>
+                  <para>&gmi.ac.ed-ex;
                   </para>
                 </entry>
 
@@ -4626,7 +4412,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>T</accel>erminiert…</guimenuitem>
+                  <para>&gmi.ac.sched;
                   </para>
                 </entry>
 
@@ -4638,7 +4424,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Zum Gegenkonto <accel>s</accel>pringen</guimenuitem>
+                  <para>&gmi.ac.jump;
                   </para>
                 </entry>
 
@@ -4653,17 +4439,17 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Trans-business-menu">
-        <title>Kontenblatt - <guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.bus;-Menü</title>
 
-        <para>Die im Menü <guimenu>Geschäft</guimenu> angezeigten Elemente sind die gleichen wie in
+        <para>Die im Menü &gm.bus; angezeigten Elemente sind die gleichen wie in
           <xref linkend="gui-window-business-menu" />.
         </para>
       </sect3>
 
       <sect3 id="Trans-reports-menu">
-        <title>Kontenblatt - <guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.rep;-Menü</title>
 
-        <para>Die im Menü <guimenu>Berichte</guimenu> angezeigten Elemente sind die gleichen wie in
+        <para>Die im Menü &gm.rep; angezeigten Elemente sind die gleichen wie in
           <xref linkend="gui-window-reports-menu" /> und zusätzlich die zwei Berichte, die im
           Folgenden aufgeführt sind.
         </para>
@@ -4691,7 +4477,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem>Kontenbericht</guimenuitem>
+                  <para>&gmi.rep.acct-rep;
                   </para>
                 </entry>
 
@@ -4703,7 +4489,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Kontenbuch - Einzelbuchung</guimenuitem>
+                  <para>&gmi.rep.acct-rep-tr;
                   </para>
                 </entry>
 
@@ -4718,25 +4504,25 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Trans-tools-menu">
-        <title>Kontenblatt - <guimenu><accel>W</accel>erkzeuge</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.tool;-Menü</title>
 
-        <para>Die im Menü <guimenu>Werkzeuge</guimenu> genannten Einträge sind in
+        <para>Die im Menü &gm.tool; genannten Einträge sind in
           <xref linkend="gui-window-tools-menu" /> beschrieben.
         </para>
       </sect3>
 
       <sect3 id="Trans-windows-menu">
-        <title>Kontenblatt - <guimenu><accel>F</accel>enster</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.win;-Menü</title>
 
-        <para>Die Einträge im <guimenu>Fenster</guimenu>menü entsprechen den Menüpunkten in
+        <para>Die Einträge im &gm.win;menü entsprechen den Menüpunkten in
           <xref linkend="gui-window-windows-menu" />.
         </para>
       </sect3>
 
       <sect3 id="Trans-help-menu">
-        <title>Kontenblatt - <guimenu><accel>H</accel>ilfe</guimenu>-Menü</title>
+        <title>Kontenblatt - &gm.help;-Menü</title>
 
-        <para>Das <guimenu>Hilfe</guimenu> Menü wird in <xref linkend="gui-window-help-menu" /> beschrieben.
+        <para>Das &gm.help; Menü wird in <xref linkend="gui-window-help-menu" /> beschrieben.
         </para>
       </sect3>
     </sect2>
@@ -4748,9 +4534,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         <emphasis>Werkzeugleiste</emphasis> um schnell auf einige allgemeine Funktionen zuzugreifen,
         die mit der jeweils aktiven Registerkarte interagieren. Die
         <emphasis>Werkzeugleiste</emphasis> kann unter
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>W</accel>erkzeugleiste</guimenuitem>
-        </menuchoice>
+        &mc.vw.tbar;
         ein- oder ausgeblendet werden.
       </para>
 
@@ -4889,9 +4673,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <entry>
                 <para>Alle Buchungsteile des aktuellen Buchungssatzes anzeigen. Nicht hervorgehoben, wenn
-                  <menuchoice>
-                    <guimenu>Ansicht</guimenu> <guimenuitem>Aktive vollständig</guimenuitem>
-                  </menuchoice>
+                  &mc.vw.spl-led;
                   aktiviert ist.
                 </para>
               </entry>
@@ -4979,11 +4761,11 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Anzeigebereich</title>
 
       <para>Dieses Ansicht wird immer dann angezeigt, wenn Sie einen Bericht oder ein Diagramm aus dem Menü
-        <guimenu>Berichte</guimenu> aufrufen.
+        &gm.rep; aufrufen.
       </para>
 
       <para>Um das Berichtsfenster zu öffnen, wählen Sie einen Bericht aus dem Menü
-        <guimenu>Berichte</guimenu> in der <emphasis>Menüleiste</emphasis>. Dadurch wird ein neues
+        &gm.rep; in der <emphasis>Menüleiste</emphasis>. Dadurch wird ein neues
         Fenster mit dem angezeigten Bericht geöffnet. Es bietet eine webbrowserartige Anzeige mit
         aktiven Links zu Kontodaten.
       </para>
@@ -5005,10 +4787,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         können Sie bearbeiten, was der Bericht anzeigt und von welchen Konten die Informationen
         bezogen werden. Im Abschnitt <xref linkend="report-classes"></xref> werden spezifische
         Einstellungen für die verfügbaren Berichte und Diagramme erläutert. Durch Auswahl von
-        <menuchoice>
-          <guimenu><accel>B</accel>earbeiten</guimenu>
-          <guimenuitem>Stil<accel>v</accel>orlagen</guimenuitem>
-        </menuchoice>
+        &mc.ed.css;
         können Sie die Eigenschaften der <acronym>HTML</acronym>-Seite auswählen, in welcher ihr
         Bericht angezeigt wird.
       </para>
@@ -5034,9 +4813,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </para>
 
       <sect3 id="Report-file-menu">
-        <title>Berichte - <guimenu><accel>D</accel>atei</guimenu>-Menü</title>
+        <title>Berichte - &gm.file;-Menü</title>
 
-        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf <guimenu>Datei</guimenu> klicken, wird das
+        <para>Wenn Sie in der <emphasis>Menüleiste</emphasis> auf &gm.file; klicken, wird das
           Menü mit den in <xref linkend="gui-window-file-menu"/> beschriebenen
           Auswahlmöglichkeiten geöffnet.
         </para>
@@ -5073,13 +4852,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>P</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Bericht <accel>d</accel>rucken..</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.fi.prin-rep;
                   </para>
                 </entry>
 
@@ -5091,9 +4864,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem/>
-                    </menuchoice>
+                  <para>&mc-gsm.fi.exp;
                   </para>
                 </entry>
 
@@ -5105,7 +4876,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry namest="c2">
-                  <para><guimenuitem><accel>B</accel>ericht exportieren</guimenuitem>
+                  <para>&gmi.fi.exp.rep;
                   </para>
                 </entry>
 
@@ -5118,13 +4889,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>W</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>S<accel>c</accel>hließen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.fi.cls;
                   </para>
                 </entry>
 
@@ -5139,9 +4904,9 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Report-edit-menu">
-        <title>Berichte - <guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
+        <title>Berichte - &gm.edit;-Menü</title>
 
-        <para>Die <emphasis>Menüleiste</emphasis> im Menü <guimenu>Bearbeiten</guimenu> umfasst neben den in
+        <para>Die <emphasis>Menüleiste</emphasis> im Menü &gm.edit; umfasst neben den in
           <xref linkend="gui-window-edit-menu"/> beschriebenen Einträge noch zusätzlich die
           folgenden Menpunkte.
         </para>
@@ -5169,7 +4934,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem>Berichts<accel>o</accel>ptionen</guimenuitem>
+                  <para>&gmi.ed.rep-opt;
                   </para>
                 </entry>
 
@@ -5185,18 +4950,18 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Report-view-menu">
-        <title>Berichte - <guimenu><accel>A</accel>nsicht</guimenu>-Menü</title>
+        <title>Berichte - &gm.view;-Menü</title>
 
-        <para>Mit Ausnahme des Menüpunktes <guimenuitem>Filtern nach…</guimenuitem> entspricht das
-          <guimenu>Ansicht</guimenu>-Menü in der <emphasis>Menüleiste</emphasis> der Beschreibung
+        <para>Mit Ausnahme des Menüpunktes &gmi.vw.f-by; entspricht das
+          &gm.view;-Menü in der <emphasis>Menüleiste</emphasis> der Beschreibung
           in <xref linkend="gui-window-view-menu"/>.
         </para>
       </sect3>
 
       <sect3 id="Report-actions-menu">
-        <title>Berichte - <guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
+        <title>Berichte - &gm.act;-Menü</title>
 
-        <para>Die im Menü <guimenu>Aktionen</guimenu> angezeigten Elemente sind die gleichen wie in
+        <para>Die im Menü &gm.act; angezeigten Elemente sind die gleichen wie in
           <xref linkend="gui-window-actions-menu"/>.
         </para>
 
@@ -5205,17 +4970,17 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Report-business-menu">
-        <title>Berichte - <guimenu><accel>G</accel>eschäft</guimenu>-Menü</title>
+        <title>Berichte - &gm.bus;-Menü</title>
 
-        <para>Die im Menü <guimenu>Geschäft</guimenu> angezeigten Elemente sind die gleichen wie in
+        <para>Die im Menü &gm.bus; angezeigten Elemente sind die gleichen wie in
           <xref linkend="gui-window-business-menu" />.
         </para>
       </sect3>
 
       <sect3 id="Report-reports-menu">
-        <title>Berichte - <guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
+        <title>Berichte - &gm.rep;-Menü</title>
 
-        <para>Die im Menü <guimenu>Berichte</guimenu> angezeigten Elemente sind die gleichen wie in
+        <para>Die im Menü &gm.rep; angezeigten Elemente sind die gleichen wie in
           <xref linkend="gui-window-reports-menu" /> und zusätzlich die zwei Menüpunkte, die im
           Folgenden aufgeführt sind.
         </para>
@@ -5249,14 +5014,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry namest="c1">
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>Alt</keycap><keycap>S</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Berichtskonfiguration
-                      <accel>s</accel>peichern</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.rep.save-conf;
                   </para>
                 </entry>
 
@@ -5264,11 +5022,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                   <para>Speichert die aktuelle Berichtskonfiguration. Wenn Sie mit einer nicht gespeicherten
                     Berichtskonfiguration arbeiten, werden Sie aufgefordert einen Namen zu vergeben.
                     Sie können den Bericht erneut öffnen, indem Sie die Funktion
-                    <menuchoice>
-                      <guimenu>Be<accel>r</accel>ichte
-                      </guimenu><guimenuitem><accel>G</accel>espeicherte Berichtskonfigurationen
-                      </guimenuitem>
-                    </menuchoice>
+                    &mc.rep.saved-rep-conf;
                     aufrufen.
                   </para>
                 </entry>
@@ -5276,24 +5030,14 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry namest="c1">
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Umschalt</keycap><keycap>Strg</keycap><keycap>Alt</keycap><keycap>S</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Berichtskonfiguration speichern
-                      <accel>u</accel>nter…</guimenuitem>
-                    </menuchoice>
+                  <para>&mc-gmi.rep.save-conf-as;
                   </para>
                 </entry>
 
                 <entry nameend="c3" namest="c2">
                   <para>Speichert die aktuelle Berichtskonfiguration unter einem neuen Namen. Sie können den Bericht erneut
                     öffnen, indem Sie die Funktion
-                    <menuchoice>
-                      <guimenu>Be<accel>r</accel>ichte</guimenu><guimenuitem><accel>G</accel>espeicherte
-                      Berichtskonfigurationen </guimenuitem>
-                    </menuchoice>
+                    &mc.rep.saved-rep-conf;
                     aufrufen.
                   </para>
                 </entry>
@@ -5304,25 +5048,25 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Report-tools-menu">
-        <title>Berichte - <guimenu><accel>W</accel>erkzeuge</guimenu>-Menü</title>
+        <title>Berichte - &gm.tool;-Menü</title>
 
-        <para>Die im Menü <guimenu>Werkzeuge</guimenu> genannten Einträge sind in
+        <para>Die im Menü &gm.tool; genannten Einträge sind in
           <xref linkend="gui-window-tools-menu" /> beschrieben.
         </para>
       </sect3>
 
       <sect3 id="Report-windows-menu">
-        <title>Berichte - <guimenu><accel>F</accel>enster</guimenu>-Menü</title>
+        <title>Berichte - &gm.win;-Menü</title>
 
-        <para>Die Einträge im <guimenu>Fenster</guimenu>menü entsprechen den Menüpunkten in
+        <para>Die Einträge im &gm.win;menü entsprechen den Menüpunkten in
           <xref linkend="gui-window-windows-menu" />.
         </para>
       </sect3>
 
       <sect3 id="Report-help-menu">
-        <title>Berichte - <guimenu><accel>H</accel>ilfe</guimenu>-Menü</title>
+        <title>Berichte - &gm.help;-Menü</title>
 
-        <para>Das <guimenu>Hilfe</guimenu> Menü wird in <xref linkend="gui-window-help-menu" /> beschrieben.
+        <para>Das &gm.help; Menü wird in <xref linkend="gui-window-help-menu" /> beschrieben.
         </para>
       </sect3>
     </sect2>
@@ -5334,9 +5078,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
         <emphasis>Werkzeugleiste</emphasis> um schnell auf einige allgemeine Funktionen zuzugreifen,
         die mit der jeweils aktiven Registerkarte interagieren. Die
         <emphasis>Werkzeugleiste</emphasis> kann unter
-        <menuchoice>
-          <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>W</accel>erkzeugleiste</guimenuitem>
-        </menuchoice>
+        &mc.vw.tbar;
         ein- oder ausgeblendet werden.
       </para>
 
@@ -5478,10 +5220,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 <para>Speichert die aktuelle Berichtskonfiguration. Wenn Sie mit einer nicht gespeicherten
                   Berichtskonfiguration arbeiten, werden Sie aufgefordert einen Namen zu vergeben.
                   Sie können den Bericht erneut öffnen, indem Sie die Funktion
-                  <menuchoice>
-                    <guimenu>Berichte</guimenu><guimenuitem>Gespeicherte Berichtskonfigurationen
-                    </guimenuitem>
-                  </menuchoice>
+                  &mc.rep.saved-rep-conf;
                   aufrufen.
                 </para>
               </entry>
@@ -5496,10 +5235,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
               <entry>
                 <para>Speichert die aktuelle Berichtskonfiguration unter einem neuen Namen. Sie können den Bericht erneut
                   öffnen, indem Sie die Funktion
-                  <menuchoice>
-                    <guimenu>Berichte</guimenu><guimenuitem>Gespeicherte Berichtskonfigurationen
-                    </guimenuitem>
-                  </menuchoice>
+                  &mc.rep.saved-rep-conf;
                   aufrufen.
                 </para>
               </entry>
@@ -5567,9 +5303,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </tip>
 
       <para>Um das Fenster <guilabel>Abgleichen</guilabel> zu öffnen, wählen Sie auf
-        <menuchoice>
-          <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>A</accel>bgleichen…</guimenuitem>
-        </menuchoice>
+        &mc.ac.rec;
         in der <emphasis>Menüleiste</emphasis> oder klicken die Schaltfläche
         <guibutton>Abgleichen</guibutton> aus der <emphasis>Werkzeugleiste</emphasis> eines
         Kontenblatts an. Dadurch wird ein <guilabel>Abgleichen</guilabel>-Dialog geöffnet, in dem
@@ -5678,7 +5412,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </para>
 
       <sect3 id="Tools-reconcile-menu">
-        <title>Abgleichen - <guimenu><accel>A</accel>bgleichen</guimenu>-Menü</title>
+        <title>Abgleichen - &gm.rec.rec;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="Tools-ReconcileMenu">
           <title>Abgleichen - Abgleichen-Menü - Informationen zum Abgleich sowie Fertigstellen und Unterbrechen</title>
@@ -5703,7 +5437,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem><accel>I</accel>nformationen zum Abgleich…</guimenuitem>
+                  <para>&gmi.rec.rec.info;
                   </para>
                 </entry>
 
@@ -5715,13 +5449,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>W</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>F</accel>ertig</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.rec.fin;
                   </para>
                 </entry>
 
@@ -5733,13 +5461,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>P</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>U</accel>nterbrechen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.rec.pp;
                   </para>
                 </entry>
 
@@ -5751,7 +5473,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>A</accel>bbrechen</guimenuitem>
+                  <para>&gmi.rec.rec.cnl;
                   </para>
                 </entry>
 
@@ -5766,7 +5488,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Tools-reconcile-account">
-        <title>Abgleichen - <guimenu><accel>K</accel>onto</guimenu>-Menü</title>
+        <title>Abgleichen - &gm.rec.acc;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="Tools-ReconcileAccount">
           <title>Abgleichen - Konto-Menü - Kontenfunktionen</title>
@@ -5791,7 +5513,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem><accel>K</accel>onto öffnen</guimenuitem>
+                  <para>&gmi.rec.acc.open;
                   </para>
                 </entry>
 
@@ -5803,7 +5525,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Konto <accel>b</accel>earbeiten</guimenuitem>
+                  <para>&gmi.rec.acc.edit;
                   </para>
                 </entry>
 
@@ -5815,13 +5537,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>T</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>B</accel>uchen…</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.acc.trf;
                   </para>
                 </entry>
 
@@ -5833,7 +5549,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Überprü<accel>f</accel>en</guimenuitem>
+                  <para>&gmi.rec.acc.chk-rep;
                   </para>
                 </entry>
 
@@ -5849,7 +5565,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Tools-reconcile-trans">
-        <title>Abgleichen - <guimenu><accel>B</accel>uchung</guimenu>-Menü</title>
+        <title>Abgleichen - &gm.rec.tr;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="Tools-ReconcileTrans">
           <title>Abgleichen - Buchung-Menü - Funktionen zur Bearbeitung von Geschäftsvorgängen</title>
@@ -5874,13 +5590,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>B</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>S</accel>aldo</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.tr.bal;
                   </para>
                 </entry>
 
@@ -5892,13 +5602,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>E</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>B</accel>earbeiten</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.tr.edit;
                   </para>
                 </entry>
 
@@ -5910,13 +5614,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>R</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem>Auswahl <accel>a</accel>bgleichen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.tr.rec-sel;
                   </para>
                 </entry>
 
@@ -5928,14 +5626,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>U</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>N</accel>icht abgeglichene
-                      Auswahl</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.tr.unrec-sel;
                   </para>
                 </entry>
 
@@ -5947,13 +5638,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <shortcut>
-                      <keycombo>
-                        <keycap>Strg</keycap><keycap>D</keycap>
-                      </keycombo>
-                      </shortcut> <guimenuitem><accel>L</accel>öschen</guimenuitem>
-                    </menuchoice>
+                  <para>&mc.rec.tr.del;
                   </para>
                 </entry>
 
@@ -5968,7 +5653,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="Tools-reconcile-help">
-        <title>Abgleichen - <guimenu><accel>H</accel>ilfe</guimenu>-Menü</title>
+        <title>Abgleichen - &gm.rec.help;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="Tools-ReconcileHelp">
           <title>Abgleichen - Hilfe-Menü - Diese Hilfe sowie das Dokument &app;-Kurs und Konzepte</title>
@@ -5993,7 +5678,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem><accel>H</accel>ilfe</guimenuitem>
+                  <para>&gmi.rec.help.hlp;
                   </para>
                 </entry>
 
@@ -6203,10 +5888,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </note>
 
       <para>Dieses Ansicht wird geöffnet, wenn
-        <menuchoice>
-          <guimenu>A<accel>k</accel>tionen</guimenu> <guisubmenu>Term<accel>i</accel>nierte
-          Buchungen</guisubmenu><guimenuitem>Terminierte Buchungen Editor</guimenuitem>
-        </menuchoice>
+        &gmi.ac.scd.tr-ed;
         in der <emphasis>Menüleiste</emphasis> ausgewählt wird. Dadurch wird eine neue
         Registerkarte geöffnet, in dem die terminierten Buchungen geplant werden.
       </para>
@@ -6242,7 +5924,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
                 <entry>
                   <para>Enthält die im Fenster <quote>Terminierte Buchungen</quote> verwendeten Menüs. Es bietet den
                     Grundumfang der <emphasis>Menüleiste</emphasis> und den zusätzlichen
-                    Menüeintrag <guimenu><accel>T</accel>erminiert</guimenu>.
+                    Menüeintrag &gm.sx;.
                   </para>
 
                   <note>
@@ -6325,13 +6007,13 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
     <sect2 id="tools-SX-menus">
       <title>Menüleiste</title>
 
-      <para>Die folgende Tabelle beschreibt die Menüpunkte im <guimenu>Terminiert</guimenu>-Menü der
+      <para>Die folgende Tabelle beschreibt die Menüpunkte im &gm.sx;-Menü der
         <emphasis>Menüleiste</emphasis> die zur Arbeit in der Ansicht <guilabel>Terminierte
         Buchungen</guilabel> zur Verfügung stehen.
       </para>
 
       <sect3 id="tool-SX-trans">
-        <title>Terminierte Buchungen - <guimenu><accel>T</accel>erminiert</guimenu>-Menü</title>
+        <title>Terminierte Buchungen - &gm.sx;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="tool-SXTrans">
           <title>Terminierte Buchungen - Terminiert-Menü - Funktionen zur Bearbeitung von terminierten Buchungen</title>
@@ -6356,7 +6038,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem><accel>N</accel>eu</guimenuitem>
+                  <para>&gmi.sx.new;
                   </para>
                 </entry>
 
@@ -6368,7 +6050,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>B</accel>earbeiten</guimenuitem>
+                  <para>&gmi.sx.edit;
                   </para>
                 </entry>
 
@@ -6380,7 +6062,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>L</accel>öschen</guimenuitem>
+                  <para>&gmi.sx.del;
                   </para>
                 </entry>
 
@@ -6550,9 +6232,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
         <step>
           <para>Betätige
-            <keycombo>
-              <keycap>Enter</keycap>
-            </keycombo>
+              &kc.enter;
             um die Eingabe zu beenden.
           </para>
         </step>
@@ -6563,10 +6243,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Menüleiste</title>
 
       <para>Der Menüeintrag
-        <menuchoice>
-          <guimenu>A<accel>k</accel>tionen</guimenu><guisubmenu>B<accel>u</accel>dget</guisubmenu>
-          <guimenuitem>Budget <accel>ö</accel>ffnen</guimenuitem>
-        </menuchoice>
+        &mc.ac.bgt.open;
         öffnet das Standardbudget oder bietet eine Auswahl an, wenn es mehr als ein Budget gibt. Es
         wird eine neue Registerkarte mit dem angezeigten Budget geöffnet.
       </para>
@@ -6575,7 +6252,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </para>
 
       <sect3 id="budget-menus-edit">
-        <title>Budget - <guimenu><accel>B</accel>earbeiten</guimenu>-Menü</title>
+        <title>Budget - &gm.edit;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="budget-menus-edit-items">
           <title>Budget - Bearbeiten-Menü - Spezielle Menüpunkte für das Budgetfenster</title>
@@ -6600,7 +6277,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><guimenuitem>Budget ab<accel>s</accel>chätzen…</guimenuitem>
+                  <para>&gmi.ed.bgt.est;
                   </para>
                 </entry>
 
@@ -6613,7 +6290,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem><accel>A</accel>lle Perioden…</guimenuitem>
+                  <para>&gmi.ed.bgt.per;
                   </para>
                 </entry>
 
@@ -6625,7 +6302,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Budget <accel>l</accel>öschen…</guimenuitem>
+                  <para>&gmi.ed.bgt.del;
                   </para>
                 </entry>
 
@@ -6637,7 +6314,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Bemerkung bearbeiten</guimenuitem>
+                  <para>&gmi.ed.bgt.note;
                   </para>
                 </entry>
 
@@ -6649,7 +6326,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
               <row>
                 <entry>
-                  <para><guimenuitem>Budget <accel>O</accel>ptionen…</guimenuitem>
+                  <para>&gmi.ed.bgt.opt;
                   </para>
                 </entry>
 
@@ -6665,7 +6342,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="budget-menus-actions">
-        <title>Budget - <guimenu>A<accel>k</accel>tionen</guimenu>-Menü</title>
+        <title>Budget - &gm.act;-Menü</title>
 
         <table pgwide="1" frame="topbot" id="budget-menus-actions-items">
           <title>Budget - Aktionen-Menü - Einträge im Standardmenü die sich auf Budgets beziehen</title>
@@ -6690,9 +6367,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <guisubmenu>B<accel>u</accel>dget</guisubmenu><guimenuitem/>
-                    </menuchoice>
+                  <para>&mc-gsm.ac.bgt;
                   </para>
                 </entry>
 
@@ -6713,7 +6388,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       </sect3>
 
       <sect3 id="budget-menus-reports">
-        <title>Budget - <guimenu>Be<accel>r</accel>ichte</guimenu>-Menü</title>
+        <title>Budget - &gm.rep;-Menü</title>
 
         <note>
           <title>Arbeiten mit mehreren Budgets</title>
@@ -6722,10 +6397,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             ausgewählte Budget. Siehe <xref linkend="book-options"></xref> und
             <xref linkend="budgeting-book-options"></xref> für weitere Details. Nachdem der Bericht
             angezeigt wurde, kann das darin verwendete Budget unter dem Menüeintrag
-            <menuchoice>
-              <guimenu><accel>B</accel>earbeiten</guimenu>
-              <guimenuitem>Berichts<accel>o</accel>ptionen</guimenuitem>
-            </menuchoice>
+            &mc.ed.bgt.opt;
             Reiter <guilabel>Allgemein</guilabel> geändert werden.
           </para>
         </note>
@@ -6753,9 +6425,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
             <tbody>
               <row>
                 <entry>
-                  <para><menuchoice>
-                      <guisubmenu>B<accel>u</accel>dget</guisubmenu><guimenuitem/>
-                    </menuchoice>
+                  <para>&mc-gsm.rep.bgt;
                   </para>
                 </entry>
 
@@ -6999,10 +6669,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Kundenübersicht</title>
 
       <para>Um die Anzeige der <guilabel>Kundenübersicht</guilabel> zu öffnen, klicken Sie auf
-        <menuchoice>
-          <guimenu><accel>G</accel>eschäft</guimenu><guimenuitem><accel>K</accel>unden
-          </guimenuitem><guimenuitem>Kundenübersicht</guimenuitem>
-        </menuchoice>
+        &mc.bus.cus.o-view;
         .
       </para>
 
@@ -7110,7 +6777,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
           <tbody>
             <row>
               <entry>
-                <para><guimenuitem>Seite umbe<accel>n</accel>ennen</guimenuitem>
+                <para>&gmi.ac.re-pg;
                 </para>
               </entry>
 
@@ -7122,7 +6789,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem><accel>K</accel>unden bearbeiten</guimenuitem>
+                <para>&gmi.ed.cus.edit;
                 </para>
               </entry>
 
@@ -7134,7 +6801,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>N<accel>e</accel>ue Rechnung</guimenuitem>
+                <para>&gmi.bus.cus.new-inv;
                 </para>
               </entry>
 
@@ -7147,7 +6814,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>Kundenbericht</guimenuitem>
+                <para>&gmi.rep.bus.cus-rep;
                 </para>
               </entry>
 
@@ -7159,7 +6826,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>Zahlung verarbeiten</guimenuitem>
+                <para>&gmi.bus.cus.pro-pay;
                 </para>
               </entry>
 
@@ -7183,10 +6850,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Lieferantenübersicht</title>
 
       <para>Um die Anzeige der <guilabel>Lieferantenübersicht</guilabel> zu öffnen, klicken Sie auf
-        <menuchoice>
-          <guimenu><accel>G</accel>eschäft</guimenu><guimenuitem><accel>L</accel>ieferanten
-          </guimenuitem><guimenuitem>Lieferantenübersicht</guimenuitem>
-        </menuchoice>
+        &mc.bus.ven.o-view;
         .
       </para>
 
@@ -7294,7 +6958,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
           <tbody>
             <row>
               <entry>
-                <para><guimenuitem>Seite umbe<accel>n</accel>ennen</guimenuitem>
+                <para>&gmi.ac.re-pg;
                 </para>
               </entry>
 
@@ -7306,7 +6970,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem><accel>L</accel>ieferant bearbeiten</guimenuitem>
+                <para>&gmi.ed.ven.edit;
                 </para>
               </entry>
 
@@ -7318,7 +6982,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>N<accel>e</accel>ue Lieferantenrechnung</guimenuitem>
+                <para>&gmi.bus.ven.new-bil;
                 </para>
               </entry>
 
@@ -7331,7 +6995,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>Lieferantenbericht</guimenuitem>
+                <para>&gmi.rep.bus.ven-rep;
                 </para>
               </entry>
 
@@ -7343,7 +7007,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>Zahlung verarbeiten</guimenuitem>
+                <para>&gmi.bus.ven.pro-pay;
                 </para>
               </entry>
 
@@ -7367,10 +7031,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
       <title>Mitarbeiterübersicht</title>
 
       <para>Um die Anzeige der <guilabel>Mitarbeiterübersicht</guilabel> zu öffnen, klicken Sie auf
-        <menuchoice>
-          <guimenu><accel>G</accel>eschäft</guimenu><guimenuitem><accel>M</accel>itarbeiter
-          </guimenuitem><guimenuitem>Mitarbeiterübersicht</guimenuitem>
-        </menuchoice>
+        &mc.bus.emp.o-view;
         .
       </para>
 
@@ -7466,7 +7127,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
           <tbody>
             <row>
               <entry>
-                <para><guimenuitem>Seite umbe<accel>n</accel>ennen</guimenuitem>
+                <para>&gmi.ac.re-pg;
                 </para>
               </entry>
 
@@ -7478,7 +7139,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem><accel>M</accel>itarbeiter bearbeiten</guimenuitem>
+                <para>&gmi.ed.emp.edit;
                 </para>
               </entry>
 
@@ -7490,7 +7151,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>Neuer <accel>A</accel>uslagenbeleg…</guimenuitem>
+                <para>&gmi.bus.emp.new-exp-vou;
                 </para>
               </entry>
 
@@ -7503,7 +7164,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 
             <row>
               <entry>
-                <para><guimenuitem>Mitarbeiterbericht</guimenuitem>
+                <para>&gmi.rep.bus.emp-rep;
                 </para>
               </entry>
 
@@ -7515,7 +7176,7 @@ url="&url-docs-de;guide/chapter_txns.html#txns-regstyle1"> &app; Kurs und
 <!-- FIXME source: new item -->
             <row>
               <entry>
-                <para><guimenuitem>Zahlung verarbeiten</guimenuitem>
+                <para>&gmi.bus.emp.pro-pay;
                 </para>
               </entry>
 
diff --git a/manual/de/ch_GettingHelp.xml b/manual/de/ch_GettingHelp.xml
index e71a0a7a..3e6ad243 100644
--- a/manual/de/ch_GettingHelp.xml
+++ b/manual/de/ch_GettingHelp.xml
@@ -85,26 +85,12 @@
         </listitem>
 
         <listitem>
-          <para>Auswahl aus dem Menü
-            <menuchoice>
-              <guimenu><accel>H</accel>ilfe</guimenu><guimenuitem>I<accel>n</accel>halt
-              </guimenuitem>
-            </menuchoice>
-            geöffnet.
+          <para>Auswahl aus dem Menü &mc.help.cont; geöffnet.
           </para>
         </listitem>
 
         <listitem>
-          <para>Mit
-            <menuchoice>
-              <shortcut>
-              <keycombo action='simul'>
-                <keycap>Strg</keycap><keycap>H</keycap>
-              </keycombo>
-              </shortcut><guimenu><accel>H</accel>ilfe</guimenu><guimenuitem>&app;-Kurs und
-              Konzepte</guimenuitem>
-            </menuchoice>
-            wird der andere Teil dieser Dokumentation, das Tutorial, geöffnet.
+          <para>Mit &mc.help.guide; wird der andere Teil dieser Dokumentation, das Tutorial, geöffnet.
           </para>
         </listitem>
 
@@ -168,15 +154,7 @@
         &appname;!</guilabel> Menü wählen.
       </para>
 
-      <para>Um diese Anleitung manuell zu öffnen, gehen Sie zu
-        <menuchoice>
-          <guimenu>Hilfe</guimenu> <guimenuitem>&app;-Kurs und Konzepte</guimenuitem>
-        </menuchoice>
-        oder betätigen Sie
-        <keycombo action='simul'>
-          <keycap>Strg</keycap><keycap>H</keycap>
-        </keycombo>
-        .
+      <para>Um diese Anleitung manuell zu öffnen, gehen Sie zu &mc.help.guide;.
       </para>
 
       <important>
diff --git a/manual/de/ch_GettingStarted.xml b/manual/de/ch_GettingStarted.xml
index 285e51a1..a2eda170 100644
--- a/manual/de/ch_GettingStarted.xml
+++ b/manual/de/ch_GettingStarted.xml
@@ -181,7 +181,7 @@ Translators:
                 <term><guibutton>Ja</guibutton></term>
 
                 <listitem>
-                  <para>Klicken Sie diese Schaltfläche oder drücken Sie <keycap>Enter</keycap> auf Ihrer Tastatur damit
+                  <para>Klicken Sie diese Schaltfläche oder drücken Sie &kc.enter; auf Ihrer Tastatur damit
                     der <guilabel>Willkommen bei &appname;!</guilabel> Bildschirm abermals angezeigt
                     wird.
                   </para>
diff --git a/manual/de/ch_Reports.xml b/manual/de/ch_Reports.xml
index d1531147..c6af38be 100644
--- a/manual/de/ch_Reports.xml
+++ b/manual/de/ch_Reports.xml
@@ -41,9 +41,7 @@
     </para>
 
     <para>To run a report or chart, click on the
-      <menuchoice>
-        <guimenu>Reports</guimenu>
-      </menuchoice>
+      &gm.rep;
       menu, then either select a report (it will open with standard options), or click on
       <guibutton> Saved Report Configuration</guibutton> to select a report you have previously
       configured and saved.
@@ -64,10 +62,7 @@
     <tip>
       <para>If you often run a report with a date as at the start or end of an accounting period, set the
         accounting period start and end dates in
-        <menuchoice>
-          <guimenu>Edit</guimenu><guisubmenu>Preferences</guisubmenu> <guimenuitem>Accounting
-          Period</guimenuitem>
-        </menuchoice>
+        &mc.ed.pref; <guilabel>Buchführungsperioden</guilabel>
         then select appropriate report date options. See <xref linkend="prefs-accounting-period" />.
       </para>
     </tip>
@@ -75,13 +70,9 @@
     <tip>
       <para>If you cannot find a specific report to suit your requirements, you may be able to use the
         <guilabel>Find Transaction</guilabel> assistant (
-        <menuchoice>
-          <guimenu>Edit</guimenu><guimenuitem>Find</guimenuitem>
-        </menuchoice>
+        &mc.ed.find;
         ) to select a set of transactions, and then report them using
-        <menuchoice>
-          <guimenu>Reports</guimenu> <guimenuitem>Account Report</guimenuitem>
-        </menuchoice>
+        &mc.rep.acct-rep;
         . Further formatting or analysis may be done by copying and pasting the report into a
         spreadsheet.
       </para>
@@ -126,9 +117,7 @@
       </para>
 
       <para>After your customized report has been saved, it is available for use by the
-        <menuchoice>
-          <guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem>
-        </menuchoice>
+        &mc.rep.saved-rep-conf;
         menu and it will also be listed when starting
         <menuchoice>
           <guimenu>Reports</guimenu><guisubmenu>Sample & Custom</guisubmenu><guimenuitem>Custom
@@ -142,9 +131,7 @@
       <title>Working with Saved Report Configurations</title>
 
       <para>Selecting
-        <menuchoice>
-          <guimenu>Reports</guimenu><guimenuitem>Saved Report Configurations</guimenuitem>
-        </menuchoice>
+        &mc.rep.saved-rep-conf;
         will open a dialog window with the list of the <emphasis>Saved Report
         Configurations</emphasis> you have previously created. In this context <emphasis>Saved
         Report Configurations</emphasis> means the set of customized settings for standard reports.
@@ -245,10 +232,7 @@
           <tip>
             <para>If you often run a report with a date as at the start or end of an accounting period, set the
               accounting period start and end dates in
-              <menuchoice>
-                <guimenu>Edit</guimenu> <guisubmenu>Preferences</guisubmenu> <guimenuitem>Accounting
-                Period</guimenuitem>
-              </menuchoice>
+              &mc.ed.pref; <guilabel>Buchführungsperioden</guilabel>
               then select appropriate report date options. See
               <xref linkend="prefs-accounting-period" />.
             </para>
@@ -293,9 +277,7 @@
             there are four style sheets: <guilabel>Default</guilabel>, <guilabel>Easy</guilabel>,
             <guilabel>Footer</guilabel> and <guilabel>Technicolor</guilabel>. You can customize each
             of these from the
-            <menuchoice>
-              <guimenu>Edit</guimenu><guimenuitem>Style Sheets...</guimenuitem>
-            </menuchoice>
+            &mc.ed.css;
             menu item. This is described in the <xref linkend="change-style"></xref>
 <!--Changing Style Sheets-->
             section.
@@ -314,9 +296,7 @@
           </para>
 
           <para>The default Report Currency is defined in
-            <menuchoice>
-              <guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem>
-            </menuchoice>
+            &mc.ed.pref;
             Reports tab. See <xref linkend="prefs-reports" />.
           </para>
         </listitem>
@@ -3096,10 +3076,7 @@ Income (type INCOME)
           <emphasis>deductible</emphasis> and <emphasis>non deductible</emphasis> expenses. The user
           must also set the <guilabel>TXF category</guilabel> of each tax related account. This can
           be done by the <guimenuitem>Income Tax Information</guimenuitem> dialog, reachable by
-          <menuchoice>
-            <guimenu><accel>E</accel>dit</guimenu><guimenuitem>Ta<accel>x</accel> Report
-            Options</guimenuitem>
-          </menuchoice>
+          &mc.ed.tax-rep-opt;
           . Its usage is explained in <xref linkend="set-tax-options"></xref>.
         </para>
       </important>
@@ -3170,9 +3147,7 @@ Income (type INCOME)
     <para>&app; is able to print reports and to export the reports to <acronym>HTML</acronym> (web) pages. The
       Print &app; Document dialog is accessed from the <guibutton>Print</guibutton> button on the
       <emphasis>toolbar</emphasis> or go to
-      <menuchoice>
-        <guimenu>File</guimenu><guimenuitem>Print</guimenuitem>
-      </menuchoice>
+      &mc.fi.prin;
       in the menu. To Export a report to a web page (<acronym>HTML</acronym>) select the
       <guibutton>Export</guibutton> button on the <emphasis>Toolbar</emphasis> and type in a file
       name.
diff --git a/manual/de/ch_Tools_Assistants.xml b/manual/de/ch_Tools_Assistants.xml
index c77ffa48..5b078845 100644
--- a/manual/de/ch_Tools_Assistants.xml
+++ b/manual/de/ch_Tools_Assistants.xml
@@ -65,7 +65,7 @@
         results in a register window. To open the <guilabel>Find Transaction</guilabel> dialog in
         <guilabel>Split Search</guilabel> mode, you can type the keyboard shortcut
         <keycombo>
-          <keycap>Ctrl</keycap><keycap>f</keycap>
+          &kc.ctrl;<keycap>f</keycap>
         </keycombo>
         .
       </para>
@@ -74,9 +74,7 @@
         the main accounts hierarchy page, all transactions will be searched. If you start from an
         individual account register, only transactions in that account will be searched. And if you
         filter the transactions in a register using
-        <menuchoice>
-          <guimenuitem>View </guimenuitem><guimenuitem> Filter By... </guimenuitem>
-        </menuchoice>
+        &mc.vw.f-by;
         , then only transactions in that account and shown by the filter will be searched.
       </para>
 
@@ -108,8 +106,8 @@
 
       <para>In the <guilabel>Type of Search</guilabel> pane there are five selections. The first option is
         always enabled, the following three are available when you invoke the
-        <guimenuitem>Find...</guimenuitem> option from a register window or after performing the
-        first <guibutton>Find</guibutton> if the <guimenuitem>Find...</guimenuitem> command was
+        &gmi.ed.find; option from a register window or after performing the
+        first <guibutton>Find</guibutton> if the &gmi.ed.find; command was
         invoked from any other window. The last option is available only for
         <link linkend="tool-find-bsnss">Business search</link>.
       </para>
@@ -173,9 +171,7 @@
       <para>When search criteria are selected, you can press the <guibutton>Find</guibutton> button. You will be
         presented with the search results in a new register tab. A report of the search results may
         created and printed using
-        <menuchoice>
-          <guimenu> Reports</guimenu><guimenuitem>Account Report</guimenuitem>
-        </menuchoice>
+        &mc.rep.acct-rep;
         . The Account Report has limited formatting options but, like all &app; reports, being in
         html format, can be copied and pasted into a spreadsheet for further formatting.
         Alternatively, the Account Report can be exported to an html file, and the html file may be
@@ -1134,9 +1130,7 @@
       <para>The business find assistant is used to search for business related items (Customer, Invoice, Job,
         Vendor, Bill, Employee, Expense Voucher). To open the business search dialog select the
         desired item to <guimenuitem>Find</guimenuitem> from the
-        <menuchoice>
-          <guimenu>Business</guimenu><guisubmenu>Customer/Vendor/Employee </guisubmenu>
-        </menuchoice>
+        &mc.bus.cus.find-cus;, &mc.bus.ven.find-ven; or &mc.bus.emp.find-emp;
         submenus.
       </para>
 
@@ -4406,10 +4400,7 @@
     <para>This assistant creates a loan repayment scheduled transaction. When used to setup a scheduled
       transaction, the assistant creates a variable formula so that the compounding interest is
       correctly calculated. To start this assistant manually go to
-      <menuchoice>
-        <guilabel>Actions</guilabel><guisubmenu>Scheduled Transactions</guisubmenu>
-        <guimenuitem>Mortgage and Loan Repayment...</guimenuitem>
-      </menuchoice>
+      &mc.ac.scd.loan;
       .
     </para>
 
@@ -4750,9 +4741,7 @@
       </para>
 
       <para>The Stock Split assistant is accessed by going to
-        <menuchoice>
-          <guimenu>Actions</guimenu> <guimenuitem>Stock Split...</guimenuitem>
-        </menuchoice>
+        &mc.ac.stk-spt;
         .
       </para>
 
@@ -5019,7 +5008,7 @@
     </para>
 
     <tip>
-      <para>If <guilabel>Online Banking Setup</guilabel> does not appear in your <guimenu>Tools</guimenu> menu,
+      <para>If &gmi.to.aqb; does not appear in your &gm.tool; menu,
         verify that you are in an <guilabel>Account Tree</guilabel> or <guilabel>Register</guilabel>
         tab.
       </para>
@@ -6497,9 +6486,7 @@ tips_appendix.xml and to adapt the text here. -->
 
       <para>To open the <guilabel>Lots in Account</guilabel> window, open the security account register, then
         select
-        <menuchoice>
-          <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
-        </menuchoice>
+        &mc.ac.vw-lots;
         .
       </para>
 
@@ -6934,9 +6921,7 @@ tips_appendix.xml and to adapt the text here. -->
         <para>To open the <guilabel>Lots in Account AAAA</guilabel> window, where AAAA is the <emphasis>Accounts
           Receivable</emphasis> (AR) or <emphasis>Accounts Payable</emphasis> (AP) account, open the
           <emphasis>AR</emphasis> or <emphasis>AP</emphasis> account register, then select
-          <menuchoice>
-            <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
-          </menuchoice>
+          &mc.ac.vw-lots;
           .
         </para>
 
diff --git a/manual/de/ch_Transactions.xml b/manual/de/ch_Transactions.xml
index 567a0599..f7a2c2b1 100644
--- a/manual/de/ch_Transactions.xml
+++ b/manual/de/ch_Transactions.xml
@@ -68,14 +68,7 @@ Translators:
     <title>Verwenden des Buchen Dialogs</title>
 
     <para>Der <guilabel>Buchen</guilabel> Dialog ist im Menü und mit dem Tastenkürzel mittels
-      <menuchoice>
-        <shortcut>
-        <keycombo>
-          <keycap>Strg</keycap><keycap>T</keycap>
-        </keycombo>
-        </shortcut> <guimenu>A<accel>k</accel>tionen</guimenu>
-        <guimenuitem><accel>B</accel>uchen…</guimenuitem>
-      </menuchoice>
+      &mc.ac.trf;
       sowie durch Verwenden der Schaltfläche <guibutton>Buchen</guibutton> in der
       <emphasis>Werkzeugleiste</emphasis> des Kontobuchs zu erreichen und dient in &app; zwei
       Zwecken:
@@ -291,22 +284,22 @@ Translators:
 
     <note>
       <para>Wenn Sie in &app; an Buchungen arbeiten, beachten Sie, dass die
-        <keycap function="enter">Eingabe</keycap> Taste und die <keycap function="tab">Tab</keycap>
+        &kc.enter; Taste und die &kc.tab;
         Taste sich unterschiedlich verhalten und unterschiedliche Aktionen ausführen.
       </para>
 
-      <para>Die Taste <keycap function="enter">Eingabe</keycap> wechselt in das erste Feld des nächsten
+      <para>Die Taste &kc.enter; wechselt in das erste Feld des nächsten
         Buchungsteils, unabhängig davon, in welchem Feld Sie sich befinden. Wenn es keinen
         nächsten Buchungsteil gibt, wird mit der Eingabe der nächsten Buchung begonnen. In jedem
-        Fall schließt <keycap function="enter">Eingabe</keycap> die Bearbeitung der Buchung ab, und
+        Fall schließt &kc.enter; die Bearbeitung der Buchung ab, und
         ein mögliche Ausgleichsbuchung wird auf das <emphasis>Ausgleichskonto-CUR</emphasis>
         gebucht, wobei <emphasis>CUR</emphasis> die Währung der Buchung ist.
       </para>
 
-      <para>Mit der Taste <keycap function="tab">Tab</keycap> wechseln Sie zum nächsten Feld im aktuellen
+      <para>Mit der Taste &kc.tab; wechseln Sie zum nächsten Feld im aktuellen
         Buchungsteil. Wenn es das letzte Feld ist, geht der Cursor zum nächsten Buchungsteil oder
         erstellt eine neuen, wenn es keinen gibt. Wenn der Buchungsteil leer ist, schließt die
-        Taste <keycap function="tab">Tab</keycap> die Buchung ab und bucht eine etwaige
+        Taste &kc.tab; die Buchung ab und bucht eine etwaige
         Ausgleichsbuchung, wie oben beschrieben, in das <emphasis>Ausgleichskonto-CUR</emphasis>.
       </para>
     </note>
@@ -324,7 +317,7 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der <keycap>Tab</keycap>-Taste weiter oder klicken Sie das Feld
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste weiter oder klicken Sie das Feld
           <guilabel>Nr</guilabel> an. Hier können Sie eine Scheck- bzw. Buchungsnummer eingeben.
           <tip>
             <para>Mit der Taste <keycap>+</keycap> wird automatisch die Nummer der letzten Buchung, die eine Nummer
@@ -335,7 +328,7 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der <keycap>Tab</keycap>-Taste weiter oder klicken Sie das Feld
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste weiter oder klicken Sie das Feld
           <guilabel>Beschreibung</guilabel> an. Hier geben Sie entweder einen Zahlungsempfänger
           oder eine andere Beschreibung für die Buchung ein. Während des Eintippens versucht &app;
           automatisch, den Namen des Zahlungsempfängers zu ergänzen.
@@ -343,7 +336,7 @@ Translators:
       </step>
 
       <step>
-        <para>Wenn Sie an dieser Stelle die <keycap>Tab</keycap>-Taste drücken, passieren zwei Dinge: Falls &app;
+        <para>Wenn Sie an dieser Stelle die &kc.tab;-Taste drücken, passieren zwei Dinge: Falls &app;
           eine Ãœbereinstimmung mit einer bereits vorhandenen Buchung findet, springt der Cursor auf
           eines der Betragsfelder, und das Feld <guilabel>Buchen</guilabel> wird automatisch
           gefüllt. Falls noch keine entsprechende Buchung existiert, bewegt &app; den Cursor in das
@@ -386,7 +379,7 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der <keycap>Tab</keycap>-Taste zum ersten Betragsfeld. Die Bezeichnungen
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste zum ersten Betragsfeld. Die Bezeichnungen
           der beiden Betragsspalten sind je nach Kontoart unterschiedlich. So heißen sie bei
           <emphasis>Bank</emphasis>-Konten <guilabel>Einzahlung</guilabel> und
           <guilabel>Abhebung</guilabel>, bei <emphasis>Kreditkarten</emphasis>-Konten
@@ -399,19 +392,13 @@ Translators:
       <step>
         <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Ist die Buchung
           <quote>ausgeglichen</quote> wird durch Drücken der
-          <keycap function="enter">Eingabe</keycap> Taste, Betätigung der
+          &kc.enter; Taste, Betätigung der
           <guibutton>Eingabe</guibutton> Schaltfläche in der <emphasis> Werkzeugleiste </emphasis>
           oder mit
-          <menuchoice>
-            <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-            ein<accel>g</accel>eben</guimenuitem>
-          </menuchoice>
+          &mc.tr.ent;
           die Buchung abgeschlossen. Durch Anklicken der <guibutton>Abbrechen</guibutton>
           Schaltfläche oder mit
-          <menuchoice>
-            <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-            <accel>a</accel>bbrechen</guimenuitem>
-          </menuchoice>
+          &mc.tr.cnl;
           wird die Buchung gelöscht.
         </para>
       </step>
@@ -427,14 +414,7 @@ Translators:
         <para>Um zu einer leeren Buchung am Ende des Kontobuchs zu wechseln, klicken Sie die
           <guibutton>Neu</guibutton> Schaltfläche in der <emphasis>Werkzeugleiste</emphasis> an
           oder wählen Sie
-          <menuchoice>
-            <shortcut>
-            <keycombo>
-              <keycap>Strg</keycap><keycap>Bild ab</keycap>
-            </keycombo>
-            </shortcut> <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>L</accel>eere
-            Buchung</guimenuitem>
-          </menuchoice>
+          &mc.ac.blk-tr;
           .
         </para>
       </step>
@@ -451,7 +431,7 @@ Translators:
 
     <para>Wählen Sie eine Buchung im <guilabel>Kontobuch</guilabel>, klicken Sie mit der rechten Maustaste
       darauf, um das <guimenu>Kontextmenü</guimenu> zu öffnen und wählen Sie
-      <guimenuitem>Verknüpfung bearbeiten…</guimenuitem>. Es öffnet sich der Dialog
+      &gmi.tr.man-doc-link;. Es öffnet sich der Dialog
       <guilabel>Buchungsverknüpfung bearbeiten</guilabel>.
     </para>
 
@@ -496,7 +476,7 @@ Translators:
       verlassen, ohne eine Änderung vorzunehmen.
     </para>
 
-    <para>Der Menüeintrag <guimenuitem>Verknüpfung öffnen</guimenuitem> ist aktiviert, wenn eine Datei oder
+    <para>Der Menüeintrag &gmi.tr.open-doc; ist aktiviert, wenn eine Datei oder
       eine URL mit der ausgewählten Buchung verknüpft ist. Wenn Sie diesen auswählen, öffnet
       sich die Datei in dem Standardprogramm für den Dateityp bzw. die URL im Standard-Browser.
     </para>
@@ -532,7 +512,7 @@ Translators:
       und solange diese Symbole von der aktuellen Schriftart für die Zelle unterstützt werden.
       Wenn Sie den Mauszeiger über der Zelle platzieren wird der Dateiname oder die URL in einem
       Tooltip angezeigt und ein Klick darauf öffnet die Datei oder URL genau so wie der Eintrag des
-      Kontextmenüs <guimenuitem>Verknüpfung öffnen</guimenuitem>.
+      Kontextmenüs &gmi.tr.open-doc;.
     </para>
   </sect1>
 
@@ -549,10 +529,7 @@ Translators:
     <para>Die weiteren Buchungszeilen werden im einzeiligen Kontobuch nicht angezeigt, es sei denn, die
       Schaltfläche <guibutton>Vollständig</guibutton> in der <emphasis>Werkzeugleiste</emphasis>
       oder der Menüeintrag
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>M</accel>ehrteilige
-        Buchung</guimenuitem>
-      </menuchoice>
+      &mc.ac.spt-tr;
       sind aktiviert.
     </para>
 
@@ -569,7 +546,7 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der <keycap>Tab</keycap>-Taste weiter oder klicken Sie das Feld
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste weiter oder klicken Sie das Feld
           <guilabel>Nr</guilabel> an. Hier können Sie eine Scheck- bzw. Buchungsnummer eingeben.
           Mit der Taste <keycap>+</keycap> wird automatisch die Nummer der letzten Buchung, die eine
           Nummer hatte, um eins erhöht und hier eingefügt.
@@ -577,7 +554,7 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der <keycap>Tab</keycap>-Taste weiter oder klicken Sie das Feld
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste weiter oder klicken Sie das Feld
           <guilabel>Beschreibung</guilabel> an. Hier geben Sie entweder einen Zahlungsempfänger
           oder eine andere Beschreibung für die Buchung ein. Während des Eintippens versucht &app;
           automatisch, den Namen des Zahlungsempfängers zu ergänzen.
@@ -585,7 +562,7 @@ Translators:
       </step>
 
       <step>
-        <para>Wenn Sie an dieser Stelle die <keycap>Tab</keycap>-Taste drücken, passieren zwei Dinge: Falls &app;
+        <para>Wenn Sie an dieser Stelle die &kc.tab;-Taste drücken, passieren zwei Dinge: Falls &app;
           eine Ãœbereinstimmung mit einer bereits vorhandenen Buchung findet, springt der Cursor auf
           eines der Betragsfelder, und das Feld <guilabel>Buchen</guilabel> wird automatisch
           gefüllt. Wenn Sie stattdessen das Feld <guilabel>Buchen</guilabel> direkt mit der Maus
@@ -622,7 +599,7 @@ Translators:
       </step>
 
       <step>
-        <para>Bewegen Sie den Cursor mit der <keycap>Tab</keycap>-Taste zum ersten Betragsfeld. Die Bezeichnungen
+        <para>Bewegen Sie den Cursor mit der &kc.tab;-Taste zum ersten Betragsfeld. Die Bezeichnungen
           der beiden Betragsspalten sind je nach Kontoart unterschiedlich. So heißen sie bei
           <emphasis>Bank</emphasis>-Konten <guilabel>Einzahlung</guilabel> und
           <guilabel>Abhebung</guilabel>, bei <emphasis>Kreditkarten</emphasis>-Konten
@@ -633,8 +610,8 @@ Translators:
       </step>
 
       <step>
-        <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Bevor Sie <keycap>Tab</keycap> oder
-          <keycap function="enter">Eingabe</keycap> drücken, lesen Sie bitte den nächsten Schritt.
+        <para>Geben Sie den Betrag für die Buchung in das richtige Feld ein. Bevor Sie &kc.tab; oder
+          &kc.enter; drücken, lesen Sie bitte den nächsten Schritt.
         </para>
       </step>
 
@@ -642,10 +619,7 @@ Translators:
         <para>Um die weiteren Buchungsteile einzugeben, drücken Sie die Schaltfläche
           <guibutton>Vollständig</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder
           wählen Sie
-          <menuchoice>
-            <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>M</accel>ehrteilige
-            Buchung</guimenuitem>
-          </menuchoice>
+          &mc.ac.spt-tr;
           . Buchungen mit mehreren Teilen tragen den Hinweis <emphasis>-- Mehrteilige Buchung
           --</emphasis> und zur Anzeige der Details wird die Funktion
           <guibutton>Vollständig</guibutton> benötigt.
@@ -684,12 +658,9 @@ Translators:
 
       <step>
         <para>Bewegen Sie den Cursor zum noch fehlenden Betragsfeld in der dritten Zeile und ergänzen Sie den
-          Betrag. Durch Drücken der <keycap function="enter">Eingabe</keycap> Taste, Anklicken der
+          Betrag. Durch Drücken der &kc.enter; Taste, Anklicken der
           Schaltfläche <guibutton>Eingeben</guibutton> oder mit
-          <menuchoice>
-            <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-            ein<accel>g</accel>eben</guimenuitem>
-          </menuchoice>
+          &mc.tr.ent;
           wird nunmehr der Cursor zur nächsten Zeile bewegt.
         </para>
       </step>
@@ -709,15 +680,12 @@ Translators:
       </step>
 
       <step>
-        <para>Wenn Sie, wie oben beschrieben, die <keycap function="enter">Eingabe</keycap> Taste drücken, bis
+        <para>Wenn Sie, wie oben beschrieben, die &kc.enter; Taste drücken, bis
           sich der Cursor hinter der Leerzeile befindet, so springt der Cursor zum nächsten
           Buchung. Dadurch wird der mehrteilige Vorgang geschlossen; er kann jedoch auch manuell
           geschlossen werden, indem Sie die Schaltfäche <guibutton>Vollständig</guibutton>
           anklicken oder
-          <menuchoice>
-            <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>M</accel>ehrteilige
-            Buchung</guimenuitem>
-          </menuchoice>
+          &mc.ac.spt-tr;
           .
         </para>
       </step>
@@ -767,22 +735,16 @@ Translators:
 
     <para>Zur Änderung einer Buchung müssen Sie nur den zu ändernden Buchungsteil auswählen. Sobald Sie
       die Änderungen vorgenommen haben, drücken Sie entweder die
-      <keycap function="enter">Eingabe</keycap> Taste, betätigen die
+      &kc.enter; Taste, betätigen die
       <guibutton>Eingeben</guibutton> Schaltfläche oder den Menübefehl
-      <menuchoice>
-        <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-        ein<accel>g</accel>eben</guimenuitem>
-      </menuchoice>
+      &mc.tr.ent;
       , und der Cursor springt automatisch zur nächsten Zeile bzw. zur nächsten Buchung.
     </para>
 
     <para>Um für die Bearbeitung eine detailliertere Ansicht die Buchung zu erhalten, betätigen Sie die
       <guibutton>Vollständig</guibutton> Schaltfläche in der <emphasis>Werkzeugleiste</emphasis>
       oder wählen Sie
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>M</accel>ehrteilige
-        Buchung</guimenuitem>
-      </menuchoice>
+      &mc.ac.spt-tr;
       .
     </para>
   </sect1>
@@ -793,29 +755,20 @@ Translators:
     <para>Soll eine Buchung aus dem Kontobuch entfernt werden, wählen Sie die Buchung aus und drücken Sie
       entweder die <guibutton>Löschen</guibutton> Schaltfläche in der
       <emphasis>Werkzeugleiste</emphasis> oder verwendenen Sie
-      <menuchoice>
-        <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-        <accel>l</accel>öschen</guimenuitem>
-      </menuchoice>
+      &mc.tr.del;
       . Es öffnet sich ein Dialogfenster, um das Löschen zu bestätigen, sofern die Einstellung
       nicht geändert wurde. Das Fenster bietet zwei Optionen: <guilabel><accel>A</accel>ntwort
       speichern und nicht wieder anzeigen.</guilabel> und <guilabel>Antwort speichern und in
       <accel>d</accel>ieser Sitzung nicht wieder anzeigen</guilabel>. Die Antwort wird entsprechend
       dem ausgewählten Kontrollkästchen gespeichert. Die Voreinstellung kann auch mittels
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>W</accel>arnungen
-        zurücksetzen</guimenuitem>
-      </menuchoice>
+      &mc.ac.res-warn;
       . <xref linkend="reset-warning" /> rückgängig gemacht werden.
     </para>
 
     <para>Teile einer Buchung können auch entfernt werden, indem Sie die Schaltfläche
       <guibutton>Vollständig</guibutton> auf der <emphasis>Werkzeugleiste</emphasis> oder durch
       Auswahl von
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>M</accel>ehrteilige
-        Buchung</guimenuitem>
-      </menuchoice>
+      &mc.ac.spt-tr;
       . Die Teilbuchung, die entfernt werden soll, kann dann zum Löschen ausgewählt werden.
     </para>
   </sect1>
@@ -831,12 +784,8 @@ Translators:
     </para>
 
     <para>Natürlich kann ein Benutzer Stornobuchungen durchaus manuell eingeben; &app; enthält dafür jedoch
-      einen Menüoption (
-      <menuchoice>
-        <guimenu>B<accel>u</accel>chungen</guimenu><guimenuitem>Stornobuchung
-        <accel>h</accel>inzufügen</guimenuitem>
-      </menuchoice>
-      ), der die Stornobuchung schnell für Sie anlegen kann. Diese Option erscheint nur, wenn Sie
+      einen Menüoption (&mc.tr.add-rev;),
+      der die Stornobuchung schnell für Sie anlegen kann. Diese Option erscheint nur, wenn Sie
       sich in einem Kontobuch befinden. Wenn Sie eine Buchung ausgewählt haben, die storniert
       werden soll, brauchen Sie nur diesen Menüpunkt zu wählen, und es wird sofort ein Duplikat
       der Buchung erstellt, die die aktive Buchung storniert.
@@ -864,30 +813,21 @@ Translators:
         <para>Wenn Sie sich in der <quote>einzeiligen</quote> Ansicht befinden, drücken Sie die Taste
           <guibutton>Vollständig</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder
           wählen Sie
-          <menuchoice>
-            <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>M</accel>ehrteilige
-            Buchung</guimenuitem>
-          </menuchoice>
+          &mc.ac.spt-tr;
           um die Buchung zu öffnen.
         </para>
       </listitem>
 
       <listitem>
         <para>Verwenden Sie
-          <menuchoice>
-            <guimenu>B<accel>u</accel>chungen</guimenu><guimenuitem>Andere
-            Buchungs<accel>t</accel>eile löschen</guimenuitem>
-          </menuchoice>
+          &mc.tr.rem;
           . Es öffnet sich ein Dialogfenster, um das Löschen zu bestätigen, sofern die
           Einstellung nicht geändert wurde. Das Fenster bietet zwei Optionen:
           <guilabel><accel>A</accel>ntwort speichern und nicht wieder anzeigen.</guilabel> und
           <guilabel>Antwort speichern und in <accel>d</accel>ieser Sitzung nicht wieder
           anzeigen</guilabel>. Die Antwort wird entsprechend dem ausgewählten Kontrollkästchen
           gespeichert. Die Voreinstellung kann auch mittels
-          <menuchoice>
-            <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>W</accel>arnungen
-            zurücksetzen</guimenuitem>
-          </menuchoice>
+          &mc.ac.res-warn;
           . <xref linkend="reset-warning" /> rückgängig gemacht werden.
         </para>
       </listitem>
@@ -914,20 +854,17 @@ Translators:
   <sect1 id="trans-copy">
     <title>Buchung kopieren</title>
 
-    <para>Um Buchungen zu kopieren, können Sie das Menü <guimenu>Buchung</guimenu> verwenden. In dem Menü
-      <guimenu>Buchung</guimenu> gibt es die Befehle <guimenu>Buchung ausschneiden</guimenu>,
-      <guimenu>Buchung kopieren</guimenu> und <guimenu>Buchung einfügen</guimenu>, mit denen ein
+    <para>Um Buchungen zu kopieren, können Sie das Menü &gm.trans; verwenden. In dem Menü
+      &gm.trans; gibt es die Befehle &gmi.tr.cut;,
+      &gmi.tr.copy; und &gmi.tr.paste;, mit denen ein
       kompletter Geschäftsvorgang ausgeschnitten oder kopiert und anschließend in einer neuen
       Zeile eingefügt werden kann. Bei dieser Methode wird als Datum das benutzt, welches in der
       leeren Zeile für neue Buchungen steht.
     </para>
 
     <para>Der Menüpunkt
-      <menuchoice>
-        <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-        dupli<accel>z</accel>ieren</guimenuitem>
-      </menuchoice>
-      oder die Schaltfläche <guimenu>Duplizieren</guimenu> in der
+      &mc.tr.dup;
+      oder die Schaltfläche <guibutton>Duplizieren</guibutton> in der
       <emphasis>Werkzeugleiste</emphasis> bietet, im Gegensatz zur Methode Kopieren die
       Möglichkeit, ein anderes Datum zu wählen.
     </para>
@@ -940,10 +877,7 @@ Translators:
 
       <listitem>
         <para>Wählen Sie
-          <menuchoice>
-            <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung
-            dupli<accel>z</accel>ieren</guimenuitem>
-          </menuchoice>
+          &mc.tr.dup;
         </para>
       </listitem>
 
@@ -1011,18 +945,13 @@ Translators:
 
         <listitem>
           <para>Ungültig. Der Status wird manuell mit dem Menüpunkt
-            <menuchoice>
-              <guimenu>B<accel>u</accel>chung</guimenu><guimenuitem>Buchung <accel>u</accel>ngültig
-              machen</guimenuitem>
-            </menuchoice>
+            &mc.tr.void;
             (siehe auch <xref linkend="Trans-transaction-menu" />) einer Buchung zugewiesen oder
             freigegeben und gilt für jede Zeile in der Buchung. Es verbirgt die meisten
             Buchungsdetails, löscht sie aber nicht. Wird eine Buchung für ungültig erklärt, so
             ist ein Grund anzugeben, der rechts neben den Buchungsnotizen erscheint. Die Notizen und
             die Begündung sind nur sichtbar, wenn Sie Folgendes aktiviert haben
-            <menuchoice>
-              <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>Z</accel>weizeilig</guimenuitem>
-            </menuchoice>
+            &mc.vw.doub;
             .
           </para>
         </listitem>
@@ -1037,19 +966,13 @@ Translators:
       einsehen zu können. Dies ermöglicht &app; ihnen, indem Sie die Schaltfläche
       <guibutton>Springen</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder den
       Menübefehl
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem>Zum Gegenkonto
-        <accel>s</accel>pringen</guimenuitem>
-      </menuchoice>
+      &mc.ac.jump;
       in der Anzeige für das Kontobuch verwenden.
     </para>
 
     <para>Wählen Sie die gewünschte Buchung im Kontobuch betätigen entweder die
       <guibutton>Springen</guibutton> Schaltfläche oder wählen
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem>Zum Gegenkonto
-        <accel>s</accel>pringen</guimenuitem>
-      </menuchoice>
+      &mc.ac.jump;
       im Menü um zugehörigen Gegenkonto in einem neuen Fenster zu öffnen. Wenn die Buchung mehr
       als ein Konto berührt, müssen Sie zuerst alle Buchungsteile anzeigen und das Gegenkonto, zu
       dem gesprungen werden soll, auswählen
@@ -1073,9 +996,7 @@ Translators:
       Vorlage verwenden wollen, und anschließend entweder die Schaltfläche
       <guibutton>Terminiert</guibutton> in der <emphasis>Werkzeugleiste</emphasis> oder den
       Menübefehl
-      <menuchoice>
-        <guimenu>A<accel>k</accel>tionen</guimenu><guimenuitem><accel>T</accel>erminiert…</guimenuitem>
-      </menuchoice>
+      &mc.ac.sched;
       . Anschließend öffnet sich das Dialogfenster <guilabel>Terminierte Buchung
       erstellen</guilabel>.
     </para>
@@ -1149,11 +1070,7 @@ Translators:
 
       <para>Eine Übersicht über die terminierten Buchungen kann aus der <emphasis>Kontenübersicht</emphasis>
         oder aus dem <emphasis>Kontobuch</emphasis> heraus mit dem Menübefehl
-        <menuchoice>
-          <guimenu>A<accel>k</accel>tionen</guimenu><guisubmenu>Term<accel>i</accel>nierte
-          Buchungen</guisubmenu> <guimenuitem>Terminierte Buchungen
-          <accel>E</accel>ditor…</guimenuitem>
-        </menuchoice>
+        &mc.ac.scd.tr-ed;
         geöffnet werden.
       </para>
 
@@ -1177,11 +1094,9 @@ Translators:
         Buchungen neu zu erstellen, zu bearbeiten und zu löschen. Die <guibutton>Neu</guibutton>
         und <guibutton>Bearbeiten</guibutton> Schaltflächen öffnen den <guilabel>Terminierte
         Buchungen bearbeiten</guilabel> Assistenten. <guibutton>Löschen</guibutton> entfernt die
-        ausgewählte Buchung. Die gleichen Möglichkeiten bietet das Menü
-        <menuchoice>
-          <guimenu><accel>T</accel>erminiert</guimenu><guimenuitem>Neu/Bearbeiten/Löschen</guimenuitem>
-        </menuchoice>
-        .
+        ausgewählte Buchung. Die gleichen Möglichkeiten sind im Menü
+        &gm.sx;
+        zu finden.
       </para>
 
       <para>Unterhalb der Liste der geplanten Buchungen befindet sich eine Kalenderübersicht mit den
@@ -1487,28 +1402,14 @@ Translators:
 
     <para>Um die Funktion zum Drucken eines Schecks in &app; zu benutzen, wählen Sie die Buchung aus, für
       die Sie einen Scheck bedrucken wollen, und wählen Sie
-      <menuchoice>
-        <shortcut>
-        <keycombo>
-          <keycap>Strg</keycap><keycap>P</keycap>
-        </keycombo>
-        </shortcut> <guimenu><accel>D</accel>atei</guimenu><guimenuitem>Scheck<accel>s</accel>
-        drucken…</guimenuitem>
-      </menuchoice>
+      &mc.fi.prin-ch;
       . Anschließend öffnet sich das Dialogfenster <guilabel>Scheck drucken</guilabel> um die
       ausgewählte Buchung zu drucken.
     </para>
 
     <para>Wollen Sie mehrere Schecks in &app; drucken, führen Sie erst eine Suche aus, um die Buchungen zu
       finden, die Sie drucken möchten. Mit dem Suchergebniss im aktuellen Fenster gehen Sie zu
-      <menuchoice>
-        <shortcut>
-        <keycombo>
-          <keycap>Strg</keycap><keycap>P</keycap>
-        </keycombo>
-        </shortcut> <guimenu><accel>D</accel>atei</guimenu><guimenuitem>Scheck<accel>s</accel>
-        drucken…</guimenuitem>
-      </menuchoice>
+      &mc.fi.prin-ch;
       . Dadurch wird ebenfalls der Dialog <guilabel>Scheck drucken</guilabel> geöffnet, um alle
       Buchungen des Suchergebnis zu drucken.
     </para>
@@ -1790,9 +1691,7 @@ Translators:
 
       <para>Auf die Importfunktionen der vorgenannten Dateiformate, und noch weitere Möglichkeiten zum
         Importieren anderer Datentypen, kann über das Untermenü
-        <menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu><guisubmenu><accel>I</accel>mportieren</guisubmenu>
-        </menuchoice>
+        &mc-gsm.fi.imp;
         zugegriffen werden.
       </para>
     </sect2>
@@ -1802,9 +1701,7 @@ Translators:
 <!-- FIXME: source: new register "import" in prefs, adjust link to "prefs-import" -->
       <para>Die Vorgaben für die <link linkend="prefs-online">Import Einstellungen</link>, die der Benutzer im
         <guilabel>&app; Einstellungen</guilabel> Dialog
-        <menuchoice>
-          <guimenu><accel>B</accel>earbeiten</guimenu><guisubmenu><accel>E</accel>instellungen</guisubmenu>
-        </menuchoice>
+        &mc.ed.pref;
         festlegen kann, wirken sich auf das Importieren der Buchungen aus den unten beschriebenen
         Dateien aus.
       </para>
@@ -1822,11 +1719,7 @@ Translators:
       </para>
 
       <para>Wenn Sie QIF-Dateien importieren wollen, wählen Sie
-        <menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu>
-          <guisubmenu><accel>I</accel>mportieren</guisubmenu> <guimenuitem><accel>Q</accel>IF-Datei
-          importieren…</guimenuitem>
-        </menuchoice>
+        &mc.fi.imp.QIF;
         aus dem Menü, um das unten abgebildete Dialogfeld <quote>QIF-Datei importieren</quote> zu
         öffnen.
       </para>
@@ -2119,11 +2012,7 @@ Translators:
     <sect2 id="trans-import-ofx">
       <title>Importieren von OFX/QFX Dateien</title>
 
-      <para><menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu>
-          <guisubmenu><accel>I</accel>mportieren</guisubmenu> <guimenuitem><accel>O</accel>FX/QFX
-          importieren…</guimenuitem>
-        </menuchoice>
+      <para>&mc.fi.imp.OFX;
         öffnet einen Dateiauswahldialog. Navigieren Sie zu der Datei, die Sie importieren möchten,
         wählen Sie eine Datei mit der entsprechenden Erweiterung (.ofx oder .qfx), und drücken Sie
         dann die <guibutton>Importieren</guibutton> Schaltfläche.
@@ -2146,11 +2035,7 @@ Translators:
       <title>Importieren von CSV Dateien</title>
 
       <para>Die Auswahl von
-        <menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu>
-          <guisubmenu><accel>I</accel>mportieren</guisubmenu> <guimenuitem><accel>B</accel>uchungen
-          importieren aus CSV…</guimenuitem>
-        </menuchoice>
+        &mc.fi.imp.tran-csv;
         öffnet den unten abgebildete CSV-Buchungsimport Assistenten.
       </para>
 
@@ -2787,16 +2672,13 @@ Translators:
       <title>Importieren von MT940 & MT942 SWIFT sowie DTAUS Dateien</title>
 
       <para>In dem Menü
-        <menuchoice>
-          <guimenu><accel>D</accel>atei</guimenu>
-          <guisubmenu><accel>I</accel>mportieren</guisubmenu>
-        </menuchoice>
+        &mc-gsm.fi.imp;
         stehen die folgenden Einträge zur Verfügung:
       </para>
 <!--FIXME replace with link to glossary if and when extended to help -->
       <variablelist>
         <varlistentry>
-          <term><guimenuitem><accel>M</accel>T940 importieren</guimenuitem></term>
+          <term>&gmi.fi.imp.mt940;</term>
 
           <listitem>
             <para>Das Format SWIFT MT940 wird für einen Tagesabschluss von Banken verwendet, die das SWIFT-Netzwerk
@@ -2806,7 +2688,7 @@ Translators:
         </varlistentry>
 
         <varlistentry>
-          <term><guimenuitem>MT94<accel>2</accel> importieren</guimenuitem></term>
+          <term>&gmi.fi.imp.mt942;</term>
 
           <listitem>
             <para>MT942 wird für einen Zwischenauszug im selben System verwendet. (in der Zeit seit dem letzten
@@ -2816,7 +2698,7 @@ Translators:
         </varlistentry>
 
         <varlistentry>
-          <term><guimenuitem><accel>D</accel>TAUS importieren</guimenuitem></term>
+          <term>&gmi.fi.imp.dtaus;</term>
 
           <listitem>
             <para>DTAUS ist ein Format das seit 1976 mit 9-Spur-Magnetbändern und später mit anderen Wechselmedien
@@ -3334,7 +3216,7 @@ Translators:
 
         <varlistentry>
           <term><keycombo action="simul">
-              <keycap>Strg</keycap><mousebutton>Button1</mousebutton>
+              &kc.ctrl;<mousebutton>Button1</mousebutton>
             </keycombo>
             Klick</term>
 
@@ -3347,7 +3229,7 @@ Translators:
 
         <varlistentry>
           <term><keycombo action="simul">
-              <keycap>Shift</keycap><mousebutton>Button1</mousebutton>
+              &kc.shift;<mousebutton>Button1</mousebutton>
             </keycombo>
             Klick</term>
 
@@ -3505,7 +3387,7 @@ Translators:
               </keycombo>
               auf die erste Zeile und dann mit
               <keycombo action='simul'>
-                <keycap>Strg</keycap> <mousebutton>Button1</mousebutton>
+                &kc.ctrl; <mousebutton>Button1</mousebutton>
               </keycombo>
               auf weitere Zeilen, um die Auswahl zu ergänzen.
             </para>
@@ -3518,7 +3400,7 @@ Translators:
               </keycombo>
               auf die erste Zeile und dann mit
               <keycombo action='simul'>
-                <keycap>Umschalt</keycap> <mousebutton>Button1</mousebutton>
+                &kc.shift; <mousebutton>Button1</mousebutton>
               </keycombo>
               auf eine andere Zeile, um alle Zeilen dazwischen auszuwählen.
             </para>
@@ -3532,7 +3414,7 @@ Translators:
               <emphasis> gedrückt halten und über Zeilen ziehen können</emphasis>, um eine
               Auswahl zu erstellen. Um weitere Zeilen hinzuzufügen, betätigen Sie
               <keycombo action="simul">
-                <keycap>Strg</keycap><mousebutton>Button1</mousebutton>
+                &kc.ctrl;<mousebutton>Button1</mousebutton>
               </keycombo>
               <emphasis>und ziehen</emphasis> Sie über weitere Zeilen.
             </para>
@@ -3748,10 +3630,7 @@ Translators:
         <guilabel>Automatisch (Bayesisch)</guilabel>, die <guilabel>Nicht-Bayesische</guilabel> und
         die <guilabel>Online</guilabel> gewonnen Buchungsinformationen bearbeiten. Um den Editor zu
         öffnen wählen Sie
-        <menuchoice>
-          <guimenu><accel>W</accel>erkzeuge</guimenu><guimenuitem><accel>I</accel>mport-Zuordnungen
-          Editor</guimenuitem>
-        </menuchoice>
+        &mc.to.imp-map;
         aus der Menüleiste.
       </para>
 
@@ -3953,18 +3832,12 @@ Translators:
       werden. Die Menübefehle zum Exportieren von Buchungen sind:
       <itemizedlist>
         <listitem>
-          <para><menuchoice>
-              <guimenu><accel>D</accel>atei</guimenu><guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem><accel>B</accel>uchungen
-              nach CSV exportieren…</guimenuitem>
-            </menuchoice>
+          <para>&mc.fi.exp.tran-csv;
           </para>
         </listitem>
 
         <listitem>
-          <para><menuchoice>
-              <guimenu><accel>D</accel>atei</guimenu><guisubmenu>E<accel>x</accel>portieren</guisubmenu><guimenuitem><accel>A</accel>ktives
-              Kontobuch als CSV-Datei exportieren…</guimenuitem>
-            </menuchoice>
+          <para>&mc.fi.exp.regi-csv;
             .
           </para>
         </listitem>
@@ -4309,11 +4182,11 @@ Translators:
           <para>Das Bedienfeld <guilabel>Konten</guilabel> zeigt eine Kontenstruktur an, in der ein oder mehrere
             Konten für den Export ausgewählt werden können. (
             <keycombo action="click">
-              <keycap>Strg</keycap><mousebutton>Button1</mousebutton>
+              &kc.ctrl;<mousebutton>Button1</mousebutton>
             </keycombo>
             und
             <keycombo action="click">
-              <keycap>Shift</keycap><mousebutton>Button1</mousebutton>
+              &kc.shift;<mousebutton>Button1</mousebutton>
             </keycombo>
             können verwendet werden, um Konten auszuwählen). Die Schaltfläche
             <guibutton>Unterkonten auswählen</guibutton> wählt alle Unterkonten eines markierten
@@ -4400,10 +4273,7 @@ Translators:
 
         <listitem>
           <para>Mit
-            <menuchoice>
-              <guimenu>A<accel>k</accel>tion</guimenu><guimenuitem><accel>O</accel>nline
-              Aktion</guimenuitem><guisubmenu><accel>S</accel>aldenabfrage…</guisubmenu>
-            </menuchoice>
+            &mc.ac.onli.get-bal;
             wird für das ausgewählte Konto eine Onlineverbindung zu dem Geldinstitut aufgebaut und
             der aktuelle Kontosaldo abgefragt. Nach kurzer Zeit wird Ihnen, im sich öffnendem
             Dialogfenster, der Saldo angezeigt und Sie können direkt im Anschluss das
@@ -4417,10 +4287,7 @@ Translators:
 
         <listitem>
           <para>Der Menüpunkt
-            <menuchoice>
-              <guimenu>A<accel>k</accel>tion</guimenu><guimenuitem><accel>O</accel>nline
-              Aktion</guimenuitem><guisubmenu>Abfrage Konto<accel>u</accel>msätze…</guisubmenu>
-            </menuchoice>
+            &mc.ac.onli.get-tr;
             bietet Ihnen die Möglichkeit, die Umsätze des in der Kontenstruktur markierten
             Onlinekontos, oder des geöffenten Kontobuchs, abzurufen und im Anschluss in &app; zu
             importieren. Es wird der Dialog <guilabel>Online Kontoumsätze abfragen</guilabel>
@@ -4511,10 +4378,7 @@ Translators:
 
         <listitem>
           <para>Wenn Sie im Menü den Eintrag
-            <menuchoice>
-              <guimenu>A<accel>k</accel>tion</guimenu><guimenuitem><accel>O</accel>nline
-              Aktion</guimenuitem><guisubmenu>SEPA <accel>E</accel>inzelüberweisung…</guisubmenu>
-            </menuchoice>
+            &mc.ac.onli.sepa-tr;
             wählen, öffnet sich der Dialog
             <variablelist>
               <title>Online-Auftrag Einzelüberweisung</title>
@@ -4676,10 +4540,7 @@ Translators:
 <!-- FIXME: Insert a description for this item. -->
         <listitem>
           <para>Die Funktion
-            <menuchoice>
-              <guimenu>A<accel>k</accel>tion</guimenu><guimenuitem><accel>O</accel>nline
-              Aktion</guimenuitem><guisubmenu> <accel>I</accel>nterne Umbuchung…</guisubmenu>
-            </menuchoice>
+            &mc.ac.onli.sepa-int;
             kann der Übersetzer nicht ausprobieren, weil das Geldinstitut diesen Geschäftsvorfall
             für seine Konten nicht unterstützen.
           </para>
@@ -4703,10 +4564,7 @@ Translators:
 
     <para>Standardmäßig werden im Journal nur die Buchungen des letzten Monats angezeigt. Sie können mit
       dem Menüpunkt
-      <menuchoice>
-        <guimenu><accel>A</accel>nsicht</guimenu><guimenuitem><accel>F</accel>ilter
-        nach…</guimenuitem>
-      </menuchoice>
+      &mc.vw.f-by;
       den Datumsbereich eingrenzen.
     </para>
   </sect1>
diff --git a/manual/de/para-assist-intro.xml b/manual/de/para-assist-intro.xml
index bd72bd00..ee67ff8e 100644
--- a/manual/de/para-assist-intro.xml
+++ b/manual/de/para-assist-intro.xml
@@ -16,7 +16,7 @@
   </important>
 
   <varlistentry>
-    <term><guibutton><accel>A</accel>bbrechen</guibutton> oder <keycap>ESC</keycap></term>
+    <term><guibutton><accel>A</accel>bbrechen</guibutton> oder &kc.esc;</term>
 
     <listitem>
       <para>Beendet den Assistenten, ohne Änderungen an Ihren Daten oder, bei Exporten, dem Dateisystem vorzunehmen.
diff --git a/manual/de/tips-appendix.xml b/manual/de/tips-appendix.xml
index 59eb9e60..073a00b0 100644
--- a/manual/de/tips-appendix.xml
+++ b/manual/de/tips-appendix.xml
@@ -146,11 +146,7 @@
                     <listitem>
                       <para>Ihren dort erhaltenen Schlüssel in
 <!-- Fixme: unwritten: <link linkend="prefs-online-quotes"> / -->
-                        <menuchoice>
-                          <guimenu> <accel>B</accel>earbeiten</guimenu> <guimenuitem>
-                          <accel>E</accel>instellungen </guimenuitem> <guilabel>Online
-                          Kurse</guilabel>
-                        </menuchoice>
+                        &mc.ed.pref; <guilabel>Online Kurse</guilabel>
 <!-- Fixme: unwritten: </link> / -->
                         eingeben.
                       </para>

commit 1c596f2a027a2937d56b5e681747ac036594ce2a
Author: Christian Wehling <christian.wehling at web.de>
Date:   Sat Dec 3 17:07:09 2022 +0100

    gnc-gui-struct.dtd: fix some mistakes and add insert much more entities
    
    ...for menuitems and menuchoice.
    e.g. for the part  of business, budget editor, scheduled editor,
    OS-specific for win and mac.

diff --git a/docbook/gnc-gui-C.dtd b/docbook/gnc-gui-C.dtd
index 64bd542f..959cc2c6 100644
--- a/docbook/gnc-gui-C.dtd
+++ b/docbook/gnc-gui-C.dtd
@@ -43,13 +43,17 @@
 <!ENTITY % gmi.fi.save-as "<guimenuitem>Save <accel>a</accel>s…</guimenuitem>">
 <!ENTITY % gmi.fi.rev "<guimenuitem><accel>R</accel>evert</guimenuitem>">
 <!ENTITY % gmi.fi.prin "<guimenuitem><accel>P</accel>rint…</guimenuitem>">
+<!ENTITY % gmi.fi.prin-rep "<guimenuitem><accel>P</accel>rint Report…</guimenuitem>">
+<!ENTITY % gmi.fi.prin-ch "<guimenuitem><accel>P</accel>rint Checks…</guimenuitem>">
 <!ENTITY % gmi.fi.page "<guimenuitem>Pa<accel>g</accel>e Setup…</guimenuitem>">
 <!ENTITY % gsm.fi.exp "<guisubmenu><accel>E</accel>xport</guisubmenu>">
 <!ENTITY % gmi.fi.exp.acct-csv "<guimenuitem>Export Account T<accel>r</accel>ee to CSV…</guimenuitem>">
 <!ENTITY % gmi.fi.exp.tran-csv "<guimenuitem>Export <accel>T</accel>ransactions to CSV…</guimenuitem>">
 <!ENTITY % gmi.fi.exp.regi-csv "<guimenuitem>Export A<accel>c</accel>tive Register to CSV…</guimenuitem>">
+<!ENTITY % gmi.fi.exp.rep "<guimenuitem>Export <accel>R</accel>eports</guimenuitem>">
 <!ENTITY % gmi.fi.exp.acct "<guimenuitem>Export <accel>A</accel>ccounts</guimenuitem>">
 <!ENTITY % gmi.fi.prop "<guimenuitem>Proper<accel>t</accel>ies</guimenuitem>">
+<!ENTITY % gmi.fi.mru "<guimenuitem>Most Recently Used</guimenuitem>">
 <!ENTITY % gmi.fi.cls "<guimenuitem><accel>C</accel>lose</guimenuitem>">
 <!ENTITY % gmi.fi.quit "<guimenuitem><accel>Q</accel>uit</guimenuitem>">
 
@@ -58,7 +62,8 @@
 <!ENTITY % gmi.ed.cut "<guimenuitem>Cu<accel>t</accel></guimenuitem>">
 <!ENTITY % gmi.ed.copy "<guimenuitem><accel>C</accel>opy</guimenuitem>">
 <!ENTITY % gmi.ed.paste "<guimenuitem><accel>P</accel>aste</guimenuitem>">
-<!ENTITY % gmi.ed.pay "<guimenuitem>Assing as payment…</guimenuitem>">
+<!ENTITY % gmi.ed.pay-asng "<guimenuitem>Assing as payment…</guimenuitem>">
+<!ENTITY % gmi.ed.pay-edit "<guimenuitem>Edit payment…</guimenuitem>">
 <!ENTITY % gmi.ed.acc-edit "<guimenuitem>Edit <accel>A</accel>ccount</guimenuitem>">
 <!ENTITY % gmi.ed.acc-del "<guimenuitem><accel>D</accel>elete Account…</guimenuitem>">
 <!ENTITY % gmi.ed.acc-find "<guimenuitem>F<accel>i</accel>nd Account</guimenuitem>">
@@ -175,9 +180,12 @@
 <!ENTITY % gmi.bus.link-doc "<guimenuitem><accel></accel>Business Linked Documents</guimenuitem>">
 <!ENTITY % gmi.bus.tax-tab "<guimenuitem>Sales <accel>T</accel>ax Table</guimenuitem>">
 <!ENTITY % gmi.bus.bil-edit "<guimenuitem><accel>B</accel>illing Terms Editor</guimenuitem>">
-<!ENTITY % gmi.bus.man-doc-link "<guimenuitem><accel>M</accel>anage Document Link…</guimenuitem>">
-<!ENTITY % gmi.bus.open-doc "<guimenuitem><accel>O</accel>pen Linked Document</guimenuitem>">
-<!ENTITY % gmi.bus.pay-inv "<guimenuitem><accel>P</accel>ay Invoice</guimenuitem>">
+
+<!-- Scheduled-Menu -->
+<!ENTITY % gm.sx "<guimenu><accel>S</accel>cheduled</guimenu>">
+<!ENTITY % gmi.sx.new "<guimenuitem><accel>N</accel>ew</guimenuitem>">
+<!ENTITY % gmi.sx.edit "<guimenuitem><accel>E</accel>dit</guimenuitem>">
+<!ENTITY % gmi.sx.del "<guimenuitem><accel>D</accel>elete</guimenuitem>">
 
 <!-- Reports-Menu -->
 <!ENTITY % gm.rep "<guimenu><accel>R</accel>eports</guimenu>">
@@ -203,7 +211,7 @@
 <!ENTITY % gmi.rep.bgt.bgt-flow "<guimenuitem>Bu<accel>d</accel>get Flow</guimenuitem>">
 <!ENTITY % gmi.rep.bgt.bgt-in-stat "<guimenuitem>Bud<accel>g</accel>et Income Statement</guimenuitem>">
 <!ENTITY % gmi.rep.bgt.bgt-p-r "<guimenuitem>Budg<accel>e</accel>t Profit & Loss</guimenuitem>">
-<!ENTITY % gmi.rep.bgt.bgt-rep "<guimenuitemitem>Budge<accel>t</accel> Report</guimenuitemitem>">
+<!ENTITY % gmi.rep.bgt.bgt-rep "<guimenuitem>Budge<accel>t</accel> Report</guimenuitem>">
 <!ENTITY % gsm.rep.bus "<guisubmenu><accel>B</accel>usiness</guisubmenu>">
 <!ENTITY % gmi.rep.bus.aus-tax "<guimenuitem><accel>A</accel>ustralian Tax Invoice</guimenuitem>">
 <!ENTITY % gmi.rep.bus.cus-rep "<guimenuitem><accel>C</accel>ustomer Report</guimenuitem>">
@@ -251,10 +259,12 @@
 <!ENTITY % gmi.rep.rec-rep "<guimenuitem><accel>R</accel>econciliation Report</guimenuitem>">
 <!ENTITY % gmi.rep.tax-xml "<guimenuitem><accel>T</accel>ax Report & XML Report</guimenuitem>">
 <!ENTITY % gmi.rep.tr-rep "<guimenuitem>Tran<accel>s</accel>action Report</guimenuitem>">
-<!ENTITY % gmi.rep.save-rep-conf "<guimenuitem><accel>S</accel>aved Report Configurations</guimenuitem>">
+<!ENTITY % gmi.rep.saved-rep-conf "<guimenuitem><accel>S</accel>aved Report Configurations</guimenuitem>">
 <!ENTITY % gmi.rep.save-conf "<guimenuitem>Save <accel>R</accel>eport Configuration</guimenuitem>">
 <!ENTITY % gmi.rep.save-conf-as "<guimenuitem>Save Report Configuration As…</guimenuitem>">
 <!ENTITY % gmi.rep.com-rep "<guimenuitem><accel>C</accel>ompany Report</guimenuitem>">
+<!ENTITY % gmi.rep.acct-rep "<guimenuitem>Account Report</guimenuitem>">
+<!ENTITY % gmi.rep.acct-rep-tr "<guimenuitem>Account Report - Single Transaction</guimenuitem>">
 
 <!-- Tools-Menu -->
 <!ENTITY % gm.tool "<guimenu><accel>T</accel>ools</guimenu>">
@@ -279,32 +289,73 @@
 <!ENTITY % gmi.help.cont "<guimenuitem><accel>C</accel>ontents</guimenuitem>">
 <!ENTITY % gmi.help.abo "<guimenuitem><accel>A</accel>bout</guimenuitem>">
 
-<!-- Invoce Editor -->
-<!-- Invoice Editor; Edit-Menu -->
-<!ENTITY % gmi.inv.ed.edit "<guimenuitem><accel>E</accel>dit Invoice</guimenuitem>">
-<!ENTITY % gmi.inv.ed.dup "<guimenuitem><accel>D</accel>uplicate Invoice</guimenuitem>">
-<!ENTITY % gmi.inv.ed.post "<guimenuitem><accel>P</accel>ost Invoice</guimenuitem>">
-<!ENTITY % gmi.inv.ed.unpost "<guimenuitem><accel>U</accel>npost Invoice</guimenuitem>">
-
-<!-- Invoice Editor; View-Menu -->
-<!ENTITY % gmi.inv.vw.use-def "<guimenuitem><accel>U</accel>se as Default Layout for Customer Documents</guimenuitem>">
-<!ENTITY % gmi.inv.vw.res-def "<guimenuitem><accel>R</accel>eset Default Layout for Customer Documents</guimenuitem>">
-<!ENTITY % gsm.inv.vw.ord "<guisubmenu>Sort <accel>O</accel>rder</guisubmenu>">
-<!ENTITY % gmi.inv.vw.ord.def "<guimenuitem><accel>S</accel>tandard</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.date "<guimenuitem><accel>D</accel>ate</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.entry "<guimenuitem>Date of <accel>E</accel>ntry</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.qua "<guimenuitem><accel>Q</accel>uantity</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.pri "<guimenuitem><accel>P</accel>rice</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.desc "<guimenuitem>Descri<accel>p</accel>tion</guimenuitem>">
-
-<!-- Invoice Editor; Actions-Menu -->
-<!ENTITY % gmi.inv.ac.ent "<guimenuitem><accel>E</accel>nter</guimenuitem>">
-<!ENTITY % gmi.inv.ac.cnl "<guimenuitem><accel>C</accel>ancel</guimenuitem>">
-<!ENTITY % gmi.inv.ac.del "<guimenuitem><accel>D</accel>elete</guimenuitem>">
-<!ENTITY % gmi.inv.ac.blk "<guimenuitem><accel>B</accel>lank</guimenuitem>">
-<!ENTITY % gmi.inv.ac.dup "<guimenuitem>Dup<accel>l</accel>icate Entry</guimenuitem>">
-<!ENTITY % gmi.inv.ac.up "<guimenuitem>Move Entry <accel>U</accel>p</guimenuitem>">
-<!ENTITY % gmi.inv.ac.down "<guimenuitem>Move Entry Do<accel>w</accel>n</guimenuitem>">
+<!-- Budget Editor -->
+<!-- Budget Editor; Edit-Menu -->
+<!ENTITY % gmi.ed.bgt.est "<guimenuitem>Esti<accel>m</accel>ate Budget…</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.per "<guimenuitem><accel>A</accel>ll Periods…</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.del "<guimenuitem><accel>D</accel>elete Budget…</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.note "<guimenuitem>Edit Note</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.rep "<guimenuitem>Budget Report</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.opt "<guimenuitem>Budget <accel>O</accel>ptions…</guimenuitem>">
+
+<!-- Business (Customer, Vendor and Employee) -->
+<!-- Business (Customer, Vendor and Employee); Edit-Menu -->
+<!ENTITY % gmi.ed.cus.edit "<guimenuitem>E<accel>d</accel>it Customer</guimenuitem>">
+<!ENTITY % gmi.ed.cus.new "<guimenuitem><accel>N</accel>ew Customer…</guimenuitem>">
+<!ENTITY % gmi.ed.ven.edit "<guimenuitem>E<accel>d</accel>it Vendor</guimenuitem>">
+<!ENTITY % gmi.ed.ven.new "<guimenuitem><accel>N</accel>ew Vendor…</guimenuitem>">
+<!ENTITY % gmi.ed.emp.edit "<guimenuitem>E<accel>d</accel>it Employee</guimenuitem>">
+<!ENTITY % gmi.ed.emp.new "<guimenuitem><accel>N</accel>ew Employee…</guimenuitem>">
+
+<!-- Business (Customer, Vendor and Employee); Reports-Menu -->
+<!ENTITY % gmi.rep.cus-list "<guimenuitem>Customer Listing</guimenuitem>">
+<!ENTITY % gmi.rep.cus-rep "<guimenuitem>Customer Report</guimenuitem>">
+<!ENTITY % gmi.rep.ven-list "<guimenuitem>Vendor Listing</guimenuitem>">
+<!ENTITY % gmi.rep.ven-rep "<guimenuitem>Vendor Report</guimenuitem>">
+<!ENTITY % gmi.rep.emp-rep "<guimenuitem>Employee Report</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher) -->
+<!-- Business (Invoice, Bill, Voucher); File-Menu -->
+<!ENTITY % gmi.fi.prin-inv "<guimenuitem><accel>P</accel>rint Invoice</guimenuitem>">
+<!ENTITY % gmi.fi.prin-bill "<guimenuitem><accel>P</accel>rint Bill</guimenuitem>">
+<!ENTITY % gmi.fi.prin-vou "<guimenuitem><accel>P</accel>rint Voucher</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); Edit-Menu -->
+<!ENTITY % gmi.ed.edit "<guimenuitem><accel>E</accel>dit Invoice</guimenuitem>">
+<!ENTITY % gmi.ed.dup "<guimenuitem><accel>D</accel>uplicate Invoice</guimenuitem>">
+<!ENTITY % gmi.ed.post "<guimenuitem><accel>P</accel>ost Invoice</guimenuitem>">
+<!ENTITY % gmi.ed.unpost "<guimenuitem><accel>U</accel>npost Invoice</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); View-Menu -->
+<!ENTITY % gmi.vw.use-lay-cus "<guimenuitem><accel>U</accel>se as Default Layout for Customer Documents</guimenuitem>">
+<!ENTITY % gmi.vw.res-lay-cus "<guimenuitem><accel>R</accel>eset Default Layout for Customer Documents</guimenuitem>">
+<!ENTITY % gmi.vw.use-lay-ven "<guimenuitem><accel>U</accel>se as Default Layout for Vendor Documents</guimenuitem>">
+<!ENTITY % gmi.vw.res-lay-ven "<guimenuitem><accel>R</accel>eset Default Layout for Vendor Documents</guimenuitem>">
+<!ENTITY % gmi.vw.use-lay-emp "<guimenuitem><accel>U</accel>se as Default Layout for Employee Documents</guimenuitem>">
+<!ENTITY % gmi.vw.res-lay-emp "<guimenuitem><accel>R</accel>eset Default Layout for Employee Documents</guimenuitem>">
+<!ENTITY % gsm.vw.ord "<guisubmenu>Sort <accel>O</accel>rder</guisubmenu>">
+<!ENTITY % gmi.vw.ord.def "<guimenuitem><accel>S</accel>tandard</guimenuitem>">
+<!ENTITY % gmi.vw.ord.date "<guimenuitem><accel>D</accel>ate</guimenuitem>">
+<!ENTITY % gmi.vw.ord.entry "<guimenuitem>Date of <accel>E</accel>ntry</guimenuitem>">
+<!ENTITY % gmi.vw.ord.qua "<guimenuitem><accel>Q</accel>uantity</guimenuitem>">
+<!ENTITY % gmi.vw.ord.pri "<guimenuitem><accel>P</accel>rice</guimenuitem>">
+<!ENTITY % gmi.vw.ord.desc "<guimenuitem>Descri<accel>p</accel>tion</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); Actions-Menu -->
+<!ENTITY % gmi.ac.ent "<guimenuitem><accel>E</accel>nter</guimenuitem>">
+<!ENTITY % gmi.ac.cnl "<guimenuitem><accel>C</accel>ancel</guimenuitem>">
+<!ENTITY % gmi.ac.del "<guimenuitem><accel>D</accel>elete</guimenuitem>">
+<!ENTITY % gmi.ac.blk "<guimenuitem><accel>B</accel>lank</guimenuitem>">
+<!ENTITY % gmi.ac.dup "<guimenuitem>Dup<accel>l</accel>icate Entry</guimenuitem>">
+<!ENTITY % gmi.ac.up "<guimenuitem>Move Entry <accel>U</accel>p</guimenuitem>">
+<!ENTITY % gmi.ac.down "<guimenuitem>Move Entry Do<accel>w</accel>n</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); Business-Menu -->
+<!ENTITY % gmi.bus.man-doc-link "<guimenuitem><accel>M</accel>anage Document Link…</guimenuitem>">
+<!ENTITY % gmi.bus.open-doc "<guimenuitem><accel>O</accel>pen Linked Document</guimenuitem>">
+<!ENTITY % gmi.bus.pay-inv "<guimenuitem><accel>P</accel>ay Invoice</guimenuitem>">
+<!ENTITY % gmi.bus.pay-bill "<guimenuitem><accel>P</accel>ay Bill</guimenuitem>">
+<!ENTITY % gmi.bus.pay-vou "<guimenuitem><accel>P</accel>ay Voucher</guimenuitem>">
 
 <!-- Reconcile-Window -->
 <!-- Reconcile-Window; Reconcile-Menu -->
@@ -333,6 +384,25 @@
 <!ENTITY % gm.rec.help "<guimenu><accel>H</accel>elp</guimenu>">
 <!ENTITY % gmi.rec.help.hlp "<guimenuitem><accel>H</accel>elp</guimenuitem>">
 
+<!-- Specific strings for Operating Systems -->
+<!-- Strings for Windows -->
+<!ENTITY % gm.winOS "<guimenu>Start</guimenu>">
+<!ENTITY % gsm.winOS.gc "<guisubmenu>GnuCash</guisubmenu>">
+<!ENTITY % gmi.winOS.inst-fq "<guimenuitem>Install Online Price Retrieval for GnuCash</guimenuitem>">
+<!ENTITY % gsm.winOS.pref "<guisubmenu>Settings</guisubmenu>">
+<!ENTITY % gsm.winOS.pref.lang "<guisubmenu>Time & Language</guisubmenu>">
+<!ENTITY % gmi.winOS.pref.lang.local "<guimenuitem>Region</guimenuitem>">
+<!ENTITY % gsm.winOS.sys "<guisubmenu>System</guisubmenu>">
+<!ENTITY % gmi.winOS.sys.tasks "<guimenuitem>Task Scheduler</guimenuitem>">
+<!ENTITY % gmi.winOS.sys.task "<guimenuitem>Create Task…</guimenuitem>">
+
+<!-- Strings for Mac -->
+<!ENTITY % gm.macOS "<guimenu>Apple</guimenu>">
+<!ENTITY % gsm.macOS.sys "<guisubmenu>System Settings</guisubmenu>">
+<!ENTITY % gsm.macOS.sys.gen "<guisubmenu>General</guisubmenu>">
+<!ENTITY % gmi.macOS.sys.gen.lang "<guimenuitem>Language & Region</guimenuitem>">
+<!ENTITY % gsm.macOS.gc "<guisubmenu>GnuCash</guisubmenu>">
+<!ENTITY % gmi.macOS.gc.pref "<guimenuitem>Preference</guimenuitem>">
 
 <!-- keycaps for keycombos and shortcuts -->
 <!ENTITY % kc.alt '<keycap function="alt">Alt</keycap>'>
@@ -345,6 +415,7 @@
 <!ENTITY % kc.home '<keycap function="home">Home</keycap>'>
 <!ENTITY % kc.pgdown '<keycap function="pagedown">Page Down</keycap>'>
 <!ENTITY % kc.shift '<keycap function="shift">Shift</keycap>'>
+<!ENTITY % kc.opt-shift '<keycap function="shift"><optional>Shift</optional></keycap>'>
 <!ENTITY % kc.space '<keycap function="space">Space</keycap>'>
 <!ENTITY % kc.tab '<keycap function="tab">Tab</keycap>'>
 
@@ -355,12 +426,6 @@
 <!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>">
-
-
 <!-- Column selector for tables -->
 <!ENTITY % tip-col-sel '<tip><para>You can customize the columns displayed by clicking
   in the header line on the far right on the small <guilabel>triangle</guilabel> and selecting
diff --git a/docbook/gnc-gui-de.dtd b/docbook/gnc-gui-de.dtd
index 8c2a6039..08b51267 100644
--- a/docbook/gnc-gui-de.dtd
+++ b/docbook/gnc-gui-de.dtd
@@ -29,27 +29,31 @@
 <!ENTITY % gsm.fi.imp "<guisubmenu><accel>I</accel>mportieren</guisubmenu>">
 <!ENTITY % gmi.fi.imp.bill-inv "<guimenuitem><accel>R</accel>echnungen importieren…</guimenuitem>">
 <!ENTITY % gmi.fi.imp.acct-csv "<guimenuitem><accel>K</accel>ontenhierarchie importieren aus CSV…</guimenuitem>">
-<!ENTITY % gmi.fi.imp.tran-csv "<guimenuitem><accel>B</accel>unchungen importieren aus CSV…</guimenuitem>">
+<!ENTITY % gmi.fi.imp.tran-csv "<guimenuitem><accel>B</accel>uchungen importieren aus CSV…</guimenuitem>">
 <!ENTITY % gmi.fi.imp.pri-csv "<guimenuitem>K<accel>u</accel>rse aus CSV-Datei importieren…</guimenuitem>">
 <!ENTITY % gmi.fi.imp.cust-ven "<guimenuitem>K<accel>u</accel>nden und Lieferanten importieren…</guimenuitem>">
-<!ENTITY % gmi.fi.imp.repl "<guimenuitem><accel>Q</accel>IF-Datei importieren…</guimenuitem>">
+<!ENTITY % gmi.fi.imp.QIF "<guimenuitem><accel>Q</accel>IF-Datei importieren…</guimenuitem>">
 <!ENTITY % gmi.fi.imp.repl "<guimenuitem>Einträge aus <accel>L</accel>ogdatei einspielen…</guimenuitem>">
 <!ENTITY % gmi.fi.imp.OFX "<guimenuitem><accel>O</accel>FX/QFX importieren…</guimenuitem>">
 <!ENTITY % gmi.fi.imp.mt940 "<guimenuitem><accel>M</accel>T940 importieren</guimenuitem>">
-<!ENTITY % gmi.fi.imp.mt942 "<guimenuitem MT94<accel>2</accel> importieren</guimenuitem>">
+<!ENTITY % gmi.fi.imp.mt942 "<guimenuitem>MT94<accel>2</accel> importieren</guimenuitem>">
 <!ENTITY % gmi.fi.imp.dtaus "<guimenuitem><accel>D</accel>TAUS importieren</guimenuitem>">
 <!ENTITY % gmi.fi.imp.dtaus-sen "<guimenuitem>DTAUS importieren und <accel>s</accel>enden…</guimenuitem>">
-<!ENTITY % gmi.fi.save "<guimenuitem><accel>S</accel>peichern<guimenuitem>">
+<!ENTITY % gmi.fi.save "<guimenuitem><accel>S</accel>peichern</guimenuitem>">
 <!ENTITY % gmi.fi.save-as "<guimenuitem>Speichern <accel>u</accel>nter…</guimenuitem>">
 <!ENTITY % gmi.fi.rev "<guimenuitem>Änderungen ver<accel>w</accel>erfen</guimenuitem>">
 <!ENTITY % gmi.fi.prin "<guimenuitem><accel>D</accel>rucken…</guimenuitem>">
+<!ENTITY % gmi.fi.prin-rep "<guimenuitem>Bericht <accel>D</accel>rucken…</guimenuitem>">
+<!ENTITY % gmi.fi.prin-ch "<guimenuitem>Schecks <accel>d</accel>rucken…</guimenuitem>">
 <!ENTITY % gmi.fi.page "<guimenuitem>Seite ein<accel>r</accel>ichten…</guimenuitem>">
 <!ENTITY % gsm.fi.exp "<guisubmenu>E<accel>x</accel>portieren</guisubmenu>">
 <!ENTITY % gmi.fi.exp.acct-csv "<guimenuitem>Konten<accel>h</accel>ierarchie nach CSV exportieren…</guimenuitem>">
 <!ENTITY % gmi.fi.exp.tran-csv "<guimenuitem><accel>B</accel>uchungen nach CSV exportieren…</guimenuitem>">
 <!ENTITY % gmi.fi.exp.regi-csv "<guimenuitem><accel>A</accel>ktives Kontobuch als CSV-Datei exportieren…</guimenuitem>">
+<!ENTITY % gmi.fi.exp.rep "<guimenuitem><accel>B</accel>ericht exportieren</guimenuitem>">
 <!ENTITY % gmi.fi.exp.acct "<guimenuitem><accel>K</accel>onten exportieren</guimenuitem>">
-<!ENTITY % gmi.fi.prop "<guimenuitem><accel>E</accel>eigenschaften</guimenuitem>">
+<!ENTITY % gmi.fi.prop "<guimenuitem><accel>E</accel>igenschaften</guimenuitem>">
+<!ENTITY % gmi.fi.mru "<guimenuitem>Zuletzt geöffnete Dateien</guimenuitem>">
 <!ENTITY % gmi.fi.cls "<guimenuitem>S<accel>c</accel>hließen</guimenuitem>">
 <!ENTITY % gmi.fi.quit "<guimenuitem><accel>B</accel>eenden</guimenuitem>">
 
@@ -58,7 +62,8 @@
 <!ENTITY % gmi.ed.cut "<guimenuitem><accel>A</accel>usschneiden</guimenuitem>">
 <!ENTITY % gmi.ed.copy "<guimenuitem><accel>K</accel>opieren</guimenuitem>">
 <!ENTITY % gmi.ed.paste "<guimenuitem>E<accel>i</accel>nfügen</guimenuitem>">
-<!ENTITY % gmi.ed.pay "<guimenuitem>Als <accel>Z</accel>ahlung zuweisen…</guimenuitem>">
+<!ENTITY % gmi.ed.pay-asng "<guimenuitem>Als <accel>Z</accel>ahlung zuweisen…</guimenuitem>">
+<!ENTITY % gmi.ed.pay-edit "<guimenuitem>Zahlung bearbeiten…</guimenuitem>">
 <!ENTITY % gmi.ed.acc-edit "<guimenuitem>Konto <accel>b</accel>earbeiten</guimenuitem>">
 <!ENTITY % gmi.ed.acc-del "<guimenuitem>Konto <accel>l</accel>öschen…</guimenuitem>">
 <!ENTITY % gmi.ed.acc-find "<guimenuitem>Konto <accel>s</accel>uchen</guimenuitem>">
@@ -75,8 +80,8 @@
 <!-- View-Menu -->
 <!ENTITY % gm.view "<guimenu><accel>A</accel>nsicht</guimenu>">
 <!ENTITY % gmi.vw.tbar "<guimenuitem><accel>W</accel>erkzeugleiste</guimenuitem>">
-<!ENTITY % gmi.vw.sum "guimenuitem><accel>Z</accel>usammenfassungsleiste</guimenuitem>">
-<!ENTITY % gmi.vw.stat "<guimenuitem>S<accel>t</accel>tatusleiste</guimenuitem>">
+<!ENTITY % gmi.vw.sum "<guimenuitem><accel>Z</accel>usammenfassungsleiste</guimenuitem>">
+<!ENTITY % gmi.vw.stat "<guimenuitem>S<accel>t</accel>atusleiste</guimenuitem>">
 <!ENTITY % gmi.vw.bas-led "<guimenuitem><accel>E</accel>inzeilig</guimenuitem>">
 <!ENTITY % gmi.vw.spl-led "<guimenuitem><accel>A</accel>ktive vollständig</guimenuitem>">
 <!ENTITY % gmi.vw.jour "<guimenuitem><accel>V</accel>ollständig</guimenuitem>">
@@ -87,7 +92,7 @@
 <!ENTITY % gmi.vw.new-page "<guimenuitem>Neue <accel>K</accel>ontenübersicht</guimenuitem>">
 
 <!-- Actions-Menu -->
-<!ENTITY % gm.act "<guimenu>A<accel>k</accel>tion</guimenu>">
+<!ENTITY % gm.act "<guimenu>A<accel>k</accel>tionen</guimenu>">
 <!ENTITY % gsm.ac.onli "<guisubmenu><accel>O</accel>nline Aktionen</guisubmenu>">
 <!ENTITY % gmi.ac.onli.get-bal "<guimenuitem><accel>S</accel>aldenabfrage</guimenuitem>">
 <!ENTITY % gmi.ac.onli.get-tr "<guimenuitem>Abfrage Konto<accel>u</accel>msätze…</guimenuitem>">
@@ -96,7 +101,7 @@
 <!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 "<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.tr-ed "<guimenuitem><accel>E</accel>ditor für geplante 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>">
@@ -127,7 +132,7 @@
 <!ENTITY % gmi.ac.re-pg "<guimenuitem>Seite umbe<accel>n</accel>ennen</guimenuitem>">
 
 <!-- Transactions-Menu -->
-<!ENTITY % gm.trans "<guimenu>B<accel>u</accel>chungen</guimenu>">
+<!ENTITY % gm.trans "<guimenu>B<accel>u</accel>chung</guimenu>">
 <!ENTITY % gmi.tr.cut "<guimenuitem>Buchung auss<accel>c</accel>hneiden</guimenuitem>">
 <!ENTITY % gmi.tr.copy "<guimenuitem>Buchung <accel>k</accel>opieren</guimenuitem>">
 <!ENTITY % gmi.tr.paste "<guimenuitem>Buchung ein<accel>f</accel>ügen</guimenuitem>">
@@ -165,7 +170,7 @@
 <!ENTITY % gmi.bus.ven.find-job "<guimenuitem><accel>A</accel>uftrag suchen…</guimenuitem>">
 <!ENTITY % gmi.bus.ven.pro-pay "<guimenuitem><accel>Z</accel>ahlung verarbeiten…</guimenuitem>">
 <!ENTITY % gmi.bus.ven.bil-due-rem "<guimenuitem>Erinnerungen an <accel>f</accel>ällige Rechnungen</guimenuitem>">
-<!ENTITY % gsm.bus.emp "<guisubmenu><accel>M</accel>itarbeiter</guisubenu>">
+<!ENTITY % gsm.bus.emp "<guisubmenu><accel>M</accel>itarbeiter</guisubmenu>">
 <!ENTITY % gmi.bus.emp.o-view "<guimenuitem>Mitarbeiterüber<accel>s</accel>icht</guimenuitem>">
 <!ENTITY % gmi.bus.emp.new-emp "<guimenuitem><accel>N</accel>euer Mitarbeiter…</guimenuitem>">
 <!ENTITY % gmi.bus.emp.find-emp "<guimenuitem><accel>M</accel>itarbeiter suchen…</guimenuitem>">
@@ -175,9 +180,12 @@
 <!ENTITY % gmi.bus.link-doc "<guimenuitem><accel></accel>Verknüpfte Geschäftsdokumente</guimenuitem>">
 <!ENTITY % gmi.bus.tax-tab "<guimenuitem>USt.-<accel>S</accel>teuertabelle…</guimenuitem>">
 <!ENTITY % gmi.bus.bil-edit "<guimenuitem>Tabelle für <accel>Z</accel>ahlungsbedingungen</guimenuitem>">
-<!ENTITY % gmi.bus.man-doc-link "<guimenuitem><accel>V</accel>erknüpfung bearbeiten…</guimenuitem>">
-<!ENTITY % gmi.bus.open-doc "<guimenuitem><accel>V</accel>erknüpfung öffnen</guimenuitem>">
-<!ENTITY % gmi.bus.pay-inv "<guimenuitem>Rechnung be<accel>z</accel>ahlen</guimenuitem>">
+
+<!-- Scheduled-Menu -->
+<!ENTITY % gm.sx "<guimenu><accel>T</accel>erminiert</guimenu>">
+<!ENTITY % gmi.sx.new "<guimenuitem><accel>N</accel>eu</guimenuitem>">
+<!ENTITY % gmi.sx.edit "<guimenuitem><accel>B</accel>earbeiten</guimenuitem>">
+<!ENTITY % gmi.sx.del "<guimenuitem><accel>L</accel>öschen</guimenuitem>">
 
 <!-- Reports-Menu -->
 <!ENTITY % gm.rep "<guimenu>Be<accel>r</accel>ichte</guimenu>">
@@ -203,7 +211,7 @@
 <!ENTITY % gmi.rep.bgt.bgt-flow "<guimenuitem>Budg<accel>e</accel>t Flow</guimenuitem>">
 <!ENTITY % gmi.rep.bgt.bgt-in-stat "<guimenuitem>Bud<accel>g</accel>et Einnahmeüberschussrechnung</guimenuitem>">
 <!ENTITY % gmi.rep.bgt.bgt-p-r "<guimenuitem>Budge<accel>t</accel> Gewinn- und Verlust</guimenuitem>">
-<!ENTITY % gmi.rep.bgt.bgt-rep "<guimenuitemitem><accel>B</accel>udget-Bericht</guimenuitemitem>">
+<!ENTITY % gmi.rep.bgt.bgt-rep "<guimenuitem><accel>B</accel>udget-Bericht</guimenuitem>">
 <!ENTITY % gsm.rep.bus "<guisubmenu><accel>G</accel>eschäft</guisubmenu>">
 <!ENTITY % gmi.rep.bus.aus-tax "<guimenuitem>A<accel>u</accel>stralische Rechnung mit Steuerangaben</guimenuitem>">
 <!ENTITY % gmi.rep.bus.cus-rep "<guimenuitem><accel>K</accel>undenbericht</guimenuitem>">
@@ -225,7 +233,7 @@
 <!ENTITY % gmi.rep.examp.samp-grap "<guimenuitem>B<accel>e</accel>ispiel-Diagramme</guimenuitem>">
 <!ENTITY % gmi.rep.examp.samp-rep "<guimenuitem><accel>B</accel>eispielbericht</guimenuitem>">
 <!ENTITY % gmi.rep.examp.wel-gnc "<guimenuitem><accel>W</accel>illkommen zu GnuCash</guimenuitem>">
-<!ENTITY % gsm.rep.exper "<guisubmenu><accel>E</accel>experimentell</guisubmenu>">
+<!ENTITY % gsm.rep.exper "<guisubmenu><accel>E</accel>xperimentell</guisubmenu>">
 <!ENTITY % gmi.rep.exper.bal-sht "<guimenuitem><accel>B</accel>ilanz (mehrspaltig)</guimenuitem>">
 <!ENTITY % gmi.rep.exper.ifrs-rep "<guimenuitem><accel>I</accel>FRS gewichtete durchschnittliche Kostenbasis</guimenuitem>">
 <!ENTITY % gmi.rep.exper.inc-stat "<guimenuitem><accel>E</accel>rgebnisrechnung (mehrspaltig)</guimenuitem>">
@@ -244,17 +252,19 @@
 <!ENTITY % gmi.rep.inc-exp.pro-los "<guimenuitem>Gewi<accel>n</accel>n und Verlustrechnung</guimenuitem>">
 <!ENTITY % gmi.rep.inc-exp.tri-bal "<guimenuitem>R<accel>o</accel>hbilanz</guimenuitem>">
 <!ENTITY % gsm.rep.mul-col "<guisubmenu><accel>M</accel>ehrspaltig</guisubmenu>">
-<!ENTITY % gmi.rep.mul-col.cus-mul-col "<guimenuitem><accel>B</accel>enutzerdefiniert</guimenuitem>">
+<!ENTITY % gmi.rep.mul-col.cus-mul-col "<guimenuitem><accel>B</accel>enutzerdefiniert Mehrspaltig</guimenuitem>">
 <!ENTITY % gmi.rep.mul-col.dash "<guimenuitem><accel>Ü</accel>bersicht</guimenuitem>">
 <!ENTITY % gmi.rep.acct-sum "<guimenuitem><accel>K</accel>ontenübersicht</guimenuitem>">
 <!ENTITY % gmi.rep.fut-tr-sum "<guimenuitem><accel>Z</accel>ukünftige Terminierte Buchungen</guimenuitem>">
 <!ENTITY % gmi.rep.rec-rep "<guimenuitem>Abg<accel>l</accel>eichungsbericht</guimenuitem>">
 <!ENTITY % gmi.rep.tax-xml "<guimenuitem><accel>S</accel>teuer-Bericht & Elster Export</guimenuitem>">
 <!ENTITY % gmi.rep.tr-rep "<guimenuitem>B<accel>u</accel>chungsbericht</guimenuitem>">
-<!ENTITY % gmi.rep.save-rep-conf "<guimenuitem><accel>S</accel>aved Report Configurations</guimenuitem>">
-   <!ENTITY % gmi.rep.save-conf "<guimenuitem>Save <accel>R</accel>eport Configuration</guimenuitem>">
-   <!ENTITY % gmi.rep.save-conf "<guimenuitem><accel>G</accel>espeicherte Berichtskonfigurationen</guimenuitem>">
+<!ENTITY % gmi.rep.saved-rep-conf "<guimenuitem><accel>G</accel>espeicherte Berichtskonfigurationen</guimenuitem>">
+<!ENTITY % gmi.rep.save-conf "<guimenuitem>Berichtskonfiguration <accel>s</accel>peichern</guimenuitem>">
+<!ENTITY % gmi.rep.save-conf-as "<guimenuitem>Berichtskonfiguration speichern <accel>u</accel>nter…</guimenuitem>">
 <!ENTITY % gmi.rep.com-rep "<guimenuitem><accel>F</accel>irmenbericht</guimenuitem>">
+<!ENTITY % gmi.rep.acct-rep "<guimenuitem>Kontenbericht</guimenuitem>">
+<!ENTITY % gmi.rep.acct-rep-tr "<guimenuitem>Kontenbuch - Einzelbuchung</guimenuitem>">
 
 <!-- Tools-Menu -->
 <!ENTITY % gm.tool "<guimenu><accel>W</accel>erkzeuge</guimenu>">
@@ -279,32 +289,73 @@
 <!ENTITY % gmi.help.cont "<guimenuitem>I<accel>n</accel>halt</guimenuitem>">
 <!ENTITY % gmi.help.abo "<guimenuitem><accel>I</accel>nfo</guimenuitem>">
 
-<!-- Invoce Editor -->
-<!-- Invoice Editor; Edit-Menu -->
-<!ENTITY % gmi.inv.ed.edit "<guimenuitem>Rechnung be<accel>a</accel>rbeiten</guimenuitem>">
-<!ENTITY % gmi.inv.ed.dup "<guimenuitem>Rechnung d<accel>u</accel>plizieren</guimenuitem>">
-<!ENTITY % gmi.inv.ed.post "<guimenuitem>Rechnung <accel>b</accel>uchen</guimenuitem>">
-<!ENTITY % gmi.inv.ed.unpost "<guimenuitem>Rechnungsbuchung <accel>r</accel>ückgängig</guimenuitem>">
-
-<!-- Invoice Editor; View-Menu -->
-<!ENTITY % gmi.inv.vw.use-def "<guimenuitem>Als <accel>v</accel>oreingestelltes Layout für Kundendokumente benutzen</guimenuitem>">
-<!ENTITY % gmi.inv.vw.res-def "<guimenuitem>Voreingestelltes Layout für Kundendokumente <accel>z</accel>urücksetzen</guimenuitem>">
-<!ENTITY % gsm.inv.vw.ord "<guisubmenu>S<accel>o</accel>rtierreihenfolge</guisubmenu>">
-<!ENTITY % gmi.inv.vw.ord.def "<guimenuitem><accel>S</accel>tandardreihenfolge</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.date "<guimenuitem><accel>D</accel>atum</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.entry "<guimenuitem><accel>E</accel>ingabe-Datum</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.qua "<guimenuitem><accel>A</accel>nzahl</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.pri "<guimenuitem><accel>P</accel>reis</guimenuitem>">
-<!ENTITY % gmi.inv.vw.ord.desc "<guimenuitem>Be<accel>s</accel>chreibung</guimenuitem>">
-
-<!-- Invoice Editor; Actions-Menu -->
-<!ENTITY % gmi.inv.ac.ent "<guimenuitem><accel>Ü</accel>bernehmen</guimenuitem>">
-<!ENTITY % gmi.inv.ac.cnl "<guimenuitem><accel>A</accel>bbrechen</guimenuitem>">
-<!ENTITY % gmi.inv.ac.del "<guimenuitem><accel>L</accel>öschen</guimenuitem>">
-<!ENTITY % gmi.inv.ac.blk "<guimenuitem><accel>N</accel>eue Buchung</guimenuitem>">
-<!ENTITY % gmi.inv.ac.dup "<guimenuitem>Eintrag <accel>d</accel>uplizieren</guimenuitem>">
-<!ENTITY % gmi.inv.ac.up "<guimenuitem>Eintrag <accel>h</accel>öher sortieren</guimenuitem>">
-<!ENTITY % gmi.inv.ac.down "<guimenuitem>Eintrag <accel>t</accel>iefer sortieren</guimenuitem>">
+<!-- Budget Editor -->
+<!-- Budget Editor; Edit-Menu -->
+<!ENTITY % gmi.ed.bgt.est "<guimenuitem>Budget ab<accel>s</accel>chätzen…</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.per "<guimenuitem><accel>A</accel>lle Perioden…</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.del "<guimenuitem>Budget <accel>l</accel>öschen…</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.note "<guimenuitem>Bemerkung bearbeiten</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.rep "<guimenuitem>Budget-Bericht</guimenuitem>">
+<!ENTITY % gmi.ed.bgt.opt "<guimenuitem>Budget <accel>O</accel>ptionen…</guimenuitem>">
+
+<!-- Business (Customer, Vendor and Employee) -->
+<!-- Business (Customer, Vendor and Employee); Edit-Menu -->
+<!ENTITY % gmi.ed.cus.edit "<guimenuitem><accel>K</accel>unde bearbeiten</guimenuitem>">
+<!ENTITY % gmi.ed.cus.new "<guimenuitem><accel>N</accel>euer Kunde…</guimenuitem>">
+<!ENTITY % gmi.ed.ven.edit "<guimenuitem><accel>L</accel>ieferant bearbeiten</guimenuitem>">
+<!ENTITY % gmi.ed.ven.new "<guimenuitem><accel>N</accel>euer Lieferant…</guimenuitem>">
+<!ENTITY % gmi.ed.emp.edit "<guimenuitem><accel>M</accel>itarbeiter bearbeiten</guimenuitem>">
+<!ENTITY % gmi.ed.emp.new "<guimenuitem><accel>N</accel>euer Mitarbeiter…</guimenuitem>">
+
+<!-- Business Editor (Customer, Vendor and Employee); Reports-Menu -->
+<!ENTITY % gmi.rep.cus-list "<guimenuitem>Liste der Kunden</guimenuitem>">
+<!ENTITY % gmi.rep.cus-rep "<guimenuitem>Kundenbericht</guimenuitem>">
+<!ENTITY % gmi.rep.ven-list "<guimenuitem>Liste der Lieferanten</guimenuitem>">
+<!ENTITY % gmi.rep.ven-rep "<guimenuitem>Lieferantenbericht</guimenuitem>">
+<!ENTITY % gmi.rep.emp-rep "<guimenuitem>Mitarbeiterbericht</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher) -->
+<!-- Business (Invoice, Bill, Voucher); File-Menu -->
+<!ENTITY % gmi.fi.prin-inv "<guimenuitem>Rechnung <accel>d</accel>rucken</guimenuitem>">
+<!ENTITY % gmi.fi.prin-bill "<guimenuitem>Rechnung <accel>d</accel>rucken</guimenuitem>">
+<!ENTITY % gmi.fi.prin-vou "<guimenuitem>Auslagenerstattung <accel>d</accel>rucken</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); Edit-Menu -->
+<!ENTITY % gmi.ed.edit "<guimenuitem>Rechnung be<accel>a</accel>rbeiten</guimenuitem>">
+<!ENTITY % gmi.ed.dup "<guimenuitem>Rechnung d<accel>u</accel>plizieren</guimenuitem>">
+<!ENTITY % gmi.ed.post "<guimenuitem>Rechnung <accel>b</accel>uchen</guimenuitem>">
+<!ENTITY % gmi.ed.unpost "<guimenuitem>Rechnungsbuchung <accel>r</accel>ückgängig</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); View-Menu -->
+<!ENTITY % gmi.vw.use-lay-cus "<guimenuitem>Als <accel>v</accel>oreingestelltes Layout für Kundendokumente benutzen</guimenuitem>">
+<!ENTITY % gmi.vw.res-lay-cus "<guimenuitem>Voreingestelltes Layout für Kundendokumente <accel>z</accel>urücksetzen</guimenuitem>">
+<!ENTITY % gmi.vw.use-lay-ven "<guimenuitem>Als <accel>v</accel>oreingestelltes Layout für Lieferantendokumente benutzen</guimenuitem>">
+<!ENTITY % gmi.vw.res-lay-ven "<guimenuitem>Voreingestelltes Layout für Lieferantendokumente <accel>z</accel>urücksetzen</guimenuitem>">
+<!ENTITY % gmi.vw.use-lay-emp "<guimenuitem>Als <accel>v</accel>oreingestelltes Layout für Mitarbeiterdokumente benutzen</guimenuitem>">
+<!ENTITY % gmi.vw.res-lay-emp "<guimenuitem>Voreingestelltes Layout für Mitarbeiterdokumente <accel>z</accel>urücksetzen</guimenuitem>">
+<!ENTITY % gsm.vw.ord "<guisubmenu>S<accel>o</accel>rtierreihenfolge</guisubmenu>">
+<!ENTITY % gmi.vw.ord.def "<guimenuitem><accel>S</accel>tandardreihenfolge</guimenuitem>">
+<!ENTITY % gmi.vw.ord.date "<guimenuitem><accel>D</accel>atum</guimenuitem>">
+<!ENTITY % gmi.vw.ord.entry "<guimenuitem><accel>E</accel>ingabe-Datum</guimenuitem>">
+<!ENTITY % gmi.vw.ord.qua "<guimenuitem><accel>A</accel>nzahl</guimenuitem>">
+<!ENTITY % gmi.vw.ord.pri "<guimenuitem><accel>P</accel>reis</guimenuitem>">
+<!ENTITY % gmi.vw.ord.desc "<guimenuitem>Be<accel>s</accel>chreibung</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); Actions-Menu -->
+<!ENTITY % gmi.ac.ent "<guimenuitem><accel>Ü</accel>bernehmen</guimenuitem>">
+<!ENTITY % gmi.ac.cnl "<guimenuitem><accel>A</accel>bbrechen</guimenuitem>">
+<!ENTITY % gmi.ac.del "<guimenuitem><accel>L</accel>öschen</guimenuitem>">
+<!ENTITY % gmi.ac.blk "<guimenuitem><accel>N</accel>eue Buchung</guimenuitem>">
+<!ENTITY % gmi.ac.dup "<guimenuitem>Eintrag <accel>d</accel>uplizieren</guimenuitem>">
+<!ENTITY % gmi.ac.up "<guimenuitem>Eintrag <accel>h</accel>öher sortieren</guimenuitem>">
+<!ENTITY % gmi.ac.down "<guimenuitem>Eintrag <accel>t</accel>iefer sortieren</guimenuitem>">
+
+<!-- Business (Invoice, Bill, Voucher); Business-Menu -->
+<!ENTITY % gmi.bus.man-doc-link "<guimenuitem><accel>V</accel>erknüpfung bearbeiten…</guimenuitem>">
+<!ENTITY % gmi.bus.open-doc "<guimenuitem><accel>V</accel>erknüpfung öffnen</guimenuitem>">
+<!ENTITY % gmi.bus.pay-inv "<guimenuitem>Rechnung be<accel>z</accel>ahlen</guimenuitem>">
+<!ENTITY % gmi.bus.pay-bill "<guimenuitem>Rechnung be<accel>z</accel>ahlen</guimenuitem>">
+<!ENTITY % gmi.bus.pay-vou "<guimenuitem>Auslagenerstattung be<accel>z</accel>ahlen</guimenuitem>">
 
 <!-- Reconcile-Window -->
 <!-- Reconcile-Window; Reconcile-Menu -->
@@ -333,6 +384,25 @@
 <!ENTITY % gm.rec.help "<guimenu><accel>H</accel>ilfe</guimenu>">
 <!ENTITY % gmi.rec.help.hlp "<guimenuitem><accel>H</accel>ilfe</guimenuitem>">
 
+<!-- Specific strings for Operating Systems -->
+<!-- Strings for Windows -->
+<!ENTITY % gm.winOS "<guimenu>Start</guimenu>">
+<!ENTITY % gsm.winOS.gc "<guisubmenu>GnuCash</guisubmenu>">
+<!ENTITY % gmi.winOS.inst-fq "<guimenuitem>Erweiterung um Kurse mit GnuCash online abzurufen</guimenuitem>">
+<!ENTITY % gsm.winOS.pref "<guisubmenu>Einstellungen</guisubmenu>">
+<!ENTITY % gsm.winOS.pref.lang "<guisubmenu>Zeit & Sprache</guisubmenu>">
+<!ENTITY % gmi.winOS.pref.lang.local "<guimenuitem>Region</guimenuitem>">
+<!ENTITY % gsm.winOS.sys "<guisubmenu>Systemsteuerung</guisubmenu>">
+<!ENTITY % gmi.winOS.sys.tasks "<guimenuitem>Aufgabenplanung</guimenuitem>">
+<!ENTITY % gmi.winOS.sys.task "<guimenuitem>Aufgabe erstellen…</guimenuitem>">
+
+<!-- Strings for Mac -->
+<!ENTITY % gm.macOS "<guimenu>Apple</guimenu>">
+<!ENTITY % gsm.macOS.sys "<guisubmenu>Systemeinstellungen</guisubmenu>">
+<!ENTITY % gsm.macOS.sys.gen "<guisubmenu>Allgemein</guisubmenu>">
+<!ENTITY % gmi.macOS.sys.gen.lang "<guimenuitem>Sprache und Region</guimenuitem>">
+<!ENTITY % gsm.macOS.gc "<guisubmenu>GnuCash</guisubmenu>">
+<!ENTITY % gmi.macOS.gc.pref "<guimenuitem>Einstellungen</guimenuitem>">
 
 <!-- keycaps for keycombos and shortcuts -->
 <!ENTITY % kc.alt '<keycap function="alt">Alt</keycap>'>
@@ -345,6 +415,7 @@
 <!ENTITY % kc.home '<keycap function="home">Pos1</keycap>'>
 <!ENTITY % kc.pgdown '<keycap function="pagedown">Seite Abwärts</keycap>'>
 <!ENTITY % kc.shift '<keycap function="shift">Umschalt</keycap>'>
+<!ENTITY % kc.opt-shift '<keycap function="shift"><optional>Umschalt</optional></keycap>'>
 <!ENTITY % kc.space '<keycap function="space">Leerzeichen</keycap>'>
 <!ENTITY % kc.tab '<keycap function="tab">Tab</keycap>'>
 
@@ -355,11 +426,6 @@
 <!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>">
-
 <!-- Column selector for tables -->
 <!ENTITY % tip-col-sel '<tip><para>Sie können die angezeigten Spalten anpassen,
   indem Sie in der Ãœberschriftenzeile ganz rechts auf das kleine
diff --git a/docbook/gnc-gui-struct.dtd b/docbook/gnc-gui-struct.dtd
index 4e4c87fe..44a08d36 100644
--- a/docbook/gnc-gui-struct.dtd
+++ b/docbook/gnc-gui-struct.dtd
@@ -1,7 +1,7 @@
 <!-- This file contains an entity as a definition for each individual
      menu item, which is referenced by the documents.
      Defined are at present beside the individual menu items also
-     so-called shortcuts. 
+     so-called shortcuts.
      
      The translation is done in the language-specific gnc-gui-*.dtd
      files.  -->
@@ -43,13 +43,17 @@
 <!ENTITY gmi.fi.save-as "%gmi.fi.save-as;">
 <!ENTITY gmi.fi.rev "%gmi.fi.rev;">
 <!ENTITY gmi.fi.prin "%gmi.fi.prin;">
+<!ENTITY gmi.fi.prin-rep "%gmi.fi.prin-rep;">
+<!ENTITY gmi.fi.prin-ch "%gmi.fi.prin-ch;">
 <!ENTITY gmi.fi.page "%gmi.fi.page;">
 <!ENTITY gsm.fi.exp "%gsm.fi.exp;">
 <!ENTITY gmi.fi.exp.acct-csv "%gmi.fi.exp.acct-csv;">
 <!ENTITY gmi.fi.exp.tran-csv "%gmi.fi.exp.tran-csv;">
 <!ENTITY gmi.fi.exp.regi-csv "%gmi.fi.exp.regi-csv;">
+<!ENTITY gmi.fi.exp.rep "%gmi.fi.exp.rep;">
 <!ENTITY gmi.fi.exp.acct "%gmi.fi.exp.acct;">
 <!ENTITY gmi.fi.prop "%gmi.fi.prop;">
+<!ENTITY gmi.fi.mru "%gmi.fi.mru;">
 <!ENTITY gmi.fi.cls "%gmi.fi.cls;">
 <!ENTITY gmi.fi.quit "%gmi.fi.quit;">
 
@@ -58,7 +62,8 @@
 <!ENTITY gmi.ed.cut "%gmi.ed.cut;">
 <!ENTITY gmi.ed.copy "%gmi.ed.copy;">
 <!ENTITY gmi.ed.paste "%gmi.ed.paste;">
-<!ENTITY gmi.ed.pay "%gmi.ed.pay;">
+<!ENTITY gmi.ed.pay-asng "%gmi.ed.pay-asng;">
+<!ENTITY gmi.ed.pay-edit "%gmi.ed.pay-edit;">
 <!ENTITY gmi.ed.acc-edit "%gmi.ed.acc-edit;">
 <!ENTITY gmi.ed.acc-del "%gmi.ed.acc-del;">
 <!ENTITY gmi.ed.acc-find "%gmi.ed.acc-find;">
@@ -102,7 +107,7 @@
 <!ENTITY gsm.ac.bgt "%gsm.ac.bgt;">
 <!ENTITY gmi.ac.bgt.new "%gmi.ac.bgt.new;">
 <!ENTITY gmi.ac.bgt.open "%gmi.ac.bgt.open;">
-<!ENTITY gmi.ac.bgt.coy "%gmi.ac.bgt.copy;">
+<!ENTITY gmi.ac.bgt.copy "%gmi.ac.bgt.copy;">
 <!ENTITY gmi.ac.bgt.del "%gmi.ac.bgt.del;">
 <!ENTITY gmi.ac.act-new "%gmi.ac.act-new;">
 <!ENTITY gmi.ac.act-hier "%gmi.ac.act-hier;">
@@ -175,9 +180,12 @@
 <!ENTITY gmi.bus.link-doc "%gmi.bus.link-doc;">
 <!ENTITY gmi.bus.tax-tab "%gmi.bus.tax-tab;">
 <!ENTITY gmi.bus.bil-edit "%gmi.bus.bil-edit;">
-<!ENTITY gmi.bus.man-doc-link "%gmi.bus.man-doc-link;">
-<!ENTITY gmi.bus.open-doc "%gmi.bus.open-doc;">
-<!ENTITY gmi.bus.pay-inv "%gmi.bus.pay-inv;">
+
+<!-- Scheduled-Menu -->
+<!ENTITY gm.sx "%gm.sx;">
+<!ENTITY gmi.sx.new "%gmi.sx.new;">
+<!ENTITY gmi.sx.edit "%gmi.sx.edit;">
+<!ENTITY gmi.sx.del "%gmi.sx.del;">
 
 <!-- Reports-Menu -->
 <!ENTITY gm.rep "%gm.rep;">
@@ -251,10 +259,12 @@
 <!ENTITY gmi.rep.rec-rep "%gmi.rep.rec-rep;">
 <!ENTITY gmi.rep.tax-xml "%gmi.rep.tax-xml;">
 <!ENTITY gmi.rep.tr-rep "%gmi.rep.tr-rep;">
-<!ENTITY gmi.rep.save-rep-conf "%gmi.rep.save-rep-conf;">
+<!ENTITY gmi.rep.saved-rep-conf "%gmi.rep.saved-rep-conf;">
 <!ENTITY gmi.rep.save-conf "%gmi.rep.save-conf;">
 <!ENTITY gmi.rep.save-conf-as "%gmi.rep.save-conf-as;">
 <!ENTITY gmi.rep.com-rep "%gmi.rep.com-rep;">
+<!ENTITY gmi.rep.acct-rep "%gmi.rep.acct-rep;">
+<!ENTITY gmi.rep.acct-rep-tr "%gmi.rep.acct-rep-tr;">
 
 <!-- Tools-Menu -->
 <!ENTITY gm.tool "%gm.tool;">
@@ -279,32 +289,73 @@
 <!ENTITY gmi.help.cont "%gmi.help.cont;">
 <!ENTITY gmi.help.abo "%gmi.help.abo;">
 
-<!-- Invoce Editor -->
-<!-- Invoice Editor; Edit-Menu -->
-<!ENTITY gmi.inv.ed.edit "%gmi.inv.ed.edit;">
-<!ENTITY gmi.inv.ed.dup "%gmi.inv.ed.dup;">
-<!ENTITY gmi.inv.ed.post "%gmi.inv.ed.post;">
-<!ENTITY gmi.inv.ed.unpost "%gmi.inv.ed.unpost;">
-
-<!-- Invoice Editor; View-Menu -->
-<!ENTITY gmi.inv.vw.use-def "%gmi.inv.vw.use-def;">
-<!ENTITY gmi.inv.vw-res-def "%gmi.inv.vw.res-def;">
-<!ENTITY gsm.inv.vw.ord "%gsm.inv.vw.ord;">
-<!ENTITY gmi.inv.vw.ord.def "%gmi.inv.vw.ord.def;">
-<!ENTITY gmi.inv.vw.ord.date "%gmi.inv.vw.ord.date;">
-<!ENTITY gmi.inv.vw.ord.entry "%gmi.inv.vw.ord.entry;">
-<!ENTITY gmi.inv.vw.ord.qua "%gmi.inv.vw.ord.qua;">
-<!ENTITY gmi.inv.vw.ord.pri "%gmi.inv.vw.ord.pri;">
-<!ENTITY gmi.inv.vw.ord.desc "%gmi.inv.vw.ord.desc;">
-
-<!-- Invoice Editor; Actions-Menu -->
-<!ENTITY gmi.inv.ac.ent "%gmi.inv.ac.ent;">
-<!ENTITY gmi.inv.ac.cnl "%gmi.inv.ac.cnl;">
-<!ENTITY gmi.inv.ac.del "%gmi.inv.ac.del;">
-<!ENTITY gmi.inv.ac.blk "%gmi.inv.ac.blk;">
-<!ENTITY gmi.inv.ac.dup "%gmi.inv.ac.dup;">
-<!ENTITY gmi.inv.ac.up "%gmi.inv.ac.up;">
-<!ENTITY gmi.inv.ac.down "%gmi.inv.ac.down;">
+<!-- Budget Editor -->
+<!-- Budget Editor; Edit Menu -->
+<!ENTITY gmi.ed.bgt.est "%gmi.ed.bgt.est;">
+<!ENTITY gmi.ed.bgt.per "%gmi.ed.bgt.per;">
+<!ENTITY gmi.ed.bgt.del "%gmi.ed.bgt.del;">
+<!ENTITY gmi.ed.bgt.note "%gmi.ed.bgt.note;">
+<!ENTITY gmi.ed.bgt.rep "%gmi.ed.bgt.rep;">
+<!ENTITY gmi.ed.bgt.opt "%gmi.ed.bgt.opt;">
+
+<!-- Business (Customer, Vendor and Employee) -->
+<!-- Business (Customer, Vendor and Employee); Edit-Menu -->
+<!ENTITY gmi.ed.cus.edit "%gmi.ed.cus.edit;">
+<!ENTITY gmi.ed.cus.new "%gmi.ed.cus.new;">
+<!ENTITY gmi.ed.ven.edit "%gmi.ed.ven.edit;">
+<!ENTITY gmi.ed.ven.new "%gmi.ed.ven.new;">
+<!ENTITY gmi.ed.emp.edit "%gmi.ed.emp.edit;">
+<!ENTITY gmi.ed.emp.new "%gmi.ed.emp.new;">
+
+<!-- Business (Customer, Vendor and Employee); Reports-Menu -->
+<!ENTITY gmi.rep.cus-list "%gmi.rep.cus-list;">
+<!ENTITY gmi.rep.cus-rep "%gmi.rep.cus-rep;">
+<!ENTITY gmi.rep.ven-list "%gmi.rep.ven-list;">
+<!ENTITY gmi.rep.ven-rep "%gmi.rep.ven-rep;">
+<!ENTITY gmi.rep.emp-rep "%gmi.rep.emp-rep;">
+
+<!-- Business (Invoice, Bill, Voucher) -->
+<!-- Business (Invoice, Bill, Voucher); File-Menu -->
+<!ENTITY gmi.fi.prin-inv "%gmi.fi.prin-inv;">
+<!ENTITY gmi.fi.prin-bill "%gmi.fi.prin-bill;">
+<!ENTITY gmi.fi.prin-vou "%gmi.fi.prin-vou;">
+
+<!-- Business (Invoice, Bill, Voucher); Edit-Menu -->
+<!ENTITY gmi.ed.edit "%gmi.ed.edit;">
+<!ENTITY gmi.ed.dup "%gmi.ed.dup;">
+<!ENTITY gmi.ed.post "%gmi.ed.post;">
+<!ENTITY gmi.ed.unpost "%gmi.ed.unpost;">
+
+<!-- Business (Invoice, Bill, Voucher); View-Menu -->
+<!ENTITY gmi.vw.use-lay-cus "%gmi.vw.use-lay-cus;">
+<!ENTITY gmi.vw.res-lay-cus "%gmi.vw.res-lay-cus;">
+<!ENTITY gmi.vw.use-lay-ven "%gmi.vw.use-lay-ven;">
+<!ENTITY gmi.vw.res-lay-ven "%gmi.vw.res-lay-ven;">
+<!ENTITY gmi.vw.use-lay-emp "%gmi.vw.use-lay-emp;">
+<!ENTITY gmi.vw.res-lay-emp "%gmi.vw.res-lay-emp;">
+<!ENTITY gsm.vw.ord "%gsm.vw.ord;">
+<!ENTITY gmi.vw.ord.def "%gmi.vw.ord.def;">
+<!ENTITY gmi.vw.ord.date "%gmi.vw.ord.date;">
+<!ENTITY gmi.vw.ord.entry "%gmi.vw.ord.entry;">
+<!ENTITY gmi.vw.ord.qua "%gmi.vw.ord.qua;">
+<!ENTITY gmi.vw.ord.pri "%gmi.vw.ord.pri;">
+<!ENTITY gmi.vw.ord.desc "%gmi.vw.ord.desc;">
+
+<!-- Business (Invoice, Bill, Voucher); Actions-Menu -->
+<!ENTITY gmi.ac.ent "%gmi.ac.ent;">
+<!ENTITY gmi.ac.cnl "%gmi.ac.cnl;">
+<!ENTITY gmi.ac.del "%gmi.ac.del;">
+<!ENTITY gmi.ac.blk "%gmi.ac.blk;">
+<!ENTITY gmi.ac.dup "%gmi.ac.dup;">
+<!ENTITY gmi.ac.up "%gmi.ac.up;">
+<!ENTITY gmi.ac.down "%gmi.ac.down;">
+
+<!-- Business (Invoice, Bill, Voucher); Business-Menu -->
+<!ENTITY gmi.bus.man-doc-link "%gmi.bus.man-doc-link;">
+<!ENTITY gmi.bus.open-doc "%gmi.bus.open-doc;">
+<!ENTITY gmi.bus.pay-inv "%gmi.bus.pay-inv;">
+<!ENTITY gmi.bus.pay-bill "%gmi.bus.pay-bill;">
+<!ENTITY gmi.bus.pay-vou "%gmi.bus.pay-vou;">
 
 <!-- Reconcile-Window -->
 <!-- Reconcile-Window; Reconcile-Menu -->
@@ -333,6 +384,25 @@
 <!ENTITY gm.rec.help "%gm.rec.help;">
 <!ENTITY gmi.rec.help.hlp "%gmi.rec.help.hlp;">
 
+<!-- Specific strings for Operating Systems -->
+<!-- Strings for Windows -->
+<!ENTITY gm.winOS "%gm.winOS;">
+<!ENTITY gsm.winOS.gc "%gsm.winOS.gc;">
+<!ENTITY gmi.winOS.inst-fq "%gmi.winOS.inst-fq;">
+<!ENTITY gsm.winOS.pref "%gsm.winOS.pref;">
+<!ENTITY gsm.winOS.pref.lang "%gsm.winOS.pref.lang;">
+<!ENTITY gmi.winOS.pref.lang.local "%gmi.winOS.pref.lang.local;">
+<!ENTITY gsm.winOS.sys "%gsm.winOS.sys;">
+<!ENTITY gmi.winOS.sys.tasks "%gmi.winOS.sys.tasks;">
+<!ENTITY gmi.winOS.sys.task "%gmi.winOS.sys.task;">
+
+<!-- Strings for Mac -->
+<!ENTITY gm.macOS "%gm.macOS;">
+<!ENTITY gsm.macOS.sys "%gsm.macOS.sys;">
+<!ENTITY gsm.macOS.sys.gen "%gsm.macOS.sys.gen;">
+<!ENTITY gmi.macOS.sys.gen.lang "%gmi.macOS.sys.gen.lang;">
+<!ENTITY gsm.macOS.gc "%gsm.macOS.gc;">
+<!ENTITY gmi.macOS.gc.pref "%gmi.macOS.gc.pref;">
 
 <!-- keycaps for keycombos and shortcuts -->
 <!ENTITY kc.alt "%kc.alt;">
@@ -345,6 +415,7 @@
 <!ENTITY kc.home "%kc.home;">
 <!ENTITY kc.pgdown "%kc.pgdown;">
 <!ENTITY kc.shift "%kc.shift;">
+<!ENTITY kc.opt-shift "%kc.opt-shift;">
 <!ENTITY kc.space "%kc.space;">
 <!ENTITY kc.tab "%kc.tab;">
 
@@ -355,10 +426,16 @@
 <!-- The menuchoice is a combination of <guimenu>, optionally <guisubmenu>
      and <guimenuitem>. If defined in GnuCash, <shortcut> and <keycap>
      are also used. -->
+<!-- In GUIMenus.xml there are some special kind of <menuchoice> without <guimenu>
+     These ENTITIES are described as mc-gmi.xx.yy.zz -->
+
 
 <!-- File-Menu menuchoice -->
 <!ENTITY mc.fi.new "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>N</keycap></keycombo></shortcut>&gm.file;&gmi.fi.new;</menuchoice>">
+<!ENTITY mc-gmi.fi.new "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>N</keycap></keycombo></shortcut>&gmi.fi.new;</menuchoice>">
 <!ENTITY mc.fi.open "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>O</keycap></keycombo></shortcut>&gm.file;&gmi.fi.open;</menuchoice>">
+<!ENTITY mc-gmi.fi.open "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>O</keycap></keycombo></shortcut>&gmi.fi.open;</menuchoice>">
+<!ENTITY mc-gsm.fi.imp "<menuchoice>&gsm.fi.imp;<guimenuitem /></menuchoice>">
 <!ENTITY mc.fi.imp.bill-inv "<menuchoice>&gm.file;&gsm.fi.imp;&gmi.fi.imp.bill-inv;</menuchoice>">
 <!ENTITY mc.fi.imp.acct-csv "<menuchoice>&gm.file;&gsm.fi.imp;&gmi.fi.imp.acct-csv;</menuchoice>">
 <!ENTITY mc.fi.imp.tran-csv "<menuchoice>&gm.file;&gsm.fi.imp;&gmi.fi.imp.tran-csv;</menuchoice>">
@@ -372,31 +449,54 @@
 <!ENTITY mc.fi.imp.dtaus "<menuchoice>&gm.file;&gsm.fi.imp;&gmi.fi.imp.dtaus;</menuchoice>">
 <!ENTITY mc.fi.imp.dtaus-sen "<menuchoice>&gm.file;&gsm.fi.imp;&gmi.fi.imp.dtaus-sen;</menuchoice>">
 <!ENTITY mc.fi.save "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>S</keycap></keycombo></shortcut>&gm.file;&gmi.fi.save;</menuchoice>">
+<!ENTITY mc-gmi.fi.save "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>S</keycap></keycombo></shortcut>&gmi.fi.save;</menuchoice>">
 <!ENTITY mc.fi.save_as "<menuchoice><shortcut><keycombo>&kc.shift;&kc.ctrl;<keycap>S</keycap></keycombo></shortcut>&gm.file;&gmi.fi.save-as;</menuchoice>">
+<!ENTITY mc-gmi.fi.save_as "<menuchoice><shortcut><keycombo>&kc.shift;&kc.ctrl;<keycap>S</keycap></keycombo></shortcut>&gmi.fi.save-as;</menuchoice>">
 <!ENTITY mc.fi.rev "<menuchoice>&gm.file;&gmi.fi.rev;</menuchoice>">
 <!ENTITY mc.fi.prin "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin;</menuchoice>">
+<!ENTITY mc.fi.prin-rep "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin-rep;</menuchoice>">
+<!ENTITY mc.fi.prin-ch "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin-ch;</menuchoice>">
+<!ENTITY mc.fi.prin-inv "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin-inv;</menuchoice>">
+<!ENTITY mc-gmi.fi.prin "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gmi.fi.prin;</menuchoice>">
+<!ENTITY mc-gmi.fi.prin-rep "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gmi.fi.prin-rep;</menuchoice>">
+<!ENTITY mc-gmi.fi.prin-ch "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gmi.fi.prin-ch;</menuchoice>">
+<!ENTITY mc-gmi.fi.prin-inv "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gmi.fi.prin-inv;</menuchoice>">
 <!ENTITY mc.fi.page "<menuchoice><shortcut><keycombo>&kc.shift;&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.page;</menuchoice>">
+<!ENTITY mc-gmi.fi.page "<menuchoice><shortcut><keycombo>&kc.shift;&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gmi.fi.page;</menuchoice>">
+<!ENTITY mc-gsm.fi.exp "<menuchoice>&gsm.fi.exp;<guimenuitem /></menuchoice>">
 <!ENTITY mc.fi.exp.acct-csv "<menuchoice>&gm.file;&gsm.fi.exp;&gmi.fi.exp.acct-csv;</menuchoice>">
 <!ENTITY mc.fi.exp.tran-csv "<menuchoice>&gm.file;&gsm.fi.exp;&gmi.fi.exp.tran-csv;</menuchoice>">
 <!ENTITY mc.fi.exp.regi-csv "<menuchoice>&gm.file;&gsm.fi.exp;&gmi.fi.exp.regi-csv;</menuchoice>">
 <!ENTITY mc.fi.exp.acct "<menuchoice>&gm.file;&gsm.fi.exp;&gmi.fi.exp.acct;</menuchoice>">
 <!ENTITY mc.fi.prop "<menuchoice><shortcut><keycombo>&kc.alt;&kc.enter;</keycombo></shortcut>&gm.file;&gmi.fi.prop;</menuchoice>">
-<!ENTITY mc.fi.close "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>W</keycap></keycombo></shortcut>&gm.file;&gmi.fi.cls;</menuchoice>">
+<!ENTITY mc-gmi.fi.prop "<menuchoice><shortcut><keycombo>&kc.alt;&kc.enter;</keycombo></shortcut>&gmi.fi.prop;</menuchoice>">
+<!ENTITY mc.fi.cls "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>W</keycap></keycombo></shortcut>&gm.file;&gmi.fi.cls;</menuchoice>">
+<!ENTITY mc-gmi.fi.cls "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>W</keycap></keycombo></shortcut>&gmi.fi.cls;</menuchoice>">
 <!ENTITY mc.fi.quit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>Q</keycap></keycombo></shortcut>&gm.file;&gmi.fi.quit;</menuchoice>">
+<!ENTITY mc-gmi.fi.quit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>Q</keycap></keycombo></shortcut>&gmi.fi.quit;</menuchoice>">
 
 <!-- Edit-Menu menuchoice -->
 <!ENTITY mc.ed.cut "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>X</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.cut;</menuchoice>">
+<!ENTITY mc-gmi.ed.cut "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>X</keycap></keycombo></shortcut>&gmi.ed.cut;</menuchoice>">
 <!ENTITY mc.ed.copy "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>C</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.copy;</menuchoice>">
+<!ENTITY mc-gmi.ed.copy "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>C</keycap></keycombo></shortcut>&gmi.ed.copy;</menuchoice>">
 <!ENTITY mc.ed.paste "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>V</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.paste;</menuchoice>">
-<!ENTITY mc.ed.pay "<menuchoice>&gm.edit;&gmi.ed.pay;</menuchoice>">
+<!ENTITY mc-gmi.ed.paste "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>V</keycap></keycombo></shortcut>&gmi.ed.paste;</menuchoice>">
+<!ENTITY mc.ed.pay-asng "<menuchoice>&gm.edit;&gmi.ed.pay-asng;</menuchoice>">
+<!ENTITY mc.ed.pay-edit "<menuchoice>&gm.edit;&gmi.ed.pay-edit;</menuchoice>">
 <!ENTITY mc.ed.acc-edit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>E</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.acc-edit;</menuchoice>">
+<!ENTITY mc-gmi.ed.acc-edit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>E</keycap></keycombo></shortcut>&gmi.ed.acc-edit;</menuchoice>">
 <!ENTITY mc.ed.acc-del "<menuchoice><shortcut>&kc.del;</shortcut>&gm.edit;&gmi.ed.acc-del;</menuchoice>">
+<!ENTITY mc-gmi.ed.acc-del "<menuchoice><shortcut>&kc.del;</shortcut>&gmi.ed.acc-del;</menuchoice>">
 <!ENTITY mc.ed.acc-find "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>I</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.acc-find;</menuchoice>">
+<!ENTITY mc-gmi.ed.acc-find "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>I</keycap></keycombo></shortcut>&gmi.ed.acc-find;</menuchoice>">
 <!ENTITY mc.ed.acc-casc "<menuchoice>&gm.edit;&gmi.ed.acc-casc;</menuchoice>">
 <!ENTITY mc.ed.acc-renum "<menuchoice>&gm.edit;&gmi.ed.acc-renum;</menuchoice>">
 <!ENTITY mc.ed.acc-open "<menuchoice>&gm.edit;&gmi.ed.acc-open;</menuchoice>">
 <!ENTITY mc.ed.acc-open-sub "<menuchoice>&gm.edit;&gmi.ed.acc-open-sub;</menuchoice>">
+<!ENTITY mc.ed.bgt-opt "<menuchoice>&gm.edit;&gmi.ed.bgt-opt;</menuchoice>">
 <!ENTITY mc.ed.find "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>F</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.find;</menuchoice>">
+<!ENTITY mc-gmi.ed.find "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>F</keycap></keycombo></shortcut>&gmi.ed.find;</menuchoice>">
 <!ENTITY mc.ed.pref "<menuchoice>&gm.edit;&gmi.ed.pref;</menuchoice>">
 <!ENTITY mc.ed.css "<menuchoice>&gm.edit;&gmi.ed.css;</menuchoice>">
 <!ENTITY mc.ed.rep-opt "<menuchoice>&gm.edit;&gmi.ed.rep-opt;</menuchoice>">
@@ -413,42 +513,48 @@
 <!ENTITY mc.vw.s-by "<menuchoice>&gm.view;&gmi.vw.s-by;</menuchoice>">
 <!ENTITY mc.vw.f-by "<menuchoice>&gm.view;&gmi.vw.f-by;</menuchoice>">
 <!ENTITY mc.vw.ref "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>R</keycap></keycombo></shortcut>&gm.view;&gmi.vw.ref;</menuchoice>">
+<!ENTITY mc-gmi.vw.ref "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>R</keycap></keycombo></shortcut>&gmi.vw.ref;</menuchoice>">
 <!ENTITY mc.vw.new-page "<menuchoice>&gm.view;&gmi.vw.new-page;</menuchoice>">
 
 <!-- Actions-Menu menuchoice -->
+<!ENTITY mc-gsm.ac.onli "<menuchoice>&gsm.ac.onli;<guimenuitem /></menuchoice>">
 <!ENTITY mc.ac.onli.get-bal "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.get-bal;</menuchoice>">
 <!ENTITY mc.ac.onli.get-tr "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.get-tr;</menuchoice>">
-<!ENTITY mc.ac.onli.sepa-tr "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.sepa-;</menuchoice>">
+<!ENTITY mc.ac.onli.sepa-tr "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.sepa-tr;</menuchoice>">
 <!ENTITY mc.ac.onli.sepa-int "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.sepa-int;</menuchoice>">
 <!ENTITY mc.ac.onli.int-tr "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.int-tr;</menuchoice>">
 <!ENTITY mc.ac.onli.log "<menuchoice>&gm.act;&gsm.ac.onli;&gmi.ac.onli.log;</menuchoice>">
+<!ENTITY mc-gsm.ac.scd "<menuchoice>&gsm.ac.scd;<guimenuitem /></menuchoice>">
 <!ENTITY mc.ac.scd.tr-ed "<menuchoice>&gm.act;&gsm.ac.scd;&gmi.ac.scd.tr-ed;</menuchoice>">
 <!ENTITY mc.ac.scd.slr "<menuchoice>&gm.act;&gsm.ac.scd;&gmi.ac.scd.slr;</menuchoice>">
 <!ENTITY mc.ac.scd.loan "<menuchoice>&gm.act;&gsm.ac.scd;&gmi.ac.scd.loan;</menuchoice>">
+<!ENTITY mc-gsm.ac.bgt "<menuchoice>&gsm.ac.bgt;<guimenuitem /></menuchoice>">
 <!ENTITY mc.ac.bgt.new "<menuchoice>&gm.act;&gsm.ac.bgt;&gmi.ac.bgt.new;</menuchoice>">
 <!ENTITY mc.ac.bgt.open "<menuchoice>&gm.act;&gsm.ac.bgt;&gmi.ac.bgt.open;</menuchoice>">
 <!ENTITY mc.ac.bgt.copy "<menuchoice>&gm.act;&gsm.ac.bgt;&gmi.ac.bgt.copy;</menuchoice>">
 <!ENTITY mc.ac.bgt.del "<menuchoice>&gm.act;&gsm.ac.bgt;&gmi.ac.bgt.del;</menuchoice>">
 <!ENTITY mc.ac.act-new "<menuchoice>&gm.act;&gmi.ac.act-new;</menuchoice>">
 <!ENTITY mc.ac.act-hier "<menuchoice>&gm.act;&gmi.ac.act-hier;</menuchoice>">
-<!ENTITY mc.ac.trf "<shortcut><keycombo>&kc.ctrl;<keycap>T</keycap></keycombo></shortcut>">
+<!ENTITY mc.ac.trf "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>T</keycap></keycombo></shortcut>&gm.act;&gmi.ac.trf;</menuchoice>">
+<!ENTITY mc-gmi.ac.trf "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>T</keycap></keycombo></shortcut>&gmi.ac.trf;</menuchoice>">
 <!ENTITY mc.ac.rec "<menuchoice>&gm.act;&gmi.ac.rec;</menuchoice>">
 <!ENTITY mc.ac.au-clr "<menuchoice>&gm.act;&gmi.ac.au-clr;</menuchoice>">
 <!ENTITY mc.ac.stk-spt "<menuchoice>&gm.act;&gmi.ac.stk-spt;</menuchoice>">
 <!ENTITY mc.ac.vw-lots "<menuchoice>&gm.act;&gmi.ac.vw-lots;</menuchoice>">
 <!ENTITY mc.ac.blk-tr "<menuchoice><shortcut><keycombo>&kc.ctrl;&kc.pgdown;</keycombo></shortcut>&gm.act;&gmi.ac.blk-tr;</menuchoice>">
-<!ENTITY mc.ac.go-to "<menuchoice>shortcut><keycombo>&kc.ctrl;<keycap>G</keycap></keycombo></shortcut>&gm.act;&gmi.ac.go-to;</menuchoice>">
+<!ENTITY mc-gmi.ac.blk-tr "<menuchoice><shortcut><keycombo>&kc.ctrl;&kc.pgdown;</keycombo></shortcut>&gmi.ac.blk-tr;</menuchoice>">
+<!ENTITY mc.ac.go-to "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>G</keycap></keycombo></shortcut>&gm.act;&gmi.ac.go-to;</menuchoice>">
+<!ENTITY mc-gmi.ac.go-to "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>G</keycap></keycombo></shortcut>&gmi.ac.go-to;</menuchoice>">
 <!ENTITY mc.ac.spt-tr "<menuchoice>&gm.act;&gmi.ac.spt-tr;</menuchoice>">
 <!ENTITY mc.ac.ed-ex "<menuchoice>&gm.act;&gmi.ac.ed-ex;</menuchoice>">
 <!ENTITY mc.ac.sched "<menuchoice>&gm.act;&gmi.ac.sched;</menuchoice>">
-<!ENTITY mc.ac.ed-ex "<menuchoice>&gm.act;&gmi.ac.ed-ex;</menuchoice>">
-<!ENTITY mc.ac.sched "<menuchoice>&gm.act;&gmi.ac.sched;</menuchoice>">
 <!ENTITY mc.ac.jump "<menuchoice>&gm.act;&gmi.ac.jump;</menuchoice>">
-<!ENTITY mc.ac.chk-rep.acct "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.acct;</menuchoice>">
-<!ENTITY mc.ac.chk-rep.sacct "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.sacct;</menuchoice>">
-<!ENTITY mc.ac.chk-rep.all "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.all;</menuchoice>">
-<!ENTITY mc.ac.chk-rep.tr-all "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.tr-all;</menuchoice>">
-<!ENTITY mc.ac.chk-rep.tr-this "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.tr-this;</menuchoice>">
+<!ENTITY mc-gsm.ac.chk-rep "<menuchoice>&gsm.ac.chk-rep;<guimenuitem /></menuchoice>">
+<!ENTITY mc.ac.chk-rep.acct "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.chk-rep.acct;</menuchoice>">
+<!ENTITY mc.ac.chk-rep.sacct "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.chk-rep.sacct;</menuchoice>">
+<!ENTITY mc.ac.chk-rep.all "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.chk-rep.all;</menuchoice>">
+<!ENTITY mc.ac.chk-rep.tr-all "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.chk-rep.tr-all;</menuchoice>">
+<!ENTITY mc.ac.chk-rep.tr-this "<menuchoice>&gm.act;&gsm.ac.chk-rep;&gmi.ac.chk-rep.tr-this;</menuchoice>">
 <!ENTITY mc.ac.res-warn "<menuchoice>&gm.act;&gmi.ac.res-warn;</menuchoice>">
 <!ENTITY mc.ac.re-pg "<menuchoice>&gm.act;&gmi.ac.re-pg;</menuchoice>">
 
@@ -469,6 +575,8 @@
 <!ENTITY mc.tr.jump-inv "<menuchoice>&gm.trans;&gmi.tr.jump-inv;</menuchoice>">
 
 <!-- Business-Menu menuchoice -->
+<!ENTITY mc-gsm.bus.cus "<menuchoice>&gsm.bus.cus;<guimenuitem /></menuchoice>">
+<!ENTITY mc.bus.cus "<menuchoice>&gm.bus;&gsm.bus.cus;</menuchoice>">
 <!ENTITY mc.bus.cus.o-view "<menuchoice>&gm.bus;&gsm.bus.cus;&gmi.bus.cus.o-view;</menuchoice>">
 <!ENTITY mc.bus.cus.new-cus "<menuchoice>&gm.bus;&gsm.bus.cus;&gmi.bus.cus.new-cus;</menuchoice>">
 <!ENTITY mc.bus.cus.find-cus "<menuchoice>&gm.bus;&gsm.bus.cus;&gmi.bus.cus.find-cus;</menuchoice>">
@@ -478,6 +586,8 @@
 <!ENTITY mc.bus.cus.find-job "<menuchoice>&gm.bus;&gsm.bus.cus;&gmi.bus.cus.find-job;</menuchoice>">
 <!ENTITY mc.bus.cus.pro-pay "<menuchoice>&gm.bus;&gsm.bus.cus;&gmi.bus.cus.pro-pay;</menuchoice>">
 <!ENTITY mc.bus.cus.inv-due-rem "<menuchoice>&gm.bus;&gsm.bus.cus;&gmi.bus.cus.inv-due-rem;</menuchoice>">
+<!ENTITY mc-gsm.bus.ven "<menuchoice>&gsm.bus.ven;<guimenuitem /></menuchoice>">
+<!ENTITY mc.bus.ven "<menuchoice>&gm.bus;&gsm.bus.ven;</menuchoice>">
 <!ENTITY mc.bus.ven.o-view "<menuchoice>&gm.bus;&gsm.bus.ven;&gmi.bus.ven.o-view;</menuchoice>">
 <!ENTITY mc.bus.ven.new-ven "<menuchoice>&gm.bus;&gsm.bus.ven;&gmi.bus.ven.new-ven;</menuchoice>">
 <!ENTITY mc.bus.ven.find-ven "<menuchoice>&gm.bus;&gsm.bus.ven;&gmi.bus.ven.find-ven;</menuchoice>">
@@ -487,6 +597,7 @@
 <!ENTITY mc.bus.ven.find-job "<menuchoice>&gm.bus;&gsm.bus.ven;&gmi.bus.ven.find-job;</menuchoice>">
 <!ENTITY mc.bus.ven.pro-pay "<menuchoice>&gm.bus;&gsm.bus.ven;&gmi.bus.ven.pro-pay;</menuchoice>">
 <!ENTITY mc.bus.ven.bil-due-rem "<menuchoice>&gm.bus;&gsm.bus.ven;&gmi.bus.ven.bil-due-rem;</menuchoice>">
+<!ENTITY mc-gsm.bus.emp "<menuchoice>&gsm.bus.emp;<guimenuitem /></menuchoice>">
 <!ENTITY mc.bus.emp.o-view "<menuchoice>&gm.bus;&gsm.bus.emp;&gmi.bus.emp.o-view;</menuchoice>">
 <!ENTITY mc.bus.emp.new-emp "<menuchoice>&gm.bus;&gsm.bus.emp;&gmi.bus.emp.new-emp;</menuchoice>">
 <!ENTITY mc.bus.emp.find-emp "<menuchoice>&gm.bus;&gsm.bus.emp;&gmi.bus.emp.find-emp;</menuchoice>">
@@ -500,8 +611,8 @@
 <!ENTITY mc.bus.open-doc "<menuchoice>&gm.bus;&gmi.bus.open-doc;</menuchoice>">
 <!ENTITY mc.bus.pay-inv "<menuchoice>&gm.bus;&gmi.bus.pay-inv;</menuchoice>">
 
-<!-- <!ENTITY mc.rep. "<menuchoice>&gm.rep;&gsm.rep.;&gmi.rep.;</menuchoice>"> -->
 <!-- Reports-Menu menuchoice -->
+<!ENTITY mc-gsm.rep.ass-lia "<menuchoice>&gsm.rep.ass-lia;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.ass-lia.adv-por "<menuchoice>&gm.rep;&gsm.rep.ass-lia;&gmi.rep.ass-lia.adv-por;</menuchoice>">
 <!ENTITY mc.rep.ass-lia.ass-chr "<menuchoice>&gm.rep;&gsm.rep.ass-lia;&gmi.rep.ass-lia.ass-chr;</menuchoice>">
 <!ENTITY mc.rep.ass-lia.ass-pie "<menuchoice>&gm.rep;&gsm.rep.ass-lia;&gmi.rep.ass-lia.ass-pie;</menuchoice>">
@@ -518,11 +629,13 @@
 <!ENTITY mc.rep.ass-lia.pri "<menuchoice>&gm.rep;&gsm.rep.ass-lia;&gmi.rep.ass-lia.pri;</menuchoice>">
 <!ENTITY mc.rep.ass-lia.sec-pie "<menuchoice>&gm.rep;&gsm.rep.ass-lia;&gmi.rep.ass-lia.sec-pie;</menuchoice>">
 <!ENTITY mc.rep.bgt.bgt-bal "<menuchoice>&gm.rep;&gsm.rep.bgt;&gmi.rep.bgt.bgt-bal;</menuchoice>">
+<!ENTITY mc-gsm.rep.bgt "<menuchoice>&gsm.rep.bgt;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.bgt.bgt-chr "<menuchoice>&gm.rep;&gsm.rep.bgt;&gmi.rep.bgt.bgt-chr;</menuchoice>">
 <!ENTITY mc.rep.bgt.bgt-flow "<menuchoice>&gm.rep;&gsm.rep.bgt;&gmi.rep.bgt.bgt-flow;</menuchoice>">
 <!ENTITY mc.rep.bgt.bgt-in-stat "<menuchoice>&gm.rep;&gsm.rep.bgt;&gmi.rep.bgt.bgt-in-stat;</menuchoice>">
 <!ENTITY mc.rep.bgt.bgt-p-r "<menuchoice>&gm.rep;&gsm.rep.bgt;&gmi.rep.bgt.bgt-p-r;</menuchoice>">
 <!ENTITY mc.rep.bgt.bgt-rep "<menuchoice>&gm.rep;&gsm.rep.bgt;&gmi.rep.bgt.bgt-rep;</menuchoice>">
+<!ENTITY mc-gsm.rep.bus "<menuchoice>&gsm.rep.bus;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.bus.aus-tax "<menuchoice>&gm.rep;&gsm.rep.bus;&gmi.rep.bus.aus-tax;</menuchoice>">
 <!ENTITY mc.rep.bus.cus-rep "<menuchoice>&gm.rep;&gsm.rep.bus;&gmi.rep.bus.cus-rep;</menuchoice>">
 <!ENTITY mc.rep.bus.cus-sum "<menuchoice>&gm.rep;&gsm.rep.bus;&gmi.rep.bus.cus-sum;</menuchoice>">
@@ -536,15 +649,18 @@
 <!ENTITY mc.rep.bus.rec-age "<menuchoice>&gm.rep;&gsm.rep.bus;&gmi.rep.bus.rec-age;</menuchoice>">
 <!ENTITY mc.rep.bus.tax-inv "<menuchoice>&gm.rep;&gsm.rep.bus;&gmi.rep.bus.tax-inv;</menuchoice>">
 <!ENTITY mc.rep.bus.ven-rep "<menuchoice>&gm.rep;&gsm.rep.bus;&gmi.rep.bus.ven-rep;</menuchoice>">
+<!ENTITY mc-gsm.rep.examp "<menuchoice>&gsm.rep.examp;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.examp.av-bal "<menuchoice>&gm.rep;&gsm.rep.examp;&gmi.rep.examp.av-bal;</menuchoice>">
 <!ENTITY mc.rep.examp.exp-day "<menuchoice>&gm.rep;&gsm.rep.examp;&gmi.rep.examp.exp-day;</menuchoice>">
 <!ENTITY mc.rep.examp.inc-day "<menuchoice>&gm.rep;&gsm.rep.examp;&gmi.rep.examp.inc-day;</menuchoice>">
 <!ENTITY mc.rep.examp.samp-grap "<menuchoice>&gm.rep;&gsm.rep.examp;&gmi.rep.examp.samp-grap;</menuchoice>">
 <!ENTITY mc.rep.examp.samp-rep "<menuchoice>&gm.rep;&gsm.rep.examp;&gmi.rep.examp.samp-rep;</menuchoice>">
 <!ENTITY mc.rep.examp.wel-gnc "<menuchoice>&gm.rep;&gsm.rep.examp;&gmi.rep.examp.wel-gnc;</menuchoice>">
+<!ENTITY mc-gsm.rep.exper "<menuchoice>&gsm.rep.exper;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.exper.bal-sht "<menuchoice>&gm.rep;&gsm.rep.exper;&gmi.rep.exper.bal-sht;</menuchoice>">
 <!ENTITY mc.rep.exper.ifrs-rep "<menuchoice>&gm.rep;&gsm.rep.exper;&gmi.rep.exper.ifrs-rep;</menuchoice>">
 <!ENTITY mc.rep.exper.inc-stat "<menuchoice>&gm.rep;&gsm.rep.exper;&gmi.rep.exper.inc-stat;</menuchoice>">
+<!ENTITY mc-gsm.rep.inc-exp "<menuchoice>&gsm.rep.inc-exp;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.inc-exp.cash-flo "<menuchoice>&gm.rep;&gsm.rep.inc-exp;&gmi.rep.inc-exp.cash-flo;</menuchoice>">
 <!ENTITY mc.rep.inc-exp.cash-bar "<menuchoice>&gm.rep;&gsm.rep.inc-exp;&gmi.rep.inc-exp.cash-bar;</menuchoice>">
 <!ENTITY mc.rep.inc-exp.equ-stat "<menuchoice>&gm.rep;&gsm.rep.inc-exp;&gmi.rep.inc-exp.equ-stat;</menuchoice>">
@@ -558,6 +674,7 @@
 <!ENTITY mc.rep.inc-exp.inc-stat "<menuchoice>&gm.rep;&gsm.rep.inc-exp;&gmi.rep.inc-exp.inc-stat;</menuchoice>">
 <!ENTITY mc.rep.inc-exp.pro-los "<menuchoice>&gm.rep;&gsm.rep.inc-exp;&gmi.rep.inc-exp.pro-los;</menuchoice>">
 <!ENTITY mc.rep.inc-exp.tri-bal "<menuchoice>&gm.rep;&gsm.rep.inc-exp;&gmi.rep.inc-exp.tri-bal;</menuchoice>">
+<!ENTITY mc-gsm.rep.mul-col "<menuchoice>&gsm.rep.mul-col;<guimenuitem /></menuchoice>">
 <!ENTITY mc.rep.mul-col.cus-mul-col "<menuchoice>&gm.rep;&gsm.rep.mul-col;&gmi.rep.mul-col.cus-mul-col;</menuchoice>">
 <!ENTITY mc.rep.mul-col.dash "<menuchoice>&gm.rep;&gsm.rep.mul-col;&gmi.rep.mul-col.dash;</menuchoice>">
 <!ENTITY mc.rep.acct-sum "<menuchoice>&gm.rep;&gmi.rep.acct-sum;</menuchoice>">
@@ -565,10 +682,14 @@
 <!ENTITY mc.rep.rec-rep "<menuchoice>&gm.rep;&gmi.rep.rec-rep;</menuchoice>">
 <!ENTITY mc.rep.tax-xml "<menuchoice>&gm.rep;&gmi.rep.tax-xml;</menuchoice>">
 <!ENTITY mc.rep.tr-rep "<menuchoice>&gm.rep;&gmi.rep.tr-rep;</menuchoice>">
-<!ENTITY mc.rep.save-rep-conf "<menuchoice>&gm.rep;&gmi.rep.save-rep-conf;</menuchoice>">
+<!ENTITY mc.rep.saved-rep-conf "<menuchoice>&gm.rep;&gmi.rep.saved-rep-conf;</menuchoice>">
 <!ENTITY mc.rep.save-conf "<menuchoice><shortcut><keycombo>&kc.ctrl;&kc.alt;<keycap>S</keycap></keycombo></shortcut>&gm.rep;&gmi.rep.save-conf;</menuchoice>">
+<!ENTITY mc-gmi.rep.save-conf "<menuchoice><shortcut><keycombo>&kc.ctrl;&kc.alt;<keycap>S</keycap></keycombo></shortcut>&gmi.rep.save-conf;</menuchoice>">
 <!ENTITY mc.rep.save-conf-as "<menuchoice><shortcut><keycombo>&kc.shift;&kc.ctrl;&kc.alt;<keycap>S</keycap></keycombo></shortcut>&gm.rep;&gmi.rep.save-conf-as;</menuchoice>">
+<!ENTITY mc-gmi.rep.save-conf-as "<menuchoice><shortcut><keycombo>&kc.shift;&kc.ctrl;&kc.alt;<keycap>S</keycap></keycombo></shortcut>&gmi.rep.save-conf-as;</menuchoice>">
 <!ENTITY mc.rep.com-rep "<menuchoice>&gm.rep;&gmi.rep.com-rep;</menuchoice>">
+<!ENTITY mc.rep.acct-rep "<menuchoice>&gm.rep;&gmi.rep.acct-rep;</menuchoice>">
+<!ENTITY mc.rep.acct-rep-tr "<menuchoice>&gm.rep;&gmi.rep.acct-rep-tr;</menuchoice>">
 
 <!-- Tools-Menu menuchoice-->
 <!ENTITY mc.to.aqb "<menuchoice>&gm.tool;&gmi.to.aqb;</menuchoice>">
@@ -586,41 +707,84 @@
 
 <!-- Help-Menu menuchoice -->
 <!ENTITY mc.help.guide "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>H</keycap></keycombo></shortcut>&gm.help;&gmi.help.guide;</menuchoice>">
+<!ENTITY mc-gmi.help.guide "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>H</keycap></keycombo></shortcut>&gmi.help.guide;</menuchoice>">
 <!ENTITY mc.help.tip "<menuchoice>&gm.help;&gmi.help.tip;</menuchoice>">
 <!ENTITY mc.help.cont "<menuchoice><shortcut><keycap>F1</keycap></shortcut>&gm.help;&gmi.help.cont;</menuchoice>">
+<!ENTITY mc-gmi.help.cont "<menuchoice><shortcut><keycap>F1</keycap></shortcut>&gmi.help.cont;</menuchoice>">
 <!ENTITY mc.help.abo "<menuchoice>&gm.help;&gmi.help.abo;</menuchoice>">
 
-<!-- Invoce Editor -->
-<!-- Invoice Editor; Edit-Menu menuchoice -->
-<!ENTITY mc.inv.ed.edit "<menuchoice>&gm.edit;&gmi.ed.inv-edit;</menuchoice>">
-<!ENTITY mc.inv.ed.dup "<menuchoice>&gm.edit;&gmi.ed.inv-dup;</menuchoice>">
-<!ENTITY mc.inv.ed.post "<menuchoice>&gm.edit;&gmi.ed.inv-post;</menuchoice>">
-<!ENTITY mc.inv.ed.unpost "<menuchoice>&gm.edit;&gmi.ed.inv-unpost;</menuchoice>">
-
-<!-- Invoice Editor; View-Menu menuchoice-->
-<!ENTITY mc.inv.vw.use-def "<menuchoice>&gm.view;&gmi.vw.inv-use-def;</menuchoice>">
-<!ENTITY mc.inv.vw.res-def "<menuchoice>&gm.view;&gmi.vw.inv-res-def;</menuchoice>">
-<!ENTITY mc.inv.vw.ord.def "<menuchoice>&gm.view;&gsm.vw.inv-ord;&gmi.vw.def;</menuchoice>">
-<!ENTITY mc.inv.vw.ord.date "<menuchoice>&gm.view;&gsm.vw.inv-ord;&gmi.vw.date;</menuchoice>">
-<!ENTITY mc.inv.vw.ord.entry "<menuchoice>&gm.view;&gsm.vw.inv-ord;&gmi.vw.entry;</menuchoice>">
-<!ENTITY mc.inv.vw.ord.qua "<menuchoice>&gm.view;&gsm.vw.inv-ord;&gmi.vw.qua;</menuchoice>">
-<!ENTITY mc.inv.vw.ord.pri "<menuchoice>&gm.view;&gsm.vw.inv-ord;&gmi.vw.pri;</menuchoice>">
-<!ENTITY mc.inv.vw.ord.desc "<menuchoice>&gm.view;&gsm.vw.inv-ord;&gmi.vw.desc;</menuchoice>">
-
-<!-- Invoice Editor; Actions-Menu menuchoice-->
-<!ENTITY mc.inv.ac.ent "<menuchoice>&gm.act;&gmi.inv.ac.ent;</menuchoice>">
-<!ENTITY mc.inv.ac.cnl "<menuchoice>&gm.act;&gmi.inv.ac.cnl;</menuchoice>">
-<!ENTITY mc.inv.ac.del "<menuchoice>&gm.act;&gmi.inv.ac.del;</menuchoice>">
-<!ENTITY mc.inv.ac.blk "<menuchoice>&gm.act;&gmi.inv.ac.blk;</menuchoice>">
-<!ENTITY mc.inv.ac.dup "<menuchoice>&gm.act;&gmi.inv.ac.dup;</menuchoice>">
-<!ENTITY mc.inv.ac.up "<menuchoice>&gm.act;&gmi.inv.ac.up;</menuchoice>">
-<!ENTITY mc.inv.ac.down "<menuchoice>&gm.act;&gmi.inv.ac.down;</menuchoice>">
-
+<!-- Budget Editor -->
+<!-- Budget Editor; Edit-Menu menuchoice -->
+<!ENTITY mc.ed.bgt.est "<menuchoice>&gm.edit;&gmi.ed.bgt.est;</menuchoice>">
+<!ENTITY mc.ed.bgt.per "<menuchoice>&gm.edit;&gmi.ed.bgt.per;</menuchoice>">
+<!ENTITY mc.ed.bgt.del "<menuchoice>&gm.edit;&gmi.ed.bgt.del;</menuchoice>">
+<!ENTITY mc.ed.bgt.note "<menuchoice>&gm.edit;&gmi.ed.bgt.note;</menuchoice>">
+<!ENTITY mc.ed.bgt.rep "<menuchoice>&gm.edit;&gmi.ed.bgt.rep;</menuchoice>">
+<!ENTITY mc.ed.bgt.opt "<menuchoice>&gm.edit;&gmi.ed.bgt.opt;</menuchoice>">
+
+<!-- Business (Customer, Vendor and Employee) -->
+<!-- Business (Customer, Vendor and Employee); Edit-Menu menuchoice -->
+<!ENTITY mc.ed.cus.edit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>E</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.cus.edit;</menuchoice>">
+<!ENTITY mc.ed.cus.new "<menuchoice>&gm.edit;&gmi.ed.cus.new;</menuchoice>">
+<!ENTITY mc.ed.ven.edit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>E</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.ven.edit;</menuchoice>">
+<!ENTITY mc.ed.ven.new "<menuchoice>&gm.edit;&gmi.ed.ven.new;</menuchoice>">
+<!ENTITY mc.ed.emp.edit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>E</keycap></keycombo></shortcut>&gm.edit;&gmi.ed.emp.edit;</menuchoice>">
+<!ENTITY mc.ed.emp.new "<menuchoice>&gm.edit;&gmi.ed.emp.new;</menuchoice>">
+
+<!-- Business (Customer, Vendor and Employee); Reports-Menu -->
+<!ENTITY mc.rep.cus-list "<menuchoice>&gm.rep;&gmi.rep.cus-list;</menuchoice>">
+<!ENTITY mc.rep.cus-rep "<menuchoice>&gm.rep;&gmi.rep.cus-rep;</menuchoice>">
+<!ENTITY mc.rep.ven-list "<menuchoice>&gm.rep;&gmi.rep.ven-list;</menuchoice>">
+<!ENTITY mc.rep.ven-rep "<menuchoice>&gm.rep;&gmi.rep.ven-rep;</menuchoice>">
+<!ENTITY mc.rep.emp-rep "<menuchoice>&gm.rep;&gmi.rep.emp-rep;</menuchoice>">
+
+<!-- Business (Invoice, Bill, Voucher) -->
+<!-- Business (Invoice, Bill, Voucher); File-Menu menuchoice -->
+<!ENTITY mc.fi.prin-inv "<menuchoice><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin-inv;</menuchoice>">
+<!ENTITY mc.fi.prin-bill "<menuchoice><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin-bill;</menuchoice>">
+<!ENTITY mc.fi.prin-vou "<menuchoice><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.file;&gmi.fi.prin-vou;</menuchoice>">
+
+<!-- Business (Invoice, Bill, Voucher); Edit-Menu menuchoice -->
+<!ENTITY mc.ed.edit "<menuchoice>&gm.edit;&gmi.ed.edit;</menuchoice>">
+<!ENTITY mc.ed.dup "<menuchoice>&gm.edit;&gmi.ed.dup;</menuchoice>">
+<!ENTITY mc.ed.post "<menuchoice>&gm.edit;&gmi.ed.post;</menuchoice>">
+<!ENTITY mc.ed.unpost "<menuchoice>&gm.edit;&gmi.ed.unpost;</menuchoice>">
+
+<!-- Business (Invoice, Bill, Voucher); View-Menu menuchoice -->
+<!ENTITY mc.vw.use-lay-cus "<menuchoice>&gm.view;&gmi.vw.use-lay-cus;</menuchoice>">
+<!ENTITY mc.vw.res-lay-cus "<menuchoice>&gm.view;&gmi.vw.res-lay-cus;</menuchoice>">
+<!ENTITY mc.vw.use-lay-ven "<menuchoice>&gm.view;&gmi.vw.use-lay-ven;</menuchoice>">
+<!ENTITY mc.vw.res-lay-ven "<menuchoice>&gm.view;&gmi.vw.res-lay-ven;</menuchoice>">
+<!ENTITY mc.vw.use-lay-emp "<menuchoice>&gm.view;&gmi.vw.use-lay-emp;</menuchoice>">
+<!ENTITY mc.vw.res-lay-emp "<menuchoice>&gm.view;&gmi.vw.res-lay-emp;</menuchoice>">
+<!ENTITY mc.vw.ord.def "<menuchoice>&gm.view;&gsm.vw.ord;&gmi.vw.def;</menuchoice>">
+<!ENTITY mc.vw.ord.date "<menuchoice>&gm.view;&gsm.vw.ord;&gmi.vw.date;</menuchoice>">
+<!ENTITY mc.vw.ord.entry "<menuchoice>&gm.view;&gsm.vw.ord;&gmi.vw.entry;</menuchoice>">
+<!ENTITY mc.vw.ord.qua "<menuchoice>&gm.view;&gsm.vw.ord;&gmi.vw.qua;</menuchoice>">
+<!ENTITY mc.vw.ord.pri "<menuchoice>&gm.view;&gsm.vw.ord;&gmi.vw.pri;</menuchoice>">
+<!ENTITY mc.vw.ord.desc "<menuchoice>&gm.view;&gsm.vw.ord;&gmi.vw.desc;</menuchoice>">
+
+<!-- Business (Invoice, Bill, Voucher); Actions-Menu menuchoice -->
+<!ENTITY mc.ac.ent "<menuchoice>&gm.act;&gmi.ac.ent;</menuchoice>">
+<!ENTITY mc.ac.cnl "<menuchoice>&gm.act;&gmi.ac.cnl;</menuchoice>">
+<!ENTITY mc.ac.del "<menuchoice>&gm.act;&gmi.ac.del;</menuchoice>">
+<!ENTITY mc.ac.blk "<menuchoice>&gm.act;&gmi.ac.blk;</menuchoice>">
+<!ENTITY mc.ac.dup "<menuchoice>&gm.act;&gmi.ac.dup;</menuchoice>">
+<!ENTITY mc.ac.up "<menuchoice>&gm.act;&gmi.ac.up;</menuchoice>">
+<!ENTITY mc.ac.down "<menuchoice>&gm.act;&gmi.ac.down;</menuchoice>">
+
+<!-- Business (Invoice, Bill, Voucher); Business-Menu menuchoice -->
+<!ENTITY mc.bus.man-doc-link "<menuchoice>&gm.bus;&gmi.bus.man-doc-link;</menuchoice>">
+<!ENTITY mc.bus.open-doc "<menuchoice>&gm.bus;&gmi.bus.open-doc;</menuchoice>">
+<!ENTITY mc.bus.pay-inv "<menuchoice>&gm.bus;&gmi.bus.pay-inv;</menuchoice>">
+<!ENTITY mc.bus.pay-bill "<menuchoice>&gm.bus;&gmi.bus.pay-bill;</menuchoice>">
+<!ENTITY mc.bus.pay-vou "<menuchoice>&gm.bus;&gmi.bus.pay-vou;</menuchoice>">
 
+<!-- Reconcile Window -->
 <!-- Reconcile-Window; Reconcile-Menu menuchoice -->
 <!ENTITY mc.rec.rec.info "<menuchoice>&gm.rec.rec;&gmi.rec.rec.info;</menuchoice>">
-<!ENTITY mc.rec.rec.fin "<menuchoice>&gm.rec.rec;&gmi.rec.rec.fin;</menuchoice>">
-<!ENTITY mc.rec.rec.pp "<menuchoice>&gm.rec.rec;&gmi.rec.rec.pp;</menuchoice>">
+<!ENTITY mc.rec.rec.fin "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>W</keycap></keycombo></shortcut>&gm.rec.rec;&gmi.rec.rec.fin;</menuchoice>">
+<!ENTITY mc.rec.rec.pp "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>P</keycap></keycombo></shortcut>&gm.rec.rec;&gmi.rec.rec.pp;</menuchoice>">
 <!ENTITY mc.rec.rec.cnl "<menuchoice>&gm.rec.rec;&gmi.rec.rec.cnl;</menuchoice>">
 
 <!-- Reconcile-Window; Account-Menu menuchoice -->
@@ -630,27 +794,30 @@
 <!ENTITY mc.rec.acc.chk-rep "<menuchoice>&gm.rec.acc;&gmi.rec.acc.chk-rep;</menuchoice>">
 
 <!-- Reconcile-Window; Transaction-Menu menuchoice -->
-<!ENTITY mc.rec.tr.bal "<menuchoice>&gm.rec.tr;&gmi.rec.tr.bal;</menuchoice>">
-<!ENTITY mc.rec.tr.edit "<menuchoice>&gm.rec.tr;&gmi.rec.tr.edit;</menuchoice>">
-<!ENTITY mc.rec.tr.rec-sel "<menuchoice>&gm.rec.tr;&gmi.rec.tr.rec-sel;</menuchoice>">
-<!ENTITY mc.rec.tr.unrec-sel "<menuchoice>&gm.rec.tr;&gmi.rec.tr.unrec-sel;</menuchoice>">
-<!ENTITY mc.rec.tr.del "<menuchoice>&gm.rec.tr;&gmi.rec.tr.del;</menuchoice>">
+<!ENTITY mc.rec.tr.bal "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>B</keycap></keycombo></shortcut>&gm.rec.tr;&gmi.rec.tr.bal;</menuchoice>">
+<!ENTITY mc.rec.tr.edit "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>E</keycap></keycombo></shortcut>&gm.rec.tr;&gmi.rec.tr.edit;</menuchoice>">
+<!ENTITY mc.rec.tr.rec-sel "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>R</keycap></keycombo></shortcut>&gm.rec.tr;&gmi.rec.tr.rec-sel;</menuchoice>">
+<!ENTITY mc.rec.tr.unrec-sel "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>U</keycap></keycombo></shortcut>&gm.rec.tr;&gmi.rec.tr.unrec-sel;</menuchoice>">
+<!ENTITY mc.rec.tr.del "<menuchoice><shortcut><keycombo>&kc.ctrl;<keycap>D</keycap></keycombo></shortcut>&gm.rec.tr;&gmi.rec.tr.del;</menuchoice>">
 
 <!-- Reconcile-Window; Help-Menu menuchoice -->
 <!ENTITY mc.rec.help. "<menuchoice>&gm.rec.help;&gmi.rec.help.hlp;</menuchoice>">
 
+<!-- Specific strings for Operating Systems -->
+<!-- Strings for Windows -->
+<!ENTITY mc.winOS.inst-fq "<menuchoice>%gm.winOS;%gsm.winOS.gc;%gmi.winOS.inst-fq;</menuchoice>">
+<!ENTITY mc.winOS.pref.lang.local "<menuchoice>%gm.winOS;%gsm.winOS.pref;%gsm.winOS.pref.lang;%gmi.winOS.pref.lang.local;</menuchoice>">
+<!ENTITY mc.winOS.sys.tasks "<menuchoice>%gm.winOS;%gsm.winOS.sys;%gmi.winOS.sys.tasks;</menuchoice>">
+
+<!-- Strings for Mac -->
+<!ENTITY mc.macOS.sys.gen.lang "<menuchoice>%gm.macOS;%gsm.macOS.sys;%gsm.macOS.sys.gen;%gmi.macOS.sys.gen.lang;</menuchoice>">
+<!ENTITY mc.macOS.gc.pref "<menuchoice>%gm.macOS;%gsm.macOS.gc;%gmi.macOS.gc.pref;</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">

commit 72e0eb84c0ac7bd6b534b46c1b0f2745429102bb
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Dec 2 08:37:52 2022 +0100

    L10N:*: replace irc.gnome… by irc.gimp…—the last

diff --git a/manual/de/ch_GettingHelp.xml b/manual/de/ch_GettingHelp.xml
index 51e58760..e71a0a7a 100644
--- a/manual/de/ch_GettingHelp.xml
+++ b/manual/de/ch_GettingHelp.xml
@@ -289,7 +289,7 @@
       </bridgehead>
 
       <para>Einige der Entwickler und erfahrene Benutzer verfolgen den <ulink url="&url-irc;">#gnucash-Kanal bei
-        irc.gnome.org</ulink>. Sie sind meist auch mit etwas anderem beschäftigt und natürlich
+        &srv-irc;</ulink>. Sie sind meist auch mit etwas anderem beschäftigt und natürlich
         nicht immer an ihrem Computer. Loggen Sie sich ein, stellen Sie Ihre Frage, und bleiben Sie
         eingeloggt; es kann einige Stunden dauern, bis Ihre Frage bemerkt und beantwortet wird.
         <itemizedlist>

commit e0e673686902a8e936403180a728dc0d5f4c824a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Dec 2 02:48:34 2022 +0100

    L10N:*: replace irc.gnome… by irc.gimp…

diff --git a/guide/de/ch_invest.xml b/guide/de/ch_invest.xml
index 103d7a55..23542782 100644
--- a/guide/de/ch_invest.xml
+++ b/guide/de/ch_invest.xml
@@ -1356,7 +1356,7 @@ Einnahmen
         <note>
           <para>Wenn Sie sich unbehaglich bei der Durchführung der Schritte fühlen, mailen Sie entweder an die
             &app;-user mailing list (<email>gnucash-de at gnucash.org</email>) und bitten um Hilfe oder
-            kommen in den &app; IRC-Kanal auf irc.gnome.org. Sie können diesen Schritt auch
+            kommen in den <ulink url='&url-irc;'>#gnucash IRC-Kanal auf &srv-irc;</ulink>. Sie können diesen Schritt auch
             auslassen und händisch die Preise der Aktien aktualisieren.
           </para>
         </note>
diff --git a/guide/de/ch_oview.xml b/guide/de/ch_oview.xml
index c1689da2..584b812e 100644
--- a/guide/de/ch_oview.xml
+++ b/guide/de/ch_oview.xml
@@ -572,12 +572,12 @@
         IRC
       </bridgehead>
 
-      <para>Etliche Entwickler beobachten den #gnucash Kanal auf irc.gnome.org. Normalerweise sind sie auch mit
+      <para>Etliche Entwickler beobachten den <ulink url='&url-irc;'>#gnucash Kanal auf &srv-irc;</ulink>. Normalerweise sind sie auch mit
         anderen Dingen beschäftigt und natürlich nicht immer an ihren Computern. Loggen Sie sich
         ein, stellen Ihre Frage und bleiben Sie eingeloggt; es kann mehrere Stunden dauern, bis
         Ihre Frage bemerkt und darauf geantwortet wird. Um nachzusehen, ob Sie etwas verpasst haben,
         <ulink
-    url="https://code.gnucash.org/logs">prüfen Sie die IRC Logs</ulink>.
+    url="https://code.gnucash.org/logs">prüfen Sie die IRC Protokolle</ulink>.
       </para>
 
       <para>Auf der <ulink url="http://www.gnucash.org">&app; Webseite </ulink> finden Sie weitere Einzelheiten
diff --git a/guide/it/index.docbook b/guide/it/index.docbook
index 132f7720..486b168e 100644
--- a/guide/it/index.docbook
+++ b/guide/it/index.docbook
@@ -1137,7 +1137,7 @@
             IRC
           </bridgehead>
 
-          <para>Several of the developers monitor the #gnucash channel at irc.gnome.org. They're usually doing
+          <para>Several of the developers monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. They're usually doing
             something else, too, and of course aren't always at their computers. Log in, ask your
             question, and stay logged in; it may be several hours before your question is noticed
             and responded to. To see if you missed anything <ulink url="&url-logs-irc;">check the
@@ -9340,7 +9340,7 @@ Entrate
             <note>
               <para>Se non ci si sente sicuri nell’esecuzione di questi passaggi, è possibile contattare la lista
                 di discussione degli utenti di &app; (<email>gnucash-user at gnucash.org</email>) per
-                chiedere aiuto o andare nell canale IRC di &app; su irc.gnome.org. È anche
+                chiedere aiuto o andare nell &app; su <ulink url='&url-irc;'>#gnucash canale di &srv-irc;</ulink>. È anche
                 possibile saltare questi passaggi e aggiornare manualmente i prezzi delle proprie
                 azioni.
               </para>
diff --git a/guide/it/it.po b/guide/it/it.po
index 4f46fe5b..c0f6f42a 100644
--- a/guide/it/it.po
+++ b/guide/it/it.po
@@ -13133,14 +13133,14 @@ msgid ""
 "If you feel uncomfortable about performing any of these steps, please either "
 "email the <application>GnuCash</application>-user mailing list "
 "(<email>gnucash-user at gnucash.org</email>) for help or come to the "
-"<application>GnuCash</application> IRC channel on irc.gnome.org. You can "
+"<ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. You can "
 "also leave out this step and manually update your stock prices."
 msgstr ""
 "Se non ci si sente sicuri nell’esecuzione di questi passaggi, è "
 "possibile contattare la lista di discussione degli utenti di "
 "&app; (<email>gnucash-user at gnucash.org</email>) "
-"per chiedere aiuto o andare nell canale IRC di &app; "
-"su irc.gnome.org. È anche possibile saltare questi passaggi e "
+"per chiedere aiuto o andare nell su "
+"<ulink url='&url-irc;'>#gnucash canale IRC di &srv-irc;</ulink>. È anche possibile saltare questi passaggi e "
 "aggiornare manualmente i prezzi delle proprie azioni."
 
 #: C/gnucash-guide.xml:1229(title)
@@ -22705,11 +22705,11 @@ msgstr ""
 
 #: C/gnucash-guide.xml:36(para)
 msgid ""
-"A: Yes. Many of the developers hang out on icq in the #gnucash discussion on "
-"irc.gnome.org. Also, there is a wiki online at <ulink url=\"&url-wiki;\"/>."
+"A: Yes. Many of the developers hang out on icq in the on "
+"<ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. Also, there is a wiki online at <ulink url=\"&url-wiki;\"/>."
 msgstr ""
 "R: Sì. La maggior parte dei programmatori si ritrovano su ICQ nella "
-"discussione #gnucash su irc.gnome.org. È anche disponibile un wiki qui: "
+"discussione su <ulink url='&url-irc;'>#gnucash canale di &srv-irc;</ulink>. È anche disponibile un wiki qui: "
 "<ulink url=\"h&url-wiki;\"/>."
 
 #: C/gnucash-guide.xml:41(title)
diff --git a/guide/ja/ch_invest.xml b/guide/ja/ch_invest.xml
index 751ac387..dc11761a 100644
--- a/guide/ja/ch_invest.xml
+++ b/guide/ja/ch_invest.xml
@@ -1017,7 +1017,7 @@ role="strong">オンライン相場表取得ツールをインストール</emph
         </para>
 
         <note>
-          <para>これらの手順のどれかを実行してうまくいかない、ヘルプを求めて&app;利用者メーリングリスト(<email>gnucash-user at gnucash.org</email>)に電子メールを出すか、irc.gnome.orgの上の&app;
+          <para>これらの手順のどれかを実行してうまくいかない、ヘルプを求めて&app;利用者メーリングリスト(<email>gnucash-user at gnucash.org</email>)に電子メールを出すか、<ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>の上の&app;
             IRCチャンネルに来てください。
             この手順を省いて、手動で株価を更新することもできます。
           </para>
diff --git a/guide/pt/ch_invest.xml b/guide/pt/ch_invest.xml
index 13845abf..b31e188b 100644
--- a/guide/pt/ch_invest.xml
+++ b/guide/pt/ch_invest.xml
@@ -1193,7 +1193,7 @@ Receita
         <note>
           <para>Se não se sente confortável a executar estes passos, por favor envie uma mensagem à lista de
             correio dos utilizadores do &app; - <email>gnucash-user at gnucash.org</email> para ajuda,
-            ou venha ao canal IRC do &app; em irc.gnome.org. Também pode saltar estes passos e
+            ou venha ao &app; em <ulink url='&url-irc;'>#gnucash canal IRC do &srv-irc;</ulink>. Também pode saltar estes passos e
             actualizar manualmente as cotações das suas acções.
           </para>
         </note>
diff --git a/guide/ru/ch_invest.xml b/guide/ru/ch_invest.xml
index a6d39fe4..ea108cb9 100644
--- a/guide/ru/ch_invest.xml
+++ b/guide/ru/ch_invest.xml
@@ -1432,8 +1432,8 @@ Income
 
         <note>
           <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
-            mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the &app; IRC
-            channel on irc.gnome.org. You can also leave out this step and manually update your
+            mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the 
+            <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. You can also leave out this step and manually update your
             stock prices.
           </para>
         </note>
diff --git a/guide/ru/ch_oview.xml b/guide/ru/ch_oview.xml
index 82feb784..b7b1c3da 100644
--- a/guide/ru/ch_oview.xml
+++ b/guide/ru/ch_oview.xml
@@ -652,15 +652,15 @@
         IRC
       </bridgehead>
 
-      <para>Некоторые из разработчиков мониторят канал #gnucash на
-        irc.gnome.org. Они обычно заняты чем-то еще в это время, и
+      <para>Некоторые из разработчиков мониторят
+       <ulink url='&url-irc;'>канал #gnucash на &srv-irc;</ulink>. Они обычно заняты чем-то еще в это время, и
         конечно, не всегда находятся у компьютеров.
         Войдите в систему, задайте свой вопрос и
         оставайтесь в системе; Иногда может пройти
         несколько часов, пока ваш вопрос будет замечен и
         кто-нибудь ответит на него. Чтобы увидеть,
         пропустили ли вы что-нибудь, вы можете проверить
-        <ulink url="https://code.gnucash.org/logs">IRC протоколы</ulink>.
+        <ulink url="&url-logs-irc;">IRC протоколы</ulink>.
       </para>
 
       <para>На <ulink url="http://www.gnucash.org">&app; странице</ulink> вы найдете
diff --git a/manual/it/index.docbook b/manual/it/index.docbook
index 81f392d0..aaf1e7f8 100644
--- a/manual/it/index.docbook
+++ b/manual/it/index.docbook
@@ -737,7 +737,7 @@
         </itemizedlist>
       </para>
 
-      <para>Or you can chat live with the developers on IRC. Join them on #gnucash at irc.gnome.org.
+      <para>Or you can chat live with the developers on IRC. Join them on <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
       </para>
 
       <para>The <ulink url="http://www.gnucash.org"><application>GnuCash</application> web site</ulink> has
@@ -9986,7 +9986,7 @@
                 <para>If you feel uncomfortable about performing any of these steps, please either email the
                   <application>GnuCash</application>-user mailing list
                   (<email>gnucash-user at gnucash.org</email>) for help or come to the
-                  <application>GnuCash</application> IRC channel on irc.gnome.org. More information
+                  <application>GnuCash</application> <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. More information
                   is available on the <application>GnuCash</application> Wiki FAQ for example
                   <ulink url="&url-wiki-faq;#Q:_How_do_I_fix_a_.22system_error.22_or_.22unknown_error.22_when_getting_stock_quotes.3F"/>
                   You can also leave out this step and manually update your stock prices.
diff --git a/manual/it/it.po b/manual/it/it.po
index 66dbd4e8..124f8d29 100644
--- a/manual/it/it.po
+++ b/manual/it/it.po
@@ -473,8 +473,8 @@ msgid "<emphasis role=\"bold\">Development List </emphasis><email>gnucash-devel@
 msgstr "<emphasis role=\"bold\">Lista degli sviluppatori </emphasis><email>gnucash-devel at gnucash.org</email>: vengono discusse le questioni riguardanti la progettazione e lo sviluppo di &app;, e la presentazione di patch."
 
 #: C/gnucash-help.xml:133(para)
-msgid "You can chat live with the developers on IRC! Join them on #gnucash at irc.gnome.org. Much more at the <ulink url=\"&url-www;\"><application>GnuCash</application> web site </ulink> including links to WIKI and Bugzilla !!"
-msgstr "È anche possibile utilizzare la chat di IRC e discutere in diretta con gli sviluppatori! Unisciti a loro su #gnucash at irc.gnome.org. Altre risorse sono disponibili sul <ulink url=\"&url-www;\"> sito di &app;</ulink> come i collegamenti al WIKI e a Bugzilla."
+msgid "You can chat live with the developers on IRC! Join them on <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. Much more at the <ulink url=\"&url-www;\"><application>GnuCash</application> web site </ulink> including links to WIKI and Bugzilla !!"
+msgstr "È anche possibile utilizzare la chat di IRC e discutere in diretta con gli sviluppatori! Unisciti a loro su <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. Altre risorse sono disponibili sul <ulink url=\"&url-www;\"> sito di &app;</ulink> come i collegamenti al WIKI e a Bugzilla."
 
 #: C/gnucash-help.xml:20(title)
 msgid "Getting Started"
@@ -4249,8 +4249,8 @@ msgid "After installation is complete, you should run the <quote>gnc-fq-dump</qu
 msgstr "Quando l’installazione è terminata, eseguire il programma di test <quote>gnc-fq-dump</quote>, nella stessa cartella, distribuito con &app; per verificare se <application>Finance::Quote</application> è installato e funziona correttamente."
 
 #: C/gnucash-help.xml:476(para)
-msgid "If you feel uncomfortable about performing any of these steps, please either email the <application>GnuCash</application>-user mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the <application>GnuCash</application> IRC channel on irc.gnome.org. You can also leave out this step and manually update your stock prices."
-msgstr "Se non ci si sente sicuri nell’esecuzione di questi passaggi, è possibile contattare la lista di discussione degli utenti di &app; (<email>gnucash-user at gnucash.org</email>) per chiedere aiuto o andare nell canale IRC di &app; su irc.gnome.org. È anche possibile saltare questi passaggi e aggiornare manualmente i prezzi delle proprie azioni."
+msgid "If you feel uncomfortable about performing any of these steps, please either email the <application>GnuCash</application>-user mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the <application>GnuCash</application> <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>. You can also leave out this step and manually update your stock prices."
+msgstr "Se non ci si sente sicuri nell’esecuzione di questi passaggi, è possibile contattare la lista di discussione degli utenti di &app; (<email>gnucash-user at gnucash.org</email>) per chiedere aiuto o andare nell <ulink url='&url-irc;'>#gnucash canale IRC di &srv-irc;</ulink>. È anche possibile saltare questi passaggi e aggiornare manualmente i prezzi delle proprie azioni."
 
 #: C/gnucash-help.xml:483(para)
 msgid "Create the Account for the mutual fund or stock with it listed in the <guilabel>Security/Currency</guilabel> field, as described above."
diff --git a/manual/pt/ch_Account-Actions.xml b/manual/pt/ch_Account-Actions.xml
index 9dcc314c..4b3a8de5 100644
--- a/manual/pt/ch_Account-Actions.xml
+++ b/manual/pt/ch_Account-Actions.xml
@@ -660,7 +660,7 @@
             <note>
               <para>Se não se sente confortável a realizar estes passos, por favor, envie um email para a lista de
                 correio &app;-user (<email>gnucash-user at gnucash.org</email>) para assistência ou
-                visite o canal IRC do &app; em irc.gnome.org. Também pode ignorar este passo e
+                visite o <ulink url='&url-irc;'>canal IRC do &app; em &srv-irc;</ulink>. Também pode ignorar este passo e
                 actualizar manualmente as cotações.
               </para>
             </note>
diff --git a/manual/pt/ch_GettingHelp.xml b/manual/pt/ch_GettingHelp.xml
index c26079e2..239b43c0 100644
--- a/manual/pt/ch_GettingHelp.xml
+++ b/manual/pt/ch_GettingHelp.xml
@@ -155,7 +155,7 @@
       </itemizedlist>
     </para>
 
-    <para>Ou pode conversar ao vivo com os programadores no IRC. Junte-se a eles em #gnucash no irc.gnome.org.
+    <para>Ou pode conversar ao vivo com os programadores no IRC. Junte-se a eles em <ulink url='&url-irc;'>#gnucash no &srv-irc;</ulink>.
     </para>
 
     <para>A <ulink url="url-www">página web do &app;</ulink> tem mais detalhes sobre estes canais. Também

commit 85716124e335a63b5c6fc491988ca908c34e1ce4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Dec 2 00:06:47 2022 +0100

    Update README: irc server, more http: -> https:

diff --git a/README b/README
index b0b38a92..e54c78c4 100644
--- a/README
+++ b/README
@@ -70,8 +70,8 @@ can help. PLEASE let us know via IRC or the gnucash-devel mailing list what
 you can work on or help with.
 
 See also:
-* http://wiki.gnucash.org/wiki/Documentation_Update_Instructions
-* http://wiki.gnucash.org/wiki/Translation
+* https://wiki.gnucash.org/wiki/Documentation_Update_Instructions
+* https://wiki.gnucash.org/wiki/Translation
 
 Other Formats
 #############
@@ -211,8 +211,8 @@ https://github.com/Gnucash/gnucash-docs/.
 - With any problems you have, you can contact us in the following ways:
 
 * quick questions via IRC
-** en: irc://irc.gnome.org/gnucash 
-: see http://wiki.gnucash.org/wiki/IRC
+** en: irc://irc.gimp.net/gnucash 
+: see https://wiki.gnucash.org/wiki/IRC
 
 * translation related questions preferable via the local mailing lists
 ** de: https://lists.gnucash.org/mailman/listinfo/gnucash-de

commit b513056e7a80d6f069b38db18991a2684e00b362
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Wed Nov 30 09:30:57 2022 +0100

    Update url-irc to "irc://irc.gimp.net/gnucash"
    
    https://lists.gnucash.org/pipermail/gnucash-announce/2022-November/000374.html

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index ba55c27f..3ad6bb5a 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -119,7 +119,8 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY url-docs-pt "&url-docs;pt/gnucash-">
 <!ENTITY url-docs-ru "&url-docs;ru/gnucash-">
 
-<!ENTITY url-irc "irc://irc.gnome.org/gnucash">
+<!ENTITY srv-irc "irc.gimp.net">
+<!ENTITY url-irc "irc://&srv-irc;/gnucash">
 <!ENTITY url-logs-irc "https://lists.gnucash.org/logs/">  <!-- for IRC. If someone needs build logs, scan https://code.gnucash.org/builds/ -->
 
 <!ENTITY url-mail-ar "https://lists.gnucash.org/pipermail/">  <!-- Append <list>/<Year>-<Monthname>/<Number>.html -->
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 48d5f6f2..2b1fc22e 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -577,12 +577,21 @@
         IRC
       </bridgehead>
 
-      <para>Several of the developers monitor the #gnucash channel at irc.gnome.org. They're usually doing
-        something else, too, and of course aren't always at their computers. Log in, ask your
-        question, and stay logged in; it may be several hours before your question is noticed and
-        responded to. To see if you missed anything
-        <ulink
-    url="https://code.gnucash.org/logs">check the IRC logs</ulink>.
+      <para>Several of the developers monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
+        They are usually busy with other tasks and of course are not always at their computers.
+        Log in, ask your question, and stay logged in; it may take  several hours before your question is noticed and responded.
+        <itemizedlist>
+          <listitem>
+            <simpara>If you got disconnected <ulink url="&url-logs-irc;">check the IRC logs</ulink> to verify that you
+              missed nothing related.
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>Requirements, netiquette, and other details are explained in the <ulink url="&url-wiki-irc;">IRC
+              wiki page</ulink>.
+            </simpara>
+          </listitem>
+        </itemizedlist>
       </para>
 
       <para>The <ulink url="http://www.gnucash.org">&app; website </ulink> has more details on these channels.
diff --git a/manual/C/ch_GettingHelp.xml b/manual/C/ch_GettingHelp.xml
index 3307c657..a837a101 100644
--- a/manual/C/ch_GettingHelp.xml
+++ b/manual/C/ch_GettingHelp.xml
@@ -288,17 +288,16 @@
         Chat
       </bridgehead>
 
-      <para>Several of the developers and experienced users monitor the <ulink url="&url-irc;">#gnucash channel
-        at irc.gnome.org</ulink>. They're usually doing something else, too, and of course aren't
-        always at their computers. Log in, ask your question, and stay logged in; it may take
-        several hours before your question is noticed and responded.
+      <!-- ToDo: Consider to join the following ulink with that in Guide's oview, but perhaps also the whole section. -->
+      <para>Several of the developers and experienced users monitor the <ulink url='&url-irc;'>#gnucash channel at &srv-irc;</ulink>.
+        They are usually busy with other tasks and of course are not always at their computers.
+        Log in, ask your question, and stay logged in; it may take  several hours before your question is noticed and responded.
         <itemizedlist>
           <listitem>
             <simpara>If you got disconnected <ulink url="&url-logs-irc;">check the IRC logs</ulink> to verify that you
-              missed nothing.
+              missed nothing related.
             </simpara>
           </listitem>
-
           <listitem>
             <simpara>Requirements, netiquette, and other details are explained in the <ulink url="&url-wiki-irc;">IRC
               wiki page</ulink>.

commit 18551f4613c176f668ddd5f50e47a8989ab2f98c
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Nov 28 00:38:05 2022 +0100

    Partial Modernization of Manual:C:Business
    
    Differentiation of admonitions,
    improvement of lists

diff --git a/manual/C/ch_Business.xml b/manual/C/ch_Business.xml
index dfd4b937..65206b83 100644
--- a/manual/C/ch_Business.xml
+++ b/manual/C/ch_Business.xml
@@ -194,7 +194,7 @@
         for early payment of invoices (or vendor bills).
       </para>
 
-      <note>
+      <caution>
         <para>As of &app; 2.6.7, Billing terms are only partially supported. Date due is calculated but discount
           amount is not.
         </para>
@@ -219,7 +219,7 @@
             </listitem>
           </itemizedlist>
         </para>
-      </note>
+      </caution>
 
       <para>You can specify the billing terms on each invoice/bill. Invoice billing terms will default from the
         customer billing terms. Bill billing terms will default from the vendor billing terms.
@@ -318,9 +318,10 @@
       <emphasis>Assets</emphasis> to accrue income you're owed. It is within this account that the
       integrated A/R system will place transactions, debiting it when you post bills and crediting
       it when you receive payments.
-<screen>Basic A/R Account Hierarchy:
-
--Assets
+    </para>
+    <example>
+    <title>Basic A/R Account Hierarchy</title>
+<screen>-Assets
   -Accounts Receivable
   -Checking
 -Income
@@ -329,7 +330,7 @@
   -Tax
     -Tax on Purchases
     -Tax on Sales</screen>
-    </para>
+    </example>
 
     <important>
       <para>If you deal with customers in more than one currency you will need a separate <emphasis>Accounts
@@ -454,11 +455,11 @@
             <guilabel>Preferences</guilabel>
           </para>
 
-          <note>
+          <important>
             <para>All invoices will be denominated in this currency and &app; will require an Accounts Receivable
               account in this currency.
             </para>
-          </note>
+          </important>
         </listitem>
 
         <listitem>
@@ -562,13 +563,13 @@
         within this set, the customer cannot be found, regardless of new search criteria.
       </para>
 
-      <note>
+      <tip>
         <para>To return a list of all registered active customers, set the search criterion to <guilabel>matches
           regex</guilabel>, and place a single dot "." in the text field area. Make sure
           <guilabel>Search only active data</guilabel> is checked, then click
           <guibutton>Find</guibutton>. The regular expression "." means to match anything.
         </para>
-      </note>
+      </tip>
     </sect2>
   </sect1>
 
@@ -677,7 +678,7 @@
       <para>From the Edit Invoice window you can enter an itemized list of goods and services you sold on this
         invoice in a manner similar to how the account register works. For credit notes you enter an
         itemized list of goods and services you refunded instead.
-        <note>
+        <tip>
           <para>Saved column layout works a bit differently in invoices from the account registers: Layouts are not
             saved for each invoice; instead a layout can be saved as a default for invoices to
             override the calculated widths using the <guimenu>View</guimenu>><guimenuitem>Use as
@@ -685,7 +686,7 @@
             as the default with <guimenu>View</guimenu>><guimenuitem>Reset Default Layout for
             Customer Documents</guimenuitem>.
           </para>
-        </note>
+        </tip>
       </para>
 
       <para>There are 15 columns in the <guilabel>Invoice Entries</guilabel> area:
@@ -924,10 +925,10 @@
         menu item. From the results of the search, you can select an invoice to edit or view.
       </para>
 
-      <note>
+      <important>
         <para>Before you can edit a posted invoice, you will need to <guilabel>Unpost</guilabel> it.
         </para>
-      </note>
+      </important>
 
       <para>One of the design goals in &app;’s Account Receivable system was to allow different processes
         to get to the same state, so you can reach an invoice from different directions based on the
@@ -1216,17 +1217,17 @@
     <sect2 id="busnss-ar-baddebt">
       <title>Writing Off a Bad Debt</title>
 
-      <note>
+      <important>
         <para>Please check with your accountant to ensure the following is acceptable in your region.
         </para>
-      </note>
+      </important>
 
       <para>The usual way to do this is to process a payment for the invoice to a <emphasis>BadDebt</emphasis>
         account. Such an account would be an expense account. However, in &app;, you can't process a
         payment for an invoice directly to an expense account, so it takes two steps:
       </para>
 
-      <itemizedlist>
+      <orderedlist>
         <listitem>
           <para>Pay the invoice to an asset or liability account, such as your checking account.
           </para>
@@ -1237,7 +1238,7 @@
             the payment transaction, to the BadDebt expense account.
           </para>
         </listitem>
-      </itemizedlist>
+      </orderedlist>
 
       <para>Specifically
       </para>
@@ -1249,8 +1250,9 @@
             your BadDebt and A/R account.
           </para>
 
-          <para>In case the payment has associated lot link transactions
-            <link linkend="busnss-ar-baddeb-lot">(1)</link>, remove those as well.
+          <para>In case the payment has associated <emphasis>lot link</emphasis>
+            transactions<link linkend="busnss-ar-baddeb-lot"><superscript>a</superscript></link>,
+             remove those as well.
           </para>
 
           <para>If all is well, your <guilabel>Process Payment</guilabel> window for this customer should list the
@@ -1267,7 +1269,7 @@
         <listitem>
           <para>Open the account register for your A/R account. For this invoice there should now be one payment
             transaction. If you are using &app; 2.6.0 - 2.6.4 there will also be one lot link
-            transaction <link linkend="busnss-ar-baddeb-lot">(1)</link>.
+            transaction<link linkend="busnss-ar-baddeb-lot"><superscript>a</superscript></link>.
           </para>
         </listitem>
 
@@ -1282,34 +1284,63 @@
       <para>If all is well, your <guilabel>Process Payment</guilabel> window should still be clean: no
         pre-payments, and the bad debt invoice gone.
       </para>
-
-      <note id="busnss-ar-baddeb-lot">
-        <para>(1): &app; versions 2.6.0 to 2.6.4 created lot link transactions which show in the A/R account
-          register. This came with its own set of subtle issues. It is recommended to upgrade to the
-          latest (or at least 2.6.6) version, which fixes a lot of small problems. Version 2.6.5 had
-          a flaw in the logic cleaning up the lot links. Once upgraded, please run
+      <!-- Todo: As soon as yelp understads <footnotelink> convert this into a <footnote> and the links above in <footnotelink>s. -->
+      <caution id="busnss-ar-baddeb-lot">
+        <para><superscript>a</superscript> &app; version
+          <variablelist>
+            <varlistentry>
+              <term>2.6.0 to 2.6.4</term>
+              <listitem>
+                <para>created lot link transactions which show in the A/R account register. This came
+                   with its own set of subtle issues.
+                </para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>2.6.5</term>
+              <listitem>
+                <para>had a flaw in the logic cleaning up the lot links.
+                </para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
+        </para>
+        <para>
+          It is recommended to upgrade to the latest (or at least 2.6.6) version, which fixes a lot
+          of small problems. Once upgraded, please run
+          <!-- ToDo: Replace the <menuchoice> after the entities are fixed by:  &mc.ac.chk-rep.all; —or at least &mc.ac.chk-rep.acct; 
+          on your A/R and A/P accounts— -->
           <menuchoice>
             <guimenu> Actions</guimenu><guimenuitem>Check & Repair</guimenuitem>
           </menuchoice>
-          on your A/R and A/P accounts to clean up most of the lot link legacy. Don't forget to make
+          to clean up most of the lot link legacy. Don't forget to make
           a backup first just in case.
         </para>
 
-        <para>Lots are used internally for relating payments to invoices. Lots themselves are invisible in the
-          account registers. To see them you need to open the lot viewer, which can be found in
-          <menuchoice>
-            <guimenu>Actions</guimenu><guimenuitem>View lots </guimenuitem>
-          </menuchoice>
-          while in any A/R or A/P account register. Select a lot to see the <emphasis>Splits in
-          lot</emphasis>.
-        </para>
-
-        <para><emphasis>Lot links</emphasis> are <emphasis>transactions</emphasis> which you can see in your A/R
-          and A/P accounts. They are unusual in the sense that all their splits are in one account
-          (A/R or A/P). Each split in a lot link transaction is <emphasis>linked</emphasis> (hence
-          the name) to an invoice or payment transaction by means of a lot.
-        </para>
-      </note>
+        <variablelist>
+          <title>Distinction between <emphasis>Lot</emphasis> and <emphasis>Lot link</emphasis></title>
+          <varlistentry>
+            <term>Lots</term>
+            <listitem>
+              <para>are used internally for relating payments to invoices. Lots themselves are invisible in the
+                account registers. To see them you need to open the lot viewer, which can be found in &mc.ac.vw-lots;
+                while in any A/R or A/P account register. Select a lot to see the <emphasis>Splits in
+                lot</emphasis>.
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>Lot links</term>
+            <listitem>
+              <para>are <emphasis>transactions</emphasis> which you can see in your A/R
+                and A/P accounts. They are unusual in the sense that all their splits are in one account
+                (A/R or A/P). Each split in a lot link transaction is <emphasis>linked</emphasis> (hence
+                the name) to an invoice or payment transaction by means of a lot.
+              </para>
+            </listitem>
+          </varlistentry>
+        </variablelist>
+      </caution>
 
       <para>See <ulink url="&url-wiki-bus-feat;"  /> for more information.
       </para>

commit 5f964dd058caf91aa07844558ebe79a4b6f3a36b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Nov 14 18:46:20 2022 +0100

    [Bug 798665] New: ENG. Typo: Unnecessary determiner "a" [2.6.1.
    Migrating financial data]

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index 0b7eda79..8d8728c0 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -1481,7 +1481,7 @@ Translators:
     <sect2 id="migrate-financial">
       <title>Migrating financial data</title>
 
-      <para>Migrating &app; financial data is a as simple as copying <filename>.gnucash</filename> files with a
+      <para>Migrating &app; financial data is as simple as copying <filename>.gnucash</filename> files with a
         file manager if you know where they are saved. If you can’t remember where a file is
         stored but you can open it directly within &app;, save it in the desired path from within
         &app;.

commit afa8cbec9c5afd696492ca32c883fd3e44473b8c
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Nov 1 03:17:16 2022 +0100

    Manual:C: Convert CSV assistant into <procedure>

diff --git a/manual/C/ch_Transactions.xml b/manual/C/ch_Transactions.xml
index 549796dc..aa0e2956 100644
--- a/manual/C/ch_Transactions.xml
+++ b/manual/C/ch_Transactions.xml
@@ -1605,22 +1605,6 @@ Translators:
         Assistant dialog illustrated below.
       </para>
 
-      <figure pgwide="1">
-        <title>The CSV Transaction Import Assistant - Introduction</title><screenshot id="CSV_Transaction_Import_Assistant">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
-                         srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
-                         srccredit="David Cousens"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
-
       <para>The CSV Transaction import Assistant is largely self explanatory with information panes which
         describe the functionality.
       </para>
@@ -1653,153 +1637,188 @@ Translators:
         </para>
       </formalpara>
 
-      <formalpara>
+      <procedure>
         <title>CSV Import Process Steps</title>
 
-        <para>The steps in the CSV import process are listed in the left hand pane with the current step
-          highlighted. Explanatory text and the widgets to setup and carry out the step are
-          displayed in the right hand pane. The function of the controls in each step is explained
-          below, in the explanatory information in the panes or in tooltips on some controls. The
-          steps in the CSV import process are:
-          <itemizedlist>
-            <listitem>
-              <para><emphasis role="bold">Transaction Import Assistant</emphasis>: Introductory information panel. Click
-                <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to continue;
-              </para>
-            </listitem>
+        <highlights>
+          <para>The steps in the CSV import process are listed in the left hand pane with the current step
+            highlighted. Explanatory text and the widgets to setup and carry out the step are
+            displayed in the right hand pane. The function of the controls in each step is explained
+            below, in the explanatory information in the panes or in tooltips on some controls. The
+            steps in the CSV import process are:
+          </para>
+        </highlights>
+        <step>
+          <title>Introductory information panel</title>
 
-            <listitem>
-              <para><emphasis role="bold"><guilabel>Select File for Import</guilabel></emphasis>: Display the File
-                selection dialog. Navigate to the file you wish to import then click the
-                <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
-              </para>
-            </listitem>
+      <figure pgwide="1">
+        <title>The CSV Transaction Import Assistant - Introduction</title><screenshot id="CSV_Transaction_Import_Assistant">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
+                         srccredit="David Cousens" width="&img-w;"/>
+            </imageobject>
 
-            <listitem>
-              <para><emphasis role="bold">Import Preview</emphasis>: The Import Preview pane controls set options for
-                the import of CSV data and provides a preview of the data to be imported.
-                <figure pgwide="1">
-                  <title>The CSV Import Preview Pane</title><screenshot id="CSV_Import_Preview">
-                    <mediaobject>
-                      <imageobject role="html">
-                        <imagedata fileref="figures/CSV_Import_transactions_Preview.png" width="&img-w;"
-                                   srccredit="David Cousens"/>
-                      </imageobject>
-                      <imageobject role="fo">
-                        <imagedata fileref="figures/CSV_Import_transactions_Preview.png"
-                                   srccredit="David Cousens"/>
-                      </imageobject>
-                      <caption>
-                        The CSV Import Preview Pane with settings to import the shown data.
-                      </caption>
-                    </mediaobject>
-                  </screenshot>
-                </figure>
-
-                <itemizedlist>
-                  <title>Import preview Controls</title>
-
-                  <listitem>
-                    <para id="trans-import-csv-save"><emphasis role="bold"><guilabel>Load and Save Settings</guilabel></emphasis>: Once you have set all
-                      the import parameters, you can save these settings by typing in a setting a
-                      unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box
-                      and clicking the Save icon just to the right of the box. A previously defined
-                      settings group can be retrieved by selecting the appropriate setting group
-                      name from the dropdown list activated by the down arrow at the right end of
-                      the text box. This will set all other settings to the stored values.
-                    </para>
+            <imageobject role="fo">
+              <imagedata fileref="figures/CSV_Transaction_Import_Assistant.png"
+                         srccredit="David Cousens"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
+          <para>Click <emphasis role="bold"><guibutton>Next</guibutton></emphasis> to continue;
+          </para>
+        </step>
 
-                    <para>The delete/trashcan icon to the right of the Save icon can be used to remove the saved settings
-                      group selected from the drop down list for the box.
-                    </para>
+        <step>
+          <para><emphasis role="bold"><guilabel>Select File for Import</guilabel></emphasis>: Display the File
+            selection dialog. Navigate to the file you wish to import then click the
+            <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
+          </para>
+        </step>
+
+        <step>
+          <para><emphasis role="bold">Import Preview</emphasis>: The Import Preview pane controls set options for
+            the import of CSV data and provides a preview of the data to be imported.
+            <figure pgwide="1">
+              <title>The CSV Import Preview Pane</title><screenshot id="CSV_Import_Preview">
+                <mediaobject>
+                  <imageobject role="html">
+                    <imagedata fileref="figures/CSV_Import_transactions_Preview.png" width="&img-w;"
+                               srccredit="David Cousens"/>
+                  </imageobject>
+                  <imageobject role="fo">
+                    <imagedata fileref="figures/CSV_Import_transactions_Preview.png"
+                               srccredit="David Cousens"/>
+                  </imageobject>
+                  <caption>
+                    The CSV Import Preview Pane with settings to import the shown data.
+                  </caption>
+                </mediaobject>
+              </screenshot>
+            </figure>
 
+            <itemizedlist>
+              <title>Import preview Controls</title>
+              <listitem>
+                <variablelist id="trans-import-csv-save">
+                  <title>Load and Save Settings</title>
+                  <abstract>
                     <para>The settings group <emphasis role="bold"><guilabel>&appname; Export Settings</guilabel></emphasis>
                       defines a setting group for used for the export and reimport of
                       <application>&appname;</application> transaction data - use this if importing
-                      data previously exported from <application>&appname;</application>;
+                      data previously exported from <application>&appname;</application>.
                     </para>
-                  </listitem>
+                  </abstract>
+                  <varlistentry>
+                    <term>Save</term>
+                    <listitem>
+                      <para>Once you have set all the import parameters, you can save these settings by typing a
+                        unique name in the <guilabel>Load and Save Settings Entry</guilabel> combo box
+                        and clicking the Save icon just to the right of the box.
+                      </para>
+                    </listitem>
+                  </varlistentry>
+                  <varlistentry>
+                    <term>Load</term>
+                    <listitem>
+                      <para>A previously defined settings group can be retrieved by selecting the appropriate setting group
+                        name from the dropdown list activated by the down arrow at the right end of
+                        the text box. This will set all other settings to the stored values.
+                      </para>
+                    </listitem>
+                  </varlistentry>
+                  <varlistentry>
+                    <term>Delete</term>
+                    <listitem>
+                      <para>The delete/trashcan icon to the right of the Save icon can be used to remove the saved settings
+                        group selected from the drop down list for the box.
+                      </para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: If the data you are importing does
-                      not specify the source account for the transaction an account can be selected
-                      from the drop down list will import all transactions to the selected account.
-                      Leave blank if your imported data specifies a source account;
-                    </para>
-                  </listitem>
-
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>File Format</guilabel></emphasis>:
-                      <itemizedlist>
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Separators</guilabel></emphasis>: Selecting this radio button will
-                            allow you to define characters which will be used to distinguish columns
-                            in the input file. The default is comma separated. In countries using
-                            the comma as decimal separator the semicolon is common as column
-                            separator. However spaces, tabs, colons or semicolons or any combination
-                            of them may be used to separate columns in the input file by selecting
-                            the appropriate check boxes. You may also define custom separators by
-                            typing the required characters into the text box and selecting the
-                            <guilabel>Custom</guilabel> checkbox. This may be used in combination
-                            with any of the predefined separators;
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Fixed-Width</guilabel></emphasis>: Selecting this radio button will
-                            allow you to define column boundaries by double clicking at the
-                            appropriate positions in the sample records displayed in the panel
-                            below. Single clicking in a column will narrow, widen or merge the
-                            column.
-                          </para>
-                        </listitem>
-                      </itemizedlist>
-                    </para>
-                  </listitem>
-
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Multi-split</guilabel></emphasis>: Selecting this check box allows
-                      the splits for a single transaction to be defined on consecutive lines within
-                      the file with each line defining a single split. If not selected each line is
-                      assumed to contain the information for a single transaction including one or
-                      two splits;
-                    </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: If the data you are importing does
+                  not specify the source account for the transaction an account can be selected
+                  from the drop down list will import all transactions to the selected account.
+                  Leave blank if your imported data specifies a source account;
+                </para>
+              </listitem>
 
-                    <para>Multi-split is a gnucash specific variant of a csv file to support easier
-                      data preparation.
-                    </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>File Format</guilabel></emphasis>:
+                  <itemizedlist>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Separators</guilabel></emphasis>: Selecting this radio button will
+                        allow you to define characters which will be used to distinguish columns
+                        in the input file. The default is comma separated. In countries using
+                        the comma as decimal separator the semicolon is common as column
+                        separator. However spaces, tabs, colons or semicolons or any combination
+                        of them may be used to separate columns in the input file by selecting
+                        the appropriate check boxes. You may also define custom separators by
+                        typing the required characters into the text box and selecting the
+                        <guilabel>Custom</guilabel> checkbox. This may be used in combination
+                        with any of the predefined separators;
+                      </para>
+                    </listitem>
+
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Fixed-Width</guilabel></emphasis>: Selecting this radio button will
+                        allow you to define column boundaries by double clicking at the
+                        appropriate positions in the sample records displayed in the panel
+                        below. Single clicking in a column will narrow, widen or merge the
+                        column.
+                      </para>
+                    </listitem>
+                  </itemizedlist>
+                </para>
+              </listitem>
 
-                    <para>Each line should define one split by
-                      <variablelist>
-                        <varlistentry>
-                          <term>transaction-specific fields</term>
-                          <listitem>
-                            <para>date and description as bare minimum
-                              <emphasis>and</emphasis>
-                            </para>
-                          </listitem>
-                        </varlistentry>
-                        <varlistentry>
-                          <term>split specific fields</term>
-                          <listitem>
-                            <para>account and deposit/withdrawal as bare minimum.
-                            </para>
-                          </listitem>
-                        </varlistentry>
-                      </variablelist>
-                    </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Multi-split</guilabel></emphasis>: Selecting this check box allows
+                  the splits for a single transaction to be defined on consecutive lines within
+                  the file with each line defining a single split. If not selected each line is
+                  assumed to contain the information for a single transaction including one or
+                  two splits;
+                </para>
 
-                    <tip>
-                      <para>There is a convenience feature built-in so you don't have to repeat the
-                        transaction fields if the split belongs to the same transaction as the
-                        previous one (though you can repeat them if that makes csv preparation
-                        easier).
-                      </para>
-                    </tip>
+                <para>Multi-split is a gnucash specific variant of a csv file to support easier
+                  data preparation.
+                </para>
 
-                    <example>
-                      <title>Sample Multi-split.csv</title>
-                      <programlisting language="csv">Date,Description,Deposit,Account
+                <para>Each line should define one split by
+                  <variablelist>
+                    <varlistentry>
+                      <term>transaction-specific fields</term>
+                      <listitem>
+                        <para>date and description as bare minimum
+                          <emphasis>and</emphasis>
+                        </para>
+                      </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                      <term>split specific fields</term>
+                      <listitem>
+                        <para>account and deposit/withdrawal as bare minimum.
+                        </para>
+                      </listitem>
+                    </varlistentry>
+                  </variablelist>
+                </para>
+
+                <tip>
+                  <para>There is a convenience feature built-in so you don't have to repeat the
+                    transaction fields if the split belongs to the same transaction as the
+                    previous one (though you can repeat them if that makes csv preparation
+                    easier).
+                  </para>
+                </tip>
+
+                <example>
+                  <title>Sample Multi-split.csv</title>
+                  <programlisting language="csv">Date,Description,Deposit,Account
 05/03/2006,Grocery Store,-45.21,Assets:Checking
 ,,45.21,Expenses:Groceries
 14/03/2006,Employers R Us,670.00,Assets:Checking
@@ -1807,292 +1826,290 @@ Translators:
 ,,90.00,Expenses:Taxes:Medicare
 ,,60.00,Expenses:Taxes:Social Security
 ,,-1000.00,Income:Salary</programlisting>
-                    </example>
-                  </listitem>
-
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Miscellaneous</guilabel></emphasis>: The miscellaneous settings
-                      allow you to set:
-                      <itemizedlist>
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>: This is usually UTF-8, but may
-                            differ for files from other sources;
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Date Format</guilabel></emphasis>: This does not default to the
-                            Locale setting so check it matches the data you are importing;
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Currency Format</guilabel></emphasis>: Select the format of the
-                            decimal separator (full stop or comma or other) for the currency if the
-                            correct value is not supplied by Locale;
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>: Select the number of
-                            header lines to skip in the imported file;<footnote id='txn-imp-skip'><simpara>
-                              While we only want to import <emphasis>transactions</emphasis>, some banks send additional informations like
-                              a <emphasis>fieldname</emphasis> header or <emphasis>account status</emphasis> information as header or footer.</simpara></footnote>
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>: Select the number of
-                            trailing lines to skip in the import file;<footnoteref linkend='txn-imp-skip'/>
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para><emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>: Use to skip every second
-                            line in the import file.
-                          </para>
-                        </listitem>
-                      </itemizedlist>
-                      to match the settings for the file you are importing. Tooltips may also
-                      contain information on the setting and options.
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </para>
+                </example>
+              </listitem>
 
-              <para>The import panel shows the data being imported as it is interpreted using the settings chosen to
-                define columns and formats. The dropdown lists in the headers for each column of the
-                import allow you to associate a specific column in the imported data with a specific
-                field in the display of a transaction in an account register. At a minimum to import
-                data, columns in the imported data containing the following information
-                <emphasis>must</emphasis> be specified:
-                <itemizedlist>
-                  <listitem>
-                    <para><guilabel>Date</guilabel>: of transaction;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Miscellaneous</guilabel></emphasis>: The miscellaneous settings
+                  allow you to set:
+                  <itemizedlist>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Encoding</guilabel></emphasis>: This is usually UTF-8, but may
+                        differ for files from other sources;
+                      </para>
+                    </listitem>
 
-                  <listitem>
-                    <para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the
-                      base account as above);
-                    </para>
-                  </listitem>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Date Format</guilabel></emphasis>: This does not default to the
+                        Locale setting so check it matches the data you are importing;
+                      </para>
+                    </listitem>
 
-                  <listitem>
-                    <para><guilabel>Description</guilabel>: of the transaction;
-                    </para>
-                  </listitem>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Currency Format</guilabel></emphasis>: Select the format of the
+                        decimal separator (full stop or comma or other) for the currency if the
+                        correct value is not supplied by Locale;
+                      </para>
+                    </listitem>
 
-                  <listitem>
-                    <para><guilabel>Deposit or Withdrawal</guilabel>: column.
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </para>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Leading Lines to Skip</guilabel></emphasis>: Select the number of
+                        header lines to skip in the imported file;<footnote id='txn-imp-skip'><simpara>
+                          While we only want to import <emphasis>transactions</emphasis>, some banks send additional informations like
+                          a <emphasis>fieldname</emphasis> header or <emphasis>account status</emphasis> information as header or footer.</simpara></footnote>
+                      </para>
+                    </listitem>
 
-              <para>The dropdown list of <application>&appname;</application> transaction data fields which may be
-                associated with a column of the imported data contains the following:
-                <itemizedlist>
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>None</guilabel></emphasis>: The column is not assigned to a
-                      transaction data field and is not imported;
-                    </para>
-                  </listitem>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Trailing Lines to Skip</guilabel></emphasis>: Select the number of
+                        trailing lines to skip in the import file;<footnoteref linkend='txn-imp-skip'/>
+                      </para>
+                    </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Date</guilabel></emphasis>: Ensure the date format in the column
-                      matches the Miscellaneous date Format Setting;
-                    </para>
-                  </listitem>
+                    <listitem>
+                      <para><emphasis role="bold"><guilabel>Skip alternate lines</guilabel></emphasis>: Use to skip every second
+                        line in the import file.
+                      </para>
+                    </listitem>
+                  </itemizedlist>
+                  to match the settings for the file you are importing. Tooltips may also
+                  contain information on the setting and options.
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Num</guilabel></emphasis>: Transaction Num field - Use for check
-                      numbers etc.;
-                    </para>
-                  </listitem>
+          <para>The import panel shows the data being imported as it is interpreted using the settings chosen to
+            define columns and formats. The dropdown lists in the headers for each column of the
+            import allow you to associate a specific column in the imported data with a specific
+            field in the display of a transaction in an account register. At a minimum to import
+            data, columns in the imported data containing the following information
+            <emphasis>must</emphasis> be specified:
+            <itemizedlist>
+              <listitem>
+                <para><guilabel>Date</guilabel>: of transaction;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Description</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><guilabel>Account</guilabel>: into which transaction is to be imported (or alternatively set the
+                  base account as above);
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Notes</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><guilabel>Description</guilabel>: of the transaction;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Transaction Commodity</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><guilabel>Deposit or Withdrawal</guilabel>: column.
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+          <para>The dropdown list of <application>&appname;</application> transaction data fields which may be
+            associated with a column of the imported data contains the following:
+            <itemizedlist>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>None</guilabel></emphasis>: The column is not assigned to a
+                  transaction data field and is not imported;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Action</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Date</guilabel></emphasis>: Ensure the date format in the column
+                  matches the Miscellaneous date Format Setting;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: This header should be matched to a
-                      column specifying the source account for a transaction if it is present.
-                      Otherwise, set the source account in the
-                      <emphasis role="bold"><guilabel>Account</guilabel></emphasis> combo box;
-                    </para>
-                  </listitem>
-
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>: Apply this header to a column
-                      containing the amount of the transaction. Positive amounts in the column
-                      generally represent an increase in the account balance and negative amounts a
-                      decrease in the balance (asset accounts: Checking, Savings). In external
-                      statements supplied by a bank for a check or savings account, a credit (Cr) is
-                      normally an increase in the account balance and a debit (Dr) a decrease in the
-                      account balance. In the banks eyes, your savings or checking account is a
-                      Liability to them;
-                    </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Num</guilabel></emphasis>: Transaction Num field - Use for check
+                  numbers etc.;
+                </para>
+              </listitem>
 
-                    <para>If the amount data is in separate columns for debits and credits you will have to apply both this
-                      heading and the Withdrawal heading.
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Description</guilabel></emphasis>;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>: Apply this header to a column with
-                      the amount of the transaction where positive amounts in the column represent a
-                      decrease in the account balance and negative amounts an increase in the
-                      balance (e.g. Liability account: credit card).
-                    </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Notes</guilabel></emphasis>;
+                </para>
+              </listitem>
 
-                    <para>Where separate columns are used for debits and credit to the account apply it to the opposite to the
-                      column to which Deposits is applied;
-                    </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transaction Commodity</guilabel></emphasis>;
+                </para>
+              </listitem>
 
-                    <note>
-                      <para>Some experimentation may be necessary to determine the correct allocation of the Deposit and
-                        Withdrawal headings.
-                      </para>
-                    </note>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Void Reason</guilabel></emphasis>;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Price</guilabel></emphasis>: The price for commodity transactions
-                      and/or transactions involving currency exchange;
-                    </para>
-                  </listitem>
-
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis>: Additional column containing descriptive
-                      information relevant to one split of a transaction. If in the first line of a
-                      multi-split import it will apply to the source account. In subsequent
-                      lines/splits it is applied to the transfer account defined in that line or
-                      allocated to it in the matcher;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Action</guilabel></emphasis>;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>: Apply to a column indicating the
-                      reconciliation status of the transaction. This generally only applies to data
-                      exported from <application>&appname;</application>;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Account</guilabel></emphasis>: This header should be matched to a
+                  column specifying the source account for a transaction if it is present.
+                  Otherwise, set the source account in the
+                  <emphasis role="bold"><guilabel>Account</guilabel></emphasis> combo box;
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: Apply to a column which
-                      specifies the date of reconciliation, generally only for
-                      <application>&appname;</application> exported data;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Deposit</guilabel></emphasis>: Apply this header to a column
+                  containing the amount of the transaction. Positive amounts in the column
+                  generally represent an increase in the account balance and negative amounts a
+                  decrease in the balance (asset accounts: Checking, Savings). In external
+                  statements supplied by a bank for a check or savings account, a credit (Cr) is
+                  normally an increase in the account balance and a debit (Dr) a decrease in the
+                  account balance. In the banks eyes, your savings or checking account is a
+                  Liability to them;
+                </para>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Transfer Action</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+                <para>If the amount data is in separate columns for debits and credits you will have to apply both this
+                  heading and the Withdrawal heading.
+                </para>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>: This header should be
-                      applied to a column which specifies the transfer account for the second split
-                      of a single line import and/or for subsequent splits in multiline exported
-                      transactions;
-                    </para>
-                  </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Withdrawal</guilabel></emphasis>: Apply this header to a column with
+                  the amount of the transaction where positive amounts in the column represent a
+                  decrease in the account balance and negative amounts an increase in the
+                  balance (e.g. Liability account: credit card).
+                </para>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Transfer Memo</guilabel></emphasis>: Apply to a column with
-                      descriptive information relevant to a split to a transfer account specified by
-                      <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+                <para>Where separate columns are used for debits and credit to the account apply it to the opposite to the
+                  column to which Deposits is applied;
+                </para>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Transfer Reconciled</guilabel></emphasis>: Apply to a column with
-                      reconciliation status information relevant to a split to a transfer account
-                      specified by <emphasis role="bold"> <guilabel>Transfer
-                      Account</guilabel></emphasis>;
-                    </para>
-                  </listitem>
+                <note>
+                  <para>Some experimentation may be necessary to determine the correct allocation of the Deposit and
+                    Withdrawal headings.
+                  </para>
+                </note>
+              </listitem>
 
-                  <listitem>
-                    <para><emphasis role="bold"><guilabel>Transfer Reconcile Date</guilabel></emphasis>: Apply to a column
-                      containing a reconciliation date relevant to a split to a transfer account
-                      previously specified in <emphasis role="bold"><guilabel>Transfer
-                      Account</guilabel></emphasis>.
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Price</guilabel></emphasis>: The price for commodity transactions
+                  and/or transactions involving currency exchange;
+                </para>
+              </listitem>
 
-              <para>The <guilabel>Skip Errors</guilabel> check box will skip trying to import any rows with errors in
-                matching the columns.
-              </para>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Memo</guilabel></emphasis>: Additional column containing descriptive
+                  information relevant to one split of a transaction. If in the first line of a
+                  multi-split import it will apply to the source account. In subsequent
+                  lines/splits it is applied to the transfer account defined in that line or
+                  allocated to it in the matcher;
+                </para>
+              </listitem>
 
-              <para>When you are happy with all the import settings, <link linkend="trans-import-csv-save">save</link>
-                them if you will use the same settings again, then press the
-                <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button.
-              </para>
-            </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Reconciled</guilabel></emphasis>: Apply to a column indicating the
+                  reconciliation status of the transaction. This generally only applies to data
+                  exported from <application>&appname;</application>;
+                </para>
+              </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">Match Import and <application>&appname;</application> accounts</emphasis>:
-                This window allows you to map the accounts identified in the account columns
-                (Account and Transfer Account) with accounts in the
-                <application>&appname;</application> account tree (Account name). Double click on a
-                row to bring up a dialog to select the matching <application>&appname;</application>
-                account. If you have previously imported transactions to this account and account
-                mappings can be matched automatically, this window will not be displayed. When you
-                have selected a match for all accounts, click on the
-                <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
-              </para>
-            </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Reconcile Date</guilabel></emphasis>: Apply to a column which
+                  specifies the date of reconciliation, generally only for
+                  <application>&appname;</application> exported data;
+                </para>
+              </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">Transaction Information</emphasis>: The Transaction Information panel allows
-                review of data entry settings so far. Clicking Next will perform checks on the data.
-                If there are errors you will be returned to the <emphasis role="bold">Import
-                Preview</emphasis> pane to edit the settings. For no errors you proceed to the next
-                step;
-              </para>
-            </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Action</guilabel></emphasis>;
+                </para>
+              </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">Match Transactions</emphasis>: Clicking on Match Transactions will then bring
-                up the main <link linkend="trans-import-matcher">Import Matcher</link> window. The
-                Import Matcher is described in a separate section;
-              </para>
-            </listitem>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>: This header should be
+                  applied to a column which specifies the transfer account for the second split
+                  of a single line import and/or for subsequent splits in multiline exported
+                  transactions;
+                </para>
+              </listitem>
 
-            <listitem>
-              <para><emphasis role="bold">Import Summary</emphasis>: <application>&appname;</application> displays a
-                summary of the imported data. Click on the
-                <emphasis role="bold"><guibutton>Close</guibutton></emphasis> to exit the wizard.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </para>
-      </formalpara>
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Memo</guilabel></emphasis>: Apply to a column with
+                  descriptive information relevant to a split to a transfer account specified by
+                  <emphasis role="bold"><guilabel>Transfer Account</guilabel></emphasis>;
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Reconciled</guilabel></emphasis>: Apply to a column with
+                  reconciliation status information relevant to a split to a transfer account
+                  specified by <emphasis role="bold"> <guilabel>Transfer
+                  Account</guilabel></emphasis>;
+                </para>
+              </listitem>
+
+              <listitem>
+                <para><emphasis role="bold"><guilabel>Transfer Reconcile Date</guilabel></emphasis>: Apply to a column
+                  containing a reconciliation date relevant to a split to a transfer account
+                  previously specified in <emphasis role="bold"><guilabel>Transfer
+                  Account</guilabel></emphasis>.
+                </para>
+              </listitem>
+            </itemizedlist>
+          </para>
+
+          <para>The <guilabel>Skip Errors</guilabel> check box will skip trying to import any rows with errors in
+            matching the columns.
+          </para>
+
+          <para>When you are happy with all the import settings, <link linkend="trans-import-csv-save">save</link>
+            them if you will use the same settings again, then press the
+            <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button.
+          </para>
+        </step>
+
+        <step>
+          <para><emphasis role="bold">Match Import and <application>&appname;</application> accounts</emphasis>:
+            This window allows you to map the accounts identified in the account columns
+            (Account and Transfer Account) with accounts in the
+            <application>&appname;</application> account tree (Account name). Double click on a
+            row to bring up a dialog to select the matching <application>&appname;</application>
+            account. If you have previously imported transactions to this account and account
+            mappings can be matched automatically, this window will not be displayed. When you
+            have selected a match for all accounts, click on the
+            <emphasis role="bold"><guibutton>Next</guibutton></emphasis> button;
+          </para>
+        </step>
+
+        <step>
+          <para><emphasis role="bold">Transaction Information</emphasis>: The Transaction Information panel allows
+            review of data entry settings so far. Clicking Next will perform checks on the data.
+            If there are errors you will be returned to the <emphasis role="bold">Import
+            Preview</emphasis> pane to edit the settings. For no errors you proceed to the next
+            step;
+          </para>
+        </step>
+
+        <step>
+          <para><emphasis role="bold">Match Transactions</emphasis>: Clicking on Match Transactions will then bring
+            up the main <link linkend="trans-import-matcher">Import Matcher</link> window. The
+            Import Matcher is described in a separate section;
+          </para>
+        </step>
+
+        <step>
+          <para><emphasis role="bold">Import Summary</emphasis>: <application>&appname;</application> displays a
+            summary of the imported data. Click on the
+            <emphasis role="bold"><guibutton>Close</guibutton></emphasis> to exit the wizard.
+          </para>
+        </step>
+      </procedure>
 
       <caution>
         <para>Multi-split imports of multicurrency transactions and commodity transactions are experimental and

commit e479538a57910f46b6ae09c4b6bd4d24168df0d4
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Oct 31 05:54:10 2022 +0100

    Improve markup of PR_#292

diff --git a/manual/C/ch_Transactions.xml b/manual/C/ch_Transactions.xml
index 2317c4a4..549796dc 100644
--- a/manual/C/ch_Transactions.xml
+++ b/manual/C/ch_Transactions.xml
@@ -1769,43 +1769,45 @@ Translators:
                       data preparation.
                     </para>
 
-                    <para>Each line should define one split via:
-                      <itemizedlist>
-
-                        <listitem>
-                          <para>transaction-specific fields (date and description as bare minimum)
-                            <emphasis role="italic">and</emphasis>;
-                          </para>
-                        </listitem>
-
-                        <listitem>
-                          <para>split specific fields (account and deposit/withdrawal as bare minimum).
-                          </para>
-                        </listitem>
-
-                      </itemizedlist>
-                    </para>
-
-                    <para>There is a convenience feature built-in so you don't have to repeat the
-                      transaction fields if the split belongs to the same transaction as the
-                      previous one (though you can repeat them if that makes csv preparation
-                      easier).
+                    <para>Each line should define one split by
+                      <variablelist>
+                        <varlistentry>
+                          <term>transaction-specific fields</term>
+                          <listitem>
+                            <para>date and description as bare minimum
+                              <emphasis>and</emphasis>
+                            </para>
+                          </listitem>
+                        </varlistentry>
+                        <varlistentry>
+                          <term>split specific fields</term>
+                          <listitem>
+                            <para>account and deposit/withdrawal as bare minimum.
+                            </para>
+                          </listitem>
+                        </varlistentry>
+                      </variablelist>
                     </para>
 
-                    <para>
-                      Sample Multi-split.csv
-                    </para>
-
-                    <para>
-                      Date,Description,Deposit,Account
-                      05/03/2006,Grocery Store,-45.21,Assets:Checking
-                      ,,45.21,Expenses:Groceries
-                      14/03/2006,Employers R Us,670.00,Assets:Checking
-                      ,,180.00,Expenses:Taxes:Federal
-                      ,,90.00,Expenses:Taxes:Medicare
-                      ,,60.00,Expenses:Taxes:Social Security
-                      ,,-1000.00,Income:Salary
-                    </para>
+                    <tip>
+                      <para>There is a convenience feature built-in so you don't have to repeat the
+                        transaction fields if the split belongs to the same transaction as the
+                        previous one (though you can repeat them if that makes csv preparation
+                        easier).
+                      </para>
+                    </tip>
+
+                    <example>
+                      <title>Sample Multi-split.csv</title>
+                      <programlisting language="csv">Date,Description,Deposit,Account
+05/03/2006,Grocery Store,-45.21,Assets:Checking
+,,45.21,Expenses:Groceries
+14/03/2006,Employers R Us,670.00,Assets:Checking
+,,180.00,Expenses:Taxes:Federal
+,,90.00,Expenses:Taxes:Medicare
+,,60.00,Expenses:Taxes:Social Security
+,,-1000.00,Income:Salary</programlisting>
+                    </example>
                   </listitem>
 
                   <listitem>

commit 0d30e9280976ce91d669916b91bff7647ddd314c
Author: flywire <flywire0 at gmail.com>
Date:   Mon Oct 31 09:17:31 2022 +1100

    Multi-split csv elaboration
    
    For discussion

diff --git a/manual/C/ch_Transactions.xml b/manual/C/ch_Transactions.xml
index 20683586..2317c4a4 100644
--- a/manual/C/ch_Transactions.xml
+++ b/manual/C/ch_Transactions.xml
@@ -1764,6 +1764,48 @@ Translators:
                       assumed to contain the information for a single transaction including one or
                       two splits;
                     </para>
+
+                    <para>Multi-split is a gnucash specific variant of a csv file to support easier
+                      data preparation.
+                    </para>
+
+                    <para>Each line should define one split via:
+                      <itemizedlist>
+
+                        <listitem>
+                          <para>transaction-specific fields (date and description as bare minimum)
+                            <emphasis role="italic">and</emphasis>;
+                          </para>
+                        </listitem>
+
+                        <listitem>
+                          <para>split specific fields (account and deposit/withdrawal as bare minimum).
+                          </para>
+                        </listitem>
+
+                      </itemizedlist>
+                    </para>
+
+                    <para>There is a convenience feature built-in so you don't have to repeat the
+                      transaction fields if the split belongs to the same transaction as the
+                      previous one (though you can repeat them if that makes csv preparation
+                      easier).
+                    </para>
+
+                    <para>
+                      Sample Multi-split.csv
+                    </para>
+
+                    <para>
+                      Date,Description,Deposit,Account
+                      05/03/2006,Grocery Store,-45.21,Assets:Checking
+                      ,,45.21,Expenses:Groceries
+                      14/03/2006,Employers R Us,670.00,Assets:Checking
+                      ,,180.00,Expenses:Taxes:Federal
+                      ,,90.00,Expenses:Taxes:Medicare
+                      ,,60.00,Expenses:Taxes:Social Security
+                      ,,-1000.00,Income:Salary
+                    </para>
                   </listitem>
 
                   <listitem>

commit 9a2083be156d26e16b940935785fc53b309636b0
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Thu Oct 27 11:56:04 2022 +0200

    Update app-fq-vers to "1.53"

diff --git a/docbook/gnc-docbookx.dtd b/docbook/gnc-docbookx.dtd
index ac82584a..ba55c27f 100644
--- a/docbook/gnc-docbookx.dtd
+++ b/docbook/gnc-docbookx.dtd
@@ -38,7 +38,7 @@ https://www.w3.org/2003/entities/2007/w3centities-f.ent
 <!ENTITY vers-stable "&series-stable;.12">
 <!ENTITY series-unstable "master">
 <!ENTITY vers-unstable "">
-<!ENTITY app-fq-vers "1.52">
+<!ENTITY app-fq-vers "1.53">
 
 <!ENTITY manrevision "&vers-stable;">
 <!ENTITY date "25 September 2022">

commit 7a108b111e9ccc2516ad621233554406f415ba85
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Oct 25 23:33:15 2022 +0200

    Replace "Online Quote Setup" instructions in Guide by links to the
    manual chapter
    
    https://lists.gnucash.org/logs/2022/10/14.html#T15:47:06

diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index e2ebd417..c0154306 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -792,7 +792,7 @@ Income
                   <note>
                     <para>If the <guibutton>Get Online Quotes</guibutton> button is not highlighted, and it is not tickable,
                       then the &app-fq; package is not installed.
-                      See the section on <xref linkend="invest-stockprice-auto-install3"/>.
+                      See the chapter <ulink url="&url-docs;C/gnucash-help/finance-quote.html">Setting Up the Quote Retrieval</ulink> in the manual.
                     </para>
                   </note>
 
@@ -1267,79 +1267,11 @@ Income
         be installed in order to activate this feature.
       </para>
 
-      <para>To determine if the <application>Perl</application> module &app-fq;
-        is already installed on your system, type <command>perldoc Finance::Quote</command> in a
-        terminal window and check to see if there is any documentation available. If you see the
-        documentation, then the module is installed, if you do not see the documentation, then it
-        has not been installed.
+      <para>See the chapter
+        <ulink url="&url-docs;C/gnucash-help/finance-quote.html">Setting Up the Quote Retrieval</ulink>
+        in the manual.
       </para>
 
-      <sect3 id="invest-stockprice-auto-install3">
-        <title>Installing &app-fq;</title>
-        <para>The process of installing &app-fq; depends on the system. </para>
-
-        <procedure>
-          <title>Installing &app-fq; on &lin;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Run the command <command>which gnc-fq-update</command> to check <filename>gnc-fq-update</filename> program is in your PATH environment
-            variable.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote>
-          </simpara>
-            <substeps><step id="gnc-fq-update-not-found">
-                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is                installed.</simpara>
-                </step>
-            </substeps>
-          </step>
-          <step><simpara>Run the command <command>sudo gnc-fq-update</command> or <command>su -c gnc-fq-update</command> in order to run it with root privilege.
-            It depends on your distribution.
-          If <filename>gnc-fq-update</filename> is not in your PATH, specify full path of <filename>gnc-fq-update</filename>
-            instead, which is found by <xref linkend="gnc-fq-update-not-found" />.</simpara>
-            <para>
-              This will launch a <application>Perl</application> <acronym><ulink url="https://www.cpan.org/">CPAN</ulink></acronym><footnote>
-                <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
-              module internally. When you launch the CPAN module for the first time, you must setup and configure it. However, on the most systems if you accept the default settings
-              or answer the first question <computeroutput>Are you ready for manual
-              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully.              </para>
-          </step>
-
-          <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
-        </procedure>
-
-
-        <procedure>
-          <title>Installing &app-fq; on &mac;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Install Xcode if it is not installed.</simpara>
-              <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
-          </step>
-          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara>              <para>You can run it from the dmg or copy it to the same
-                folder to which you copied &app;.
-                It will open a Terminal window and run a script for you
-                which will ask lots of questions. Accept the default for each unless you know what
-                you’re doing.
-            </para>
-          </step>
-        </procedure>
-
-        <procedure>
-          <title>Installing &app-fq; on &win;</title>
-          <step><simpara>Close &app;.</simpara></step>
-          <step><simpara>Run <menuchoice>
-                               <guimenu>Start</guimenu>
-                               <guisubmenu>&app;</guisubmenu>
-                               <guimenuitem>Install Online Price Retrieval</guimenuitem></menuchoice>.
-            </simpara>
-          </step>
-        </procedure>
-
-        <note>
-          <para>If you feel uncomfortable about performing any of these steps, please either email the &app;-user
-            mailing list (<email>gnucash-user at gnucash.org</email>) for help or come to the &app; IRC
-            channel on irc.gnome.org. You can also leave out this step and manually update your
-            stock prices.
-          </para>
-        </note>
-      </sect3>
-
       <sect3 id="invest-stockprice-auto-configure3">
         <title>Configuring Securities for Online Quotes</title>
 
@@ -1357,55 +1289,15 @@ Income
           to return to the <guilabel>Price Database</guilabel> and click on the <guibutton>Get
           Quotes</guibutton> button to update your stock prices on the Internet.
         </para>
-
-        <para>The command <command>gnucash-cli --quotes get <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command><footnote>
-          <simpara>The Online Quotes Retrieval command has been changed from &app; 4.0. The old command
-            <command>gnucash --add-price-quotes <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command> is            still available, but it is deprecated and will be removed in the future release.
-            If you've upgraded from &app; 3.11 or previous version,            it is recommended to use the new command <command>gnucash-cli</command>.</simpara>
-          </footnote> can be used to
-          fetch the current prices of your stocks. The file specified
-          <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename> will depend on the name and
-          location of your data file. This can be determined by the name displayed in the top frame
-          of the &app; window, before the <quote>-</quote>. The file name can also be found under
-          <guimenu>File</guimenu> in the recently opened file list; the first item, numbered 1, is
-          the name of the currently open file.
-        </para>
-
-
       </sect3>
 
       <sect3 id="invest-stockprice-auto-scheduler">
         <title>Configuring for Getting Online Quotes Periodically</title>
 
-        <para>You have to register the <command>gnucash-cli</command> with a scheduler in order to get Online Quotes automatically and periodically.
-          The method depends on your OS. For example, suppose you want to update
-          your file on 16:00 on every Friday.
-        </para>
-
-        <procedure>
-          <title>Register <command>gnucash-cli</command> with <application>cron</application> on &lin; and &mac;</title>
-          <step><simpara>Run <command>crontab -e</command>.</simpara></step>
-          <step><para>Add the following line to your crontab:
-            <informalexample>
-              <screen>0 16 * * 5 gnucash-cli --quotes get <replaceable>${HOME}/gnucash-filename</replaceable> > /dev/null 2>&1</screen>
-            </informalexample></para>
-          </step>
-        </procedure>
-
-        <procedure>
-          <title>Register <command>gnucash-cli</command> with Task Scheduler on &win;</title>
-          <step><simpara>Select <menuchoice><guimenu>Start</guimenu><guisubmenu>Windows Administrative Tools</guisubmenu><guimenuitem>Task Scheduler</guimenuitem></menuchoice>.</simpara></step>
-          <step><simpara>Select <guimenuitem>Create Task</guimenuitem>.</simpara></step>
-          <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
-        </procedure>
-
-        <para>See <ulink url="&url-docs-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink>          and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
-        </para>
-
-        <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and
-          require several hours after the exchange closes before being available. If
-          <acronym>NAV</acronym>s are downloaded before the current days <acronym>NAV</acronym>s are
-          determined, yesterday’s <acronym>NAV</acronym>s are retrieved.
+        <para>After you have verified the proper fetching of Online Quotes for your commodities, 
+         you can tell your operating system to fetch the quotes periodically. See the section
+        <ulink url="&url-docs;C/gnucash-help/finance-quote-scheduler.html">Configuring for Getting Quotes Periodically</ulink>
+        in the manual.
         </para>
       </sect3>
     </sect2>

commit 2f410033ff1721015eed79ed0e1e504103d89d57
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Tue Oct 25 01:58:23 2022 +0200

    Bug 798645 - screens instead of WINDOWS

diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index b93152c7..0b7eda79 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -814,14 +814,26 @@ Translators:
         Tabs can be configured in Preferences to appear along any side of the &app; window.
       </para>
 
-      <para>To see the full name for a tab, hover the mouse pointer over an account window tab.
+      <para>To see the full name for a tab, hover the mouse pointer over an account window tab. If
+        more tabs are open than can be displayed across the window, some tabs will not display.
       </para>
 
-      <para>If more screens are open than can be displayed across the screen, some tabs will not display. You
-        can move through all tabs by clicking the arrows on either end of the tab bar. A complete
-        list of tabs can be viewed by right-clicking the Tab Bar and any tab can be selected by
-        clicking it.
-      </para>
+      <tip>
+        <orderedlist>
+          <listitem>
+            <simpara>You can move through all tabs by clicking the arrows on either end of the tab bar.</simpara>
+          </listitem>
+        <listitem>
+          <simpara>You can also change the alignment of the tab bar by changing the
+            <guilabel>Tab Position</guilabel> in
+            <ulink url="&url-docs;C/gnucash-help/set-prefs.html#prefs-window">The Preferences window, Windows tab</ulink>.</simpara>
+          </listitem>
+          <listitem>
+            <simpara>A complete list of tabs can be viewed by right-clicking the Tab Bar and
+              any tab can be selected by clicking it.</simpara>
+          </listitem>
+        </orderedlist>
+      </tip>
     </sect2>
 
     <sect2 id="basics-options2">

commit 62327bb26201d51b8158308865cf957635ce8df1
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sat Oct 22 14:55:01 2022 +0200

    Enhance bookinfos by subtitle and titleabbrev;drop "Help" from manual
    
    titleabbrev allows yelp to display the version in its titlebar

diff --git a/guide/C/index.docbook b/guide/C/index.docbook
index c272551b..e4b4ddac 100644
--- a/guide/C/index.docbook
+++ b/guide/C/index.docbook
@@ -22,7 +22,9 @@
 <!-- appropriate code -->
   <bookinfo>
     <title>&app; Tutorial and Concepts Guide</title>
-    <edition>V&manrevision;</edition>
+    <subtitle>The Didactical Documentation</subtitle>
+    <edition>v&manrevision;</edition>
+    <titleabbrev>&appname; Guide &manrevision;</titleabbrev>
     <copyright>
       <year>2009-2022</year> <holder>&appname; Documentation Team</holder>
     </copyright>
@@ -54,14 +56,14 @@
     <copyright>
       <year>2001</year> <holder>Carol Champagne and Chris Lyttle</holder>
     </copyright>
-<!-- translators: uncomment this:
 
+<!-- translators: uncomment this:
   <copyright>
    <year>2000</year>
    <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
   </copyright>
+-->
 
-   -->
     <publisher>
       <publishername>The &appname; Documentation Team</publishername>
 <address>
diff --git a/manual/C/index.docbook b/manual/C/index.docbook
index 8a25ba99..db464aa4 100644
--- a/manual/C/index.docbook
+++ b/manual/C/index.docbook
@@ -14,19 +14,21 @@
 <!-- please do not change the id; for translations, change lang to -->
 <!-- appropriate code -->
   <bookinfo>
-    <title>&app; Help Manual</title>
+    <title>&appname; Manual</title>
+    <subtitle>The Technical Reference</subtitle>
     <edition>v&manrevision;</edition>
+    <titleabbrev>&appname; Manual &manrevision;</titleabbrev>
     <copyright>
       <year>2002-2022</year> <holder>&appname; Documentation Team</holder>
     </copyright>
-<!-- translators: uncomment this:
 
+<!-- translators: uncomment this:
    <copyright>
       <year>2000</year>
       <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
    </copyright>
+-->
 
-  -->
     <publisher>
       <publishername>&appname; Documentation Team</publishername>
 <address><email>gnucash-user at gnucash.org</email></address>

commit 540f0cef70b96bb025f4096e73828e158e05d209
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Sun Oct 9 22:40:54 2022 +0200

    Guide:C: Fix image declarations
    
    Some were not proper scaled.
    Now all appear in the List of Figures.

diff --git a/guide/C/ch_accts.xml b/guide/C/ch_accts.xml
index 7f45e20e..bece4198 100644
--- a/guide/C/ch_accts.xml
+++ b/guide/C/ch_accts.xml
@@ -43,31 +43,28 @@ Translators:
       type.
     </para>
 
-    <screenshot id="accts-AccountRelationships">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/basics_AccountRelationships.png"
-                     srccredit="Geert Janssens"/>
-        </imageobject>
-
-        <imageobject role="fo">
-          <imagedata fileref="figures/basics_AccountRelationships.svg"
-                     format="SVG" srccredit="Geert Janssens"
-                     contentwidth="4in"/>
-        </imageobject>
-
-        <textobject>
-          <phrase>The basic accounts relationships</phrase>
-        </textobject>
-
-        <caption>
-          <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
-            through income and decreases through expenses. The arrows represent the movement of
-            value.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>The basic accounts relationships</title>
+      <screenshot id="accts-AccountRelationships">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/basics_AccountRelationships.png"
+                       srccredit="Geert Janssens"/>
+          </imageobject>
+          <imageobject role="fo">
+            <imagedata fileref="figures/basics_AccountRelationships.svg"
+                       srccredit="Geert Janssens"
+                       contentwidth="4in"/>
+          </imageobject>
+          <caption>
+            <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
+              through income and decreases through expenses. The arrows represent the movement of
+              value.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <sect3 id="accts-bsa2">
       <title>Balance Sheet Accounts</title>
@@ -377,41 +374,37 @@ Translators:
         </menuchoice>).
       </para>
 
-      <screenshot id="accts-DefaultIncomeAccounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
-                         srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Default income accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the standard <emphasis>Income</emphasis> accounts
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
-
-      <screenshot id="accts-DefaultExpenseAccounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
+      <figure pgwide="1">
+        <title>Default Income Accounts</title>
+        <screenshot id="accts-DefaultIncomeAccounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_DefaultIncomeAccounts.png"
                          srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Some default expense accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows some standard <emphasis>Expenses</emphasis> accounts
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            </imageobject>
+            <caption>
+              <para>This image shows the standard <emphasis>Income</emphasis> accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
+
+      <figure pgwide="1">
+        <title>Default Expense Accounts</title>
+        <screenshot id="accts-DefaultExpenseAccounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_DefaultExpenseAccounts.png"
+                           srccredit="Cristian Marchi"/>
+            </imageobject>
+           <caption>
+              <para>This image shows some standard <emphasis>Expense</emphasis> accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="accts-other-types">
@@ -493,23 +486,21 @@ Translators:
             <guilabel>New top level account</guilabel>)
           </para>
 
-          <screenshot id="accts-CreateAssetsAccounts">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/accts_CreateAssetsAccount.png"
+          <figure pgwide="1">
+            <title>Creating an Assets account</title>
+            <screenshot id="accts-CreateAssetsAccounts">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/accts_CreateAssetsAccount.png"
                              srccredit="Cristian Marchi"/>
-              </imageobject>
-
-              <textobject>
-                <phrase>Creating an Assets account</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the dialog to create an assets account
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+                </imageobject>
+                <caption>
+                  <para>This image shows the dialog to create an asset account.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -540,23 +531,21 @@ Translators:
       <para>When you have created the top-level accounts, the main Account page in &app; should look like below.
       </para>
 
-      <screenshot id="accts-toplevel">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_toplevel.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Basic Top-level Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the basic top-level accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Basic Top-level Accounts</title>
+        <screenshot id="accts-toplevel">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_toplevel.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the basic top-level accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="accts-examples-organization2">
@@ -668,23 +657,21 @@ Translators:
       <para>After you have created these additional sub-accounts, the end result should look like below
       </para>
 
-      <screenshot id="accts-tree">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/accts_tree.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Basic Chart of Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows a simple chart of accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Basic Chart of Accounts</title>
+        <screenshot id="accts-tree">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/accts_tree.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows a simple chart of accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Save this chart of accounts with the name <filename>gcashdata_3</filename>, as well as
         <filename>gcashdata_3emptyAccts</filename>, as we will continue to use them in the later
diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index c38fe244..b93152c7 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -129,7 +129,8 @@ Translators:
       </para>
 
       <figure pgwide="1">
-        <title>The basic accounts relationships</title><screenshot id="basics-AccountRelationships">
+        <title>The basic accounts relationships</title>
+        <screenshot id="basics-AccountRelationships">
           <mediaobject>
             <imageobject role="html">
               <imagedata fileref="figures/basics_AccountRelationships.png"
@@ -141,11 +142,6 @@ Translators:
                          format="SVG" srccredit="Geert Janssens"
                          contentwidth="4in"/>
             </imageobject>
-
-            <textobject>
-              <phrase>The basic accounts relationships</phrase>
-            </textobject>
-
             <caption>
               <para>A graphical view of the relationship between the 5 basic accounts. Net worth (equity) increases
                 through income and decreases through expenses. The arrows represent the movement of
@@ -622,23 +618,21 @@ Translators:
         program:
       </para>
 
-      <screenshot id="basics-TipOfDay">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/basics_TipOfDay.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Tip of the Day</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <guilabel>Tip of the Day</guilabel>.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Tip of the Day</title>
+        <screenshot id="basics-TipOfDay">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_TipOfDay.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the <guilabel>Tip of the Day</guilabel>.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>These tips provide useful information for beginning users. To view more of the tips, click
         <guibutton>Forward</guibutton> to continue. If you do not wish to see this screen box on
@@ -657,23 +651,21 @@ Translators:
         Accounts</guilabel> are shown.
       </para>
 
-      <screenshot id="basics-Accounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/basics_Accounts.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Account Tree Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <guilabel>Accounts</guilabel> window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The basic accounts relationships</title>
+        <screenshot id="basics-Accounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_Accounts.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the <guilabel>Accounts</guilabel> window.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The Account Tree window (also known as a Chart of Accounts, or CoA) provides an overview of the data
         contained in the current file. It contains a list of account names and their current
@@ -719,28 +711,21 @@ Translators:
         look similar to a checkbook register.
       </para>
 
-      <screenshot id="basics-CheckAccount">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/basics_CheckAccount.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>The Checking Account Register</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <guilabel>Checking Account - Register </guilabel> with several transactions.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Checking Account Register</title>
+        <screenshot id="basics-CheckAccount">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/basics_CheckAccount.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>This image shows the <guilabel>Checking Account - Register</guilabel> with several transactions.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para><xref linkend="chapter_txns"></xref> explains more about account register windows and how to enter
         data into them. For now, note that the parts of an account register window are similar to
@@ -1174,20 +1159,10 @@ Translators:
                 <title>Save screen when <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel> is selected.</title>
                 <screenshot id="basics-SaveXML">
                   <mediaobject>
-                    <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Cristian Marchi" width="&img-w;"/>
-                    </imageobject>
-
-                    <imageobject role="fo">
+                    <imageobject>
                       <imagedata fileref="figures/basics_SaveXML.png"
-                         srccredit="Cristian Marchi"/>
+                                 srccredit="Cristian Marchi"/>
                     </imageobject>
-
-                    <textobject>
-                      <phrase>The Save screen</phrase>
-                    </textobject>
-
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
                         Format</guilabel> is <guilabel>xml</guilabel> or <guilabel>sqlite3</guilabel>.
@@ -1231,20 +1206,10 @@ Translators:
                 <title>Save screen when <guilabel>mysql</guilabel> or <guilabel>postgres</guilabel> is selected.</title>
                 <screenshot id="basics-SaveSQL">
                   <mediaobject>
-                    <imageobject role="html">
-                      <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Marchi Cristian" width="&img-w;"/>
-                    </imageobject>
-
                     <imageobject role="fo">
                       <imagedata fileref="figures/basics_SaveSQL.png"
-                             srccredit="Cristian Marchi"/>
+                                 srccredit="Cristian Marchi"/>
                     </imageobject>
-
-                    <textobject>
-                      <phrase>The Save screen</phrase>
-                    </textobject>
-
                     <caption>
                       <para>This image shows the <guilabel>Save</guilabel> screen when the selected <guilabel>Data
                         Format</guilabel> is <guilabel>mysql</guilabel> or
@@ -1738,14 +1703,13 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the first screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant.
                 </para>
@@ -1771,16 +1735,10 @@ Translators:
         <figure pgwide="1">
           <title>New Account Hierarchy Setup: Book Options</title><screenshot id="basics-NewBookOptions">
             <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger" width="&img-w;"/>
-              </imageobject>
-
-              <imageobject role="fo">
+              <imageobject>
                 <imagedata fileref="figures/basics_NewBookOpts.png"
-                         srccredit="Frank H. Ellenberger"/>
+                           srccredit="Frank H. Ellenberger"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the second screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you select the <guilabel>Book Options</guilabel>.
@@ -1807,14 +1765,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_currency.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the third screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you select the <guilabel>Currency</guilabel>.
@@ -1842,14 +1798,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Accounts.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the fourth screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you choose the various <guilabel>Accounts</guilabel>.
@@ -1872,14 +1826,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Setup.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
-
               <caption>
                 <para>This image shows the fifth screen of the <guilabel>New Account Hierarchy Setup</guilabel> assistant
                   where you can set <guilabel>Opening Balance</guilabel>.
@@ -1900,12 +1852,12 @@ Translators:
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="John Ralls" width="&img-w;"/>
+                           srccredit="John Ralls" width="&img-w;"/>
               </imageobject>
 
               <imageobject role="fo">
                 <imagedata fileref="figures/basics_NewAccountHierarchySetup_Finish.png"
-                         srccredit="John Ralls"/>
+                           srccredit="John Ralls"/>
               </imageobject>
 
               <caption>
@@ -1931,12 +1883,7 @@ Translators:
         <figure pgwide="1">
           <title>Tutorial: Starting Account View of the Test File</title><screenshot id="basics-EmptyAccounts">
             <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/basics_EmptyAccounts.png"
-                           srccredit="Frank H. Ellenberger" width="&img-w;"/>
-              </imageobject>
-
-              <imageobject role="fo">
+              <imageobject>
                 <imagedata fileref="figures/basics_EmptyAccounts.png"
                            srccredit="Frank H. Ellenberger"/>
               </imageobject>
diff --git a/guide/C/ch_bus_features.xml b/guide/C/ch_bus_features.xml
index 7643be8e..612afb8b 100644
--- a/guide/C/ch_bus_features.xml
+++ b/guide/C/ch_bus_features.xml
@@ -175,36 +175,25 @@
       </para>
 
       <figure>
-        <title>Sales Tax Tables Editor</title><screenshot id="bus-taxmain">
+        <title>Sales Tax Tables Editor</title>
+        <screenshot id="bus-taxmain">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_tax_main.png"
-                         srccredit="Chris Good" width="&img-w;" />
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_tax_main.png"
-                        srccredit="Chris Good" />
+                         srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>Sales Tax Tables Editor</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
       <figure>
-        <title>New Sales Tax Table Entry</title><screenshot id="bus-taxnew">
+        <title>New Sales Tax Table Entry</title>
+        <screenshot id="bus-taxnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_tax_new.png"
                          srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>New Sales Tax Table Entry</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -541,40 +530,37 @@
       </para>
 
       <figure>
-        <title>Entering Company Information</title><screenshot id="bus-co-reg">
+        <title>Entering Company Information</title>
+        <screenshot id="bus-co-reg">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_co_reg.png"
                         srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>Company Information</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
       <para>Here you can:
+        <itemizedlist>
+          <listitem>
+            <para>Enter the name of your company along with contact information such as your phone number, fax number,
+              e-mail address and website URL.
+            </para>
+          </listitem>
+  
+          <listitem>
+            <para>Enter your company’s tax payer id number in the <guilabel>Company ID</guilabel> field.
+            </para>
+          </listitem>
+  
+          <listitem>
+            <para>Select default tax tables applicable to your most common customers and vendors.
+            </para>
+          </listitem>
+        </itemizedlist>
       </para>
 
-      <itemizedlist>
-        <listitem>
-          <para>Enter the name of your company along with contact information such as your phone number, fax number,
-            e-mail address and website URL.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Enter your company’s tax payer id number in the <guilabel>Company ID</guilabel> field.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Select default tax tables applicable to your most common customers and vendors.
-          </para>
-        </listitem>
-      </itemizedlist>
     </sect2>
 
     <sect2 id="bus_setup_pref">
@@ -638,31 +624,25 @@
       </para>
 
       <figure>
-        <title>Billing Terms Editor</title><screenshot id="bus-termsmain">
+        <title>Billing Terms Editor</title>
+        <screenshot id="bus-termsmain">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_main.png"
-                        srccredit="Chris Good" />
+                         srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>Billing Terms Editor</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
 
       <figure>
-        <title>New Billing Term</title><screenshot id="bus-termsnew">
+        <title>New Billing Term</title>
+<screenshot id="bus-termsnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_terms_new.png"
                          srccredit="Chris Good" />
             </imageobject>
-
-            <textobject>
-              <phrase>New Billing Term</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -816,16 +796,13 @@
         </para>
 
         <figure>
-          <title>New Customer Registration Window</title><screenshot id="bus-ar-custnew">
+          <title>New Customer Registration Window</title>
+          <screenshot id="bus-ar-custnew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_custnew.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>New Customer Registration Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -845,16 +822,13 @@
         </para>
 
         <figure>
-          <title>Find Customer Window</title><screenshot id="bus-ar-custfind">
+          <title>Find Customer Window</title>
+          <screenshot id="bus-ar-custfind">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_custfind.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Find Customer Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -914,16 +888,13 @@
         </para>
 
         <figure>
-          <title>Creating a New Invoice</title><screenshot id="bus-ar-invoicenew">
+          <title>Creating a New Invoice</title>
+          <screenshot id="bus-ar-invoicenew">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoicenew.png"
                             srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Creating a New Invoice</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -941,17 +912,15 @@
           an itemized list of goods and services you refunded instead.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Edit Invoice Window</title><screenshot id="bus-ar-invoiceedit">
+          <title>Edit Invoice Window</title>
+          <screenshot id="bus-ar-invoiceedit">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoiceedit.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Edit Invoice Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -971,16 +940,13 @@
         </para>
 
         <figure>
-          <title>Post Invoice Window</title><screenshot id="bus-ar-invoicepost">
+          <title>Post Invoice Window</title>
+          <screenshot id="bus-ar-invoicepost">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoicepost.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Post Invoice Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1035,17 +1001,15 @@
           menu item.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Invoice Print Output</title><screenshot id="bus-ar-invoiceprint">
+          <title>Invoice Print Output</title>
+          <screenshot id="bus-ar-invoiceprint">
             <mediaobject>
               <imageobject>
                 <imagedata fileref="figures/bus_ar_invoiceprint.png"
-                            srccredit="Patrick Schweiger" />
+                           srccredit="Patrick Schweiger" />
               </imageobject>
-
-              <textobject>
-                <phrase>Invoice Print Output</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1127,11 +1091,12 @@
       </para>
 
       <figure>
-        <title>New Customer Job</title><screenshot id="bus-ar-jobnew">
+        <title>New Customer Job</title>
+        <screenshot id="bus-ar-jobnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_jobnew.png"
-                        srccredit="Patrick Schweiger" />
+                         srccredit="Patrick Schweiger" />
             </imageobject>
 
             <textobject>
@@ -1183,26 +1148,13 @@
       </para>
 
       <figure>
-        <title>Process Customer Payment</title><screenshot id="bus-ar-payment">
+        <title>Process Payment From Customer</title>
+        <screenshot id="bus-ar-payment">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_payment.png"
-                        srccredit="Patrick Schweiger" width="&img-w;" scalefit="0" />
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_ar_payment.png"
-                        srccredit="Patrick Schweiger" />
+                         srccredit="Patrick Schweiger" />
             </imageobject>
-
-            <textobject>
-              <phrase>Process Payment from Customer</phrase>
-            </textobject>
-
-            <caption>
-              <para>Process Payment from Customer
-              </para>
-            </caption>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1237,16 +1189,13 @@
       </para>
 
       <figure>
-        <title>The New Style Sheet Window</title><screenshot id="bus-ar-invoicechange1">
+        <title>New Style Sheet Window</title>
+        <screenshot id="bus-ar-invoicechange1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange1.png"
-                        srccredit="Cristian Marchi" />
+                         srccredit="Cristian Marchi" />
             </imageobject>
-
-            <textobject>
-              <phrase>New Style Sheet Window</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1277,22 +1226,13 @@
       </para>
 
       <figure>
-        <title>HTML Style Sheets Example Window</title><screenshot id="bus-ar-invoicechange2">
+        <title>HTML Style Sheet Example Window</title>
+        <screenshot id="bus-ar-invoicechange2">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_ar_invoicechange2.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
+            <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange2.png"
-                        srccredit="Cristian Marchi"/>
+                         srccredit="Cristian Marchi"/>
             </imageobject>
-
-            <textobject>
-              <phrase>HTML Style Sheets Example Window</phrase>
-            </textobject>
-
             <caption>
               <para>The <acronym>HTML</acronym> Style Sheets window with an example Background Tile, Heading Banner, and
                 Logo.
@@ -1318,18 +1258,15 @@
         sheet demonstrated above.
       </para>
 
+<!-- ToDo: unshrink -->
       <figure>
-        <title>HTML Style Sheets Example Output</title><screenshot id="bus-ar-invoicechange3">
+        <title>HTML Style Sheets Example Output</title>
+        <screenshot id="bus-ar-invoicechange3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ar_invoicechange3.png"
-                        srccredit="Patrick Schweiger" />
+                         srccredit="Patrick Schweiger" />
             </imageobject>
-
-            <textobject>
-              <phrase>HTML Style Sheets Example Output</phrase>
-            </textobject>
-
             <caption>
               <para>The hideous invoice which results from the graphics selected in the style sheet.
               </para>
@@ -1421,15 +1358,13 @@
         </para>
 
         <figure>
-          <title>New Vendor Registration Window</title><screenshot id="bus-ap-vendornew">
+          <title>New Vendor Registration Window</title>
+          <screenshot id="bus-ap-vendornew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendornew.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_vendornew.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>New Vendor Registration Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1448,16 +1383,15 @@
           payments.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Find Vendor Window</title><screenshot id="bus-ar-vendorfind">
+          <title>Find Vendor Window</title>
+          <screenshot id="bus-ar-vendorfind">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_vendorfind.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_vendorfind.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Find Vendor Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1519,15 +1453,13 @@
         </para>
 
         <figure>
-          <title>New Bill Registration Window</title><screenshot id="bus-ap-billnew">
+          <title>New Bill Registration Window</title>
+          <screenshot id="bus-ap-billnew">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billnew.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_billnew.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>New Bill Registration Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1544,16 +1476,15 @@
           list of goods and services the vendor refunded instead.
         </para>
 
+<!-- ToDo: unshrink -->
         <figure>
-          <title>Edit Bill Window</title><screenshot id="bus-ap-billedit">
+          <title>Edit Bill Window</title>
+          <screenshot id="bus-ap-billedit">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billedit.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_billedit.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Edit Bill Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1572,15 +1503,13 @@
         </para>
 
         <figure>
-          <title>Post Bill Window</title><screenshot id="bus-ap-billpost">
+          <title>Post Bill Window</title>
+          <screenshot id="bus-ap-billpost">
             <mediaobject>
               <imageobject>
-                <imagedata fileref="figures/bus_ap_billpost.png" srccredit="Patrick Schweiger"/>
+                <imagedata fileref="figures/bus_ap_billpost.png"
+                           srccredit="Patrick Schweiger"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Post Bill Window</phrase>
-              </textobject>
             </mediaobject>
           </screenshot>
         </figure>
@@ -1628,15 +1557,12 @@
       </para>
 
       <figure>
-        <title>New Vendor Job</title><screenshot id="bus-ap-jobnew">
+        <title>New Vendor Job</title>
+        <screenshot id="bus-ap-jobnew">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_ap_jobnew.png" srccredit="Jon Lapham"/>
             </imageobject>
-
-            <textobject>
-              <phrase>New Vendor Job</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -1677,24 +1603,13 @@
       </para>
 
       <figure>
-        <title>Process Vendor Payment</title><screenshot id="bus-ap-payment">
+        <title>Process Payment To Vendor</title>
+        <screenshot id="bus-ap-payment">
           <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/bus_ap_payment.png" srccredit="Patrick Schweiger"/>
+            <imageobject>
+              <imagedata fileref="figures/bus_ap_payment.png"
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Process Payment to Vendor</phrase>
-            </textobject>
-
-            <caption>
-              <para>Process Payment to Vendor
-              </para>
-            </caption>
           </mediaobject>
         </screenshot>
       </figure>
@@ -2045,16 +1960,13 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Initial Setup</title><screenshot id="bus-pay-ex1">
+        <title>Payroll Example: Initial Setup</title>
+        <screenshot id="bus-pay-ex1">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex1.png"
-                 srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 1</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -2217,18 +2129,15 @@
       <para>From the checking account, enter the split transaction for employee 1. It should look like this:
       </para>
 
+<!-- ToDo: unshrink -->
       <figure>
-        <title>Payroll Example: Employee Split Transaction</title><screenshot id="bus-pay-ex2">
+        <title>Payroll Example: Employee Split Transaction</title>
+        <screenshot id="bus-pay-ex2">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex2.png"
-                    srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 2</phrase>
-            </textobject>
-
             <caption>
               <para>The Split Transaction for Employee 1
               </para>
@@ -2250,16 +2159,13 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Accounts After Salaries Paid</title><screenshot id="bus-pay-ex3">
+        <title>Payroll Example: Accounts After Salaries Paid</title>
+<screenshot id="bus-pay-ex3">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex3.png"
-                    srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 3</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
@@ -2272,16 +2178,13 @@
       </para>
 
       <figure>
-        <title>Payroll Example: Accounts After Paying Government</title><screenshot id="bus-pay-ex4">
+        <title>Payroll Example: Accounts After Paying Government</title>
+        <screenshot id="bus-pay-ex4">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/bus_pay_ex4.png"
-                    srccredit="Patrick Schweiger"/>
+                         srccredit="Patrick Schweiger"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Payroll Example 4</phrase>
-            </textobject>
           </mediaobject>
         </screenshot>
       </figure>
diff --git a/guide/C/ch_capgain.xml b/guide/C/ch_capgain.xml
index 0806c95e..2cce94e6 100644
--- a/guide/C/ch_capgain.xml
+++ b/guide/C/ch_capgain.xml
@@ -176,23 +176,22 @@
       main account window which appears like this:
     </para>
 
-    <screenshot id="capgain_appmain">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/capgain_appmain.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Asset Appreciation Main Window</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset appreciation example main window
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>Asset Appreciation Main Window</title>
+      <screenshot id="capgain_appmain">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/capgain_appmain.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>The asset appreciation example main window
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
+
 
     <sect2 id="capgain_exampleunrealized2">
       <title>Unrealized Gains</title>
@@ -203,23 +202,21 @@
          Your main window will resemble this:
       </para>
 
-      <screenshot id="capgain_app2main">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/capgain_app2main.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Asset Appreciation Main Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>Chart of Accounts after unrealized gain
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Asset Appreciation Main Window</title>
+        <screenshot id="capgain_app2main">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/capgain_app2main.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>Chart of Accounts after unrealized gain
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="capgain_examplesell2">
@@ -342,23 +339,21 @@
             $130,000 and <emphasis>Income:Realized Gains</emphasis> with a total of $30,000.
           </para>
 
-          <screenshot id="capgain_app3main">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/capgain_app3main.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Asset Appreciation Main Window</phrase>
-              </textobject>
-
-              <caption>
-                <para>Chart of Accounts after realized gains
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>Asset Appreciation Main Window</title>
+            <screenshot id="capgain_app3main">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/capgain_app3main.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>Chart of Accounts after realized gains
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+           </figure>
         </listitem>
 
         <listitem>
diff --git a/guide/C/ch_cbook.xml b/guide/C/ch_cbook.xml
index 2abdffdf..de77c6d1 100644
--- a/guide/C/ch_cbook.xml
+++ b/guide/C/ch_cbook.xml
@@ -200,23 +200,21 @@
         (<filename>gcashdata_4</filename>). Your chart of accounts should look like this:
       </para>
 
-      <screenshot id="cbook-gcashdata4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cbook_gcashdata4.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Chart of Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the Chart of Accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart Of Accounts</title>
+        <screenshot id="cbook-gcashdata4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cbook_gcashdata4.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the Chart of Accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cbook-puttoget-transactions">
@@ -234,23 +232,22 @@
             account. Your <emphasis>Checking</emphasis> account should now look like this:
           </para>
 
-          <screenshot id="cbook-transferin">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_transferin.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Checking Account Register</title>
+            <screenshot id="cbook-transferin">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_transferin.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Checking Account Register.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -263,23 +260,22 @@
             Your checking account should now look like this;
           </para>
 
-          <screenshot id="cbook-checkexamp">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_checkexamp.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register after registering some more checks.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Checking Account Register After Registering Some More Checks</title>
+            <screenshot id="cbook-checkexamp">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_checkexamp.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Checking Account Register after registering some more checks.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -291,23 +287,22 @@
             25 of March.
           </para>
 
-          <screenshot id="cbook-atm">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_atm.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register with an ATM withdrawal.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Checking Account Register With An ATM Withdrawal</title>
+            <screenshot id="cbook-atm">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_atm.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Checking Account Register with an ATM withdrawal.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
     </sect2>
@@ -319,23 +314,21 @@
         statement:
       </para>
 
-      <screenshot id="cbook-bankstmt">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cbook_bankstmt.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A sample Bank Statement</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows a sample Bank Statement.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>A sample Bank Statement</title>
+        <screenshot id="cbook-bankstmt">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cbook_bankstmt.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows a sample Bank Statement.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <orderedlist>
         <listitem>
@@ -349,23 +342,22 @@
             reconcile window should look like this:
           </para>
 
-          <screenshot id="cbook-reconexamp">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_reconexamp.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The reconcile window</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the reconcile window with a $5 difference.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Reconcile Window</title>
+            <screenshot id="cbook-reconexamp">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_reconexamp.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the reconcile window with a $5 difference.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
 
           <para>Notice that your reconciled balance differs from your ending balance by $5.00. If you look at the
             sample bank statement, you will see there is a $5.00 service charge that has not been
@@ -384,23 +376,22 @@
             should now look like this:
           </para>
 
-          <screenshot id="cbook-servch">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_servch.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Checking Account Register with service charge added.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+            <figure>
+              <title>The Checking Account With Service Charge</title>
+              <screenshot id="cbook-servch">
+                <mediaobject>
+                  <imageobject>
+                    <imagedata fileref="figures/cbook_servch.png"
+                               srccredit="Bengt Thuree" />
+                  </imageobject>
+                  <caption>
+                    <para>This image shows the Checking Account Register with service charge added.
+                    </para>
+                  </caption>
+                </mediaobject>
+              </screenshot>
+            </figure>
         </listitem>
 
         <listitem>
@@ -413,23 +404,22 @@
             indicates <guilabel>Reconciled: USD 1451.79</guilabel>
           </para>
 
-          <screenshot id="cbook-reconciledCheckAct">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_reconciledCheckAct.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>The Checking Account Register</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the reconciled Checking Account Register.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+<!-- ToDo: unshrink -->
+          <figure>
+            <title>The Reconciled Checking Account</title>
+            <screenshot id="cbook-reconciledCheckAct">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_reconciledCheckAct.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the reconciled Checking Account Register.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+            </figure>
         </listitem>
       </orderedlist>
     </sect2>
@@ -441,23 +431,22 @@
         Your chart of accounts is steadily growing, and it should now look like this:
       </para>
 
-      <screenshot id="cbook-chartaccts5">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cbook_chartaccts5.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Chart of Accounts</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the Chart of Accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Chart of Accounts</title>
+        <screenshot id="cbook-chartaccts5">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cbook_chartaccts5.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the Chart of Accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cbook-puttoget-reports">
@@ -480,23 +469,21 @@
             .
           </para>
 
-          <screenshot id="cbook-puttoget2-Cash">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_CashFlow.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Cash Flow report for the month of March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Cash Flow report after <xref linkend="chapter_cbook"></xref>.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Cash Flow report for the month of March</title>
+            <screenshot id="cbook-puttoget2-Cash">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_CashFlow.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Cash Flow report after <xref linkend="chapter_cbook"></xref>.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -510,23 +497,21 @@
             .
           </para>
 
-          <screenshot id="cbook-puttoget2-TransactionRptChecking">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_TransactionRptAssets.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Assets accounts during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the Assets accounts during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Transaction Report For The Assets During March</title>
+            <screenshot id="cbook-puttoget2-TransactionRptChecking">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_TransactionRptAssets.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the Assets accounts during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -534,23 +519,21 @@
             account.
           </para>
 
-          <screenshot id="cbook-puttoget2-TransactionRptExpenses">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Expenses accounts during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the various Expense accounts during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Transaction Report For The Expenses During March</title>
+            <screenshot id="cbook-puttoget2-TransactionRptExpenses">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cbook_TransactionRptExpenses.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the various Expense accounts during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
 
diff --git a/guide/C/ch_cc.xml b/guide/C/ch_cc.xml
index 5fa893f5..8c941134 100644
--- a/guide/C/ch_cc.xml
+++ b/guide/C/ch_cc.xml
@@ -232,46 +232,42 @@
         <para>After reversing the transaction, your credit card account should look something like this:
         </para>
 
-        <screenshot id="cc-Reversing-Transaction-1">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
-                           srccredit="Bengt Thuree"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Refunded a credit card purchase</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image shows <emphasis>Liability:Credit Card</emphasis> - Register after reversing a purchase
-                transaction.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Credit Card account after reversing a purchase</title>
+          <screenshot id="cc-Reversing-Transaction-1">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/cc_Reversing_Transaction_1.png"
+                             srccredit="Bengt Thuree"/>
+              </imageobject>
+              <caption>
+                <para>This image shows <emphasis>Liability:Credit Card</emphasis> - Register after reversing a purchase
+                  transaction.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>And the <emphasis>Expenses:Clothes</emphasis> register should look something like this:
         </para>
 
-        <screenshot id="cc-Reversing-Transaction-2">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
-                           srccredit="Bengt Thuree"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Refunded a credit card purchase</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image shows <emphasis>Expenses:Clothes</emphasis> register after reversing a purchase
-                transaction.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Expenses account after reversing a purchase</title>
+          <screenshot id="cc-Reversing-Transaction-2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/cc_Reversing_Transaction_2.png"
+                             srccredit="Bengt Thuree"/>
+              </imageobject>
+              <caption>
+                <para>This image shows <emphasis>Expenses:Clothes</emphasis> register after reversing a purchase
+                  transaction.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </listitem>
 
       <listitem>
@@ -299,23 +295,21 @@
         this:
       </para>
 
-      <screenshot id="cc-accounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_accounts.png"
-                     srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Starting account structure</phrase>
-          </textobject>
-
-          <caption>
-            <para>Starting account structure for tracking a credit card in the putting it all together example.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Starting account structure for tracking a credit card</title>
+        <screenshot id="cc-accounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_accounts.png"
+                       srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Starting account structure for tracking a credit card in the putting it all together example.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-purchases2">
@@ -335,23 +329,21 @@
       <para>The register window for the credit card liability should look like this:
       </para>
 
-      <screenshot id="cc-purchases">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_purchases.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial credit card purchases</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial credit card purchases.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Initial credit card purchases</title>
+        <screenshot id="cc-purchases">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_purchases.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Initial credit card purchases.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-refund2">
@@ -366,23 +358,21 @@
         column. The transaction looks like this:
       </para>
 
-      <screenshot id="cc-refund">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_refund.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Item return transaction</phrase>
-          </textobject>
-
-          <caption>
-            <para>Returning clothes to Faux Pas Fashions, refund to credit card.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Item return transaction refunded to credit card</title>
+        <screenshot id="cc-refund">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_refund.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Returning clothes to Faux Pas Fashions, refund to credit card.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-interest2">
@@ -394,23 +384,21 @@
         credit card account as an expense.
       </para>
 
-      <screenshot id="cc-interest">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_interest.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Interest charge</phrase>
-          </textobject>
-
-          <caption>
-            <para>Interest charge.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Interest charge on the Credit Card</title>
+        <screenshot id="cc-interest">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_interest.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Interest charge.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-together-reconcile2">
@@ -428,23 +416,17 @@
         final balance of $455. Enter these values in to the initial Reconcile window as shown here.
       </para>
 
-      <screenshot id="cc-reconcile-init">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_reconcile_init.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial reconcile window</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial account reconciliation window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Initial Reconciliation Window For The Credit Card</title>
+        <screenshot id="cc-reconcile-init">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_reconcile_init.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>During the reconciliation process, you check off each transaction in the account as you confirm that
         the transaction appears in both your &app; account and the credit card statement. For this
@@ -452,23 +434,21 @@
         accounts and the credit card statement.
       </para>
 
-      <screenshot id="cc-reconcile">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_reconcile.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Main reconcile window</phrase>
-          </textobject>
-
-          <caption>
-            <para>Main account reconciliation window, demonstrating a discrepancy of $300.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Main Reconciliation Window With A Discrepancy</title>
+        <screenshot id="cc-reconcile">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_reconcile.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Main account reconciliation window, demonstrating a discrepancy of $300.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Some investigation uncovers that you forgot to record a payment you made on March 5th to the credit
         card company for $300, you must enter this payment transaction from your bank account to the
@@ -487,45 +467,37 @@
         card account register should now appear like this:
       </para>
 
-      <screenshot id="cc-payment">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_payment.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Reconciliation and payment</phrase>
-          </textobject>
-
-          <caption>
-            <para>Account register after account reconciliation and payment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Credit Card Account After Reconciliation And Payment</title>
+        <screenshot id="cc-payment">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_payment.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+            <caption>
+              <para>Account register after reconciliation and payment.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Go back to the main window and save your file (<filename>gcashdata_6</filename>). Your chart of
         accounts is steadily growing, and it should now look like this:
       </para>
 
-      <screenshot id="cc-final">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/cc_final.png"
-                       srccredit="Bengt Thuree"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>&app; main window</phrase>
-          </textobject>
-
-          <caption>
-            <para>&app; Chart of Accounts after account reconciliation and payment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>The Chart of Accounts After Account Reconciliation And Payment</title>
+        <screenshot id="cc-final">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/cc_final.png"
+                         srccredit="Bengt Thuree"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="cc-puttoget-save">
@@ -556,23 +528,21 @@
             .
           </para>
 
-          <screenshot id="cc-puttoget2-Cash">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cc_CashFlow.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Cash Flow report for the month of March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Cash Flow report after <xref linkend="chapter_cc"></xref>.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>The Cash Flow report for the month of March</title>
+            <screenshot id="cc-puttoget2-Cash">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cc_CashFlow.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Cash Flow report after <xref linkend="chapter_cc"></xref>.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
@@ -581,51 +551,46 @@
 
           <para>Select the transaction report from
             <menuchoice>
-              <guimenu>Reports</guimenu> <guimenuitem>Transaction Report</guimenuitem>
-            </menuchoice>
-            .
+              <guimenu>Reports</guimenu><guimenuitem>Transaction Report</guimenuitem>
+            </menuchoice>.
           </para>
 
-          <screenshot id="cc-puttoget2-TransactionRptVisa">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cc_TransactionRptVisa.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Visa account during March/April</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the Visa account during March/April.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>The Transaction Report for the Visa account during March/April</title>
+            <screenshot id="cc-puttoget2-TransactionRptVisa">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cc_TransactionRptVisa.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the Visa account during March/April.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
           <para>Now let’s change the transaction report to only show the various Expenses accounts.
           </para>
 
-          <screenshot id="cc-puttoget2-TransactionRptExpenses">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/cc_TransactionRptExpenses.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Expenses accounts during April</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the various Expense accounts during April.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure pgwide="1">
+            <title>The Transaction Report for the Expenses accounts during April</title>
+            <screenshot id="cc-puttoget2-TransactionRptExpenses">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/cc_TransactionRptExpenses.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the various Expense accounts during April.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
     </sect2>
diff --git a/guide/C/ch_currency.xml b/guide/C/ch_currency.xml
index a66e1aca..3bff45ab 100644
--- a/guide/C/ch_currency.xml
+++ b/guide/C/ch_currency.xml
@@ -128,23 +128,21 @@ TODO -->
         the later section (<xref linkend="currency_howto1" />) on ways to do this.
       </para>
 
-      <screenshot id="currency_main1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_main1.png"
-                       srccredit="Frank H. Ellenberger" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial multi currency Account Bank Setup</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial setup of 3 bank accounts with different currencies.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Initial multi currency Account Bank Setup</title>
+        <screenshot id="currency_main1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_main1.png"
+                         srccredit="Frank H. Ellenberger" />
+            </imageobject>
+            <caption>
+              <para>Initial setup of 3 bank accounts with different currencies.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Notice that the <guilabel>Total (Report)</guilabel> column is being displayed. This is configured in the column header
         row, select <guibutton>Arrow down</guibutton> and select <guilabel>Total(USD)</guilabel>.
@@ -220,23 +218,21 @@ TODO -->
       <para>Before we start, let’s have a quick look at the Chart of Accounts.
       </para>
 
-      <screenshot id="currency_main1a">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/currency_main1.png"
-                       srccredit="Frank H. Ellenberger" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Initial multi currency Account Bank Setup</phrase>
-          </textobject>
-
-          <caption>
-            <para>Initial set up of 3 bank accounts with different currencies.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure pgwide="1">
+        <title>Initial multi currency Account Bank Setup</title>
+        <screenshot id="currency_main1a">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/currency_main1.png"
+                         srccredit="Frank H. Ellenberger" />
+            </imageobject>
+            <caption>
+              <para>Initial set up of 3 bank accounts with different currencies.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>As you see, the overall balances do not yet reflect any value for EUR or HKD holdings. Adding
         currency exchange rates will fix this.
@@ -251,41 +247,37 @@ TODO -->
           </menuchoice>.
         </para>
 
-        <screenshot id="currency_peditor">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_peditor.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>Price Database Window—still empty
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Price Database Window—Still Empty</title>
+          <screenshot id="currency_peditor">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_peditor.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+          </figure>
 
         <para>Click on the <guibutton>Add</guibutton> button to add a new currency exchange rate. A window will
           appear in which you can set up a new exchange rate. This window should appear like this:
         </para>
 
-        <screenshot id="currency_addcurr">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_addcurr.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Set up Euro Exchange Rate</phrase>
-            </textobject>
-
-            <caption>
-              <para>Add Price Database Window
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Setup Of Euro Exchange Rate</title>
+          <screenshot id="currency_addcurr">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_addcurr.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+              <caption>
+                <para>Add Price Database Window
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Set the <guilabel>Namespace</guilabel> to <guilabel>CURRENCY</guilabel> and the <guilabel>Security</guilabel> to <guilabel>EUR
           (Euro)</guilabel>. Then set the exchange rate between the selected security and the selected
@@ -294,33 +286,33 @@ TODO -->
           this example, you will set the exchange rate to 1 EUR for 1 USD.
         </para>
 
-        <screenshot id="currency_manualpriceadded">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>The Price Database window after setting the exchange rate between Euros and US Dollars
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
-
-        <screenshot id="currency_main2">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_main2.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
+        <figure pgwide="1">
+          <title>The Price Database window after setting the exchange rate between Euros and US Dollars</title>
+          <screenshot id="currency_manualpriceadded">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" width="&img-w;" />
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
-            <caption>
-              <para>Chart of Accounts after setting the exchange rate between Euro and US Dollar
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Chart of Accounts After Setting The Exchange Rate Between Euro And US Dollar</title>
+          <screenshot id="currency_main2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_main2.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Observe that since you have no exchange rate for HKD, &app; doesn’t convert the HKD accounts
           to USD. This will be added in the next section.
@@ -340,19 +332,21 @@ TODO -->
           </menuchoice>.
         </para>
 
-        <screenshot id="currency_BeforeGetOnline">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>Price Database Window before you obtain online quotes
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Price Database Before Obtaining Online Quotes</title>
+          <screenshot id="currency_BeforeGetOnline">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" width="&img-w;" />
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_BeforeGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Click on the <guibutton>Get Quotes</guibutton> button to automatically load the various exchange
           rates you need.
@@ -366,20 +360,21 @@ TODO -->
           </para>
         </note>
 
-        <para><screenshot id="currency_AfterGetOnlineQuotes">
+        <figure pgwide="1">
+          <title>The Price Database After Obtaining Online Quotes</title>
+          <screenshot id="currency_AfterGetOnlineQuotes">
             <mediaobject>
-              <imageobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
+                           srccredit="Frank H. Ellenberger" width="&img-w;" />
+              </imageobject>
+              <imageobject role="fo">
                 <imagedata fileref="figures/currency_AfterGetOnlineQuotes.png"
                            srccredit="Frank H. Ellenberger" />
               </imageobject>
-
-              <caption>
-                <para>Price Database Window after we obtained online quotes
-                </para>
-              </caption>
             </mediaobject>
           </screenshot>
-        </para>
+        </figure>
 
         <para>&app; downloads exchange rates for all currencies that are in use in your various accounts. This
           will happen every time you click on <guibutton>Get Quotes</guibutton> or request &app; to
@@ -392,19 +387,17 @@ TODO -->
           rate.
         </para>
 
-        <screenshot id="currency_main3.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_main3.png"
-                         srccredit="Frank H. Ellenberger" />
-            </imageobject>
-
-            <caption>
-              <para>Chart of Accounts after we obtain online quotes
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Chart of Accounts After Obtaining Online Quotes</title>
+          <screenshot id="currency_main3.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_main3.png"
+                           srccredit="Frank H. Ellenberger" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
 
       <sect3 id="currency_howto_disable">
@@ -489,68 +482,54 @@ TODO -->
           charges you 150 USD to transfer the money.
         </para>
 
-        <screenshot id="currency_purchase_MoveMoney.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_MoveMoney.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Currency transfer</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transfer money to Jamaica
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Transaction <quote>Currency Transfer To Jamaica</quote></title>
+          <screenshot id="currency_purchase_MoveMoney.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_MoveMoney.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Select the Jamaica transaction line (9,850.00 USD), right click and select <guilabel>Edit Exchange
           Rate</guilabel>
         </para>
 
-        <screenshot id="currency_purchase_SetExchangeRate.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Edit Exchange rate</phrase>
-            </textobject>
-
-            <caption>
-              <para>A dialog window where the exchange rate in a currency transaction is specified.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Edit Exchange Rate</title>
+          <screenshot id="currency_purchase_SetExchangeRate.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_SetExchangeRate.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+              <caption>
+                <para>In this dialog the exchange rate of a currency transaction is specified.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>As Exchange Rate, you enter 1 USD = 64 JMD, since this is the rate your bank gave. Press ok in the
           Transfer Funds (Edit Exchange Rate) window, and then save this split transaction. Below is
           how it now looks in the main Chart of Accounts.
         </para>
 
-        <screenshot id="currency_purchase_BeforeBoat.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Chart of Accounts before purchasing the boat</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts before purchasing the boat
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Chart of Accounts before purchasing the boat</title>
+          <screenshot id="currency_purchase_BeforeBoat.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_BeforeBoat.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>You choose to buy a boat for 509,000 JMD. To record this transaction in &app;, you will need to
           enter a simple transaction in <emphasis>Assets:Current Assets:Jamaican Bank</emphasis>
@@ -558,23 +537,17 @@ TODO -->
           Assets:Boat</emphasis>.
         </para>
 
-        <screenshot id="currency_purchase_AfterBoat.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_AfterBoat.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Chart of Accounts after purchasing the boat</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts after purchasing the boat
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Chart Of Accounts After Purchasing The Boat</title>
+          <screenshot id="currency_purchase_AfterBoat.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_AfterBoat.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The Chart of Accounts now reflects that your bank account has been reduced by 509,000 JMD, and that
           your Fixed Assets boat account has been increased by the same amount. If you also have
@@ -616,23 +589,17 @@ TODO -->
         <para>The Chart of Accounts looks like this after creating all the needed accounts:
         </para>
 
-        <screenshot id="currency_purchase_BeforeStocks.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Chart of Accounts for international stocks</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts for international stocks
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Chart of Accounts For International Stocks</title>
+          <screenshot id="currency_purchase_BeforeStocks.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_BeforeStocks.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The stock definition can be seen in the Security Editor (
           <menuchoice>
@@ -640,23 +607,17 @@ TODO -->
           </menuchoice>.)
         </para>
 
-        <screenshot id="currency_purchase_Commodities.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_Commodities.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>International securities</phrase>
-            </textobject>
-
-            <caption>
-              <para>International securities
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>International Securities</title>
+          <screenshot id="currency_purchase_Commodities.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_Commodities.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>If you have not moved money (50,000 HKD) into the brokerage cash account
           (<emphasis>Assets:Investments:Brokerage Accounts:Boom:Bank</emphasis>), do so now, either
@@ -735,45 +696,41 @@ TODO -->
           <guilabel>To Amount</guilabel>.
         </para>
 
-        <screenshot id="currency_purchase_ToAmount.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_ToAmount.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Transfer Funds</phrase>
-            </textobject>
-
-            <caption>
-              <para>Setting the number of shares in the Transfer Funds dialog
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>Transfer Funds</title>
+          <screenshot id="currency_purchase_ToAmount.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_ToAmount.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+              <caption>
+                <para>Setting the number of shares in the Transfer Funds dialog
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>When you return to the Chart of Accounts, you will see the purchased shares reflected in the stock
           account’s total.
         </para>
 
-        <screenshot id="currency_purchase_AfterStocks.png">
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="figures/currency_purchase_AfterStocks.png"
-                         srccredit="Bengt Thuree" />
-            </imageobject>
-
-            <textobject>
-              <phrase>Purchased international stocks</phrase>
-            </textobject>
-
-            <caption>
-              <para>Chart of Accounts with some international stocks
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Purchased international stocks</title>
+          <screenshot id="currency_purchase_AfterStocks.png">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_purchase_AfterStocks.png"
+                           srccredit="Bengt Thuree" />
+              </imageobject>
+              <caption>
+                <para>Chart of Accounts is now containing the international stocks
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>However, as you can see, the USD totals may be zero if &app; doesn’t have an exchange rate
           between USD and HKD. To fix this, go to
@@ -1101,28 +1058,21 @@ Trading
           as follows:
         </para>
 
-        <screenshot id="currency__trading_acct_setup">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_acct_setup.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_acct_setup.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Initial multi currency Account Bank Setup</phrase>
-            </textobject>
-
-            <caption>
-              <para>Initial setup of bank accounts in multiple currencies.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Initial Multicurrency Bank Accounts Setup</title>
+          <screenshot id="currency__trading_acct_setup">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_acct_setup.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Initial setup of bank accounts in multiple currencies.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The following prices were entered in the Price Database (
           <menuchoice>
@@ -1132,56 +1082,42 @@ Trading
           USD:
         </para>
 
-        <screenshot id="currency__trading_price_database">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>The Price Database initial entries</phrase>
-            </textobject>
-
-            <caption>
-              <para>Price Database window after setting initial exchange rates between USD, HKD and EUR.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Initial Price Database Entries</title>
+          <screenshot id="currency__trading_price_database">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_Price_Database_initial.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Price Database window after setting initial exchange rates between USD, HKD and EUR.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>With the currency prices set as shown, the Accounts tab will now display the values of the foreign
           accounts in USD in the <guilabel>Total(USD)</guilabel> column:
         </para>
 
-        <screenshot id="currency_trading_acct_setup_2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_acct_setup_2.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_acct_setup_2.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Initial multi currency setup after entering exchange rates between USD, HKD
-              and EUR</phrase>
-            </textobject>
-
-            <caption>
-              <para><guilabel>Accounts</guilabel> tab after setting exchange rates to USD.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Initial Multicurrency Setup After Entering Exchange Rates Between USD, HKD
+                and EUR</title>
+          <screenshot id="currency_trading_acct_setup_2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_acct_setup_2.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para><guilabel>Accounts</guilabel> tab after setting exchange rates to USD.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
 
       <sect3 id="currency_trading_transfer">
@@ -1195,28 +1131,21 @@ Trading
           with the <guilabel>Transfer Funds</guilabel> dialog as shown below:
         </para>
 
-        <screenshot id="currency__trading_tfr_dialog">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_transfer_funds.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_transfer_funds.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transfer dialog to create transactionfor transfer from USD to HKD</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transfer of 10,200 HKD from US Bank account to Hong Kong bank account.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transfer Dialog To Create Transaction For Transfer From USD To HKD</title>
+          <screenshot id="currency__trading_tfr_dialog">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_transfer_funds.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Transfer of 10,200 HKD from US Bank account to Hong Kong bank account.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The <guilabel>Debit Amount</guilabel> has been specified in HKD and the transaction <guilabel>Amount</guilabel> being transferred in USD.
           There is no provision to enter the transfer fee in the dialog. On closing the dialog the
@@ -1231,84 +1160,71 @@ Trading
           </para>
         </note>
 
-        <screenshot id="currency_trading_transfer_trans1">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_transfer_trans1.png"
-                srccredit="David Cousens"  width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_transfer_trans1.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transaction after transfer displayed in US Bank account register</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transaction to transfer from US bank account to Hong Kong Bank account after closing transfer
-                dialog.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transaction After Transfer Displayed in The US Bank Account Register</title>
+          <screenshot id="currency_trading_transfer_trans1">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_trading_transfer_trans1.png"
+                           srccredit="David Cousens"  width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_trading_transfer_trans1.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Transaction to transfer from US bank account to Hong Kong Bank account after closing transfer
+                  dialog.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The transaction can be opened in the US Bank Account register and may then be edited to add splits
           for the transfer fee as follows:
         </para>
 
-        <screenshot id="currency_trading_transfer_trans2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_transfer_trans2.png"
-                srccredit="David Cousens"  width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_transfer_trans2.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transaction after adding the splits for the transfer fee</phrase>
-            </textobject>
-
-            <caption>
-              <para>Transaction to transfer from US bank account to Hong Kong Bank account after adding the splits for
-                the transaction fee.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transaction After Adding The Splits For The Transfer Fee</title>
+          <screenshot id="currency_trading_transfer_trans2">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_trading_transfer_trans2.png"
+                           srccredit="David Cousens"  width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_trading_transfer_trans2.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Transaction to transfer from US bank account to Hong Kong Bank account after adding the splits for
+                  the transaction fee.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>Returning to the Accounts tab we can see the result of the transfer transaction on the accounts:
         </para>
 
-        <screenshot id="currency_trading_accts_after_tfr">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Account tab balances after completion of USD to HKD transfer</phrase>
-            </textobject>
-
-            <caption>
-              <para>Account balances in the Accounts tab after the transfer of funds from the US Bank account to the
-                Hong Kong bank account.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Account Tab Balances After Completion Of USD To HKD Transfer</title>
+          <screenshot id="currency_trading_accts_after_tfr">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_accts_after_tfr.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Account balances in the Accounts tab after the transfer of funds from the US Bank account to the
+                  Hong Kong bank account.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The balances of the Asset and Equity accounts are presented with values set by the exchange rate
           entered in the transaction to transfer funds on Feb. 1, 2020.
@@ -1334,81 +1250,64 @@ Trading
           The transaction to effect the transfer is as follows:
         </para>
 
-        <screenshot id="currency_trading_tfr_back">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_trf_back.png"
-                         srccredit="David Cousens"  width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_trf_back.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Transaction to transfer funds from Hong Kong to US Bank account.</phrase>
-            </textobject>
-
-            <caption>
-              <para>The transaction transfers 10,200.00 HKD from the Hong Kong Bank account to the US Bank account.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Transaction To Transfer Funds From Hong Kong To US Bank Account</title>
+          <screenshot id="currency_trading_tfr_back">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/currency_trading_trf_back.png"
+                           srccredit="David Cousens"  width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/currency_trading_trf_back.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>The transaction transfers 10,200.00 HKD from the Hong Kong Bank account to the US Bank account.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>After transferring the funds back to the US Bank account, the prices database entries are as
           follows:
         </para>
 
-        <screenshot id="currency_trading_prices_after_trf_back">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Price database after transfer of funds back to US account</phrase>
-            </textobject>
-
-            <caption>
-              <para>The price database showing prices for the transfer of funds to HKD and back to USD.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Price database after transfer of funds back to US account</title>
+          <screenshot id="currency_trading_prices_after_trf_back">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_prices_after_trf_back.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>The price database showing prices for the transfer of funds to HKD and back to USD.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The Accounts tab balances after transferring the funds back are as follows:
         </para>
 
-        <screenshot id="currency_trading_accts_after_trf_back">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Accounts tab after transfer back</phrase>
-            </textobject>
-
-            <caption>
-              <para>State of the accounts after the funds have been transferred back.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Accounts tab after transfer back</title>
+          <screenshot id="currency_trading_accts_after_trf_back">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_accts_after_trf_back.png"
+                           srccredit="David Cousens" />
+              </imageobject>
+              <caption>
+                <para>State of the accounts after the funds have been transferred back.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
         <para>The Assets and Equity balances now reflect the the values of the accounts at the exchange rate for
           the transfer of funds back to the US Bank account. The Trading and CURRENCY placeholder accounts now indicate a
@@ -1425,28 +1324,21 @@ Trading
           Loss incurred:
         </para>
 
-        <screenshot id="currency_trading_balance_sheet">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/currency_trading_balance_sheet.png"
-                srccredit="David Cousens" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/currency_trading_balance_sheet.png"
-                srccredit="David Cousens"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Balance sheet after above transactions</phrase>
-            </textobject>
-
-            <caption>
-              <para>Balance Sheet after these transactions reflecting the trading loss incurred.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure pgwide="1">
+          <title>The Balance Sheet After Above Transactions</title>
+          <screenshot id="currency_trading_balance_sheet">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/currency_trading_balance_sheet.png"
+                           srccredit="David Cousens"/>
+              </imageobject>
+              <caption>
+                <para>Balance Sheet after these transactions reflecting the trading loss incurred.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
     </sect2>
   </sect1>
diff --git a/guide/C/ch_dep.xml b/guide/C/ch_dep.xml
index 30617a1a..136e66b7 100644
--- a/guide/C/ch_dep.xml
+++ b/guide/C/ch_dep.xml
@@ -648,23 +648,21 @@
       both purchased on January 1, 2000.
     </para>
 
-    <screenshot id="dep_example">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/dep_example.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Asset Depreciation Example1</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset depreciation example main window, before depreciation
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>Asset Accounts Before Depreciation</title>
+      <screenshot id="dep_example">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/dep_example.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>The asset accounts still only have the investments stored.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Looking at the tax codes, we realize that we must report depreciation on these items using the
       <quote>sum of digits</quote> scheme, over a 5 year period. So, the yearly depreciation amounts
@@ -681,41 +679,37 @@
       periods) of depreciation using this <guilabel>sum of digits</guilabel> scheme.
     </para>
 
-    <screenshot id="dep_assetreg">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/dep_assetreg.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Asset Depreciation Register Window</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset depreciation register window
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure pgwide="1">
+      <title>Asset Depreciation In The Register</title>
+      <screenshot id="dep_assetreg">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/dep_assetreg.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>This account shows a list of depreciation transactions.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
+    <figure pgwide="1">
+      <title>Accounts Tab After Asset Depreciation</title>
     <screenshot id="dep_assetmain">
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/dep_assetmain.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
-
-        <textobject>
-          <phrase>Asset Depreciation Main Window</phrase>
-        </textobject>
-
-        <caption>
-          <para>The asset depreciation main window
-          </para>
-        </caption>
+          <caption>
+            <para>The asset accounts got decreased by the depreciation.
+            </para>
+          </caption>
       </mediaobject>
     </screenshot>
+    </figure>
 
     <note>
       <para>A Word of Caution: Since depreciation and tax issues are closely related, you may not always be free
diff --git a/guide/C/ch_invest.xml b/guide/C/ch_invest.xml
index 6d3d445b..e2ebd417 100644
--- a/guide/C/ch_invest.xml
+++ b/guide/C/ch_invest.xml
@@ -327,29 +327,22 @@
         </para>
       </tip>
 
-      <screenshot id="invest_accountspredef">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_AccountsPredef.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This is a screen image of the <guilabel>Accounts</guilabel> tab after creating a new file and
-              selecting only the default investment accounts.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>A New File Containinng Only The Default Investment Accounts</title>
+        <screenshot id="invest_accountspredef">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_AccountsPredef.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is a screen image of the <guilabel>Accounts</guilabel> tab after creating a new file and
+                selecting only the default investment accounts.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>You will probably at least want to add a <emphasis>Bank</emphasis> account to the <emphasis>Assets</emphasis> account and
         probably an <emphasis>Equity:Opening Balances</emphasis> account, as we have done in
@@ -500,28 +493,21 @@ Income
         should look something like this:
       </para>
 
-      <screenshot id="invest-int">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This is an image of the account register after creating and investing in a certificate of deposit investment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart Of Accounts After Investing In A Certificate Of Deposit</title>
+        <screenshot id="invest-int">
+          <mediaobject>
+           <imageobject>
+              <imagedata fileref="figures/invest_int1.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is an image of the account register after creating and investing in a certificate of deposit investment.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Now, during the course of the next 6 months, you receive monthly bank statements which describe the
         activity of your account. In our fictional example, we do nothing with the money at this
@@ -530,77 +516,64 @@ Income
         should look like these:
       </para>
 
-      <screenshot id="invest-int2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This is an image of the register of the certificate of deposit account after 6 months.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
-
-      <screenshot id="invest-int2-1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int2-1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
+      <figure>
+        <title>The CD Account After 6 Months</title>
+        <screenshot id="invest-int2">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_int2.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_int2.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is an image of the register of the certificate of deposit account after 6 months.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
-          <caption>
-            <para>This is an image of the register of the Savings account after 6 months.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Savings Account After 6 Months</title>
+        <screenshot id="invest-int2-1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_int2-1.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_int2-1.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This is an image of the register of the Savings account after 6 months.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>And this is the main &app; account window:
       </para>
 
-      <screenshot id="invest-int3">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_int3.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Interest Investment</phrase>
-          </textobject>
-
-          <caption>
-            <para>This a screen capture of the accounts after 6 months.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart Of Accounts After 6 months</title>
+        <screenshot id="invest-int3">
+          <mediaobject>
+           <imageobject>
+              <imagedata fileref="figures/invest_int3.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This a screen capture of the accounts after 6 months.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>From the above image of the main &app; account window you see a nice summary of what happened to
         these investments over the 6 months. While the yield on the certificate of deposit is double that of the savings
@@ -682,28 +655,17 @@ Income
         new stock account.
       </para>
 
-      <screenshot id="invest-newaccount">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_newaccount.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>New Account Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>New Account Window
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The <quote>New Account</quote> Window For AMZN</title>
+        <screenshot id="invest-newaccount">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_newaccount.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <orderedlist>
         <listitem>
@@ -765,28 +727,17 @@ Income
               <para>Select the <guibutton>New</guibutton> button to open the <guilabel>New Security</guilabel> window.
               </para>
 
-              <screenshot id="invest-selectsecurity">
-                <mediaobject>
-                  <imageobject role="html">
-                    <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"/>
-                  </imageobject>
-
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/invest_selectsecurity.png"
-                                srccredit="Cristian Marchi"/>
-                  </imageobject>
-
-                  <textobject>
-                    <phrase>Select Security Window</phrase>
-                  </textobject>
-
-                  <caption>
-                    <para>Select Security Window
-                    </para>
-                  </caption>
-                </mediaobject>
-              </screenshot>
+              <figure>
+                <title>The <quote>Select Security</quote> Window</title>
+                <screenshot id="invest-selectsecurity">
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="figures/invest_selectsecurity.png"
+                                  srccredit="Cristian Marchi"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
             </listitem>
 
             <listitem>
@@ -804,8 +755,7 @@ Income
 
                 <listitem>
                   <para>The <guilabel>Symbol/abbreviation:</guilabel> is <userinput>AMZN</userinput>. The symbol is the stock ticker
-                    used in your quote source several lines down on the form. 
-                    <note><para>
+                    used in your quote source several lines down on the form.                    <note><para>
                     Different symbols will be used on different price sources for the same stock, an
                     example is Ericsson on the Stockholm Exchange is ERIC-B while on Yahoo it is
                     ERRICB.ST.</para>
@@ -847,29 +797,18 @@ Income
                   </note>
 
                   <para>Below is what this window should look like when finished:
-                    <screenshot id="invest-newsecurity">
-                      <mediaobject>
-                        <imageobject role="html">
-                          <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi" width="&img-w;"/>
-                        </imageobject>
-
-                        <imageobject role="fo">
-                          <imagedata fileref="figures/invest_newsecurity.png"
-                                     srccredit="Cristian Marchi"/>
-                        </imageobject>
-
-                        <textobject>
-                          <phrase>New Security Window</phrase>
-                        </textobject>
-
-                        <caption>
-                          <para>New Security Window
-                          </para>
-                        </caption>
-                      </mediaobject>
-                    </screenshot>
                   </para>
+                  <figure>
+                    <title>The <quote>New Security</quote> Window</title>
+                      <screenshot id="invest-newsecurity">
+                        <mediaobject>
+                          <imageobject>
+                            <imagedata fileref="figures/invest_newsecurity.png"
+                                       srccredit="Cristian Marchi"/>
+                          </imageobject>
+                        </mediaobject>
+                      </screenshot>
+                    </figure>
                 </listitem>
 
                 <listitem>
@@ -935,28 +874,21 @@ Income
         (notice that there are a few extra accounts here, a bank account, and an equity account):
       </para>
 
-      <screenshot id="invest-setup-current">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_current.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Current Portfolio</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image is after the creation of the first stock account (AMZN).
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Chart of Accounts After The Creation Of The First Stock Account</title>
+        <screenshot id="invest-setup-current">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_setup_current.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image is after the creation of the first stock account (AMZN).
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Open the account register window for this AMZN stock account (double click on it). Here you see the
         <emphasis
@@ -997,29 +929,26 @@ Income
         transaction. Your AMZN Commodity view should now appear like this:
       </para>
 
-      <screenshot id="invest-setup-portfolio1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_setup_portfolio1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Setup Current Portfolio</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image is the transaction register of the AMZN account after the first stock
-              <quote>purchase</quote>.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Transaction Register Of The AMZN Account After The First Purchase</title>
+        <screenshot id="invest-setup-portfolio1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_setup_portfolio1.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_setup_portfolio1.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>This image is the transaction register of the AMZN account after the first stock
+                <quote>purchase</quote>.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Notice that the <guilabel>Balance</guilabel> (last column) is in the units of the commodity (AMZN
         shares) not in currency units. Thus, the balance is 100 (AMZN units) rather than $2,000. This
@@ -1100,29 +1029,26 @@ Income
           Commodity view should now appear like this:
         </para>
 
-        <screenshot id="invest-setup-portfolio2">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio2.png"
-                          srccredit="Chris Good"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Setup Current Portfolio</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image is of the transaction register of the IBM account after the first stock
-                <quote>purchase</quote> with a commission.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure>
+          <title>The Transaction Register Of The IBM Account After The First Stock Purchase</title>
+          <screenshot id="invest-setup-portfolio2">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/invest_SetupPortfolio2.png"
+                            srccredit="Chris Good" width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/invest_SetupPortfolio2.png"
+                            srccredit="Chris Good"/>
+              </imageobject>
+              <caption>
+                <para>This image is of the transaction register of the IBM account after the first stock
+                  <quote>purchase</quote> with a commission.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
 
       <sect3 id="invest-buy-net">
@@ -1156,29 +1082,26 @@ Income
           transaction. Your IBM Commodity view should now appear like this:
         </para>
 
-        <screenshot id="invest-setup-portfolio3">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_SetupPortfolio3.png"
-                          srccredit="Chris Good"/>
-            </imageobject>
-
-            <textobject>
-              <phrase>Setup Current Portfolio</phrase>
-            </textobject>
-
-            <caption>
-              <para>This image is of the transaction register of the IBM account after the first stock
-                <quote>purchase</quote> with a commission.
-              </para>
-            </caption>
-          </mediaobject>
-        </screenshot>
+        <figure>
+          <title>The IBM Account After The First Stock Purchase With A Commission</title>
+          <screenshot id="invest-setup-portfolio3">
+            <mediaobject>
+              <imageobject role="html">
+                <imagedata fileref="figures/invest_SetupPortfolio3.png"
+                           srccredit="Chris Good" width="&img-w;"/>
+              </imageobject>
+              <imageobject role="fo">
+                <imagedata fileref="figures/invest_SetupPortfolio3.png"
+                           srccredit="Chris Good"/>
+              </imageobject>
+              <caption>
+                <para>This image is of the transaction register of the IBM account after the first stock
+                  <quote>purchase</quote> with a commission.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
       </sect3>
     </sect2>
   </sect1>
@@ -1196,8 +1119,7 @@ Income
       <title>Initial Price Database Setup</title>
 
       <para>To use the <guilabel>Price Database</guilabel> to track a stock value, you must initially insert the
-        stock. To do so, open the <guilabel>Price Database</guilabel> 
-        (<menuchoice>
+        stock. To do so, open the <guilabel>Price Database</guilabel> (<menuchoice>
           <guimenu>Tools</guimenu><guimenuitem>Price Database</guimenuitem>
         </menuchoice>)
         and click on <guibutton>Add</guibutton> button. The first time a Commodity/Stock is
@@ -1273,28 +1195,21 @@ Income
         share.
       </para>
 
-      <screenshot id="invest-peditor">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Price Database</phrase>
-          </textobject>
-
-          <caption>
-            <para>Adding the AMZN commodity to the price database, with an initial value of $40.50 per share.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Entering A Price Into The Database</title>
+        <screenshot id="invest-peditor">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_peditor.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>Adding the AMZN commodity to the price database, with an initial value of $40.50 per share.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Click <guibutton>OK</guibutton> when finished. Once you have performed this initial placement of the
         commodity into the <guilabel>Price Database</guilabel>, you will not have to do it again, even
@@ -1321,28 +1236,25 @@ Income
         <guibutton>Edit</guibutton> and entering the new price.
       </para>
 
-      <screenshot id="invest-peditor2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_peditor2.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Price Database</phrase>
-          </textobject>
-
-          <caption>
-            <para>The main price database window, showing the list of all known commodities.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Price Database With The List Of All Known Commodities</title>
+        <screenshot id="invest-peditor2">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_peditor2.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_peditor2.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>The main price database window, showing the list of all known commodities.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="invest-stockprice-auto2">
@@ -1373,8 +1285,7 @@ Income
             variable.<footnote><simpara>If you’ve installed &app; packages provided by your distribution, <filename>gnc-fq-update</filename> must be on your PATH.</simpara></footnote>
           </simpara>
             <substeps><step id="gnc-fq-update-not-found">
-                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is 
-                installed.</simpara>
+                <simpara>If <filename>gnc-fq-update</filename> is not in your PATH, search the folder where &app; is                installed.</simpara>
                 </step>
             </substeps>
           </step>
@@ -1387,10 +1298,9 @@ Income
                 <simpara>See <ulink url="https://www.cpan.org/misc/cpan-faq.html">CPAN Frequently Asked Questions</ulink> for details.</simpara></footnote>
               module internally. When you launch the CPAN module for the first time, you must setup and configure it. However, on the most systems if you accept the default settings
               or answer the first question <computeroutput>Are you ready for manual
-              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully. 
-              </para>
+              configuration? [yes]</computeroutput> with <userinput>no</userinput>, you will be able to install &app-fq; successfully.              </para>
           </step>
-          
+
           <step><simpara>Run <command>gnc-fq-dump</command> to check &app-fq; works properly.</simpara></step>
         </procedure>
 
@@ -1401,8 +1311,7 @@ Income
           <step><simpara>Install Xcode if it is not installed.</simpara>
               <simpara>XCode is an optional item from your &mac; distribution DVD.</simpara>
           </step>
-          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara> 
-              <para>You can run it from the dmg or copy it to the same
+          <step><simpara>Run the <emphasis>Update Finance Quote</emphasis> app in the &app; dmg.</simpara>              <para>You can run it from the dmg or copy it to the same
                 folder to which you copied &app;.
                 It will open a Terminal window and run a script for you
                 which will ask lots of questions. Accept the default for each unless you know what
@@ -1451,10 +1360,8 @@ Income
 
         <para>The command <command>gnucash-cli --quotes get <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command><footnote>
           <simpara>The Online Quotes Retrieval command has been changed from &app; 4.0. The old command
-            <command>gnucash --add-price-quotes <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command> is 
-            still available, but it is deprecated and will be removed in the future release.
-            If you've upgraded from &app; 3.11 or previous version, 
-            it is recommended to use the new command <command>gnucash-cli</command>.</simpara>
+            <command>gnucash --add-price-quotes <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename></command> is            still available, but it is deprecated and will be removed in the future release.
+            If you've upgraded from &app; 3.11 or previous version,            it is recommended to use the new command <command>gnucash-cli</command>.</simpara>
           </footnote> can be used to
           fetch the current prices of your stocks. The file specified
           <filename><replaceable>${HOME}/gnucash-filename</replaceable></filename> will depend on the name and
@@ -1464,12 +1371,12 @@ Income
           the name of the currently open file.
         </para>
 
-        
+
       </sect3>
 
       <sect3 id="invest-stockprice-auto-scheduler">
         <title>Configuring for Getting Online Quotes Periodically</title>
-        
+
         <para>You have to register the <command>gnucash-cli</command> with a scheduler in order to get Online Quotes automatically and periodically.
           The method depends on your OS. For example, suppose you want to update
           your file on 16:00 on every Friday.
@@ -1492,8 +1399,7 @@ Income
           <step><simpara>Enter the appropirate items on <guilabel>Create Task</guilabel> Window.</simpara></step>
         </procedure>
 
-        <para>See <ulink url="&url-docs-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink> 
-          and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
+        <para>See <ulink url="&url-docs-C;help/acct-create.html#Online-price-setup">GnuCash Help Manual</ulink>          and <ulink url="&url-wiki-OQ;#Updating_enabled_Quotes_from_outside_GnuCash">Online Quotes Page on GnuCash Wiki</ulink> for more details.
         </para>
 
         <para>Remember that Mutual Fund <quote>prices</quote> are really <quote>Net Asset Value</quote> and
@@ -1519,28 +1425,21 @@ Income
         commodities in the report currency.
       </para>
 
-      <screenshot id="invest-stockvalue">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_stockvalue.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Viewing Stock Value</phrase>
-          </textobject>
-
-          <caption>
-            <para>Viewing the value of a stock commodity in the main window using the Total in Report Currency option.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Displaying Stock Values in the Chart of Accounts</title>
+        <screenshot id="invest-stockvalue">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_stockvalue.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>Viewing the value of a stock commodity in the main window using the Total in Report Currency option.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="invest-stockprice-report">
@@ -1557,24 +1456,22 @@ Income
         report the selector may appear in either the <guilabel>General</guilabel>, the
         <guilabel>Commodities</guilabel>, or the <guilabel>Display</guilabel> tab of the
         <guilabel>Report Options</guilabel> dialog box.
+      </para>
+      <note>
+        <simpara>In the example the report can be customized using the
+          <menuchoice><guimenu>Reports</guimenu><guisubmenu>Assets & Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem></menuchoice> menu.
+        </simpara>
+      </note>
 
-        <note>
-          <simpara>In the example the report can be customized using the  
-            <menuchoice><guimenu>Reports</guimenu><guisubmenu>Assets & Liabilities</guisubmenu><guimenuitem>Average Balance</guimenuitem></menuchoice> menu.
-          </simpara>
-        </note>
-      </para> 
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Determining The Source Of The Stock Price/Currency Exchange Rate in Reports</title>
         <screenshot id="invest-stockvalue-report-options">
           <mediaobject>
             <imageobject>
               <imagedata fileref="figures/invest_stockvalue_report_options.png"
-                       srccredit="John Ralls"/>
+                         srccredit="John Ralls"/>
             </imageobject>
-
-            <textobject>
-              <phrase>Determining Stock Price/Currency Exchange Rate Source in Reports</phrase>
-            </textobject>
-
             <caption>
               <para>Determining the value of a stock commodity or a currency other than the report currency in a report
                 by setting the Price Source option.
@@ -1582,33 +1479,34 @@ Income
             </caption>
           </mediaobject>
         </screenshot>
-   
+      </figure>
 
       <variablelist>
-      <varlistentry>
-        <term><guilabel>Weighted Average</guilabel></term>        
-        <listitem><para>Calculates the price by summing the absolute value of the
-              amount and the absolute value of every split in every account denominated in the
-              commodity, excluding those splits with a zero amount, and dividing the sum of values
-              by the sum of amounts to obtain a price. For example, if you had a buy transaction for
-              200 shares of XYZ for a total of 2000 and a sell of 100 for 1300 the weighted average
-              would be 3300/300 or 11/share.
+        <varlistentry>
+          <term><guilabel>Weighted Average</guilabel></term>
+          <listitem><para>Calculates the price by summing the absolute value of the
+            amount and the absolute value of every split in every account denominated in the
+            commodity, excluding those splits with a zero amount, and dividing the sum of values
+            by the sum of amounts to obtain a price. For example, if you had a buy transaction for
+            200 shares of XYZ for a total of 2000 and a sell of 100 for 1300 the weighted average
+            would be 3300/300 or 11/share.
+            </para>
             <note>
               <para>Gain/Loss splits have an amount of 0 and are <emphasis>not</emphasis> included in this calculation.
               </para>
             </note>
-          </para>
-        </listitem>
-      </varlistentry>
+          </listitem>
+        </varlistentry>
 
-      <varlistentry>
-        <term><guilabel>Average Cost</guilabel></term>
-        <listitem><para>Calculates the price by summing the amounts and values of every
+        <varlistentry>
+          <term><guilabel>Average Cost</guilabel></term>
+          <listitem><para>Calculates the price by summing the amounts and values of every
             split in every account denominated in the commodity, including the zero amount splits.
             In the example above, with an additional split (either part of the sale transaction or
             in a separate transaction) booking the gain at 0 shares and a 300 gain, the average
             cost is 1000/100 (2000 original cost − 1300 proceeds from the sale + 300 gain)/(200 −
             100) shares or 10/share.
+            </para>
             <note>
               <itemizedlist>
                 <listitem><simpara>Gain/Loss splits <emphasis>are</emphasis> included in this calculation.</simpara></listitem>
@@ -1617,46 +1515,42 @@ Income
               <emphasis>must</emphasis> correctly book your gains and losses.</simpara></listitem>
               </itemizedlist>
             </note>
-          </para>
-        </listitem>
-      </varlistentry>
+          </listitem>
+        </varlistentry>
 
-      <varlistentry>
-        <term><guilabel>Most Recent</guilabel></term>
-        <listitem><para>Uses the latest price from the price database.</para></listitem>
-      </varlistentry>
+        <varlistentry>
+          <term><guilabel>Most Recent</guilabel></term>
+          <listitem><para>Uses the latest price from the price database.</para></listitem>
+        </varlistentry>
 
-      <varlistentry>
-        <term><guilabel>Nearest in time</guilabel></term>
-        <listitem><para>Uses the price nearest in time to the report date—the
+        <varlistentry>
+          <term><guilabel>Nearest in time</guilabel></term>
+          <listitem><para>Uses the price nearest in time to the report date—the
             datum date for time series reports like <guilabel>Assets Over
             Time</guilabel>—from the price database.
               <note>
                 <simpara>The nearest date isn’t necessarily before the date in question.</simpara>
               </note>
             </para>
-        </listitem>
-      </varlistentry>
-      </variablelist>        
-        
-      <screenshot id="invest-stockvalue-report">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_stockvalue_report.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An Asset Barchart Report based on the <guilabel>Nearest in time</guilabel> Price
-            Source.</phrase>
-          </textobject>
+          </listitem>
+        </varlistentry>
+      </variablelist>
 
-          <caption>
-            <para>Tracking what value your stocks would’ve had on the stock exchanges.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>An Asset Barchart Report Based On The <quote>Nearest In Time</quote> Price Source</title>
+        <screenshot id="invest-stockvalue-report">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_stockvalue_report.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>Tracking what value your stocks would’ve had on the stock exchanges.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
   </sect1>
 
@@ -1817,13 +1711,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -1944,309 +1834,282 @@ Income
             </tgroup>
           </table>
 
-      <example>
-
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
-          Gross Pricing</title>
-      
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-        <para>
-        You bought 100 shares of AMZN for $20 per share, then later sell them all for $36
-          per share with a commission of $75. The split transaction scheme is as follows:
-          <itemizedlist>
-            <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
-            <listitem><simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
+          <example>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined,
+              Gross Pricing</title>
 
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+            <para>You bought 100 shares of AMZN for $20 per share, then later sell them all for $36
+              per share with a commission of $75. The split transaction scheme is as follows:
+              <itemizedlist>
+                <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+                <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
+                <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
+                <listitem><simpara>and finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+              </itemizedlist>
+            </para>
+            <para><!-- Hack to get a figure inside of an example -->
+              <table>
+                <title>Selling Shares Split Scheme, Sale & Gain Combined, Gross Pricing</title>
+                <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
 
-            <colspec colnum="1" colwidth="2*"/>
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
 
-            <colspec colnum="1" colwidth="2*"/>
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
 
-            <colspec colnum="1" colwidth="1*"/>
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Expenses:Commission
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        75.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        36.00
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3600.00
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+              <figure pgwide="1">
+                <title>Selling Shares, Gain Combined, Gross Pricing</title>
+                <screenshot id="invest-sellstockManProfComb">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstock.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstock.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+              <note>
+                <para>In the above screenshot, it appears there are 2 transactions for Mar. 21, 2006. This is because the
+                  register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
+                  the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
+                  view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
+                  splits for the register account in the sale transaction, this transaction must be
+                  entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction
+                  Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
+                </para>
+              </note>
+              <figure pgwide="1">
+                <title>The Account Tree after the Example of Selling Shares for a Gain</title>
+                <screenshot id="invest-sellstockManProfComb2">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstock2.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstock2.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
+        </sect4>
 
-            <colspec colnum="1" colwidth="1*"/>
+        <sect4 id="invest-sell-man-comb-net">
+          <title>Combined, Net Pricing</title>
 
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
+          <table>
+            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Combined, Net Pricing</title>
 
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
+            <tgroup cols="5">
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
+              <colspec colnum="1" colwidth="2*"/>
 
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
+              <tbody>
+                <row>
+                  <entry>
+                    <emphasis>Account</emphasis>
+                  </entry>
 
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
+                  <entry>
+                    <emphasis>Number of Shares</emphasis>
+                  </entry>
 
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
+                  <entry>
+                    <emphasis>Share Price</emphasis>
+                  </entry>
 
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
+                  <entry>
+                    <emphasis>Total Buy</emphasis>
+                  </entry>
 
-                <entry></entry>
+                  <entry>
+                    <emphasis>Total Sell</emphasis>
+                  </entry>
+                </row>
 
-                <entry></entry>
+                <row>
+                  <entry>
+                    Assets:Bank ABC
+                  </entry>
 
-                <entry>
-                  3525.00
-                </entry>
+                  <entry></entry>
 
-                <entry></entry>
-              </row>
+                  <entry></entry>
 
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
+                  <entry>
+                    NET_SALE
+                  </entry>
 
-                <entry>
-                  0
-                </entry>
+                  <entry></entry>
+                </row>
 
-                <entry>
-                  0
-                </entry>
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
 
-                <entry>
-                  1600.00
-                </entry>
+                  <entry>
+                    0
+                  </entry>
 
-                <entry></entry>
-              </row>
+                  <entry>
+                    0
+                  </entry>
 
-              <row>
-                <entry>
-                  Expenses:Commission
-                </entry>
+                  <entry>
+                    NET_PROFIT
+                  </entry>
 
-                <entry></entry>
+                  <entry>
+                    (Loss)
+                  </entry>
+                </row>
 
-                <entry></entry>
+                <row>
+                  <entry>
+                    Assets:Stock:SYMBOL
+                  </entry>
 
-                <entry>
-                  75.00
-                </entry>
+                  <entry>
+                    −NUM_SHARES
+                  </entry>
 
-                <entry></entry>
-              </row>
+                  <entry>
+                    NET_SELL_PRICE
+                  </entry>
 
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
+                  <entry></entry>
 
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  36.00
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3600.00
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  1600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
-        <para>
-          <figure pgwide="1">
-          <title>Selling Shares, Gain Combined, Gross Pricing</title>
-          <screenshot id="invest-sellstockManProfComb">
-            <mediaobject>
-              <imageobject role="html">
-                <imagedata fileref="figures/invest_sellstock.png"
-                           srccredit="Chris Good" width="&img-w;"/>
-              </imageobject>
-
-              <imageobject role="fo">
-                <imagedata fileref="figures/invest_sellstock.png"
-                           srccredit="Chris Good"/>
-              </imageobject>
-    
-              <textobject><phrase>Selling Shares,Gain Combined, Gross Pricing</phrase></textobject>
-    
-            </mediaobject>
-          </screenshot>
-          </figure>
-          <note>
-            <para>In the above screenshot, it appears there are 2 transactions for Mar. 21, 2006. This is because the
-              register is in <guilabel> Auto-Split Ledger</guilabel> view and there are 2 splits for
-              the register account in the 1 transaction. <guilabel>Transaction Journal</guilabel>
-              view may be clearer. Refer to <xref linkend="txns-registers-txntypes" />. As there are 2
-              splits for the register account in the sale transaction, this transaction must be
-              entered in <guilabel>Auto-Split Ledger</guilabel> or <guilabel>Transaction
-              Journal</guilabel> view. It cannot be entered in <guilabel>Basic Ledger</guilabel> view.
-            </para>
-          </note>
-        </para>
-        <para>
-          <figure pgwide="1">
-            <title>the Account Tree after the Example of Selling Shares for a Gain</title>
-            <screenshot id="invest-sellstockManProfComb2">
-              <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstock2.png"
-                             srccredit="Chris Good" width="&img-w;"/>
-                  </imageobject>
-
-                  <imageobject role="fo">
-                    <imagedata fileref="figures/invest_sellstock2.png"
-                               srccredit="Chris Good"/>
-                  </imageobject>
-
-                  <textobject><phrase>Selling Shares Example</phrase></textobject>
-        
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </para>
-
-   </example>
-
-
-
-        </sect4>
-
-        <sect4 id="invest-sell-man-comb-net">
-          <title>Combined, Net Pricing</title>
-
-          <table>
-            <title>Selling Shares Split Scheme, Sale and Capital Gain/Loss Are Combined, Net Pricing</title>
-
-            <tgroup cols="5">
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <colspec colnum="1" colwidth="2*"/>
-
-              <tbody>
-                <row>
-                  <entry>
-                    <emphasis>Account</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Number of Shares</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Share Price</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Buy</emphasis>
-                  </entry>
-
-                  <entry>
-                    <emphasis>Total Sell</emphasis>
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Bank ABC
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    NET_SALE
-                  </entry>
-
-                  <entry></entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    0
-                  </entry>
-
-                  <entry>
-                    NET_PROFIT
-                  </entry>
-
-                  <entry>
-                    (Loss)
-                  </entry>
-                </row>
-
-                <row>
-                  <entry>
-                    Assets:Stock:SYMBOL
-                  </entry>
-
-                  <entry>
-                    −NUM_SHARES
-                  </entry>
-
-                  <entry>
-                    NET_SELL_PRICE
-                  </entry>
-
-                  <entry></entry>
-
-                  <entry>
-                    NET_SALE
-                  </entry>
-                </row>
+                  <entry>
+                    NET_SALE
+                  </entry>
+                </row>
 
                 <row>
                   <entry>
@@ -2268,161 +2131,150 @@ Income
               </tbody>
             </tgroup>
           </table>
-          
-                <example>
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net Pricing</title>
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-        <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later
-          sell them all for $36 per share with a commission of $75. The split transaction scheme
-          is as follows:
-          <itemizedlist>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
-            <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
 
-        <para>
-            <table>
-              <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
-<?dbfo table-width="70%" ?>
-              <tgroup cols="5">
-                <colspec colnum="1" colwidth="4*"/>
-    
-                <colspec colnum="1" colwidth="2*"/>
-    
-                <colspec colnum="1" colwidth="2*"/>
-    
-                <colspec colnum="1" colwidth="1*"/>
-    
-                <colspec colnum="1" colwidth="1*"/>
-    
-                <tbody>
-                  <row>
-                    <entry>
-                      <emphasis>Account</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Shares</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Price</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Buy</emphasis>
-                    </entry>
-    
-                    <entry>
-                      <emphasis>Sell</emphasis>
-                    </entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Assets:Bank ABC
-                    </entry>
-    
-                    <entry></entry>
-    
-                    <entry></entry>
-    
-                    <entry>
-                      3525.00
-                    </entry>
-    
-                    <entry></entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Assets:Brokerage Account:Stock:AMZN
-                    </entry>
-    
-                    <entry>
-                      0
-                    </entry>
-    
-                    <entry>
-                      0
-                    </entry>
-    
-                    <entry>
-                      1525.00
-                    </entry>
-    
-                    <entry></entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Assets:Brokerage Account:Stock:AMZN
-                    </entry>
-    
-                    <entry>
-                      −100
-                    </entry>
-    
-                    <entry>
-                      35.25
-                    </entry>
-    
-                    <entry></entry>
-    
-                    <entry>
-                      3525.00
-                    </entry>
-                  </row>
-    
-                  <row>
-                    <entry>
-                      Income:Capital Gain (Long Term):AMZN
-                    </entry>
-    
-                    <entry></entry>
-    
-                    <entry></entry>
-    
-                    <entry></entry>
-    
-                    <entry>
-                      1525.00
-                    </entry>
-                  </row>
-                </tbody>
-              </tgroup>
-            </table>
-        </para>
+          <example>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Combined, Net Pricing</title>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
+            <para>You bought 100 shares of AMZN for $20 per share (including commissions), then later
+              sell them all for $36 per share with a commission of $75. The split transaction scheme
+              is as follows:
+              <itemizedlist>
+                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+                <listitem><simpara>NET_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+                <listitem><simpara>NET_BUY is $2,000 (the original buying cost),</simpara></listitem>
+                <listitem><simpara>NET_SELL_PRICE is $35.25 (($3600 − $75) / 100)),</simpara></listitem>
+                <listitem><simpara>GROSS_SALE is $3,600, NET_SALE is $3,525,</simpara></listitem>
+                <listitem><simpara>and finally NET_PROFIT is $1,525 (NET_SALE − NET_BUY).</simpara></listitem>
+              </itemizedlist>
+            </para>
+
+            <para><!-- Hack to get a figures and tables inside of an example -->
+              <table>
+                <title>Selling Shares Split Scheme, Sale & Gain Combined, Net Pricing</title>
+                <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        35.25
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1525.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+
+              <figure pgwide="1">
+                <title>Selling Shares for Gain using Net Pricing in Transaction Journal View</title>
+                <screenshot id="invest-sellstockManProfCombNet">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                    <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
 
-        <para>
-          <figure pgwide="1">
-            <title>Selling Shares for Gain using Net Pricing in Transaction Journal View</title>
-            <screenshot id="invest-sellstockManProfCombNet">
-              <mediaobject>
-                <imageobject role="html">
-                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                              srccredit="Chris Good" width="&img-w;"/>
-                </imageobject>
-    
-                <imageobject role="fo">
-                  <imagedata fileref="figures/invest_sellstockManProfCombNet.png"
-                              srccredit="Chris Good"/>
-                </imageobject>
-    
-                <textobject><phrase>Selling Shares Example</phrase></textobject>
-    
-              </mediaobject>
-            </screenshot>
-          </figure>
-        </para>        
-      </example>
-          
-          
         </sect4>
       </sect3>
 
@@ -2442,13 +2294,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2535,13 +2383,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2609,218 +2453,198 @@ Income
               </tbody>
             </tgroup>
           </table>
-      <example>
-        <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross Pricing</title>
-        <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
-
-        <para>You bought 100 shares of AMZN for $20 per share and commissions $20, then later sell them all for
-          $36 per share with a commission of $75. The split transaction scheme is as follows:
-          <itemizedlist>
-            <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
-            <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
-            <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
-            <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
-            <listitem><simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
-          </itemizedlist>
-        </para>
-
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Sale Transaction, Gross Pricing</title>
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Bank ABC
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  3525.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Expenses:Commission
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  75.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  −100
-                </entry>
-
-                <entry>
-                  36.00
-                </entry>
-
-                <entry></entry>
-
-                <entry>
-                  3600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
-        
-        <para>
-        <table>
-          <title>Selling Shares Split Scheme, Gain Transaction, Gross Pricing</title>
-<?dbfo table-width="70%" ?>
-          <tgroup cols="5">
-            <colspec colnum="1" colwidth="4*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="2*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <colspec colnum="1" colwidth="1*"/>
-
-            <tbody>
-              <row>
-                <entry>
-                  <emphasis>Account</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Shares</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Price</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Buy</emphasis>
-                </entry>
-
-                <entry>
-                  <emphasis>Sell</emphasis>
-                </entry>
-              </row>
-
-              <row>
-                <entry>
-                  Assets:Brokerage Account:Stock:AMZN
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  0
-                </entry>
-
-                <entry>
-                  1600.00
-                </entry>
-
-                <entry></entry>
-              </row>
-
-              <row>
-                <entry>
-                  Income:Capital Gain (Long Term):AMZN
-                </entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry></entry>
-
-                <entry>
-                  1600.00
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
-        </para>
-        <para>
-        <figure pgwide="1">
-        <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
-                in <guilabel>Transaction Journal</guilabel> View</title>
-        <screenshot id="invest-sellstockManProfSep">
-          <mediaobject>
-            <imageobject role="html">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good" width="&img-w;"/>
-            </imageobject>
-
-            <imageobject role="fo">
-              <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                          srccredit="Chris Good"/>
-            </imageobject>
-
-            <textobject><phrase>Selling Shares Example</phrase></textobject>
-
-          </mediaobject>
-        </screenshot>
-        </figure>
-        </para>
-      </example>
-
+          <example>
+            <title>Sale of Shares with Profit, Manual Profit/Loss Calculation, Sale & Profit Separated, Gross Pricing</title>
+            <simpara>In this example, we will use the AMZN account created in <xref linkend="invest-setup-example2" />.</simpara>
 
+            <para>You bought 100 shares of AMZN for $20 per share and commissions $20, then later sell them all for
+              $36 per share with a commission of $75. The split transaction scheme is as follows:
+              <itemizedlist>
+                <listitem><simpara>GROSS_BUY_PRICE is $20 (the original buying price),</simpara></listitem>
+                <listitem><simpara>NUM_SHARES is 100,</simpara></listitem>
+                <listitem><simpara>GROSS_BUY is $2,000 (the original buying cost),</simpara></listitem>
+                <listitem><simpara>GROSS_SALE is $3,600,</simpara></listitem>
+                <listitem><simpara>finally GROSS_PROFIT is $1,600 (GROSS_SALE − GROSS_BUY).</simpara></listitem>
+              </itemizedlist>
+            </para>
 
+            <para>
+              <table>
+                <title>Selling Shares Split Scheme, Sale Transaction, Gross Pricing</title>
+                <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Bank ABC
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3525.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Expenses:Commission
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        75.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        −100
+                      </entry>
+
+                      <entry>
+                        36.00
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        3600.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+              <table>
+                <title>Selling Shares Split Scheme, Gain Transaction, Gross Pricing</title>
+      <?dbfo table-width="70%" ?>
+                <tgroup cols="5">
+                  <colspec colnum="1" colwidth="4*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="2*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+                  <colspec colnum="1" colwidth="1*"/>
+
+                  <tbody>
+                    <row>
+                      <entry>
+                        <emphasis>Account</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Shares</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Price</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Buy</emphasis>
+                      </entry>
+
+                      <entry>
+                        <emphasis>Sell</emphasis>
+                      </entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Assets:Brokerage Account:Stock:AMZN
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        0
+                      </entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+
+                      <entry></entry>
+                    </row>
+
+                    <row>
+                      <entry>
+                        Income:Capital Gain (Long Term):AMZN
+                      </entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry></entry>
+
+                      <entry>
+                        1600.00
+                      </entry>
+                    </row>
+                  </tbody>
+                </tgroup>
+              </table>
+              <figure pgwide="1">
+                <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
+                        in <guilabel>Transaction Journal</guilabel> View</title>
+                <screenshot id="invest-sellstockManProfSep">
+                  <mediaobject>
+                    <imageobject role="html">
+                      <imagedata fileref="figures/invest_sellstockManProfSep.png"
+                                 srccredit="Chris Good" width="&img-w;"/>
+                    </imageobject>
+                     <imageobject role="fo">
+                      <imagedata fileref="figures/invest_sellstockManProfSep.png"
+                                 srccredit="Chris Good"/>
+                    </imageobject>
+                  </mediaobject>
+                </screenshot>
+              </figure>
+            </para>
+          </example>
         </sect4>
 
         <sect4 id="invest-sell-man-sep-net">
@@ -2831,13 +2655,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -2908,13 +2728,9 @@ Income
 
             <tgroup cols="5">
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
-
               <colspec colnum="1" colwidth="2*"/>
 
               <tbody>
@@ -3005,13 +2821,9 @@ Income
 <?dbfo table-width="70%" ?>
           <tgroup cols="5">
             <colspec colnum="1" colwidth="4*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="1*"/>
-
             <colspec colnum="1" colwidth="1*"/>
 
             <tbody>
@@ -3076,20 +2888,16 @@ Income
           </tgroup>
         </table>
         </para>
-        
+
         <para>
         <table>
           <title>Selling Shares Split Scheme, Gain Transaction, Net Pricing</title>
 <?dbfo table-width="70%" ?>
           <tgroup cols="5">
             <colspec colnum="1" colwidth="4*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="2*"/>
-
             <colspec colnum="1" colwidth="1*"/>
-
             <colspec colnum="1" colwidth="1*"/>
 
             <tbody>
@@ -3152,10 +2960,7 @@ Income
               </row>
             </tbody>
           </tgroup>
-        </table>
-        </para>
-        
-        <para>
+        </table>
         <figure pgwide="1">
           <title>Selling Shares for Gain Where the Sale and Gain are Recorded in Separate Transactions,
                     in <guilabel>Transaction Journal</guilabel> View</title>
@@ -3163,17 +2968,12 @@ Income
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest_sellstockManProfSepNet.png"
-                              srccredit="Chris Good" width="&img-w;"/>
+                             srccredit="Chris Good" width="&img-w;"/>
                 </imageobject>
-    
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest_sellstockManProfSep.png"
-                              srccredit="Chris Good"/>
+                             srccredit="Chris Good"/>
                 </imageobject>
-    
-                <textobject><phrase>Selling Shares Example</phrase>
-                
-                </textobject>
               </mediaobject>
             </screenshot>
         </figure>
@@ -3191,13 +2991,12 @@ Income
       <sect3 id="invest-sellLotsIntro">
         <title>Introduction</title>
 
-        <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot.
+        <para><ulink url="&url-wp-en;Lot">Wikipedia</ulink> includes the following definition of a lot:
+          <blockquote>
+            <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument</simpara>
+          </blockquote>
         </para>
 
-        <blockquote>
-          <simpara>a set of goods for sale together in an auction; or a quantity of a financial instrument</simpara>
-        </blockquote>
-
         <para>&app; has a built-in lot management facility that can be used to keep track of capital gains or
           losses resulting from security sales. Buy and sell transactions are put into lots for the
           purpose of calculating the cost of the sale. More specifically, a lot is used to link
@@ -3214,8 +3013,7 @@ Income
           To see the <guimenuitem>Trial Balance</guimenuitem>, select <menuchoice>
             <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
-          </menuchoice>. 
-        </para>
+          </menuchoice>.        </para>
 
         <note>
           <para>If you make an error, you can delete the lot(s) and capital gain/loss transaction(s) and retry.
@@ -3260,7 +3058,7 @@ Income
         <para>To open the <guilabel>Lots in Account</guilabel> window, open the security account register, then
           select
           <menuchoice>
-            <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+            <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
           </menuchoice>.
         </para>
 
@@ -3271,16 +3069,10 @@ Income
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                 srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of Lots in Account window</phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the <emphasis>Lots in Account</emphasis> window.
                 </para>
@@ -3290,9 +3082,8 @@ Income
         </figure>
 
         <para>Refer to the Help Manual, Chapter 8 Tools & Assistants,
-          <ulink
-url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html">
-          Lots in Account </ulink> for details of the Lots in Account screen elements.
+          <ulink url="&url-docs;/C/gnucash-help/tool-lots.html">Lots in Account</ulink>
+          for details of the Lots in Account screen elements.
         </para>
       </sect3>
 
@@ -3397,7 +3188,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
         <para>Running a Trial Balance report (
           <menuchoice>
-            <guimenu>Reports</guimenu> <guisubmenu>Income & Expense</guisubmenu>
+            <guimenu>Reports</guimenu><guisubmenu>Income & Expense</guisubmenu>
             <guimenuitem>Trial Balance</guimenuitem>
           </menuchoice>
           ) after creating capital gain/loss transactions, is a basic check that capital
@@ -3634,18 +3425,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots0_RegB4Scrub.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of security register before lot scrubbing</phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the Security Account register in transaction journal view, before lot scrubbing.</simpara>
                   </caption>
@@ -3653,16 +3438,14 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               </screenshot>
             </figure>
           </step>
- 
           <step>
             <simpara>Ensure all previous capital gain/loss transactions are separate transactions to the sell
               transactions which record the reduction in the number of shares and the value
               received.</simpara>
           </step>
- 
           <step><simpara>Select
               <menuchoice>
-                <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
               security account.
@@ -3673,18 +3456,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots1_BeforeCreateLot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window before lot scrubbing</phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>Lots in Account</emphasis> window before lot scrubbing.
                     </para>
@@ -3737,18 +3514,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_BeforeScrub1Lot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window before scrubbing a single lot</phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the <emphasis>Lots in Account</emphasis> window before scrubbing a single lot.</simpara>
                   </caption>
@@ -3776,18 +3547,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Register after scrubbing a single lot</phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the Register after scrubbing a single lot.</simpara>
                   </caption>
@@ -3799,11 +3564,11 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
           <step>
             <simpara>Continue to <xref linkend="invest-sellChgCapGainsAcct" />.</simpara>
           </step>
-        
+
         </procedure>
       </example>
 
-      
+
       <example id="invest-sellAutoExample">
         <title>Automatic Creation of Capital Gain Or Loss Transactions</title>
 
@@ -3875,18 +3640,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
               <mediaobject>
                 <imageobject role="html">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
-                  srccredit="Chris Good" width="&img-w;"/>
+                             srccredit="Chris Good" width="&img-w;"/>
                 </imageobject>
-  
                 <imageobject role="fo">
                   <imagedata fileref="figures/invest2Lots0RegB4Scrub.png"
                              srccredit="Chris Good"/>
                 </imageobject>
-  
-                <textobject>
-                  <phrase>Example of security register before Scrub Account is used. </phrase>
-                </textobject>
-  
                 <caption>
                   <simpara>An image of the Security Account register in transaction journal view, before Scrub Account is used.</simpara>
                 </caption>
@@ -3898,7 +3657,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <procedure>
           <step><simpara>Select
               <menuchoice>
-                <guimenu>Actions</guimenu> <guimenuitem>View Lots</guimenuitem>
+                <guimenu>Actions</guimenu><guimenuitem>View Lots</guimenuitem>
               </menuchoice>
               to open the <guilabel>Lots in Account SSSS</guilabel> window where SSSS is the
               security account.</simpara>
@@ -3908,19 +3667,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots1B4Scrub.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window before Scrub Account is used.
-                    </phrase>
-                  </textobject>
-
                   <caption>
                     <simpara>An image of the <emphasis>Lots in Account</emphasis> window before Scrub Account is used.</simpara>
                   </caption>
@@ -3937,18 +3689,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots2LotsAftScrubAcct.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of Lots in Account window after using Scrub Account</phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>Lots in Account </emphasis> window after using Scrub Account.
                     </para>
@@ -3963,7 +3709,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 reopened so all the lots show.
               </para>
             </note>
-          </step>        
+          </step>
 
           <step>
             <simpara>Close the <guilabel>Lots in Account SSSS</guilabel> window and return to the security account register.</simpara>
@@ -3973,18 +3719,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/invest2Lots3RegAftScrubAcct.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of security register after using Scrub Account</phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>security register</emphasis> after using Scrub Account.
                     </para>
@@ -4022,18 +3762,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitReg.png"
-                srccredit="Chris Good" width="&img-w;"/>
+                           srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitReg.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of security register after Scrub Account is used. </phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                 </para>
@@ -4047,18 +3781,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
-                srccredit="Chris Good" width="&img-w;"/>
+                           srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot0.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of security register after Scrub Account is used. </phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                 </para>
@@ -4072,18 +3800,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
             <mediaobject>
               <imageobject role="html">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
-                srccredit="Chris Good" width="&img-w;"/>
+                           srccredit="Chris Good" width="&img-w;"/>
               </imageobject>
-
               <imageobject role="fo">
                 <imagedata fileref="figures/investLotsSplitLot1.png"
                            srccredit="Chris Good"/>
               </imageobject>
-
-              <textobject>
-                <phrase>Example of security register after Scrub Account is used. </phrase>
-              </textobject>
-
               <caption>
                 <para>An image of the Security Account register in transaction journal view, after Scrub Account is used.
                 </para>
@@ -4130,18 +3852,12 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 <mediaobject>
                   <imageobject role="html">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
-                    srccredit="Chris Good" width="&img-w;"/>
+                               srccredit="Chris Good" width="&img-w;"/>
                   </imageobject>
-
                   <imageobject role="fo">
                     <imagedata fileref="figures/investLots2_RegAfterScrub1Lot.png"
                                srccredit="Chris Good"/>
                   </imageobject>
-
-                  <textobject>
-                    <phrase>Example of security register after scrubbing a single lot </phrase>
-                  </textobject>
-
                   <caption>
                     <para>An image of the <emphasis>security register</emphasis> after scrubbing a single lot.
                     </para>
@@ -4153,10 +3869,10 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
 
           <step>
             <simpara>Find each new <emphasis>Realized Gain/Loss</emphasis> transaction in the security account register
-              (they will have the same date as the sell transactions). 
-              </simpara>
+              (they will have the same date as the sell transactions).
+            </simpara>
           </step>
-          
+
           <step>
             <simpara>Edit the <emphasis>Orphaned Gains-CCC</emphasis> transaction split to re-assign the income account to a more
               meaningful income (or expense) gain or loss account (for example, <emphasis>Income:Capital Gain (Long Term):IBM</emphasis>).</simpara>
@@ -4165,10 +3881,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
                 with your tax laws.
               </simpara>
             </tip>
-          </step>        
+          </step>
         </procedure>
-
-
       </example>
       </sect3>
     </sect2>
@@ -4196,28 +3910,22 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <emphasis>Broker</emphasis> Account with a tie to the stock account.
       </para>
 
-      <screenshot id="invest-dividendcash1">
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Example Of Cash Dividend Transactions</title>
+        <screenshot id="invest-dividendcash1">
         <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendcash.png"
-                       srccredit="Daniel Dodson" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
+          <imageobject>
             <imagedata fileref="figures/invest_dividendcash.png"
                        srccredit="Daniel Dodson"/>
           </imageobject>
-
-          <textobject>
-            <phrase>Example of cash dividend transactions</phrase>
-          </textobject>
-
           <caption>
             <para>An image of the <emphasis>Brokerage</emphasis> Account register after a series of cash dividends.
             </para>
           </caption>
         </mediaobject>
       </screenshot>
+      </figure>
 
       <note>
         <para>If you want to track dividends on a per-stock basis, you would need to create an
@@ -4248,28 +3956,25 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         corresponding number of <guilabel>Shares</guilabel>.
       </para>
 
-      <screenshot id="invest-dividendreinvest1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/invest_dividendreinvest1.png"
-                        srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Example of dividend reinvestment transactions</phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the NST Stock Account register after a dividend reinvestment.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Example Of Dividend Reinvestment Transactions</title>
+        <screenshot id="invest-dividendreinvest1">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/invest_dividendreinvest1.png"
+                          srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/invest_dividendreinvest1.png"
+                          srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>An image of the NST Stock Account register after a dividend reinvestment.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
   </sect1>
 
@@ -4324,28 +4029,25 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
     <para>The other side of the double entry would usually be a debit to the brokerage bank account.
     </para>
 
-    <screenshot id="invest-ret-of-cap">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good" width="&img-w;"/>
-        </imageobject>
-
-        <imageobject role="fo">
-          <imagedata fileref="figures/invest_ret_of_cap.png"
-                      srccredit="Chris Good"/>
-        </imageobject>
-
-        <textobject>
-          <phrase>Example of return of capital transactions</phrase>
-        </textobject>
-
-        <caption>
-          <para>An image of the Stock Account register after a return of capital.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Example Of Return Of Capital Transactions</title>
+      <screenshot id="invest-ret-of-cap">
+        <mediaobject>
+          <imageobject role="html">
+            <imagedata fileref="figures/invest_ret_of_cap.png"
+                        srccredit="Chris Good" width="&img-w;"/>
+          </imageobject>
+          <imageobject role="fo">
+            <imagedata fileref="figures/invest_ret_of_cap.png"
+                        srccredit="Chris Good"/>
+          </imageobject>
+          <caption>
+            <para>An image of the Stock Account register after a return of capital.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <note>
       <para>It is not possible to use the Stock Split Assistant to do this type of transaction.
@@ -4362,9 +4064,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       </para>
     </tip>
   </sect1>
-<!--  Stock Splits - Simple
 
--->
   <sect1 id="invest-splitsnmergers1">
     <title>Splits and Mergers</title>
 
@@ -4386,47 +4086,43 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         to start the assistant.
       </para>
 
-      <screenshot id="invest-split1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split1.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 1. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the selection of the stock split assistant.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+ <!-- ToDo: unshrink -->
+      <figure>
+        <title>Activation Of The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split1.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the selection of the stock split assistant.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The first screen is an Introduction, select <guibutton>Forward</guibutton> to display the selection
         of the account and stock for the split. You will need to create an entry for each
         <emphasis>Account:Stock</emphasis> combination you hold.
       </para>
 
-      <screenshot id="invest-split2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split2.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 2 - Selection of Account/Stock.
-            </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 2 - Selection of Account/Stock.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Selection Of A Stock Account In The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split2.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 2 - Selection of Account/Stock.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Select the <emphasis>Assets:Investments:DRIPs:NST</emphasis> and click on
         <guibutton>Forward</guibutton>.
@@ -4440,7 +4136,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <term>Date</term>
         <listitem><simpara>Enter the date of the split.</simpara></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term>Shares</term>
         <listitem><para>The number of shares increased (or decreased) in the transaction.
@@ -4452,8 +4148,8 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <varlistentry>
         <term>Description</term>
         <listitem><simpara>The Description should give a brief explanation of the transaction.</simpara></listitem>
-      </varlistentry>      
-      
+      </varlistentry>
+
       <varlistentry>
         <term>New Price</term>
         <listitem><simpara>If desired the new price of the stock, after the split, may be entered.</simpara></listitem>
@@ -4469,72 +4165,65 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
       <para>Click on the <guibutton>Forward</guibutton> button.
       </para>
 
-      <screenshot id="invest-split3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split3.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 3 - Split Details. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 3 - Split Details.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Split Details In The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split3.png"
+                         srccredit="Dave Herman"/>
+             </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 3 - Split Details.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The next screen will be skipped in this example as there was no <quote>Cash in Lieu</quote>.
       </para>
 
-      <screenshot id="invest-split4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_split4.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 4 - Cash in Lieu. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 4 - Cash in Lieu.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+       <figure>
+        <title><quote>Cash In Lieu</quote> In The <quote>Stock Split</quote> Assistant</title>
+        <screenshot id="invest-split4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_split4.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 4 - Cash in Lieu.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>A final <guilabel>Finish</guilabel> screen will give a last option to;
         <guibutton>Cancel</guibutton>, <guibutton>Back</guibutton> to modify any data entered or
         <guibutton>Apply</guibutton> to complete the stock split with the data entered.
       </para>
 
-      <screenshot id="invest-simplesplit1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_simplesplit1.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Example of simple stock split transaction in the stock’s register</phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the <emphasis>Assets:Investments:DRIPs:NST</emphasis> register after a simple stock
-              split transaction.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+       <figure>
+        <title>The NST Account After A Simple Stock Split</title>
+        <screenshot id="invest-simplesplit1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_simplesplit1.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the <emphasis>Assets:Investments:DRIPs:NST</emphasis> register after a simple stock
+                split transaction.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
-<!--  Moderately Complex Stock Merger
 
--->
     <sect2 id="invest-merger1">
       <title>Moderately Complex Stock Merger</title>
 
@@ -4557,24 +4246,22 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <emphasis>Investment Account:Stock</emphasis> account combination that has shares splitting.
       </para>
 
-      <screenshot id="invest-merge2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_merge2.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 2. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 2 - Selection of Account/Stock (<emphasis>Investment
-              Account:T</emphasis>).
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Selection Of A Stock Account In The <quote>Stock Split</quote> Assistant—Moderate</title>
+        <screenshot id="invest-merge2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_merge2.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 2 - Selection of Account/Stock (<emphasis>Investment
+                Account:T</emphasis>).
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Select the <emphasis>Assets:Investments:Brokerage Account:Stock:T</emphasis> and click on
         <guibutton>Forward</guibutton>.
@@ -4588,7 +4275,7 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <term>Date</term>
         <listitem><simpara>Enter the date of the split. Here we’ll enter November 18, 2005.</simpara></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term>Shares</term>
         <listitem><para>The number of shares increased (or decreased) in the transaction.
@@ -4613,57 +4300,53 @@ url="https://www.gnucash.org/docs/v&series-stable;/C/gnucash-help/tool-lots.html
         <term>Currency</term>
         <listitem><simpara>The currency of the transaction is required. This should be the same as the stock purchase currency.</simpara></listitem>
       </varlistentry>
-      
+
       </variablelist>
 
       <para>Click on the <guibutton>Forward</guibutton> button.
       </para>
 
-      <screenshot id="invest-merge3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_merge3.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>An image of the stock split assistant at step 3. </phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the stock split assistant at step 3 - Split Details.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Split Details In The <quote>Stock Split</quote> Assistant—Moderate</title>
+        <screenshot id="invest-merge3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_merge3.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the stock split assistant at step 3 - Split Details.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The next screen will be skipped in this example as there was no <quote>Cash in Lieu</quote>.
       </para>
 
-      <para>A final <quote>Finish</quote> screen will give a last option to <guimenu>Back</guimenu> to modify
-        any data entered or <guimenu>Apply</guimenu> to complete the stock split with the data
+      <para>A final <quote>Finish</quote> screen will give a last option to <guibutton>Back</guibutton> to modify
+        any data entered or <guibutton>Apply</guibutton> to complete the stock split with the data
         entered.
       </para>
 
-      <screenshot id="invest-stockmerge1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/invest_stockmerge1.png"
-                       srccredit="Dave Herman"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Example of moderate stock split transaction in the stock’s
-            register</phrase>
-          </textobject>
-
-          <caption>
-            <para>An image of the <emphasis>Investment Account:T</emphasis> register after a stock split transaction
-              that decreases the shares.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+       <figure>
+        <title>The T Account After A Moderate Stock Split</title>
+        <screenshot id="invest-stockmerge1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/invest_stockmerge1.png"
+                         srccredit="Dave Herman"/>
+            </imageobject>
+            <caption>
+              <para>An image of the <emphasis>Investment Account:T</emphasis> register after a stock split transaction
+                that decreases the shares.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
   </sect1>
 <!--  Working Location  !!!!!!!!!!!!
diff --git a/guide/C/ch_loans.xml b/guide/C/ch_loans.xml
index 03384651..35bf53f8 100644
--- a/guide/C/ch_loans.xml
+++ b/guide/C/ch_loans.xml
@@ -199,23 +199,21 @@
       </menuchoice>.
     </para>
 
-    <screenshot id="loans_fcalc">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_fcalc.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Loan Repayment Calculator</phrase>
-        </textobject>
-
-        <caption>
-          <para>The &app; <guilabel>Loan Repayment Calculator</guilabel>.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Loan Repayment Calculator</title>
+      <screenshot id="loans_fcalc">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_fcalc.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>The &app; <guilabel>Loan Repayment Calculator</guilabel>.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+      </figure>
 
     <para>The <guilabel>Loan Repayment Calculator</guilabel> can be used to calculate any one of the
       parameters: <guilabel>Payment Periods</guilabel>, <guilabel>Interest Rate</guilabel>,
@@ -475,23 +473,17 @@ The simple case for when  PMT == 0 gives the solution:
     <para>Your accounts before borrowing the money:
     </para>
 
+    <figure>
+      <title>Accounts Before Receiving Loan</title>
     <screenshot id="loans_mortgage">
       <mediaobject>
         <imageobject>
           <imagedata fileref="figures/loans_mortgage1.png"
                      srccredit="Bengt Thuree" />
         </imageobject>
-
-        <textobject>
-          <phrase>Accounts Before Receiving Loan</phrase>
-        </textobject>
-
-        <caption>
-          <para>Accounts Before Receiving Loan
-          </para>
-        </caption>
       </mediaobject>
     </screenshot>
+    </figure>
 
     <para>The purchase of the house is recorded with a split transaction in the <emphasis>Assets:Fixed
       Assets:House</emphasis> account, with $50,000 coming from the bank (i.e., your down payment),
@@ -573,44 +565,32 @@ The simple case for when  PMT == 0 gives the solution:
     <para>The split will look like this in the <emphasis>Assets:Fixed Assets:House</emphasis> Account:
     </para>
 
-    <screenshot id="loans_mortgage2.png">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_mortgage2.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Mortgage Split Transaction</phrase>
-        </textobject>
-
-        <caption>
-          <para>Mortgage Split Transaction
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Mortgage Split Transaction</title>
+      <screenshot id="loans_mortgage2.png">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_mortgage2.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Which will give a Chart of Accounts like this:
     </para>
 
-    <screenshot id="loans_mortgage3">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/loans_mortgage3.png"
-                     srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>Mortgage Accounts</phrase>
-        </textobject>
-
-        <caption>
-          <para>Mortgage Account
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>Mortgage Accounts</title>
+      <screenshot id="loans_mortgage3">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/loans_mortgage3.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+    </figure>
   </sect1>
 
   <sect1 id="loans_CarLoan">
@@ -706,22 +686,20 @@ The simple case for when  PMT == 0 gives the solution:
         <acronym>PMT</acronym> function.
       </para>
 
-      <screenshot id="loans_OpenOfficePrivateLoanDetails">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Calculation of Private Loan details</phrase>
-          </textobject>
-
-          <caption id="loans_OpenOfficePrivateLoanDetails.caption">
-            Detailed view over the private loan to Peter
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Calculation Of Private Loan Details</title>
+        <screenshot id="loans_OpenOfficePrivateLoanDetails">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanCalculation.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption id="loans_OpenOfficePrivateLoanDetails.caption">
+              Detailed view over the private loan to Peter
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_accounts">
@@ -811,23 +789,17 @@ The simple case for when  PMT == 0 gives the solution:
         </table>
       </para>
 
-      <screenshot id="loans_PrivateLoanInitial">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanInitial.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Lended money</phrase>
-          </textobject>
-
-          <caption>
-            <para>Chart of Accounts after lending money
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Chart of Accounts after lending money</title>
+        <screenshot id="loans_PrivateLoanInitial">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanInitial.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect2>
 
     <sect2 id="loans_personalLoanToSomeOne_FirstPayment">
@@ -867,23 +839,22 @@ The simple case for when  PMT == 0 gives the solution:
       <para>This can be translated to the following &app; entry
       </para>
 
-      <screenshot id="loans_PrivateLoanFirstPayment">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>First payment</phrase>
-          </textobject>
-
-          <caption>
-            <para>Detailed view over first payment
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>First Payment</title>
+        <screenshot id="loans_PrivateLoanFirstPayment">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanFirstPayment.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>Detailed view over first payment
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The balance on Peter’s loan is now $2,000 - $107.23 = $1,892.77.
       </para>
@@ -926,23 +897,21 @@ The simple case for when  PMT == 0 gives the solution:
       <para>This can be translated to the following &app; entry.
       </para>
 
-      <screenshot id="loans_PrivateLoanSecondPayment">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Second payment</phrase>
-          </textobject>
-
-          <caption>
-            <para>Detailed view over the second payment
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Second payment</title>
+        <screenshot id="loans_PrivateLoanSecondPayment">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanSecondPayment.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>Detailed view over the second payment
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>The balance on Peter’s loan is now $1,892.77 - $107.67 = $1,785.10.
       </para>
@@ -950,22 +919,18 @@ The simple case for when  PMT == 0 gives the solution:
       <para>The Chart of accounts looks now like this:
       </para>
 
-      <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Chart of Accounts after second payment</phrase>
-          </textobject>
-
-          <caption>
-            Chart of Accounts after second payment
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Chart Of Accounts After Second payment</title>
+        <screenshot id="loans_PrivateLoanSecondPaymentAccounts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/loans_PrivateLoanSecondPaymentAccounts.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>As you can see, the interest varies for every month, as well as the principal amount. So for every
         payment you receive you need to calculate the proper amounts for your various split entries.
@@ -973,7 +938,7 @@ The simple case for when  PMT == 0 gives the solution:
 
       <para>The interest amount will be less and less for every payment (since it is calculated on a smaller
         loan amount all the time), until the last payment where it is more or less 0. Please review
-        <link linkend="loans_OpenOfficePrivateLoanDetails" endterm="loans_OpenOfficePrivateLoanDetails.caption" />
+        <xref linkend="loans_OpenOfficePrivateLoanDetails" endterm="loans_OpenOfficePrivateLoanDetails.caption" />
         for more details.
       </para>
     </sect2>
@@ -982,7 +947,7 @@ The simple case for when  PMT == 0 gives the solution:
   <sect1 id="loans_Reconciling">
     <title>Reconciling with the Loan Statements (How-To)</title>
 
-    <para>Reconciling a loan statement is no different from reconciling a bank or credit card statement.
+    <para>Reconciling a loan statement is not different from reconciling a bank or credit card statement.
     </para>
 
     <para>During the period you should have recorded all the various loan related transactions, and every one
diff --git a/guide/C/ch_oview.xml b/guide/C/ch_oview.xml
index 1b173958..48d5f6f2 100644
--- a/guide/C/ch_oview.xml
+++ b/guide/C/ch_oview.xml
@@ -35,28 +35,21 @@
       need.
     </para>
 
-    <screenshot id="oview-intro">
-      <mediaobject>
-        <imageobject role="html">
-          <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree" width="&img-w;"/>
-        </imageobject>
-
-        <imageobject role="fo">
-          <imagedata fileref="figures/oview_intro.png"
-                     srccredit="Bengt Thuree"/>
-        </imageobject>
-
-        <textobject>
-          <phrase>&app; Chart of Accounts - Teaser</phrase>
-        </textobject>
-
-        <caption>
-          <para>This image shows a Chart of Accounts with multiple currencies and investments.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+    <figure>
+      <title>A Chart Of Accounts With Multiple Currencies And Investments</title>
+      <screenshot id="oview-intro">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/oview_intro.png"
+                       srccredit="Bengt Thuree"/>
+          </imageobject>
+          <caption>
+            <para>This image shows a Chart of Accounts with multiple currencies and investments.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>While &app; is well suited for personal finances, it is also powerful enough for business use. There
       are many business features, from integrated accounts receivable and payable systems, to tax
diff --git a/guide/C/ch_txns.xml b/guide/C/ch_txns.xml
index 466a935c..fda23061 100644
--- a/guide/C/ch_txns.xml
+++ b/guide/C/ch_txns.xml
@@ -126,45 +126,43 @@
       <para>First let’s view the Jeans transaction from your checking account:
       </para>
 
-      <screenshot id="txns-registersplit4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit4.png"
-                srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>3 Jeans purchases</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows one split transaction with 3 Jeans purchases
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Purchase Of 3 Jeans In Assets:Checking</title>
+        <screenshot id="txns-registersplit4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_registersplit4.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows one split transaction with 3 Jeans purchases.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Now, let’s open the <emphasis>Expenses:Clothes</emphasis> account, and look at it in Basic
         view.
       </para>
 
-      <screenshot id="txns-registersplit5">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit5.png"
-                srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows <emphasis>Expenses:Clothes</emphasis> account in Basic Ledger mode.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+ <!-- ToDo: unshrink -->
+      <figure>
+        <title>Purchase Of 3 Jeans In Expenses:Clothes Account In Basic Ledger Mode</title>
+        <screenshot id="txns-registersplit5">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_registersplit5.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows them in the <emphasis>Expenses:Clothes</emphasis> account in Basic Ledger mode.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Three entries appear here, but there was only the single split entry in the checking account.
         Further examination shows that each row has a different amount, $200, $300, and $500. This
@@ -175,23 +173,22 @@
       <para>Changing to Transaction Journal mode will display only the original split transaction.
       </para>
 
-      <screenshot id="txns-registersplit6">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_registersplit6.png"
-                srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>A jump to the <emphasis>Expenses:Clothes</emphasis> account</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows <emphasis>Expenses:Clothes</emphasis> account in Transaction Journal mode.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Purchase Of 3 Jeans In Expenses:Clothes Account In Transaction Journal Mode</title>
+        <screenshot id="txns-registersplit6">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_registersplit6.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the Expenses:Clothes account in <emphasis>Transaction Journal</emphasis> mode.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-columnwidths1">
@@ -477,23 +474,22 @@
       to show the split-related fields:
     </para>
 
-    <screenshot id="txns-registersplit2">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/txns_registersplit2.png"
-            srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>How split headings change</phrase>
-        </textobject>
-
-        <caption>
-          <para>This image shows how split headings change.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+<!-- ToDo: unshrink -->
+    <figure>
+      <title>Salary In The Assets:Checking Account</title>
+      <screenshot id="txns-registersplit2">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/txns_registersplit2.png"
+                       srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>This image shows how split headings change.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Each split contains an optional <guilabel>Action</guilabel>, or type of split, which you can either
       type in or choose from a pull-down list. The split also contains an optional
@@ -519,23 +515,22 @@
       same transaction in the <emphasis>Income:Salary</emphasis> - Register:
     </para>
 
-    <screenshot id="txns-registersplit3">
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="figures/txns_registersplit3.png"
-            srccredit="Bengt Thuree" />
-        </imageobject>
-
-        <textobject>
-          <phrase>A jump to the <emphasis>Income:Salary</emphasis> account</phrase>
-        </textobject>
-
-        <caption>
-          <para>This image shows a jump to the <emphasis>Income:Salary</emphasis> account.
-          </para>
-        </caption>
-      </mediaobject>
-    </screenshot>
+ <!-- ToDo: unshrink -->
+    <figure>
+      <title>Salary In The Income:Salary Account</title>
+      <screenshot id="txns-registersplit3">
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="figures/txns_registersplit3.png"
+              srccredit="Bengt Thuree" />
+          </imageobject>
+          <caption>
+            <para>This image shows a jump to the <emphasis>Income:Salary</emphasis> account.
+            </para>
+          </caption>
+        </mediaobject>
+      </screenshot>
+    </figure>
 
     <para>Note that the transaction line total now summarizes the effect on the
       <emphasis>Income:Salary</emphasis> account instead of the <emphasis>Checking
@@ -560,24 +555,23 @@
         similar to this figure:
       </para>
 
-      <screenshot id="txns-register-2account">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_register_2account.png"
-                       srccredit="Bengt  Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Checking Account - Register</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening balance
-              transaction.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Checking Account After Inserting The Opening Balance Transaction</title>
+        <screenshot id="txns-register-2account">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_register_2account.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the <emphasis>Assets:Checking</emphasis> register after inserting the opening balance
+                transaction.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Setting the opening balances of an account is an example of a simple two account transaction. In
         this case, affecting the <emphasis>Assets:Checking</emphasis> and the
@@ -590,24 +584,23 @@
         <emphasis>Expenses:Groceries</emphasis>. The account register should now appear:
       </para>
 
-      <screenshot id="txns-register-2account2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_register_2account2.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>The Checking Account - Register</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows <emphasis>Assets:Checking</emphasis> - Register after adding a transaction for
-              groceries.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Checking Account Adding A Transaction For Groceries</title>
+        <screenshot id="txns-register-2account2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_register_2account2.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows <emphasis>Assets:Checking</emphasis> - Register after adding a transaction for
+                groceries.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-registers-multiaccount2">
@@ -664,17 +657,17 @@
       linkend="txns-registers-features2"/> for details.
       </para>
 
+<!-- ToDo: unshrink -->
       <figure id="txns-register-multiaccount">
-        <title>Entering a split transaction</title><mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_register_multiaccount.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Account Register - Split Transaction</phrase>
-          </textobject>
-        </mediaobject>
+        <title>Entering a split transaction</title>
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_register_multiaccount.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
       </figure>
     </sect3>
   </sect2>
@@ -751,28 +744,17 @@
         </menuchoice>. A window like the one below will appear in which you can enter the reconcile information.
       </para>
 
-      <screenshot id="txns-reconcile-window-1">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_reconcile_window1.png"
+      <figure>
+        <title>The Initial Reconcile Window</title>
+        <screenshot id="txns-reconcile-window-1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_reconcile_window1.png"
                          srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_reconcile_window1.png"
-                         srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Reconcile Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>The initial reconcile window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>In the initial reconcile window, some <guilabel>Reconcile Information</guilabel> need to be entered.
       </para>
@@ -892,28 +874,21 @@
         reconcile window:
       </para>
 
-      <screenshot id="txns-reconcile-window-2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_reconcile_window2.png"
-                         srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Reconcile Window</phrase>
-          </textobject>
-
-          <caption>
-            <para>The transactions listing in the reconcile window.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Reconcile Window</title>
+          <screenshot id="txns-reconcile-window-2">
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="figures/txns_reconcile_window2.png"
+                           srccredit="Cristian Marchi"/>
+              </imageobject>
+              <caption>
+                <para>The transactions listing in the reconcile window.
+                </para>
+              </caption>
+            </mediaobject>
+          </screenshot>
+        </figure>
 
       <para>The two panes called <guilabel>Funds In</guilabel> and <guilabel>Funds Out</guilabel>, lists all the
         unreconciled transactions that belongs to the account that is going to be reconciled. The
@@ -1007,23 +982,18 @@
         what has been cleared (<guilabel>Cleared:USD 954.79 Reconciled:USD 0.00</guilabel>)
       </para>
 
-      <screenshot id="txns-reconcile-window-3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_reconcile_window3.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Checking account</phrase>
-          </textobject>
-
-          <caption>
-            <para>The Checking account after postponing the reconciliation.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>The Checking account after postponing the reconciliation</title>
+        <screenshot id="txns-reconcile-window-3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_reconcile_window3.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
   </sect2>
 
@@ -1054,23 +1024,18 @@
         <emphasis>Expenses:Internet</emphasis> as shown in the next screenshot.
       </para>
 
-      <screenshot id="txns-sxn-ledger-1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger1.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Step one creating scheduled transaction from the ledger</phrase>
-          </textobject>
-
-          <caption>
-            <para>Step one creating scheduled transaction from the ledger
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Step 1 Of Creating Scheduled Transaction From The Ledger</title>
+        <screenshot id="txns-sxn-ledger-1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger1.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <note>
         <para>Since we did not create the <emphasis>Expenses:Internet</emphasis> account, &app; will prompt us to
@@ -1081,66 +1046,50 @@
       <para>Then you right click on your transaction and select <guilabel>Schedule...</guilabel>
       </para>
 
-      <screenshot id="txns-sxn-ledger-2">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger2.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Step two creating scheduled transaction from the ledger</phrase>
-          </textobject>
-
-          <caption>
-            <para>Step two creating scheduled transaction from the ledger
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Step 2 Of Creating Scheduled Transaction From The Ledger</title>
+        <screenshot id="txns-sxn-ledger-2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger2.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>A window like this will appear:
       </para>
 
-      <screenshot id="txns-sxn-ledger-3">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger3.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Step three creating scheduled transaction from the ledger</phrase>
-          </textobject>
-
-          <caption>
-            <para>Step three creating scheduled transaction from the ledger
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Step 3 Of Creating Scheduled Transaction From The Ledger</title>
+        <screenshot id="txns-sxn-ledger-3">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger3.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Let’s fill the values, we know that the subscription is taken on the 28th each month, and the
         next one is for next month (since we entered the one for this month manually) :
       </para>
 
-      <screenshot id="txns-sxn-ledger-4">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_sxn_ledger4.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Filling in data to a scheduled transaction</phrase>
-          </textobject>
-
-          <caption>
-            <para>Filling in data to a scheduled transaction
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+<!-- ToDo: unshrink -->
+      <figure>
+        <title>Filling In Data To A Scheduled Transaction</title>
+        <screenshot id="txns-sxn-ledger-4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_ledger4.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Click the <guibutton>OK</guibutton> button, and the transaction will be scheduled. &app; now has
         memorized this scheduled transaction and on the 28th of next month, it will pop up a window
@@ -1163,57 +1112,46 @@
         opened in the current &app; window as shown below:
       </para>
 
-      <screenshot id="txns-sxn-editor-2">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-2.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-2.png"
-                       srccredit="Cristian Marchi"/>
-          </imageobject>
-
-          <textobject>
-            <phrase>Empty <guilabel>Scheduled Transactions</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para>Empty <guilabel>Scheduled Transactions</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Empty Scheduled Transactions Tab</title>
+       <screenshot id="txns-sxn-editor-2">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_editor-2.png"
+                         srccredit="Cristian Marchi"/>
+            </imageobject>
+            <caption>
+              <para>Empty <guilabel>Scheduled Transactions</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>This tab contains a list, now empty, of all the scheduled transactions. Let’s create a new one
         by clicking on the <guibutton>New</guibutton> button in the <emphasis>Toolbar</emphasis>. A
         window like the one below will pop up:
       </para>
 
-      <screenshot id="txns-sxn-editor-3-overview">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase> <guimenuitem>Edit Scheduled Transaction</guimenuitem> window,
-            <guilabel>Overview</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Overview</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Overview Tab Of The Edit Scheduled Transaction Window</title>
+        <screenshot id="txns-sxn-editor-3-overview">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/txns_sxn_editor-3-overview.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+            <caption>
+              <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Overview</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>First, let’s enter a name for this new scheduled transaction in the top of the window.
       </para>
@@ -1279,29 +1217,25 @@
         Transaction</guilabel> window. Here you can set the time-related options of the transaction.
       </para>
 
-      <screenshot id="txns-sxn-editor-3-frequency">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase> <guimenuitem>Edit Scheduled Transaction</guimenuitem> window,
-            <guilabel>Frequency</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Frequency</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Frequency Tab Of The Edit Scheduled Transaction Window</title>
+        <screenshot id="txns-sxn-editor-3-frequency">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/txns_sxn_editor-3-frequency.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+            <caption>
+              <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Frequency</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <variablelist>
         <varlistentry>
@@ -1376,30 +1310,26 @@
       <para>Now, you should have a window like this:
       </para>
 
-      <screenshot id="txns-sxn-editor-3-template">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-3-template.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
-            Transaction</guilabel> tab</phrase>
-          </textobject>
-
-          <caption>
-            <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
-              Transaction</guilabel> tab
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Template Tab Of The Edit Scheduled Transaction Window</title>
+        <screenshot id="txns-sxn-editor-3-template">
+          <mediaobject>
+            <imageobject role="html">
+              <imagedata fileref="figures/txns_sxn_editor-3-template.png"
+                         srccredit="Cristian Marchi" width="&img-w;"/>
+            </imageobject>
+            <imageobject role="fo">
+              <imagedata fileref="figures/txns_sxn_editor-3-template.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+            <caption>
+              <para><guimenuitem>Edit Scheduled Transaction</guimenuitem> window, <guilabel>Template
+                Transaction</guilabel> tab
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>Remember to click on the <guibutton>Enter</guibutton> icon, to validate and enter the transaction.
       </para>
@@ -1408,28 +1338,17 @@
         tab, now showing one item in the <guilabel>Transactions</guilabel> list:
       </para>
 
-      <screenshot id="txns-sxn-editor-4">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor-4.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor-4.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Entered scheduled transaction</phrase>
-          </textobject>
-
-          <caption>
-            <para>Entered scheduled transaction
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>The Finally Entered Scheduled Transaction</title>
+        <screenshot id="txns-sxn-editor-4">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_editor-4.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+      </figure>
 
       <tip>
         <para>If you click in the calendar part on the first day of one month, a small window, following your
@@ -1455,28 +1374,17 @@
         etc... a better description of each option can be found in the &app; manual):
       </para>
 
-      <screenshot id="txns-sxn-editor-slr">
-        <mediaobject>
-          <imageobject role="html">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png"
-                       srccredit="Cristian Marchi" width="&img-w;"/>
-          </imageobject>
-
-          <imageobject role="fo">
-            <imagedata fileref="figures/txns_sxn_editor_slr.png"
-                       srccredit="Cristian Marchi" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Scheduled transaction popup reminder</phrase>
-          </textobject>
-
-          <caption>
-            <para>Scheduled transaction popup reminder
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Scheduled Transaction Popup Reminder</title>
+        <screenshot id="txns-sxn-editor-slr">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_sxn_editor_slr.png"
+                         srccredit="Cristian Marchi" />
+            </imageobject>
+         </mediaobject>
+        </screenshot>
+      </figure>
 
       <para>You can click on the <guilabel>Status</guilabel> column to change the scheduled transaction status
         if needed. Then just click on <guibutton>Ok</guibutton> to close the <guilabel>Since Last
@@ -1523,23 +1431,21 @@
         like this:
       </para>
 
-      <screenshot id="txns-puttoget1-Charts">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Starting point for Putting It All Together</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the starting point for this section.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Starting Point For Putting It All Together</title>
+        <screenshot id="txns-puttoget1-Charts">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_puttoget_Charts.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the starting point for this section.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-puttoget-open2">
@@ -1596,23 +1502,21 @@
         <emphasis>Assets:Savings</emphasis>, and <emphasis>Liabilities:Visa</emphasis>.
       </para>
 
-      <screenshot id="txns-puttoget1-Charts1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts1.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Chart accounts after setting opening balance</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the opening balances.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Chart Of Accounts After Setting The Opening Balance</title>
+        <screenshot id="txns-puttoget1-Charts1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_puttoget_Charts1.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the opening balances.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-puttoget-add2">
@@ -1715,24 +1619,22 @@
         </listitem>
       </orderedlist>
 
-      <screenshot id="txns-puttoget2-Charts1">
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="figures/txns_puttoget_Charts2.png"
-                       srccredit="Bengt Thuree" />
-          </imageobject>
-
-          <textobject>
-            <phrase>Chart accounts after setting all the various transactions</phrase>
-          </textobject>
-
-          <caption>
-            <para>This image shows the ending balances after <xref
-          linkend="chapter_txns" />.
-            </para>
-          </caption>
-        </mediaobject>
-      </screenshot>
+      <figure>
+        <title>Chart Of Accounts After Setting All The Various Transactions</title>
+        <screenshot id="txns-puttoget2-Charts1">
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="figures/txns_puttoget_Charts2.png"
+                         srccredit="Bengt Thuree" />
+            </imageobject>
+            <caption>
+              <para>This image shows the ending balances after <xref
+            linkend="chapter_txns" />.
+              </para>
+            </caption>
+          </mediaobject>
+        </screenshot>
+      </figure>
     </sect3>
 
     <sect3 id="txns-puttoget-save">
@@ -1769,24 +1671,22 @@
             </menuchoice>.
           </para>
 
-          <screenshot id="txns-puttoget2-Cash">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_CashFlow.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Cash Flow report for the month of March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Cash Flow report after <xref
-              linkend="chapter_txns" />.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+          <figure>
+            <title>Cash Flow Report For The Month Of March</title>
+            <screenshot id="txns-puttoget2-Cash">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/txns_CashFlow.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Cash Flow report after <xref
+                linkend="chapter_txns" />.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
 
           <para>To get this customized report, right click in the report and choose <guilabel>Report
             Options</guilabel>. Then set the time period, and specify which accounts you want in the
@@ -1803,46 +1703,42 @@
             </menuchoice>.
           </para>
 
-          <screenshot id="txns-puttoget2-TransactionRptChecking">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_TransactionRptChecking.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Checking account during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the Checking account during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+           <figure>
+            <title>Transaction Report For The Checking Account During March</title>
+            <screenshot id="txns-puttoget2-TransactionRptChecking">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/txns_TransactionRptChecking.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the Checking account during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
 
         <listitem>
           <para>Now let’s change the transaction report to only show the various Expenses accounts.
           </para>
 
-          <screenshot id="txns-puttoget2-TransactionRptExpenses">
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="figures/txns_TransactionRptExpenses.png"
-                           srccredit="Bengt Thuree" />
-              </imageobject>
-
-              <textobject>
-                <phrase>Transaction Report for the Expenses accounts during March</phrase>
-              </textobject>
-
-              <caption>
-                <para>This image shows the Transaction Report for the various Expense accounts during March.
-                </para>
-              </caption>
-            </mediaobject>
-          </screenshot>
+        <figure>
+          <title>Transaction Report For The Expenses Accounts During March</title>
+            <screenshot id="txns-puttoget2-TransactionRptExpenses">
+              <mediaobject>
+                <imageobject>
+                  <imagedata fileref="figures/txns_TransactionRptExpenses.png"
+                             srccredit="Bengt Thuree" />
+                </imageobject>
+                <caption>
+                  <para>This image shows the Transaction Report for the various Expense accounts during March.
+                  </para>
+                </caption>
+              </mediaobject>
+            </screenshot>
+          </figure>
         </listitem>
       </orderedlist>
     </sect3>



Summary of changes:
 C/guide/ch_accts.xml              |  205 ++--
 C/guide/ch_basics.xml             |  205 ++--
 C/guide/ch_bus_features.xml       |  315 ++---
 C/guide/ch_capgain.xml            |   97 +-
 C/guide/ch_cbook.xml              |  391 +++---
 C/guide/ch_cc.xml                 |  417 +++----
 C/guide/ch_currency.xml           |  904 ++++++--------
 C/guide/ch_dep.xml                |   80 +-
 C/guide/ch_invest.xml             | 2442 ++++++++++++++++---------------------
 C/guide/ch_loans.xml              |  255 ++--
 C/guide/ch_oview.xml              |   70 +-
 C/guide/ch_txns.xml               |  894 ++++++--------
 C/guide/index.docbook             |   16 +-
 C/manual/ch_Business.xml          |  117 +-
 C/manual/ch_GettingHelp.xml       |   11 +-
 C/manual/ch_Transactions.xml      |  801 ++++++------
 C/manual/index.docbook            |   16 +-
 NEWS                              |   25 +
 README                            |    8 +-
 de/guide/ch_basics.xml            |   20 +-
 de/guide/ch_currency.xml          |    7 +-
 de/guide/ch_invest.xml            |   12 +-
 de/guide/ch_oview.xml             |   33 +-
 de/guide/glossary.xml             |   26 +-
 de/guide/index.docbook            |    9 +
 de/manual/ch_Account-Actions.xml  |  231 ++--
 de/manual/ch_Business.xml         |  223 +---
 de/manual/ch_Customize.xml        |  139 +--
 de/manual/ch_Finance-Quote.xml    |   16 +-
 de/manual/ch_GUIMenus.xml         | 1071 ++++++----------
 de/manual/ch_GettingHelp.xml      |   30 +-
 de/manual/ch_GettingStarted.xml   |    2 +-
 de/manual/ch_Reports.xml          |   47 +-
 de/manual/ch_Tools_Assistants.xml |   37 +-
 de/manual/ch_Transactions.xml     |  341 ++----
 de/manual/index.docbook           |    8 +
 de/manual/para-assist-intro.xml   |    2 +-
 de/manual/tips-appendix.xml       |    6 +-
 docbook/gnc-docbookx.dtd          |   37 +-
 docbook/gnc-gui-C.dtd             |  141 ++-
 docbook/gnc-gui-de.dtd            |  172 ++-
 docbook/gnc-gui-struct.dtd        |  341 ++++--
 it/guide/index.docbook            |  103 +-
 it/guide/it.po                    |  216 ++--
 it/manual/index.docbook           |  280 ++---
 it/manual/it.po                   |   12 +-
 ja/guide/ch_invest.xml            |    2 +-
 ja/guide/ch_oview.xml             |    2 +-
 ja/guide/index.docbook            |    9 +
 pt/guide/appendixa.xml            |    4 +-
 pt/guide/ch_basics.xml            |    7 +-
 pt/guide/ch_invest.xml            |    2 +-
 pt/guide/ch_oview.xml             |    2 +-
 pt/guide/index.docbook            |  174 ++-
 pt/manual/ch_Account-Actions.xml  |    2 +-
 pt/manual/ch_GettingHelp.xml      |    2 +-
 pt/manual/ch_Transactions.xml     |    2 +-
 pt/manual/index.docbook           |  193 ++-
 ru/guide/ch_invest.xml            |    9 +-
 ru/guide/ch_oview.xml             |   18 +-
 60 files changed, 5112 insertions(+), 6147 deletions(-)



More information about the gnucash-changes mailing list