gnucash master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Jun 9 15:43:33 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/9ec5eab7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/59f9b778 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/aa3e46a6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4796956d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7b6134ad (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c3794d19 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/21e87d60 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fd3a8c32 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0a1a28be (commit)
	 via  https://github.com/Gnucash/gnucash/commit/520f350a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9752daa8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/15a35e6a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fd6ce161 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5f51fc54 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cc12fcf3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a22ad2e0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9056b14d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c140563e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/727348ef (commit)
	 via  https://github.com/Gnucash/gnucash/commit/17065160 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3a91eedb (commit)
	 via  https://github.com/Gnucash/gnucash/commit/69ea174c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f6d607d7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/885689b4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6bca71f0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/528d4b52 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dfc3d274 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/51ffcae9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4ffc4d04 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5873980c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/957df9a3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f76226f9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e557b021 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ed42f8ac (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8447f426 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/712714cf (commit)
	 via  https://github.com/Gnucash/gnucash/commit/49334906 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6888bb30 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9e43f6bc (commit)
	from  https://github.com/Gnucash/gnucash/commit/d7f0f5da (commit)



commit 9ec5eab714232ecfaaa5465ab1b47298ec47e373
Merge: d7f0f5da6 59f9b7786
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jun 9 12:43:12 2019 -0700

    Merge branch 'maint'

diff --cc gnucash/report/reports/standard/taxinvoice.scm
index 7aa9df8d3,58a588ee3..0b61ed994
--- a/gnucash/report/reports/standard/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@@ -21,8 -21,8 +21,8 @@@
  ; - copy the report to your .gnucash directory
  ; - specify a different module name below (eg mytaxinvoice)
  ; - refer to it from .gnucash/config.user
- ; (see http://wiki.gnucash.org/wiki/Custom_Reports )
+ ; (see https://wiki.gnucash.org/wiki/Custom_Reports )
 -(define-module (gnucash report taxinvoice))
 +(define-module (gnucash report reports standard taxinvoice))
  
  (use-modules (ice-9 local-eval))  ; for the-environment
  (use-modules (gnucash utilities))

commit 59f9b7786d8c0359d148b96968d6ae1ccf5f743c
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jun 9 12:30:20 2019 -0700

    Don't test gnc:html-string-sanitize on emoji if guile doesn't understand them.
    
    Fixes test failures on guile 2.0.13 where SRFI64 is available but
    Unicode is broken.

diff --git a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm b/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
index ef712c7ac..cdc0849c9 100644
--- a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
+++ b/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
@@ -25,6 +25,8 @@
               "&copy;"
               (gnc:html-string-sanitize "©"))
 
+  (if (not (string=? (with-output-to-string (lambda () (display "🎃"))) "🎃"))
+      (test-skip 2))
   (test-equal "emoji unchanged"
               "🎃"
               (gnc:html-string-sanitize "🎃"))

commit aa3e46a60f3f7865afa7ccf32a7690dd9953ee00
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Jun 8 14:51:47 2019 +0100

    Enable the shadow type for the notes scroll window
    
    On the budget options dialogue, the notes field is not visible so
    enable the shadow type for the scroll window to get an outline.

diff --git a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
index 98634e108..53e693bd4 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
@@ -549,6 +549,7 @@
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <object class="GtkTextView" id="BudgetDescription">
                         <property name="visible">True</property>

commit 4796956d8444d40bdfd2f0dfd22499ca74ee97cb
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Jun 8 14:50:30 2019 +0100

    Stop error when adding commodity
    
    Change the function gnc_tree_view_commodity_select_commodity to just
    return when there is no commodity to stop error being logged.

diff --git a/gnucash/gnome-utils/gnc-tree-view-commodity.c b/gnucash/gnome-utils/gnc-tree-view-commodity.c
index 40f028964..9b34f43ca 100644
--- a/gnucash/gnome-utils/gnc-tree-view-commodity.c
+++ b/gnucash/gnome-utils/gnc-tree-view-commodity.c
@@ -670,7 +670,9 @@ gnc_tree_view_commodity_select_commodity (GncTreeViewCommodity *view, gnc_commod
     GtkTreePath *s_tree_path;
 
     g_return_if_fail (GNC_IS_TREE_VIEW_COMMODITY(view));
-    g_return_if_fail (commodity != NULL);
+
+    if (!commodity)
+        return;
 
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
 

commit 7b6134ad5c8fb03384d03db6dc6bb7444a9bca4d
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Jun 8 14:47:53 2019 +0100

    Follow up on some changes to Aqbanking Dialogue
    
    This commit changes the buttons to use names and enables the
    translation of these so they are the same as the rest of the
    application. Also added some missing underline settings and the
    mnemonic widget they are pointing to.

diff --git a/gnucash/import-export/aqb/dialog-ab.glade b/gnucash/import-export/aqb/dialog-ab.glade
index 274176362..e050543fc 100644
--- a/gnucash/import-export/aqb/dialog-ab.glade
+++ b/gnucash/import-export/aqb/dialog-ab.glade
@@ -26,14 +26,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="abort_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Abort</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
                 <signal name="clicked" handler="ggg_abort_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -44,13 +43,12 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
                 <signal name="clicked" handler="ggg_close_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -100,14 +98,16 @@
                     <property name="can_focus">False</property>
                     <property name="margin_left">12</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label8877424">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Current Job</property>
+                        <property name="label" translatable="yes">Current _Job</property>
+                        <property name="use_underline">True</property>
                         <property name="justify">center</property>
+                        <property name="mnemonic_widget">top_entry</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -160,8 +160,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="label" translatable="yes">Current Action</property>
+                        <property name="label" translatable="yes">Current _Action</property>
+                        <property name="use_underline">True</property>
                         <property name="justify">center</property>
+                        <property name="mnemonic_widget">second_entry</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -300,13 +302,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -316,13 +317,12 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -504,7 +504,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="now_button">
-                        <property name="label" translatable="yes">_Now</property>
+                        <property name="label" translatable="yes">No_w</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -608,13 +608,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton2">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -624,13 +623,12 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton2">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -679,6 +677,7 @@
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">_Password:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">input_entry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -693,6 +692,7 @@
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">Con_firm Password:</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">confirm_entry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -788,13 +788,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancelbutton1">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -804,14 +803,13 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <property name="label">gtk-ok</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -840,6 +838,7 @@
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes"> _Name of the new template:</property>
                 <property name="use_underline">True</property>
+                <property name="mnemonic_widget">template_name</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -913,13 +912,12 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1002,6 +1000,7 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Recipient Account _Number</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">recp_account_entry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1030,6 +1029,7 @@
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Recipient _Bank Code</property>
                     <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">recp_bankcode_entry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1060,6 +1060,7 @@
                     <property name="label" translatable="yes">_Recipient Name</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
+                    <property name="mnemonic_widget">recp_name_entry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1085,7 +1086,7 @@
                   <object class="GtkLabel" id="recp_bankname_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">(filled in automatically)</property>
+                    <property name="label">(filled in automatically)</property>
                     <property name="justify">center</property>
                     <property name="xalign">0</property>
                   </object>
@@ -1117,6 +1118,7 @@
                     <property name="label" translatable="yes">Payment _Purpose (only for recipient)</property>
                     <property name="use_underline">True</property>
                     <property name="justify">center</property>
+                    <property name="mnemonic_widget">purpose_entry</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1144,6 +1146,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Originator Name</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">orig_name_label</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1181,7 +1185,7 @@
                   <object class="GtkLabel" id="orig_bankname_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">something</property>
+                    <property name="label">something</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1205,7 +1209,7 @@
                   <object class="GtkLabel" id="orig_account_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">something</property>
+                    <property name="label">something</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1229,7 +1233,7 @@
                   <object class="GtkLabel" id="orig_bankcode_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">something</property>
+                    <property name="label">something</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -1396,7 +1400,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="moveup_templ_button">
-                            <property name="label">_Up</property>
+                            <property name="label" translatable="yes">_Up</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1414,7 +1418,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="movedown_templ_button">
-                            <property name="label">_Down</property>
+                            <property name="label" translatable="yes">_Down</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1450,7 +1454,7 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="del_templ_button">
-                            <property name="label">D_elete</property>
+                            <property name="label" translatable="yes">D_elete</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>

commit c3794d1907335d870413f949ed83846c181db33d
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Jun 8 14:41:58 2019 +0100

    Changes to the default layout for glade files
    
    With glade version 3.22.1, the default settings and layouts were
    changed so this commit applies them so going forward they should not
    be highlighted.

diff --git a/gnucash/gtkbuilder/assistant-acct-period.glade b/gnucash/gtkbuilder/assistant-acct-period.glade
index 709bb623f..b7585494a 100644
--- a/gnucash/gtkbuilder/assistant-acct-period.glade
+++ b/gnucash/gtkbuilder/assistant-acct-period.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAssistant" id="account_period_assistant">
@@ -10,6 +10,9 @@
     <signal name="cancel" handler="ap_assistant_cancel" swapped="no"/>
     <signal name="close" handler="ap_assistant_close" swapped="no"/>
     <signal name="prepare" handler="ap_assistant_prepare" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkLabel" id="start_page">
         <property name="visible">True</property>
@@ -248,10 +251,8 @@ Books will be closed at midnight on the selected date.</property>
     <child>
       <placeholder/>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="assistant-action_area2">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-csv-account-import.glade b/gnucash/gtkbuilder/assistant-csv-account-import.glade
index 400817281..6503db4d9 100644
--- a/gnucash/gtkbuilder/assistant-csv-account-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-account-import.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="num_hrows_adj">
@@ -17,6 +17,9 @@
     <signal name="cancel" handler="csv_import_assistant_cancel" swapped="no"/>
     <signal name="close" handler="csv_import_assistant_close" swapped="no"/>
     <signal name="prepare" handler="csv_import_assistant_prepare" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="start_page">
         <property name="visible">True</property>
@@ -74,9 +77,6 @@ Enter file name and location for the Import...
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="title" translatable="yes">Choose File to Import</property>
@@ -122,9 +122,6 @@ Enter file name and location for the Import...
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -339,9 +336,6 @@ Cancel to abort.</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="page_type">summary</property>
@@ -350,10 +344,8 @@ Cancel to abort.</property>
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="assistant-action_area2">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-csv-export.glade b/gnucash/gtkbuilder/assistant-csv-export.glade
index 367e29729..9d0727a27 100644
--- a/gnucash/gtkbuilder/assistant-csv-export.glade
+++ b/gnucash/gtkbuilder/assistant-csv-export.glade
@@ -754,5 +754,8 @@ Cancel to abort.</property>
         <property name="has_padding">False</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade
index ee3c9575a..97e5fe119 100644
--- a/gnucash/gtkbuilder/assistant-csv-price-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-price-import.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="end_row_adj">
@@ -43,6 +43,9 @@
     <signal name="close" handler="csv_price_imp_assist_close_cb" swapped="no"/>
     <signal name="destroy" handler="csv_price_imp_assist_close_cb" swapped="no"/>
     <signal name="prepare" handler="csv_price_imp_assist_prepare_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkLabel" id="start_page">
         <property name="visible">True</property>
@@ -1079,10 +1082,8 @@ Cancel to abort.</b></property>
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
index c4183714a..b2ff9ced4 100644
--- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
@@ -33,6 +33,9 @@
     <signal name="close" handler="csv_tximp_assist_close_cb" swapped="no"/>
     <signal name="destroy" handler="csv_tximp_assist_close_cb" swapped="no"/>
     <signal name="prepare" handler="csv_tximp_assist_prepare_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkLabel" id="start_page">
         <property name="visible">True</property>
@@ -142,9 +145,6 @@ Select location and file name for the Import, then click 'OK'...
                             <property name="position">0</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                         <child>
                           <object class="GtkButton" id="save_settings">
                             <property name="visible">True</property>
@@ -549,9 +549,6 @@ To know which lines belong to the same transaction, the importer will compare th
                             <property name="position">3</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>
@@ -710,9 +707,6 @@ To know which lines belong to the same transaction, the importer will compare th
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -740,9 +734,6 @@ To know which lines belong to the same transaction, the importer will compare th
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -787,9 +778,6 @@ For example
                             <property name="position">1</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>
@@ -825,9 +813,6 @@ For example
                       <object class="GtkBox" id="account_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>
@@ -939,9 +924,6 @@ For example
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -1120,7 +1102,7 @@ More information can be displayed by using the help button.</property>
           <object class="GtkLabel" id="match_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">label</property>
+            <property name="label">label</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -1164,10 +1146,8 @@ More information can be displayed by using the help button.</property>
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="assistant-action_area2">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-hierarchy.glade b/gnucash/gtkbuilder/assistant-hierarchy.glade
index 141b0e17e..91b71ee94 100644
--- a/gnucash/gtkbuilder/assistant-hierarchy.glade
+++ b/gnucash/gtkbuilder/assistant-hierarchy.glade
@@ -71,9 +71,6 @@ Please choose the currency to use for new accounts.</property>
               <object class="GtkBox" id="currency_chooser_hbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -338,9 +335,6 @@ Select categories that correspond to the ways that you foresee you will use GnuC
                     <property name="can_focus">True</property>
                     <property name="vexpand">True</property>
                     <property name="shadow_type">in</property>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -436,7 +430,11 @@ Press `Cancel' to close this dialog without creating any new accounts.</property
       <packing>
         <property name="page_type">confirm</property>
         <property name="title" translatable="yes">Finish Account Setup</property>
+        <property name="has_padding">False</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-loan.glade b/gnucash/gtkbuilder/assistant-loan.glade
index b11269528..f615ec2da 100644
--- a/gnucash/gtkbuilder/assistant-loan.glade
+++ b/gnucash/gtkbuilder/assistant-loan.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="len_liststore">
@@ -94,6 +94,9 @@
     <signal name="cancel" handler="loan_assistant_cancel" swapped="no"/>
     <signal name="close" handler="loan_assistant_close" swapped="no"/>
     <signal name="prepare" handler="loan_assistant_prepare" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkLabel" id="loan_intro_page">
         <property name="visible">True</property>
@@ -269,9 +272,6 @@ If you make a mistake or want to make changes later, you can edit the created Sc
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="xscale">0.25</property>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -389,9 +389,6 @@ If you make a mistake or want to make changes later, you can edit the created Sc
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">10</property>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                     <child type="label">
@@ -531,9 +528,6 @@ Do you utilise an escrow account, if so an account must be specified...</propert
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -719,9 +713,6 @@ All accounts must have valid entries to continue.
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="border_width">10</property>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                     <child type="label">
@@ -1054,9 +1045,6 @@ All enabled option pages must contain valid entries to continue.
                                   <object class="GtkBox" id="pay_freq_hbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1332,10 +1320,8 @@ Review the details below and if correct press Apply to create the schedule.</pro
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="assistant-action_area2">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-stock-split.glade b/gnucash/gtkbuilder/assistant-stock-split.glade
index 8ffe8fb92..3723fd1a5 100644
--- a/gnucash/gtkbuilder/assistant-stock-split.glade
+++ b/gnucash/gtkbuilder/assistant-stock-split.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAssistant" id="stock_split_assistant">
@@ -12,6 +12,9 @@
     <signal name="cancel" handler="gnc_stock_split_assistant_cancel" swapped="no"/>
     <signal name="close" handler="gnc_stock_split_assistant_finish" swapped="no"/>
     <signal name="prepare" handler="gnc_stock_split_assistant_prepare" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkLabel" id="intro_page_label">
         <property name="visible">True</property>
@@ -305,9 +308,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -366,9 +366,6 @@
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="border_width">3</property>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -389,9 +386,6 @@
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="border_width">3</property>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -426,10 +420,8 @@
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="assistant-action_area2">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/assistant-xml-encoding.glade b/gnucash/gtkbuilder/assistant-xml-encoding.glade
index 950b6035b..b0f77b300 100644
--- a/gnucash/gtkbuilder/assistant-xml-encoding.glade
+++ b/gnucash/gtkbuilder/assistant-xml-encoding.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAssistant" id="assistant_xml_encoding">
@@ -8,6 +8,9 @@
     <signal name="cancel" handler="gxi_cancel_cb" swapped="no"/>
     <signal name="close" handler="gxi_finish_cb" swapped="no"/>
     <signal name="prepare" handler="gxi_prepare_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkLabel" id="start_page">
         <property name="visible">True</property>
@@ -22,9 +25,6 @@
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child>
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox" id="conversion_page">
         <property name="visible">True</property>
@@ -75,9 +75,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -123,9 +120,6 @@
                             <property name="can_focus">False</property>
                             <property name="border_width">6</property>
                             <property name="right_padding">12</property>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -166,10 +160,8 @@
         <property name="has_padding">False</property>
       </packing>
     </child>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="assistant-action_area2">
-        <property name="can_focus">False</property>
-      </object>
+    <child>
+      <placeholder/>
     </child>
   </object>
   <object class="GtkDialog" id="encodings_dialog">
@@ -180,6 +172,9 @@
     <property name="window_position">center-on-parent</property>
     <property name="default_height">300</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/business-options-gnome.glade b/gnucash/gtkbuilder/business-options-gnome.glade
index d0a91b687..824641660 100644
--- a/gnucash/gtkbuilder/business-options-gnome.glade
+++ b/gnucash/gtkbuilder/business-options-gnome.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="taxtable_store">
@@ -12,6 +12,9 @@
   </object>
   <object class="GtkWindow" id="dummy_toplevel_window">
     <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkComboBox" id="taxtable_menu">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-billterms.glade b/gnucash/gtkbuilder/dialog-billterms.glade
index 313262da5..1ce517f25 100644
--- a/gnucash/gtkbuilder/dialog-billterms.glade
+++ b/gnucash/gtkbuilder/dialog-billterms.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="discount_adj">
@@ -46,6 +46,9 @@
   <object class="GtkWindow" id="terms_notebook_window">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">window1</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkNotebook" id="term_notebook">
         <property name="visible">True</property>
@@ -444,6 +447,9 @@
     <property name="title" translatable="yes">Terms</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="billterms_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
@@ -800,6 +806,9 @@
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
@@ -991,6 +1000,9 @@
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-book-close.glade b/gnucash/gtkbuilder/dialog-book-close.glade
index f3159ee13..0adbd432f 100644
--- a/gnucash/gtkbuilder/dialog-book-close.glade
+++ b/gnucash/gtkbuilder/dialog-book-close.glade
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="close_book_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Close Book</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_book_close_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-choose-owner.glade b/gnucash/gtkbuilder/dialog-choose-owner.glade
index 5cf36c39b..a101c9960 100644
--- a/gnucash/gtkbuilder/dialog-choose-owner.glade
+++ b/gnucash/gtkbuilder/dialog-choose-owner.glade
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="choose_owner_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Choose Owner Dialog</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-custom-report.glade b/gnucash/gtkbuilder/dialog-custom-report.glade
index c5877f128..c731e9f0f 100644
--- a/gnucash/gtkbuilder/dialog-custom-report.glade
+++ b/gnucash/gtkbuilder/dialog-custom-report.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="custom_report_dialog">
@@ -12,6 +12,9 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <signal name="close" handler="custom_report_dialog_close_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -124,8 +127,5 @@ the Reports menu or tool bar.</property>
     <action-widgets>
       <action-widget response="0">close_report_button</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-customer-import-gui.glade b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
index 8d675b58d..e6e85e303 100644
--- a/gnucash/gtkbuilder/dialog-customer-import-gui.glade
+++ b/gnucash/gtkbuilder/dialog-customer-import-gui.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="customer_import_dialog">
@@ -9,6 +9,9 @@
     <property name="title" translatable="yes" comments="Title of dialog">Import customers or vendors from text file</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_customer_import_gui_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-customer.glade b/gnucash/gtkbuilder/dialog-customer.glade
index 382da5e43..f372328f8 100644
--- a/gnucash/gtkbuilder/dialog-customer.glade
+++ b/gnucash/gtkbuilder/dialog-customer.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="tax_included_store">
@@ -31,6 +31,9 @@
     <property name="title" translatable="yes">New Customer</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_customer_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-date-close.glade b/gnucash/gtkbuilder/dialog-date-close.glade
index 8a718ea6f..7e4c41d43 100644
--- a/gnucash/gtkbuilder/dialog-date-close.glade
+++ b/gnucash/gtkbuilder/dialog-date-close.glade
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="date_account_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Question</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
@@ -318,11 +320,13 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="date_close_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Question</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-employee.glade b/gnucash/gtkbuilder/dialog-employee.glade
index 6cd62bbff..8538aebd8 100644
--- a/gnucash/gtkbuilder/dialog-employee.glade
+++ b/gnucash/gtkbuilder/dialog-employee.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="employee_dialog">
@@ -7,6 +7,9 @@
     <property name="title" translatable="yes">New Employee</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_employee_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -897,8 +900,5 @@
       <action-widget response="-6">cancelbutton</action-widget>
       <action-widget response="-5">okbutton</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-file-access.glade b/gnucash/gtkbuilder/dialog-file-access.glade
index 07afc87c2..6de6272cf 100644
--- a/gnucash/gtkbuilder/dialog-file-access.glade
+++ b/gnucash/gtkbuilder/dialog-file-access.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="file_access_dialog">
@@ -10,6 +10,9 @@
     <property name="default_height">500</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_ui_file_access_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-find-account.glade b/gnucash/gtkbuilder/dialog-find-account.glade
index 4ed0b75bb..065dede70 100644
--- a/gnucash/gtkbuilder/dialog-find-account.glade
+++ b/gnucash/gtkbuilder/dialog-find-account.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="list-store">
@@ -22,8 +22,12 @@
   </object>
   <object class="GtkWindow" id="find_account_window">
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Search the Account List</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="dialog-vbox">
         <property name="can_focus">False</property>
@@ -265,13 +269,7 @@ if account should not be shown, this will be temporarily overridden.</property>
             <property name="position">6</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-imap-editor.glade b/gnucash/gtkbuilder/dialog-imap-editor.glade
index 8ee76c486..e4fd3dba9 100644
--- a/gnucash/gtkbuilder/dialog-imap-editor.glade
+++ b/gnucash/gtkbuilder/dialog-imap-editor.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkTreeStore" id="tree-store">
@@ -39,6 +39,9 @@
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_imap_dialog_window_destroy_cb" swapped="no"/>
     <signal name="response" handler="gnc_imap_dialog_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="can_focus">False</property>
@@ -374,8 +377,5 @@
       <action-widget response="-10">delete_button</action-widget>
       <action-widget response="-6">close_button</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-lot-viewer.glade b/gnucash/gtkbuilder/dialog-lot-viewer.glade
index 556fccc72..c171a4c7e 100644
--- a/gnucash/gtkbuilder/dialog-lot-viewer.glade
+++ b/gnucash/gtkbuilder/dialog-lot-viewer.glade
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="lot_viewer_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Lot Viewer</property>
     <property name="default_width">600</property>
@@ -11,6 +10,9 @@
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="lv_window_destroy_cb" swapped="no"/>
     <signal name="response" handler="lv_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -169,8 +171,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip_text" translatable="yes">Enter any notes you want to make about this lot.</property>
-                            <property name="accepts_tab">False</property>
                             <property name="wrap_mode">word</property>
+                            <property name="accepts_tab">False</property>
                           </object>
                         </child>
                       </object>
diff --git a/gnucash/gtkbuilder/dialog-new-user.glade b/gnucash/gtkbuilder/dialog-new-user.glade
index 1d422eff0..5b17f0108 100644
--- a/gnucash/gtkbuilder/dialog-new-user.glade
+++ b/gnucash/gtkbuilder/dialog-new-user.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="new_user_cancel_dialog">
@@ -9,6 +9,9 @@
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <property name="visible">True</property>
@@ -124,13 +127,13 @@
       <action-widget response="-9">no_but</action-widget>
       <action-widget response="-8">yes_but</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkWindow" id="new_user_window">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox2">
         <property name="visible">True</property>
@@ -309,8 +312,5 @@
         </child>
       </object>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-object-references.glade b/gnucash/gtkbuilder/dialog-object-references.glade
index e2879f98d..14d7c294e 100644
--- a/gnucash/gtkbuilder/dialog-object-references.glade
+++ b/gnucash/gtkbuilder/dialog-object-references.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="object_references_dialog">
@@ -7,6 +7,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Object references</property>
     <property name="type_hint">normal</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-options.glade b/gnucash/gtkbuilder/dialog-options.glade
index a30f3fccc..e2820190c 100644
--- a/gnucash/gtkbuilder/dialog-options.glade
+++ b/gnucash/gtkbuilder/dialog-options.glade
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="gnucash_options_window">
     <property name="can_focus">False</property>
     <property name="default_width">640</property>
     <property name="default_height">480</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="dialog-vbox">
         <property name="visible">True</property>
@@ -122,9 +125,6 @@
               <object class="GtkBox" id="notebook_placeholder">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -141,8 +141,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-payment.glade b/gnucash/gtkbuilder/dialog-payment.glade
index daf839c97..f0c866651 100644
--- a/gnucash/gtkbuilder/dialog-payment.glade
+++ b/gnucash/gtkbuilder/dialog-payment.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="docs_list_hor_adj">
@@ -62,6 +62,9 @@
     <property name="default_height">560</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_payment_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-print-check.glade b/gnucash/gtkbuilder/dialog-print-check.glade
index db603beb3..aac407bd3 100644
--- a/gnucash/gtkbuilder/dialog-print-check.glade
+++ b/gnucash/gtkbuilder/dialog-print-check.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -129,6 +129,9 @@
     <property name="title" translatable="yes">Save Custom Check Format</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox7">
         <property name="visible">True</property>
@@ -281,6 +284,9 @@
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_ui_print_check_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-progress.glade b/gnucash/gtkbuilder/dialog-progress.glade
index e83e1f849..de151a0f4 100644
--- a/gnucash/gtkbuilder/dialog-progress.glade
+++ b/gnucash/gtkbuilder/dialog-progress.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkTextBuffer" id="textbuffer1">
@@ -13,6 +13,9 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox85">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-query-view.glade b/gnucash/gtkbuilder/dialog-query-view.glade
index 92b812f52..09a84c2b6 100644
--- a/gnucash/gtkbuilder/dialog-query-view.glade
+++ b/gnucash/gtkbuilder/dialog-query-view.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="query_view_dialog">
@@ -7,6 +7,9 @@
     <property name="default_width">500</property>
     <property name="default_height">300</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-reset-warnings.glade b/gnucash/gtkbuilder/dialog-reset-warnings.glade
index c6afbaec3..7c1c917c9 100644
--- a/gnucash/gtkbuilder/dialog-reset-warnings.glade
+++ b/gnucash/gtkbuilder/dialog-reset-warnings.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="reset_warnings_dialog">
@@ -8,6 +8,9 @@
     <property name="title" translatable="yes">Reset Warnings</property>
     <property name="type_hint">normal</property>
     <signal name="response" handler="gnc_reset_warnings_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade
index a08f9435e..677eb905e 100644
--- a/gnucash/gtkbuilder/dialog-sx.glade
+++ b/gnucash/gtkbuilder/dialog-sx.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="account_deletion_dialog">
@@ -10,6 +10,9 @@
     <property name="default_width">320</property>
     <property name="default_height">240</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox24">
         <property name="visible">True</property>
@@ -143,6 +146,9 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Make Scheduled Transaction</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox23">
         <property name="visible">True</property>
@@ -487,6 +493,9 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Preferences</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkGrid" id="sx_prefs">
         <property name="visible">True</property>
@@ -750,6 +759,9 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Edit Scheduled Transaction</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox17">
         <property name="visible">True</property>
@@ -1462,6 +1474,9 @@
     <property name="default_height">480</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox25">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-tax-info.glade b/gnucash/gtkbuilder/dialog-tax-info.glade
index c9774ab73..9d9519880 100644
--- a/gnucash/gtkbuilder/dialog-tax-info.glade
+++ b/gnucash/gtkbuilder/dialog-tax-info.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="copy_spin_adj">
@@ -12,6 +12,9 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Income Tax Information</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox14">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-tax-table.glade b/gnucash/gtkbuilder/dialog-tax-table.glade
index 9c4a99928..03755a9d8 100644
--- a/gnucash/gtkbuilder/dialog-tax-table.glade
+++ b/gnucash/gtkbuilder/dialog-tax-table.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="tax_table_window_dialog">
@@ -7,6 +7,9 @@
     <property name="title" translatable="yes">Tax Tables</property>
     <property name="type_hint">normal</property>
     <signal name="destroy" handler="tax_table_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
@@ -110,48 +113,48 @@
                         <property name="spacing">6</property>
                         <property name="layout_style">spread</property>
                         <child>
-                          <object class="GtkButton" id="delete_table_button">
-                            <property name="label" translatable="yes">_Delete</property>
+                          <object class="GtkButton" id="rename_table_button">
+                            <property name="label" translatable="yes">_Rename</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <signal name="clicked" handler="tax_table_delete_table_cb" swapped="no"/>
+                            <signal name="clicked" handler="tax_table_rename_table_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="new_table_button">
-                            <property name="label" translatable="yes">_New</property>
+                          <object class="GtkButton" id="delete_table_button">
+                            <property name="label" translatable="yes">_Delete</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
-                            <signal name="clicked" handler="tax_table_new_table_cb" swapped="no"/>
+                            <signal name="clicked" handler="tax_table_delete_table_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="rename_table_button">
-                            <property name="label" translatable="yes">_Rename</property>
+                          <object class="GtkButton" id="new_table_button">
+                            <property name="label" translatable="yes">_New</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
+                            <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
-                            <signal name="clicked" handler="tax_table_rename_table_cb" swapped="no"/>
+                            <signal name="clicked" handler="tax_table_new_table_cb" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">0</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
@@ -326,6 +329,9 @@
     <property name="modal">True</property>
     <property name="default_height">370</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-userpass.glade b/gnucash/gtkbuilder/dialog-userpass.glade
index e7e795f6f..6de881499 100644
--- a/gnucash/gtkbuilder/dialog-userpass.glade
+++ b/gnucash/gtkbuilder/dialog-userpass.glade
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="username_password_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Username and Password</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox16">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-vendor.glade b/gnucash/gtkbuilder/dialog-vendor.glade
index 56050ba04..147523505 100644
--- a/gnucash/gtkbuilder/dialog-vendor.glade
+++ b/gnucash/gtkbuilder/dialog-vendor.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="tax_included_store">
@@ -31,6 +31,9 @@
     <property name="title" translatable="yes">New Vendor</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_vendor_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/gnc-frequency.glade b/gnucash/gtkbuilder/gnc-frequency.glade
index 74c2b7b2c..1539fa80f 100644
--- a/gnucash/gtkbuilder/gnc-frequency.glade
+++ b/gnucash/gtkbuilder/gnc-frequency.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -569,6 +569,9 @@
   <object class="GtkWindow" id="gnc_frequency_window">
     <property name="can_focus">False</property>
     <property name="title">This window should never be realized.</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkEventBox" id="eventbox">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
index 7f102b3dd..98634e108 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="DigitsToRound_Adj">
@@ -253,6 +253,9 @@
     <property name="title" translatable="yes">Estimate Budget Values</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
@@ -405,6 +408,9 @@
                 <property name="top_attach">2</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -431,6 +437,9 @@
     <property name="title" translatable="yes">Budget Options</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox5">
         <property name="visible">True</property>
@@ -666,6 +675,9 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Budget List</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
index 088ba6c1e..1ffe4fa77 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-register.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-register.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="days_adjustment">
@@ -15,6 +15,9 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_plugin_page_register_filter_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox19">
         <property name="visible">True</property>
@@ -551,9 +554,6 @@ If 0, all previous days included</property>
       <action-widget response="-6">cancelbutton4</action-widget>
       <action-widget response="-5">okbutton4</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkAdjustment" id="num_adjustment">
     <property name="upper">1000000000</property>
@@ -568,6 +568,9 @@ If 0, all previous days included</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_plugin_page_register_sort_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox17">
         <property name="visible">True</property>
@@ -908,9 +911,6 @@ If 0, all previous days included</property>
       <action-widget response="-6">cancelbutton2</action-widget>
       <action-widget response="-5">okbutton2</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkAdjustment" id="tnum_adjustment">
     <property name="upper">1000000000</property>
@@ -924,6 +924,9 @@ If 0, all previous days included</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox15">
         <property name="visible">True</property>
@@ -1141,9 +1144,6 @@ If 0, all previous days included</property>
       <action-widget response="-6">button76</action-widget>
       <action-widget response="-5">button77</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkDialog" id="void_transaction_dialog">
     <property name="can_focus">False</property>
@@ -1153,6 +1153,9 @@ If 0, all previous days included</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox16">
         <property name="visible">True</property>
@@ -1249,8 +1252,5 @@ If 0, all previous days included</property>
       <action-widget response="-6">cancelbutton1</action-widget>
       <action-widget response="-5">okbutton1</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register2.glade b/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
index 1472d347c..53788d622 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-register2.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -8,13 +8,15 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="duplicate_transaction_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Duplicate Transaction</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox15">
         <property name="visible">True</property>
@@ -164,7 +166,6 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="filter_by_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Filter register by...</property>
@@ -172,6 +173,9 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_plugin_page_register2_filter_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox19">
         <property name="visible">True</property>
@@ -677,7 +681,6 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="void_transaction_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Void Transaction</property>
@@ -685,6 +688,9 @@
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox16">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/gnc-recurrence.glade b/gnucash/gtkbuilder/gnc-recurrence.glade
index 37ae658be..7531fb711 100644
--- a/gnucash/gtkbuilder/gnc-recurrence.glade
+++ b/gnucash/gtkbuilder/gnc-recurrence.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="GCB_PeriodType_liststore">
@@ -32,6 +32,9 @@
   <object class="GtkWindow" id="gnc_recurrence_entry_window">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="RecurrenceEntryVBox">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/gnc-tree-view-owner.glade b/gnucash/gtkbuilder/gnc-tree-view-owner.glade
index fd175f5c8..706a847a7 100644
--- a/gnucash/gtkbuilder/gnc-tree-view-owner.glade
+++ b/gnucash/gtkbuilder/gnc-tree-view-owner.glade
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="filter_by_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Filter By...</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gppot_filter_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox13">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/window-autoclear.glade b/gnucash/gtkbuilder/window-autoclear.glade
index 797b7fb37..0f99723d8 100644
--- a/gnucash/gtkbuilder/window-autoclear.glade
+++ b/gnucash/gtkbuilder/window-autoclear.glade
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="auto_clear_start_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/window-reconcile.glade b/gnucash/gtkbuilder/window-reconcile.glade
index 1cb7f1933..66661957e 100644
--- a/gnucash/gtkbuilder/window-reconcile.glade
+++ b/gnucash/gtkbuilder/window-reconcile.glade
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="reconcile_start_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
diff --git a/gnucash/import-export/aqb/dialog-ab-pref.glade b/gnucash/import-export/aqb/dialog-ab-pref.glade
index 1860d3e38..0a75f12d8 100644
--- a/gnucash/import-export/aqb/dialog-ab-pref.glade
+++ b/gnucash/import-export/aqb/dialog-ab-pref.glade
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="aqbanking_preferences">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">window1</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkGrid" id="aqbanking_prefs">
         <property name="visible">True</property>
@@ -85,6 +88,7 @@
             <property name="label" translatable="yes">Use Non-SWIFT _transaction text</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
             <property name="has_tooltip">True</property>
             <property name="tooltip_markup">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>
             <property name="tooltip_text" translatable="yes">Some banks place part of transaction description as "transaction text" in the MT940 file. Normally GNUcash ignores this text. However by activating this option, the transaction text is used for the transaction description too.</property>

commit 21e87d60867d116115ce8bfa396abce55e2cd99d
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Jun 8 14:39:17 2019 +0100

    Bug 797266 - Missing translation settings
    
    These glade files were missing the setting to enable translations on
    various widgets so it has been set.

diff --git a/gnucash/gtkbuilder/assistant-qif-import.glade b/gnucash/gtkbuilder/assistant-qif-import.glade
index c566847db..da3a50836 100644
--- a/gnucash/gtkbuilder/assistant-qif-import.glade
+++ b/gnucash/gtkbuilder/assistant-qif-import.glade
@@ -380,8 +380,8 @@ Please enter a name for the account. If the file was exported from another accou
                 <property name="invisible_char">●</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
-                <signal name="changed" handler="gnc_ui_qif_import_acct_valid_cb" swapped="no"/>
                 <signal name="activate" handler="gnc_ui_qif_import_acct_enter_cb" swapped="no"/>
+                <signal name="changed" handler="gnc_ui_qif_import_acct_valid_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -1155,7 +1155,7 @@ If you don't see your exchange listed, or none of the available choices are appr
                 </child>
                 <child>
                   <object class="GtkButton" id="convert_progress_pause">
-                    <property name="label">P_ause</property>
+                    <property name="label" translatable="yes">P_ause</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
index 40087671a..95ec4b83d 100644
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="account_cascade_color_dialog">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Cascade Account Color</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="can_focus">False</property>
@@ -32,7 +35,7 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton3">
-                <property name="label">_OK</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -148,9 +151,6 @@
       <action-widget response="-6">cancelbutton3</action-widget>
       <action-widget response="-5">okbutton3</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkDialog" id="account_delete_dialog">
     <property name="can_focus">False</property>
@@ -159,6 +159,9 @@
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox100">
         <property name="visible">True</property>
@@ -229,17 +232,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="transactions">
+              <object class="GtkBox" id="subaccounts">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkLabel" id="label100">
+                  <object class="GtkLabel" id="label101">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes"><b>Transactions</b></property>
+                    <property name="label" translatable="yes"><b>Sub-accounts</b></property>
                     <property name="use_markup">True</property>
                   </object>
                   <packing>
@@ -249,55 +252,57 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="grid100">
+                  <object class="GtkGrid" id="grid101">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkRadioButton" id="trans_mrb">
-                        <property name="label" translatable="yes">M_ove to:</property>
+                      <object class="GtkLabel" id="label8477420">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
+                        <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="margin_left">15</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="label" translatable="yes">This account contains sub-accounts. What would you like to do with these sub-accounts?</property>
+                        <property name="wrap">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="trans_drb">
-                        <property name="label" translatable="yes">Delete all _transactions</property>
+                      <object class="GtkRadioButton" id="sa_mrb">
+                        <property name="label" translatable="yes">_Move to:</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">start</property>
                         <property name="margin_left">15</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">trans_mrb</property>
-                        <signal name="toggled" handler="gppat_set_insensitive_iff_rb_active" object="trans_mas_hbox" swapped="yes"/>
+                        <signal name="toggled" handler="gppat_populate_trans_mas_list" swapped="no"/>
+                        <signal name="toggled" handler="gppat_set_insensitive_iff_rb_active" object="subaccount_trans" swapped="yes"/>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
-                        <property name="width">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="trans_rw">
+                      <object class="GtkRadioButton" id="sa_drb">
+                        <property name="label" translatable="yes">Delete all _subaccounts</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="halign">start</property>
                         <property name="margin_left">15</property>
-                        <property name="label" translatable="yes">This account contains transactions. What would you like to do with these transactions?</property>
-                        <property name="wrap">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">sa_mrb</property>
+                        <signal name="toggled" handler="gppat_set_insensitive_iff_rb_active" object="sa_mas_hbox" swapped="yes"/>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -306,22 +311,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="trans_ro">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">15</property>
-                        <property name="label" translatable="yes">This account contains read-only transactions which may not be deleted.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="trans_mas_hbox">
+                      <object class="GtkBox" id="sa_mas_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -331,7 +321,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                   </object>
@@ -345,21 +335,21 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="subaccounts">
+              <object class="GtkBox" id="transactions">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkLabel" id="label101">
+                  <object class="GtkLabel" id="label100">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
-                    <property name="label" translatable="yes"><b>Sub-accounts</b></property>
+                    <property name="label" translatable="yes"><b>Transactions</b></property>
                     <property name="use_markup">True</property>
                   </object>
                   <packing>
@@ -369,57 +359,55 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="grid101">
+                  <object class="GtkGrid" id="grid100">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkLabel" id="label8477420">
+                      <object class="GtkRadioButton" id="trans_mrb">
+                        <property name="label" translatable="yes">M_ove to:</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="halign">start</property>
                         <property name="margin_left">15</property>
-                        <property name="label" translatable="yes">This account contains sub-accounts. What would you like to do with these sub-accounts?</property>
-                        <property name="wrap">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">2</property>
+                        <property name="top_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="sa_mrb">
-                        <property name="label" translatable="yes">_Move to:</property>
+                      <object class="GtkRadioButton" id="trans_drb">
+                        <property name="label" translatable="yes">Delete all _transactions</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="halign">start</property>
                         <property name="margin_left">15</property>
                         <property name="use_underline">True</property>
-                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="gppat_populate_trans_mas_list" swapped="no"/>
-                        <signal name="toggled" handler="gppat_set_insensitive_iff_rb_active" object="subaccount_trans" swapped="yes"/>
+                        <property name="group">trans_mrb</property>
+                        <signal name="toggled" handler="gppat_set_insensitive_iff_rb_active" object="trans_mas_hbox" swapped="yes"/>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
+                        <property name="width">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="sa_drb">
-                        <property name="label" translatable="yes">Delete all _subaccounts</property>
+                      <object class="GtkLabel" id="trans_rw">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
+                        <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="margin_left">15</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">sa_mrb</property>
-                        <signal name="toggled" handler="gppat_set_insensitive_iff_rb_active" object="sa_mas_hbox" swapped="yes"/>
+                        <property name="label" translatable="yes">This account contains transactions. What would you like to do with these transactions?</property>
+                        <property name="wrap">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -428,7 +416,22 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="sa_mas_hbox">
+                      <object class="GtkLabel" id="trans_ro">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">15</property>
+                        <property name="label" translatable="yes">This account contains read-only transactions which may not be deleted.</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="trans_mas_hbox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -438,7 +441,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">3</property>
                       </packing>
                     </child>
                   </object>
@@ -452,7 +455,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -591,12 +594,14 @@
     </action-widgets>
   </object>
   <object class="GtkDialog" id="account_filter_by_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Filter By...</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gppat_filter_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox200">
         <property name="visible">True</property>
@@ -625,7 +630,7 @@
             </child>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <property name="label">_OK</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -778,17 +783,17 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="show_zero">
-                    <property name="label" translatable="yes">Show _zero total accounts</property>
+                  <object class="GtkCheckButton" id="show_unused">
+                    <property name="label" translatable="yes">Show _unused accounts</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Show accounts which have a zero total value.</property>
+                    <property name="tooltip_text" translatable="yes">Show accounts which do not have any transactions.</property>
                     <property name="halign">start</property>
                     <property name="margin_left">12</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="gppat_filter_show_zero_toggled_cb" swapped="no"/>
+                    <signal name="toggled" handler="gppat_filter_show_unused_toggled_cb" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -797,17 +802,17 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="show_unused">
-                    <property name="label" translatable="yes">Show _unused accounts</property>
+                  <object class="GtkCheckButton" id="show_zero">
+                    <property name="label" translatable="yes">Show _zero total accounts</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Show accounts which do not have any transactions.</property>
+                    <property name="tooltip_text" translatable="yes">Show accounts which have a zero total value.</property>
                     <property name="halign">start</property>
                     <property name="margin_left">12</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="gppat_filter_show_unused_toggled_cb" swapped="no"/>
+                    <signal name="toggled" handler="gppat_filter_show_zero_toggled_cb" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -893,6 +898,9 @@
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_account_window_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox300">
         <property name="visible">True</property>
@@ -921,7 +929,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">_OK</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -1625,13 +1633,15 @@
     <property name="page_increment">100</property>
   </object>
   <object class="GtkDialog" id="account_renumber_dialog">
-    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Renumber sub-accounts</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_account_renumber_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox400">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-bi-import-gui.glade b/gnucash/gtkbuilder/dialog-bi-import-gui.glade
index 7cab3940e..d2e44ad4b 100644
--- a/gnucash/gtkbuilder/dialog-bi-import-gui.glade
+++ b/gnucash/gtkbuilder/dialog-bi-import-gui.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="bi_import_dialog">
@@ -7,6 +7,9 @@
     <property name="title" translatable="yes">Import transactions from text file</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_bi_import_gui_destroy_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -106,7 +109,7 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonOpen">
-                        <property name="label">_Open</property>
+                        <property name="label" translatable="yes">_Open</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
diff --git a/gnucash/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade
index 66864ddb8..93d9ddd09 100644
--- a/gnucash/gtkbuilder/dialog-commodity.glade
+++ b/gnucash/gtkbuilder/dialog-commodity.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -37,6 +37,9 @@
     <property name="title">New Security</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="visible">True</property>
@@ -233,7 +236,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label"><b>Security Information</b></property>
+                <property name="label" translatable="yes"><b>Security Information</b></property>
                 <property name="use_markup">True</property>
               </object>
               <packing>
@@ -699,9 +702,9 @@
       </object>
     </child>
     <action-widgets>
+      <action-widget response="-11">help_button</action-widget>
       <action-widget response="-6">cancel_button</action-widget>
       <action-widget response="-5">ok_button</action-widget>
-      <action-widget response="-11">help_button</action-widget>
     </action-widgets>
   </object>
   <object class="GtkDialog" id="security_selector_dialog">
@@ -710,6 +713,9 @@
     <property name="title" translatable="yes">Select security/currency </property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
diff --git a/gnucash/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade
index 53fbcfce0..c7a9bdb2f 100644
--- a/gnucash/gtkbuilder/dialog-fincalc.glade
+++ b/gnucash/gtkbuilder/dialog-fincalc.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="liststore1">
@@ -91,6 +91,9 @@
     <property name="resizable">False</property>
     <property name="type_hint">normal</property>
     <signal name="response" handler="fincalc_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox10">
         <property name="visible">True</property>
@@ -585,7 +588,7 @@
                           <object class="GtkLabel" id="payment_total_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">total</property>
+                            <property name="label">total</property>
                             <property name="justify">center</property>
                           </object>
                           <packing>
diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index 2059fee79..828bb28bf 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -29,7 +29,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="newbutton">
-                <property name="label">New _Account...</property>
+                <property name="label" translatable="yes">New _Account...</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -1257,9 +1257,9 @@
       </object>
     </child>
     <action-widgets>
+      <action-widget response="-11">matcher__help</action-widget>
       <action-widget response="-6">matcher_cancel</action-widget>
       <action-widget response="-5">matcher_ok</action-widget>
-      <action-widget response="-11">matcher__help</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-order.glade b/gnucash/gtkbuilder/dialog-order.glade
index 09e36238f..9ddbd159f 100644
--- a/gnucash/gtkbuilder/dialog-order.glade
+++ b/gnucash/gtkbuilder/dialog-order.glade
@@ -602,7 +602,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">end</property>
-                        <property name="label" translatable="yes">(owner)</property>
+                        <property name="label">(owner)</property>
                         <property name="justify">right</property>
                       </object>
                       <packing>
diff --git a/gnucash/gtkbuilder/dialog-price.glade b/gnucash/gtkbuilder/dialog-price.glade
index 6d33455f9..25e50f317 100644
--- a/gnucash/gtkbuilder/dialog-price.glade
+++ b/gnucash/gtkbuilder/dialog-price.glade
@@ -385,7 +385,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -400,7 +400,7 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">_OK</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/gnucash/gtkbuilder/dialog-report.glade b/gnucash/gtkbuilder/dialog-report.glade
index 17d2ea5d0..4e4c76ce9 100644
--- a/gnucash/gtkbuilder/dialog-report.glade
+++ b/gnucash/gtkbuilder/dialog-report.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="col_adjustment">
@@ -12,6 +12,9 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkGrid" id="view_contents_table">
         <property name="visible">True</property>
@@ -246,15 +249,15 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkDialog" id="html_style_sheet_dialog">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">HTML Style Sheets</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_options_dialog_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox10">
         <property name="visible">True</property>
@@ -267,7 +270,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">_Close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -423,9 +426,6 @@
     <action-widgets>
       <action-widget response="-7">closebutton1</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkAdjustment" id="row_adjustment">
     <property name="upper">100</property>
@@ -439,6 +439,9 @@
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox11">
         <property name="visible">True</property>
@@ -583,9 +586,6 @@
       <action-widget response="-6">cancelbutton</action-widget>
       <action-widget response="-5">okbutton</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkDialog" id="select_style_sheet_dialog">
     <property name="can_focus">False</property>
@@ -593,6 +593,9 @@
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox9">
         <property name="visible">True</property>
@@ -703,9 +706,6 @@
       <action-widget response="2">delete_button</action-widget>
       <action-widget response="-7">close_button</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
   <object class="GtkListStore" id="template_liststore">
     <columns>
@@ -723,6 +723,9 @@
     <property name="title" translatable="yes">New Style Sheet</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox12">
         <property name="visible">True</property>
@@ -865,8 +868,5 @@
       <action-widget response="-6">cancelbutton1</action-widget>
       <action-widget response="-5">okbutton1</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-search.glade b/gnucash/gtkbuilder/dialog-search.glade
index 400e8e1d1..c233e0398 100644
--- a/gnucash/gtkbuilder/dialog-search.glade
+++ b/gnucash/gtkbuilder/dialog-search.glade
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="search_dialog">
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
@@ -117,7 +120,7 @@
                       <object class="GtkLabel" id="type_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">()</property>
+                        <property name="label">()</property>
                         <property name="justify">center</property>
                       </object>
                       <packing>
diff --git a/gnucash/gtkbuilder/dialog-totd.glade b/gnucash/gtkbuilder/dialog-totd.glade
index c8bb7db01..6b0d5f865 100644
--- a/gnucash/gtkbuilder/dialog-totd.glade
+++ b/gnucash/gtkbuilder/dialog-totd.glade
@@ -26,13 +26,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="back-button">
-                <property name="label">gtk-media-previous</property>
+                <property name="label" translatable="yes">_Previous</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -42,13 +41,12 @@
             </child>
             <child>
               <object class="GtkButton" id="forward-button">
-                <property name="label">gtk-media-next</property>
+                <property name="label" translatable="yes">_Next</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -58,13 +56,12 @@
             </child>
             <child>
               <object class="GtkButton" id="close-button">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gnucash/gtkbuilder/dialog-trans-assoc.glade b/gnucash/gtkbuilder/dialog-trans-assoc.glade
index c25f99238..484b79f72 100644
--- a/gnucash/gtkbuilder/dialog-trans-assoc.glade
+++ b/gnucash/gtkbuilder/dialog-trans-assoc.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="list-store">
@@ -22,6 +22,9 @@
   </object>
   <object class="GtkWindow" id="transaction_association_window">
     <property name="can_focus">False</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="dialog-vbox">
         <property name="can_focus">False</property>
@@ -73,7 +76,7 @@
             </child>
             <child>
               <object class="GtkButton" id="close_button">
-                <property name="label">_Close</property>
+                <property name="label" translatable="yes">_Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -201,8 +204,5 @@ Description column or Association column to open the Association</property>
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-transfer.glade b/gnucash/gtkbuilder/dialog-transfer.glade
index 2cf104fb4..81b3ad534 100644
--- a/gnucash/gtkbuilder/dialog-transfer.glade
+++ b/gnucash/gtkbuilder/dialog-transfer.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="transfer_dialog">
@@ -8,6 +8,9 @@
     <property name="title" translatable="yes">Transfer Funds</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_xfer_dialog_response_cb" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
         <property name="visible">True</property>
@@ -21,7 +24,7 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button">
-                <property name="label">_Cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -36,7 +39,7 @@
             </child>
             <child>
               <object class="GtkButton" id="button1">
-                <property name="label">_OK</property>
+                <property name="label" translatable="yes">_OK</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
diff --git a/gnucash/gtkbuilder/gnc-date-format.glade b/gnucash/gtkbuilder/gnc-date-format.glade
index 5b02e29aa..c8c85a214 100644
--- a/gnucash/gtkbuilder/gnc-date-format.glade
+++ b/gnucash/gtkbuilder/gnc-date-format.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkListStore" id="format-liststore">
@@ -38,6 +38,9 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Date Format</property>
     <property name="resizable">False</property>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkGrid" id="date_format_table">
         <property name="visible">True</property>
@@ -47,7 +50,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes">December 31, 2000</property>
+            <property name="label">December 31, 2000</property>
           </object>
           <packing>
             <property name="left_attach">2</property>

commit fd3a8c3211c8f0aaf39cd4f673efc831c6575006
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Jun 8 13:52:45 2019 +0100

    Remove some white space from import-main-matcher.c
    
    Remove some white space and insert a space at the end
    of some function names.

diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 3e667f22b..c5aca00df 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -98,8 +98,8 @@ void on_matcher_help_clicked (GtkButton *button, gpointer user_data);
 void on_matcher_help_close_clicked (GtkButton *button, gpointer user_data);
 
 /* Local prototypes */
-static void gnc_gen_trans_assign_transfer_account(
-                                                GtkTreeView *treeview, 
+static void gnc_gen_trans_assign_transfer_account (
+                                                GtkTreeView *treeview,
                                                 gboolean *first,
                                                 gboolean *is_selection,
                                                 GtkTreePath *path,
@@ -108,17 +108,17 @@ static void gnc_gen_trans_assign_transfer_account(
 static void gnc_gen_trans_assign_transfer_account_to_selection_cb (
                                           GtkMenuItem *menuitem,
                                           GNCImportMainMatcher *info);
-static void gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, 
+static void gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
                                           GdkEvent *event,
                                           GNCImportMainMatcher *info);
 static gboolean gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
                                                   GdkEvent *event,
                                                   GNCImportMainMatcher *info);
 static gboolean gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
-                                              GdkEvent *event, 
+                                              GdkEvent *event,
                                               GNCImportMainMatcher *info);
-static void refresh_model_row(GNCImportMainMatcher *gui, GtkTreeModel *model,
-                  GtkTreeIter *iter, GNCImportTransInfo *info);
+static void refresh_model_row (GNCImportMainMatcher *gui, GtkTreeModel *model,
+                               GtkTreeIter *iter, GNCImportTransInfo *info);
 /* end local prototypes */
 
 void gnc_gen_trans_list_delete (GNCImportMainMatcher *info)
@@ -130,30 +130,29 @@ void gnc_gen_trans_list_delete (GNCImportMainMatcher *info)
     if (info == NULL)
         return;
 
-    model = gtk_tree_view_get_model(info->view);
-    if (gtk_tree_model_get_iter_first(model, &iter))
+    model = gtk_tree_view_get_model (info->view);
+    if (gtk_tree_model_get_iter_first (model, &iter))
     {
         do
         {
-            gtk_tree_model_get(model, &iter,
-                               DOWNLOADED_COL_DATA, &trans_info,
-                               -1);
+            gtk_tree_model_get (model, &iter,
+                                DOWNLOADED_COL_DATA, &trans_info,
+                                -1);
 
             if (info->transaction_processed_cb)
             {
-                info->transaction_processed_cb(trans_info,
-                                               FALSE,
-                                               info->user_data);
+                info->transaction_processed_cb (trans_info, FALSE,
+                                                info->user_data);
             }
 
-            gnc_import_TransInfo_delete(trans_info);
+            gnc_import_TransInfo_delete (trans_info);
         }
         while (gtk_tree_model_iter_next (model, &iter));
     }
 
     if (GTK_IS_DIALOG(info->main_widget))
     {
-        gnc_save_window_size(GNC_PREFS_GROUP, GTK_WINDOW(info->main_widget));
+        gnc_save_window_size (GNC_PREFS_GROUP, GTK_WINDOW(info->main_widget));
         gnc_import_Settings_delete (info->user_settings);
         gtk_widget_destroy (GTK_WIDGET (info->main_widget));
     }
@@ -163,8 +162,7 @@ void gnc_gen_trans_list_delete (GNCImportMainMatcher *info)
 }
 
 void
-on_matcher_ok_clicked (GtkButton *button,
-                       GNCImportMainMatcher *info)
+on_matcher_ok_clicked (GtkButton *button, GNCImportMainMatcher *info)
 {
     GtkTreeModel *model;
     GtkTreeIter iter;
@@ -174,8 +172,8 @@ on_matcher_ok_clicked (GtkButton *button,
 
     /*   DEBUG ("Begin") */
 
-    model = gtk_tree_view_get_model(info->view);
-    if (!gtk_tree_model_get_iter_first(model, &iter))
+    model = gtk_tree_view_get_model (info->view);
+    if (!gtk_tree_model_get_iter_first (model, &iter))
         return;
 
     /* Don't run any queries and/or split sorts while processing the matcher
@@ -184,16 +182,15 @@ on_matcher_ok_clicked (GtkButton *button,
 
     do
     {
-        gtk_tree_model_get(model, &iter,
-                           DOWNLOADED_COL_DATA, &trans_info,
-                           -1);
+        gtk_tree_model_get (model, &iter,
+                            DOWNLOADED_COL_DATA, &trans_info,
+                            -1);
 
-        if (gnc_import_process_trans_item(NULL, trans_info))
+        if (gnc_import_process_trans_item (NULL, trans_info))
         {
             if (info->transaction_processed_cb)
             {
-                info->transaction_processed_cb(trans_info,
-                                               TRUE,
+                info->transaction_processed_cb (trans_info, TRUE,
                                                info->user_data);
             }
         }
@@ -219,7 +216,7 @@ on_matcher_help_close_clicked (GtkButton *button, gpointer user_data)
 {
     GtkWidget *help_dialog = user_data;
 
-    gtk_widget_destroy(help_dialog);
+    gtk_widget_destroy (help_dialog);
 }
 
 void
@@ -255,19 +252,18 @@ on_matcher_help_clicked (GtkButton *button, gpointer user_data)
     gnc_widget_set_style_context (GTK_WIDGET(box), int_not_required_class);
 
     help_dialog = GTK_WIDGET(gtk_builder_get_object (builder, "matcher_help_dialog"));
-    gtk_window_set_transient_for(GTK_WINDOW(help_dialog),
-                                 GTK_WINDOW(info->main_widget));
+    gtk_window_set_transient_for (GTK_WINDOW(help_dialog), GTK_WINDOW(info->main_widget));
 
     /* Connect the signals */
     gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, help_dialog);
 
-    g_object_unref(G_OBJECT(builder));
+    g_object_unref (G_OBJECT(builder));
 
     g_free (int_required_class);
     g_free (int_prob_required_class);
     g_free (int_not_required_class);
 
-    gtk_widget_show(help_dialog);
+    gtk_widget_show (help_dialog);
 }
 
 static void
@@ -281,14 +277,14 @@ run_account_picker_dialog (GNCImportMainMatcher *info,
     g_assert (trans_info);
     old_acc = gnc_import_TransInfo_get_destacc (trans_info);
 
-    new_acc = gnc_import_select_account(info->main_widget,
-                                        NULL,
-                                        TRUE,
-                                        _("Destination account for the auto-balance split."),
-                                        xaccTransGetCurrency(gnc_import_TransInfo_get_trans(trans_info)),
-                                        ACCT_TYPE_NONE,
-                                        old_acc,
-                                        &ok_pressed);
+    new_acc = gnc_import_select_account (info->main_widget,
+                                         NULL,
+                                         TRUE,
+                                         _("Destination account for the auto-balance split."),
+                                         xaccTransGetCurrency (gnc_import_TransInfo_get_trans (trans_info)),
+                                         ACCT_TYPE_NONE,
+                                         old_acc,
+                                         &ok_pressed);
     if (ok_pressed)
         gnc_import_TransInfo_set_destacc (trans_info, new_acc, TRUE);
 }
@@ -310,21 +306,21 @@ gnc_gen_trans_add_toggled_cb (GtkCellRendererToggle *cell_renderer,
     GtkTreeIter iter;
     GNCImportTransInfo *trans_info;
 
-    model = gtk_tree_view_get_model(gui->view);
-    if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
+    model = gtk_tree_view_get_model (gui->view);
+    if (!gtk_tree_model_get_iter_from_string (model, &iter, path))
         return;
-    gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
+    gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
 
-    if ( gnc_import_TransInfo_get_action(trans_info) == GNCImport_ADD
-            && gnc_import_Settings_get_action_skip_enabled (gui->user_settings) == TRUE)
+    if (gnc_import_TransInfo_get_action (trans_info) == GNCImport_ADD &&
+            gnc_import_Settings_get_action_skip_enabled (gui->user_settings) == TRUE)
     {
-        gnc_import_TransInfo_set_action(trans_info, GNCImport_SKIP);
+        gnc_import_TransInfo_set_action (trans_info, GNCImport_SKIP);
     }
     else
     {
-        gnc_import_TransInfo_set_action(trans_info, GNCImport_ADD);
+        gnc_import_TransInfo_set_action (trans_info, GNCImport_ADD);
     }
-    refresh_model_row(gui, model, &iter, trans_info);
+    refresh_model_row (gui, model, &iter, trans_info);
 }
 
 static void
@@ -336,21 +332,21 @@ gnc_gen_trans_clear_toggled_cb (GtkCellRendererToggle *cell_renderer,
     GtkTreeIter iter;
     GNCImportTransInfo *trans_info;
 
-    model = gtk_tree_view_get_model(gui->view);
-    if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
+    model = gtk_tree_view_get_model (gui->view);
+    if (!gtk_tree_model_get_iter_from_string (model, &iter, path))
         return;
-    gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
+    gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
 
-    if ( gnc_import_TransInfo_get_action(trans_info) == GNCImport_CLEAR
-            && gnc_import_Settings_get_action_skip_enabled (gui->user_settings) == TRUE)
+    if (gnc_import_TransInfo_get_action (trans_info) == GNCImport_CLEAR &&
+            gnc_import_Settings_get_action_skip_enabled (gui->user_settings) == TRUE)
     {
-        gnc_import_TransInfo_set_action(trans_info, GNCImport_SKIP);
+        gnc_import_TransInfo_set_action (trans_info, GNCImport_SKIP);
     }
     else
     {
-        gnc_import_TransInfo_set_action(trans_info, GNCImport_CLEAR);
+        gnc_import_TransInfo_set_action (trans_info, GNCImport_CLEAR);
     }
-    refresh_model_row(gui, model, &iter, trans_info);
+    refresh_model_row (gui, model, &iter, trans_info);
 }
 
 static void
@@ -362,30 +358,30 @@ gnc_gen_trans_update_toggled_cb (GtkCellRendererToggle *cell_renderer,
     GtkTreeIter iter;
     GNCImportTransInfo *trans_info;
 
-    model = gtk_tree_view_get_model(gui->view);
-    if (!gtk_tree_model_get_iter_from_string(model, &iter, path))
+    model = gtk_tree_view_get_model (gui->view);
+    if (!gtk_tree_model_get_iter_from_string (model, &iter, path))
         return;
-    gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
+    gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
 
-    if ( gnc_import_TransInfo_get_action(trans_info) == GNCImport_UPDATE
-            && gnc_import_Settings_get_action_skip_enabled (gui->user_settings) == TRUE)
+    if (gnc_import_TransInfo_get_action (trans_info) == GNCImport_UPDATE &&
+            gnc_import_Settings_get_action_skip_enabled (gui->user_settings) == TRUE)
     {
-        gnc_import_TransInfo_set_action(trans_info, GNCImport_SKIP);
+        gnc_import_TransInfo_set_action (trans_info, GNCImport_SKIP);
     }
     else
     {
-        gnc_import_TransInfo_set_action(trans_info, GNCImport_UPDATE);
+        gnc_import_TransInfo_set_action (trans_info, GNCImport_UPDATE);
     }
-    refresh_model_row(gui, model, &iter, trans_info);
+    refresh_model_row (gui, model, &iter, trans_info);
 }
 
 static void
-gnc_gen_trans_assign_transfer_account(GtkTreeView *treeview, 
-                                      gboolean *first,
-                                      gboolean *is_selection,
-                                      GtkTreePath *path,
-                                      Account **new_acc,
-                                      GNCImportMainMatcher *info)
+gnc_gen_trans_assign_transfer_account (GtkTreeView *treeview,
+                                       gboolean *first,
+                                       gboolean *is_selection,
+                                       GtkTreePath *path,
+                                       Account **new_acc,
+                                       GNCImportMainMatcher *info)
 {
     GtkTreeModel *model;
     GtkTreeIter iter;
@@ -396,59 +392,59 @@ gnc_gen_trans_assign_transfer_account(GtkTreeView *treeview,
     ENTER("");
     DEBUG("first = %s",*first?"true":"false");
     DEBUG("is_selection = %s",*is_selection?"true":"false");
-    DEBUG("path  = %s", gtk_tree_path_to_string(path));
-    DEBUG("account passed in = %s", gnc_get_account_name_for_register(*new_acc));
-    model = gtk_tree_view_get_model(treeview);
-    if (gtk_tree_model_get_iter(model, &iter, path))
+    DEBUG("path  = %s", gtk_tree_path_to_string (path));
+    DEBUG("account passed in = %s", gnc_get_account_name_for_register (*new_acc));
+    model = gtk_tree_view_get_model (treeview);
+    if (gtk_tree_model_get_iter (model, &iter, path))
     {
-        gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
+        gtk_tree_model_get (model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
 
         switch (gnc_import_TransInfo_get_action (trans_info))
         {
         case GNCImport_ADD:
-            if (gnc_import_TransInfo_is_balanced(trans_info) == FALSE)
+            if (gnc_import_TransInfo_is_balanced (trans_info) == FALSE)
             {
                 ok_pressed = TRUE;
                 old_acc  = gnc_import_TransInfo_get_destacc (trans_info);
                 if (*first)
                 {
                     ok_pressed = FALSE;
-                    *new_acc = gnc_import_select_account(info->main_widget,
+                    *new_acc = gnc_import_select_account (info->main_widget,
                         NULL,
                         TRUE,
                         _("Destination account for the auto-balance split."),
-                        xaccTransGetCurrency(
-                              gnc_import_TransInfo_get_trans(trans_info)),
+                        xaccTransGetCurrency (
+                              gnc_import_TransInfo_get_trans (trans_info)),
                         ACCT_TYPE_NONE,
                         old_acc,
                         &ok_pressed);
                     *first = FALSE;
-                    DEBUG("account selected = %s", 
-                            gnc_account_get_full_name(*new_acc));                    
+                    DEBUG("account selected = %s",
+                            gnc_account_get_full_name (*new_acc));
                 }
                 if (ok_pressed)
-                        gnc_import_TransInfo_set_destacc (trans_info, 
-                                                    *new_acc, TRUE);
+                    gnc_import_TransInfo_set_destacc (trans_info, *new_acc, TRUE);
             }
             break;
         case GNCImport_CLEAR:
         case GNCImport_UPDATE:
-            if (first && !is_selection) run_match_dialog (info, trans_info);
+            if (first && !is_selection)
+                run_match_dialog (info, trans_info);
             break;
-        case GNCImport_SKIP:        
+        case GNCImport_SKIP:
             break;
         default:
             PERR("InvalidGNCImportValue");
             break;
         }
-        refresh_model_row(info, model, &iter, trans_info);
+        refresh_model_row (info, model, &iter, trans_info);
     }
     LEAVE("");
 }
 
 static void
 gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
-                                             GNCImportMainMatcher *info)
+                                                       GNCImportMainMatcher *info)
 {
     GtkTreeView *treeview;
     GtkTreeSelection *selection;
@@ -461,17 +457,17 @@ gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
 
     ENTER("");
     treeview = GTK_TREE_VIEW(info->view);
-    model = gtk_tree_view_get_model(treeview);
-    selection = gtk_tree_view_get_selection(treeview);
+    model = gtk_tree_view_get_model (treeview);
+    selection = gtk_tree_view_get_selection (treeview);
     selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
     assigned_account = NULL;
     first = TRUE;
-    is_selection = TRUE;    
+    is_selection = TRUE;
     DEBUG("Rows in selection = %i",
-          gtk_tree_selection_count_selected_rows(selection));
+          gtk_tree_selection_count_selected_rows (selection));
     DEBUG("Entering loop over selection");
 
-    if (gtk_tree_selection_count_selected_rows(selection) > 0)
+    if (gtk_tree_selection_count_selected_rows (selection) > 0)
     {
         for (l = selected_rows; l != NULL; l = l->next)
         {
@@ -480,16 +476,17 @@ gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
             DEBUG("passing is_selection = %s",
                                                 is_selection?"true":"false");
             DEBUG("passing path = %s",
-                           gtk_tree_path_to_string(l->data));
+                           gtk_tree_path_to_string (l->data));
             DEBUG("passing account value = %s",
-                        gnc_account_get_full_name(assigned_account));
-            gnc_gen_trans_assign_transfer_account(treeview,
+                        gnc_account_get_full_name (assigned_account));
+            gnc_gen_trans_assign_transfer_account (treeview,
                            &first, &is_selection, l->data, &assigned_account, info);
-            DEBUG("returned value of account = %s", 
-                        gnc_account_get_full_name(assigned_account));
+            DEBUG("returned value of account = %s",
+                        gnc_account_get_full_name (assigned_account));
             DEBUG("returned value of first = %s",first?"true":"false");
-            if (assigned_account == NULL) break;
-            gtk_tree_selection_unselect_path(selection, l->data);
+            if (assigned_account == NULL)
+                break;
+            gtk_tree_selection_unselect_path (selection, l->data);
         }
     }
     g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
@@ -509,10 +506,10 @@ gnc_gen_trans_row_activated_cb (GtkTreeView *treeview,
     assigned_account = NULL;
     first = TRUE;
     is_selection = FALSE;
-    gnc_gen_trans_assign_transfer_account(treeview, 
+    gnc_gen_trans_assign_transfer_account (treeview,
                             &first,  &is_selection, path,
                             &assigned_account, info);
-    DEBUG("account returned = %s", gnc_account_get_full_name(assigned_account));
+    DEBUG("account returned = %s", gnc_account_get_full_name (assigned_account));
     LEAVE("");
 }
 
@@ -525,7 +522,7 @@ gnc_gen_trans_row_changed_cb (GtkTreeSelection *selection,
     GtkSelectionMode mode;
 
     ENTER("");
-    mode = gtk_tree_selection_get_mode(selection);
+    mode = gtk_tree_selection_get_mode (selection);
     switch (mode)
     {
         case GTK_SELECTION_MULTIPLE:
@@ -540,43 +537,43 @@ gnc_gen_trans_row_changed_cb (GtkTreeSelection *selection,
             DEBUG("mode = GTK_SELECTION_SINGLE->default");
         default:
             DEBUG("mode = default unselect selected row");
-            if (gtk_tree_selection_get_selected(selection, &model, &iter))
+            if (gtk_tree_selection_get_selected (selection, &model, &iter))
             {
-                gtk_tree_selection_unselect_iter(selection, &iter);
+                gtk_tree_selection_unselect_iter (selection, &iter);
             }
     }
     LEAVE("");
 }
 
 static void
-gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, 
+gnc_gen_trans_view_popup_menu (GtkTreeView *treeview,
                                GdkEvent *event,
                                GNCImportMainMatcher *info)
-{    
+{
     GtkWidget *menu, *menuitem;
     GdkEventButton *event_button;
 
     ENTER ("");
     menu = gtk_menu_new();
-    menuitem = gtk_menu_item_new_with_label(_("Assign a transfer account."));
-    g_signal_connect(menuitem, "activate",
-                     G_CALLBACK(
-                     gnc_gen_trans_assign_transfer_account_to_selection_cb),
-                     info);
+    menuitem = gtk_menu_item_new_with_label (_("Assign a transfer account."));
+    g_signal_connect (menuitem, "activate",
+                      G_CALLBACK(
+                      gnc_gen_trans_assign_transfer_account_to_selection_cb),
+                      info);
     DEBUG("Callback to assign destination account to selection connected");
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-    gtk_widget_show_all(menu);
+    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+    gtk_widget_show_all (menu);
     event_button = (GdkEventButton *) event;
     /* Note: event can be NULL here when called from view_onPopupMenu;
      *  gdk_event_get_time() accepts a NULL argument */
     /* replace deprecated function for GTK versions >=3.22 */
 #if GTK_CHECK_VERSION(3,22,0)
-   gtk_menu_popup_at_pointer(GTK_MENU(menu),(GdkEvent*)event);
+   gtk_menu_popup_at_pointer (GTK_MENU(menu), (GdkEvent*)event);
 #else
-    gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 
-                    (event_button != NULL) ? event_button->button : 0, 
-                    gdk_event_get_time((GdkEvent*)event)); 
-#endif  
+    gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL,
+                     (event_button != NULL) ? event_button->button : 0,
+                     gdk_event_get_time ((GdkEvent*)event));
+#endif
     LEAVE ("");
 }
 
@@ -597,10 +594,10 @@ gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
         if (event_button->button == GDK_BUTTON_SECONDARY)
         {
             DEBUG("Right mouseClick detected- popup the menu.");
-            selection = gtk_tree_view_get_selection(treeview);
-            if (gtk_tree_selection_count_selected_rows(selection) > 0)
+            selection = gtk_tree_view_get_selection (treeview);
+            if (gtk_tree_selection_count_selected_rows (selection) > 0)
             {
-              gnc_gen_trans_view_popup_menu(treeview, event, info);
+              gnc_gen_trans_view_popup_menu (treeview, event, info);
             }
             LEAVE("return TRUE");
             return TRUE;
@@ -612,16 +609,16 @@ gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
 
 static gboolean
 gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
-                              GdkEvent *event, 
+                              GdkEvent *event,
                               GNCImportMainMatcher *info)
 {
     GtkTreeSelection *selection;
     ENTER("");
     /* respond to Shift-F10 popup menu hotkey */
-    selection = gtk_tree_view_get_selection(treeview);
-    if (gtk_tree_selection_count_selected_rows(selection) > 0)
+    selection = gtk_tree_view_get_selection (treeview);
+    if (gtk_tree_selection_count_selected_rows (selection) > 0)
     {
-      gnc_gen_trans_view_popup_menu(treeview, NULL, info);
+      gnc_gen_trans_view_popup_menu (treeview, NULL, info);
     }
     LEAVE ("");
     return TRUE;
@@ -648,22 +645,22 @@ add_text_column(GtkTreeView *view, const gchar *title, int col_num)
     {
         gtk_cell_renderer_set_alignment (renderer, 1.0, 0.5); // right align amount column
         gtk_cell_renderer_set_padding (renderer, 5, 0); // add padding so its not close to description
-        gtk_tree_view_column_set_sort_column_id(column, DOWNLOADED_COL_AMOUNT_DOUBLE);
+        gtk_tree_view_column_set_sort_column_id (column, DOWNLOADED_COL_AMOUNT_DOUBLE);
     }
     else
-        gtk_tree_view_column_set_sort_column_id(column, col_num);
+        gtk_tree_view_column_set_sort_column_id (column, col_num);
 
-    g_object_set(G_OBJECT(column),
-                 "reorderable", TRUE,
-                 "resizable", TRUE,
-                 NULL);
-    gtk_tree_view_append_column(view, column);
+    g_object_set (G_OBJECT(column),
+                  "reorderable", TRUE,
+                  "resizable", TRUE,
+                  NULL);
+    gtk_tree_view_append_column (view, column);
     return column;
 }
 
 static GtkTreeViewColumn *
-add_toggle_column(GtkTreeView *view, const gchar *title, int col_num,
-                  GCallback cb_fn, gpointer cb_arg)
+add_toggle_column (GtkTreeView *view, const gchar *title, int col_num,
+                   GCallback cb_fn, gpointer cb_arg)
 {
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column;
@@ -674,12 +671,12 @@ add_toggle_column(GtkTreeView *view, const gchar *title, int col_num,
               "active", col_num,
               "cell-background", DOWNLOADED_COL_COLOR,
               NULL);
-    gtk_tree_view_column_set_sort_column_id(column, col_num);
-    g_object_set(G_OBJECT(column),
-                 "reorderable", TRUE,
-                 NULL);
-    g_signal_connect(renderer, "toggled", cb_fn, cb_arg);
-    gtk_tree_view_append_column(view, column);
+    gtk_tree_view_column_set_sort_column_id (column, col_num);
+    g_object_set (G_OBJECT(column),
+                  "reorderable", TRUE,
+                  NULL);
+    g_signal_connect (renderer, "toggled", cb_fn, cb_arg);
+    gtk_tree_view_append_column (view, column);
     return column;
 }
 
@@ -695,74 +692,74 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
     GtkTreeSelection *selection;
 
     view = info->view;
-    store = gtk_list_store_new(NUM_DOWNLOADED_COLS, G_TYPE_STRING, G_TYPE_INT64,
-                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE,
-                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN,
-                               G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING,
-                               GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_STRING);
-    gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
-    g_object_unref(store);
+    store = gtk_list_store_new (NUM_DOWNLOADED_COLS, G_TYPE_STRING, G_TYPE_INT64,
+                                G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE,
+                                G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN,
+                                G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING,
+                                GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_STRING);
+    gtk_tree_view_set_model (view, GTK_TREE_MODEL(store));
+    g_object_unref (store);
 
     /* prevent the rows being dragged to a different order */
     gtk_tree_view_set_reorderable (view, FALSE);
 
     /* Add the columns *
      * (keep the line break below to avoid a translator comment) */
-    add_text_column(view, _("Date"), DOWNLOADED_COL_DATE_TXT);
-    info->account_column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT);
-    gtk_tree_view_column_set_visible(info->account_column, show_account);
-    add_text_column(view, _("Amount"), DOWNLOADED_COL_AMOUNT);
-    add_text_column(view, _("Description"), DOWNLOADED_COL_DESCRIPTION);
-    add_text_column(view, _("Memo"), DOWNLOADED_COL_MEMO);
-    add_toggle_column(view,
-                      /* toggle column: add new transaction */
-                      _("A"), DOWNLOADED_COL_ACTION_ADD,
-                      G_CALLBACK(gnc_gen_trans_add_toggled_cb), info);
-    column = add_toggle_column(view,
+    add_text_column (view, _("Date"), DOWNLOADED_COL_DATE_TXT);
+    info->account_column = add_text_column (view, _("Account"), DOWNLOADED_COL_ACCOUNT);
+    gtk_tree_view_column_set_visible (info->account_column, show_account);
+    add_text_column (view, _("Amount"), DOWNLOADED_COL_AMOUNT);
+    add_text_column (view, _("Description"), DOWNLOADED_COL_DESCRIPTION);
+    add_text_column (view, _("Memo"), DOWNLOADED_COL_MEMO);
+    add_toggle_column (view,
+                       /* toggle column: add new transaction */
+                       _("A"), DOWNLOADED_COL_ACTION_ADD,
+                       G_CALLBACK(gnc_gen_trans_add_toggled_cb), info);
+    column = add_toggle_column (view,
             /* toggle column: update existing transaction & mark it reconciled */
             _("U+R"), DOWNLOADED_COL_ACTION_UPDATE,
                                G_CALLBACK(gnc_gen_trans_update_toggled_cb), info);
-    gtk_tree_view_column_set_visible(column, show_update);
-    add_toggle_column(view,
+    gtk_tree_view_column_set_visible (column, show_update);
+    add_toggle_column (view,
             /* toggle column: mark existing transaction reconciled */
             _("R"), DOWNLOADED_COL_ACTION_CLEAR,
                       G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info);
 
     /* The last column has multiple renderers */
     renderer = gtk_cell_renderer_pixbuf_new();
-    g_object_set(renderer, "xalign", 0.0, NULL);
-    column = gtk_tree_view_column_new_with_attributes(_("Info"), renderer,
+    g_object_set (renderer, "xalign", 0.0, NULL);
+    column = gtk_tree_view_column_new_with_attributes (_("Info"), renderer,
              "pixbuf", DOWNLOADED_COL_ACTION_PIXBUF,
              "cell-background", DOWNLOADED_COL_COLOR,
              NULL);
     renderer = gtk_cell_renderer_text_new();
-    gtk_tree_view_column_pack_start(column, renderer, TRUE);
-    gtk_tree_view_column_set_attributes(column, renderer,
-                                        "text", DOWNLOADED_COL_ACTION_INFO,
-                                        "background", DOWNLOADED_COL_COLOR,
-                                        NULL);
-    gtk_tree_view_column_set_sort_column_id(column, DOWNLOADED_COL_ACTION_INFO);
-    g_object_set(G_OBJECT(column),
-                 "reorderable", TRUE,
-                 "resizable", TRUE,
-                 NULL);
-    gtk_tree_view_append_column(info->view, column);
+    gtk_tree_view_column_pack_start (column, renderer, TRUE);
+    gtk_tree_view_column_set_attributes (column, renderer,
+                                         "text", DOWNLOADED_COL_ACTION_INFO,
+                                         "background", DOWNLOADED_COL_COLOR,
+                                         NULL);
+    gtk_tree_view_column_set_sort_column_id (column, DOWNLOADED_COL_ACTION_INFO);
+    g_object_set (G_OBJECT(column),
+                  "reorderable", TRUE,
+                  "resizable", TRUE,
+                  NULL);
+    gtk_tree_view_append_column (info->view, column);
 
     /* default sort order */
     gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
                                           DOWNLOADED_COL_DATE_INT64,
                                           GTK_SORT_ASCENDING);
 
-    selection = gtk_tree_view_get_selection(info->view);
-    g_signal_connect(info->view, "row-activated",
-                     G_CALLBACK(gnc_gen_trans_row_activated_cb), info);
-    g_signal_connect(selection, "changed",
-                     G_CALLBACK(gnc_gen_trans_row_changed_cb), info);
+    selection = gtk_tree_view_get_selection (info->view);
+    g_signal_connect (info->view, "row-activated",
+                      G_CALLBACK(gnc_gen_trans_row_activated_cb), info);
+    g_signal_connect (selection, "changed",
+                      G_CALLBACK(gnc_gen_trans_row_changed_cb), info);
 
-    g_signal_connect(view, "button-press-event", 
-                     G_CALLBACK(gnc_gen_trans_onButtonPressed_cb), info);
-    g_signal_connect(view, "popup-menu", 
-                     G_CALLBACK(gnc_gen_trans_onPopupMenu_cb), info);
+    g_signal_connect (view, "button-press-event",
+                      G_CALLBACK(gnc_gen_trans_onButtonPressed_cb), info);
+    g_signal_connect (view, "popup-menu",
+                      G_CALLBACK(gnc_gen_trans_onPopupMenu_cb), info);
 }
 
 static void
@@ -808,7 +805,7 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     /* Pack the content into the dialog vbox */
     pbox = GTK_WIDGET(gtk_builder_get_object (builder, "transaction_matcher_vbox"));
     box = GTK_WIDGET(gtk_builder_get_object (builder, "transaction_matcher_content"));
-    gtk_box_pack_start( GTK_BOX(pbox), box, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX(pbox), box, TRUE, TRUE, 0);
 
     /* Get the view */
     info->view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "downloaded_view"));
@@ -816,11 +813,11 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
 
     button = GTK_WIDGET(gtk_builder_get_object (builder, "show_source_account_button"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), all_from_same_account);
-    g_signal_connect(G_OBJECT(button), "toggled",
-                     G_CALLBACK(show_account_column_toggled_cb), info);
+    g_signal_connect (G_OBJECT(button), "toggled",
+                      G_CALLBACK(show_account_column_toggled_cb), info);
 
-    show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
-    gnc_gen_trans_init_view(info, all_from_same_account, show_update);
+    show_update = gnc_import_Settings_get_action_update_enabled (info->user_settings);
+    gnc_gen_trans_init_view (info, all_from_same_account, show_update);
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
     g_assert (heading_label != NULL);
 
@@ -830,7 +827,7 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     if (heading)
         gtk_label_set_text (GTK_LABEL (heading_label), heading);
 
-    gnc_restore_window_size(GNC_PREFS_GROUP, GTK_WINDOW(info->main_widget), GTK_WINDOW (parent));
+    gnc_restore_window_size (GNC_PREFS_GROUP, GTK_WINDOW(info->main_widget), GTK_WINDOW (parent));
     gtk_widget_show_all (GTK_WIDGET (info->main_widget));
 
     info->transaction_processed_cb = NULL;
@@ -838,7 +835,7 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     /* Connect the signals */
     gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, info);
 
-    g_object_unref(G_OBJECT(builder));
+    g_object_unref (G_OBJECT(builder));
 
     return info;
 }
@@ -889,11 +886,11 @@ GNCImportMainMatcher * gnc_gen_trans_assist_new (GtkWidget *parent,
 
     button = GTK_WIDGET(gtk_builder_get_object (builder, "show_source_account_button"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), all_from_same_account);
-    g_signal_connect(G_OBJECT(button), "toggled",
-                     G_CALLBACK(show_account_column_toggled_cb), info);
+    g_signal_connect (G_OBJECT(button), "toggled",
+                      G_CALLBACK(show_account_column_toggled_cb), info);
 
-    show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
-    gnc_gen_trans_init_view(info, all_from_same_account, show_update);
+    show_update = gnc_import_Settings_get_action_update_enabled (info->user_settings);
+    gnc_gen_trans_init_view (info, all_from_same_account, show_update);
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
     g_assert (heading_label != NULL);
 
@@ -905,7 +902,7 @@ GNCImportMainMatcher * gnc_gen_trans_assist_new (GtkWidget *parent,
     /* Connect the signals */
     gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, info);
 
-    g_object_unref(G_OBJECT(builder));
+    g_object_unref (G_OBJECT(builder));
 
     return info;
 }
@@ -919,9 +916,9 @@ void gnc_gen_trans_assist_start (GNCImportMainMatcher *info)
  *                   Assistant routines End                      *
  *****************************************************************/
 
-void gnc_gen_trans_list_add_tp_cb(GNCImportMainMatcher *info,
-                                  GNCTransactionProcessedCB trans_processed_cb,
-                                  gpointer user_data)
+void gnc_gen_trans_list_add_tp_cb (GNCImportMainMatcher *info,
+                                   GNCTransactionProcessedCB trans_processed_cb,
+                                   gpointer user_data)
 {
     info->user_data = user_data;
     info->transaction_processed_cb = trans_processed_cb;
@@ -973,7 +970,7 @@ refresh_model_row (GNCImportMainMatcher *gui,
     /*DEBUG("Begin");*/
 
     store = GTK_LIST_STORE(model);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATA, info, -1);
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_DATA, info, -1);
 
     if (gui->dark_theme == TRUE)
         class_extension = "-dark";
@@ -984,39 +981,39 @@ refresh_model_row (GNCImportMainMatcher *gui,
 
     /*Account:*/
     split = gnc_import_TransInfo_get_fsplit (info);
-    g_assert(split); // Must not be NULL
-    ro_text = xaccAccountGetName(xaccSplitGetAccount(split));
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_ACCOUNT, ro_text, -1);
+    g_assert (split); // Must not be NULL
+    ro_text = xaccAccountGetName (xaccSplitGetAccount (split));
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_ACCOUNT, ro_text, -1);
 
     /*Date*/
-    date = xaccTransGetDate (gnc_import_TransInfo_get_trans(info));
+    date = xaccTransGetDate (gnc_import_TransInfo_get_trans (info));
     text = qof_print_date (date);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE_TXT, text, -1);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE_INT64, date, -1);
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_DATE_TXT, text, -1);
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_DATE_INT64, date, -1);
     g_free(text);
 
     /*Amount*/
     amount = xaccSplitGetAmount (split);
-    ro_text = xaccPrintAmount (amount, gnc_split_amount_print_info(split, TRUE));
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_AMOUNT, ro_text, -1);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_AMOUNT_DOUBLE, gnc_numeric_to_double (amount), -1);
+    ro_text = xaccPrintAmount (amount, gnc_split_amount_print_info (split, TRUE));
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_AMOUNT, ro_text, -1);
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_AMOUNT_DOUBLE, gnc_numeric_to_double (amount), -1);
 
     /*Description*/
-    ro_text = xaccTransGetDescription(gnc_import_TransInfo_get_trans(info) );
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DESCRIPTION, ro_text, -1);
+    ro_text = xaccTransGetDescription (gnc_import_TransInfo_get_trans (info) );
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_DESCRIPTION, ro_text, -1);
 
     /*Memo*/
-    ro_text = xaccSplitGetMemo(split);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_MEMO, ro_text, -1);
+    ro_text = xaccSplitGetMemo (split);
+    gtk_list_store_set (store, iter, DOWNLOADED_COL_MEMO, ro_text, -1);
 
     /*Actions*/
 
     /* Action information */
     ro_text = text = color = NULL;
-    switch (gnc_import_TransInfo_get_action(info))
+    switch (gnc_import_TransInfo_get_action (info))
     {
     case GNCImport_ADD:
-        if (gnc_import_TransInfo_is_balanced(info) == TRUE)
+        if (gnc_import_TransInfo_is_balanced (info) == TRUE)
         {
             ro_text = _("New, already balanced");
             color = get_required_color (int_not_required_class);
@@ -1028,32 +1025,32 @@ refresh_model_row (GNCImportMainMatcher *gui,
             imbalance =
                 g_strdup
                 (xaccPrintAmount
-                 (gnc_numeric_neg(xaccTransGetImbalanceValue
-                                  (gnc_import_TransInfo_get_trans(info) )),
+                 (gnc_numeric_neg (xaccTransGetImbalanceValue
+                                  (gnc_import_TransInfo_get_trans (info))),
                   gnc_commodity_print_info
-                  (xaccTransGetCurrency(gnc_import_TransInfo_get_trans (info)),
-                   TRUE) ));
+                  (xaccTransGetCurrency (gnc_import_TransInfo_get_trans (info)),
+                   TRUE)));
             if (gnc_import_TransInfo_get_destacc (info) != NULL)
             {
                 color = get_required_color (int_not_required_class);
                 tmp = gnc_account_get_full_name
                       (gnc_import_TransInfo_get_destacc (info));
-                if (gnc_import_TransInfo_get_destacc_selected_manually(info)
+                if (gnc_import_TransInfo_get_destacc_selected_manually (info)
                         == TRUE)
                 {
                     text =
                         /* Translators: %1$s is the amount to be
                            transferred. %2$s is the destination account. */
-                        g_strdup_printf(_("New, transfer %s to (manual) \"%s\""),
-                                        imbalance, tmp);
+                        g_strdup_printf (_("New, transfer %s to (manual) \"%s\""),
+                                         imbalance, tmp);
                 }
                 else
                 {
                     text =
                         /* Translators: %1$s is the amount to be
                            transferred. %2$s is the destination account. */
-                        g_strdup_printf(_("New, transfer %s to (auto) \"%s\""),
-                                        imbalance, tmp);
+                        g_strdup_printf (_("New, transfer %s to (auto) \"%s\""),
+                                         imbalance, tmp);
                 }
                 g_free (tmp);
 
@@ -1063,17 +1060,17 @@ refresh_model_row (GNCImportMainMatcher *gui,
                 color = get_required_color (int_prob_required_class);
                 text =
                     /* Translators: %s is the amount to be transferred. */
-                    g_strdup_printf(_("New, UNBALANCED (need acct to transfer %s)!"),
-                                    imbalance);
+                    g_strdup_printf (_("New, UNBALANCED (need acct to transfer %s)!"),
+                                     imbalance);
             }
             g_free (imbalance);
         }
         break;
     case GNCImport_CLEAR:
-        if (gnc_import_TransInfo_get_selected_match(info))
+        if (gnc_import_TransInfo_get_selected_match (info))
         {
             color = get_required_color (int_not_required_class);
-            if (gnc_import_TransInfo_get_match_selected_manually(info) == TRUE)
+            if (gnc_import_TransInfo_get_match_selected_manually (info) == TRUE)
             {
                 ro_text = _("Reconcile (manual) match");
             }
@@ -1089,10 +1086,10 @@ refresh_model_row (GNCImportMainMatcher *gui,
         }
         break;
     case GNCImport_UPDATE:
-        if (gnc_import_TransInfo_get_selected_match(info))
+        if (gnc_import_TransInfo_get_selected_match (info))
         {
             color = get_required_color (int_not_required_class);
-            if (gnc_import_TransInfo_get_match_selected_manually(info) == TRUE)
+            if (gnc_import_TransInfo_get_match_selected_manually (info) == TRUE)
             {
                 ro_text = _("Update and reconcile (manual) match");
             }
@@ -1117,77 +1114,77 @@ refresh_model_row (GNCImportMainMatcher *gui,
         break;
     }
 
-    gtk_list_store_set(store, iter,
-                       DOWNLOADED_COL_COLOR, color,
-                       DOWNLOADED_COL_ACTION_INFO, ro_text ? ro_text : text,
-                       -1);
+    gtk_list_store_set (store, iter,
+                        DOWNLOADED_COL_COLOR, color,
+                        DOWNLOADED_COL_ACTION_INFO, ro_text ? ro_text : text,
+                        -1);
     if (text)
-        g_free(text);
+        g_free (text);
 
     g_free (int_required_class);
     g_free (int_prob_required_class);
     g_free (int_not_required_class);
 
     /* Set the pixmaps */
-    gtk_list_store_set(store, iter,
-                       DOWNLOADED_COL_ACTION_ADD,
-                       gnc_import_TransInfo_get_action(info) == GNCImport_ADD,
-                       -1);
-    if (gnc_import_TransInfo_get_action(info) == GNCImport_SKIP)
+    gtk_list_store_set (store, iter,
+                        DOWNLOADED_COL_ACTION_ADD,
+                        gnc_import_TransInfo_get_action (info) == GNCImport_ADD,
+                        -1);
+    if (gnc_import_TransInfo_get_action (info) == GNCImport_SKIP)
     {
         /*Show the best match's confidence pixmap in the info column*/
-        gtk_list_store_set(store, iter,
-                           DOWNLOADED_COL_ACTION_PIXBUF,
-                           gen_probability_pixbuf( gnc_import_MatchInfo_get_probability
-                                   ( gnc_import_TransInfo_get_selected_match (info)),
-                                   gui->user_settings,
-                                   GTK_WIDGET(gui->view)),
-                           -1);
+        gtk_list_store_set (store, iter,
+                            DOWNLOADED_COL_ACTION_PIXBUF,
+                            gen_probability_pixbuf (gnc_import_MatchInfo_get_probability
+                                    (gnc_import_TransInfo_get_selected_match (info)),
+                                    gui->user_settings,
+                                    GTK_WIDGET(gui->view)),
+                            -1);
     }
 
-    gtk_list_store_set(store, iter,
-                       DOWNLOADED_COL_ACTION_CLEAR,
-                       gnc_import_TransInfo_get_action(info) == GNCImport_CLEAR,
-                       -1);
-    if (gnc_import_TransInfo_get_action(info) == GNCImport_CLEAR)
+    gtk_list_store_set (store, iter,
+                        DOWNLOADED_COL_ACTION_CLEAR,
+                        gnc_import_TransInfo_get_action (info) == GNCImport_CLEAR,
+                        -1);
+    if (gnc_import_TransInfo_get_action (info) == GNCImport_CLEAR)
     {
         /*Show the best match's confidence pixmap in the info column*/
-        gtk_list_store_set(store, iter,
-                           DOWNLOADED_COL_ACTION_PIXBUF,
-                           gen_probability_pixbuf( gnc_import_MatchInfo_get_probability
-                                   ( gnc_import_TransInfo_get_selected_match (info)),
-                                   gui->user_settings,
-                                   GTK_WIDGET(gui->view)),
-                           -1);
+        gtk_list_store_set (store, iter,
+                            DOWNLOADED_COL_ACTION_PIXBUF,
+                            gen_probability_pixbuf (gnc_import_MatchInfo_get_probability
+                                    (gnc_import_TransInfo_get_selected_match (info)),
+                                    gui->user_settings,
+                                    GTK_WIDGET(gui->view)),
+                            -1);
     }
 
-    gtk_list_store_set(store, iter,
-                       DOWNLOADED_COL_ACTION_UPDATE,
-                       gnc_import_TransInfo_get_action(info) == GNCImport_UPDATE,
-                       -1);
-    if (gnc_import_TransInfo_get_action(info) == GNCImport_UPDATE)
+    gtk_list_store_set (store, iter,
+                        DOWNLOADED_COL_ACTION_UPDATE,
+                        gnc_import_TransInfo_get_action (info) == GNCImport_UPDATE,
+                        -1);
+    if (gnc_import_TransInfo_get_action (info) == GNCImport_UPDATE)
     {
         /*Show the best match's confidence pixmap in the info column*/
-        gtk_list_store_set(store, iter,
-                           DOWNLOADED_COL_ACTION_PIXBUF,
-                           gen_probability_pixbuf( gnc_import_MatchInfo_get_probability
-                                   ( gnc_import_TransInfo_get_selected_match (info)),
-                                   gui->user_settings,
-                                   GTK_WIDGET(gui->view)),
-                           -1);
+        gtk_list_store_set (store, iter,
+                            DOWNLOADED_COL_ACTION_PIXBUF,
+                            gen_probability_pixbuf (gnc_import_MatchInfo_get_probability
+                                    (gnc_import_TransInfo_get_selected_match (info)),
+                                    gui->user_settings,
+                                    GTK_WIDGET(gui->view)),
+                            -1);
     }
 
-    selection = gtk_tree_view_get_selection(gui->view);
-    gtk_tree_selection_unselect_all(selection);
+    selection = gtk_tree_view_get_selection (gui->view);
+    gtk_tree_selection_unselect_all (selection);
 }
 
-void gnc_gen_trans_list_add_trans(GNCImportMainMatcher *gui, Transaction *trans)
+void gnc_gen_trans_list_add_trans (GNCImportMainMatcher *gui, Transaction *trans)
 {
-    gnc_gen_trans_list_add_trans_with_ref_id(gui, trans, 0);
+    gnc_gen_trans_list_add_trans_with_ref_id (gui, trans, 0);
     return;
 }/* end gnc_import_add_trans() */
 
-void gnc_gen_trans_list_add_trans_with_ref_id(GNCImportMainMatcher *gui, Transaction *trans, guint32 ref_id)
+void gnc_gen_trans_list_add_trans_with_ref_id (GNCImportMainMatcher *gui, Transaction *trans, guint32 ref_id)
 {
     GNCImportTransInfo * transaction_info = NULL;
     GtkTreeModel *model;
@@ -1202,24 +1199,24 @@ void gnc_gen_trans_list_add_trans_with_ref_id(GNCImportMainMatcher *gui, Transac
         return;
     else
     {
-        transaction_info = gnc_import_TransInfo_new(trans, NULL);
-        gnc_import_TransInfo_set_ref_id(transaction_info, ref_id);
+        transaction_info = gnc_import_TransInfo_new (trans, NULL);
+        gnc_import_TransInfo_set_ref_id (transaction_info, ref_id);
 
-        gnc_import_TransInfo_init_matches(transaction_info,
-                                          gui->user_settings);
+        gnc_import_TransInfo_init_matches (transaction_info,
+                                           gui->user_settings);
 
         selected_match =
-            gnc_import_TransInfo_get_selected_match(transaction_info);
+            gnc_import_TransInfo_get_selected_match (transaction_info);
         match_selected_manually =
-            gnc_import_TransInfo_get_match_selected_manually(transaction_info);
+            gnc_import_TransInfo_get_match_selected_manually (transaction_info);
 
         if (selected_match)
-            gnc_import_PendingMatches_add_match(gui->pending_matches,
-                                                selected_match,
-                                                match_selected_manually);
+            gnc_import_PendingMatches_add_match (gui->pending_matches,
+                                                 selected_match,
+                                                 match_selected_manually);
 
-        model = gtk_tree_view_get_model(gui->view);
-        gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+        model = gtk_tree_view_get_model (gui->view);
+        gtk_list_store_append (GTK_LIST_STORE(model), &iter);
         refresh_model_row (gui, model, &iter, transaction_info);
     }
     return;
@@ -1227,7 +1224,7 @@ void gnc_gen_trans_list_add_trans_with_ref_id(GNCImportMainMatcher *gui, Transac
 
 GtkWidget *gnc_gen_trans_list_widget (GNCImportMainMatcher *info)
 {
-    g_assert(info);
+    g_assert (info);
     return info->main_widget;
 }
 

commit 0a1a28be16209d96b6b3857de6b0fc4153c3e890
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Fri Jun 7 16:47:22 2019 +0100

    Readd the fix for the date/amount sorting for import main matcher

diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 48aa5ff75..3e667f22b 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -64,13 +64,16 @@ struct _main_matcher_info
     GNCTransactionProcessedCB transaction_processed_cb;
     gpointer user_data;
     GNCImportPendingMatches *pending_matches;
+    GtkTreeViewColumn *account_column;
 };
 
 enum downloaded_cols
 {
-    DOWNLOADED_COL_DATE = 0,
+    DOWNLOADED_COL_DATE_TXT = 0,
+    DOWNLOADED_COL_DATE_INT64, // used only for sorting
     DOWNLOADED_COL_ACCOUNT,
     DOWNLOADED_COL_AMOUNT,
+    DOWNLOADED_COL_AMOUNT_DOUBLE, // used only for sorting
     DOWNLOADED_COL_DESCRIPTION,
     DOWNLOADED_COL_MEMO,
     DOWNLOADED_COL_ACTION_ADD,
@@ -637,7 +640,19 @@ add_text_column(GtkTreeView *view, const gchar *title, int col_num)
               "text", col_num,
               "background", DOWNLOADED_COL_COLOR,
               NULL);
-    gtk_tree_view_column_set_sort_column_id(column, col_num);
+
+    // If date column, use the time64 value for the sorting.
+    if (col_num == DOWNLOADED_COL_DATE_TXT)
+        gtk_tree_view_column_set_sort_column_id(column, DOWNLOADED_COL_DATE_INT64);
+    else if (col_num == DOWNLOADED_COL_AMOUNT) // If amount column, use double value
+    {
+        gtk_cell_renderer_set_alignment (renderer, 1.0, 0.5); // right align amount column
+        gtk_cell_renderer_set_padding (renderer, 5, 0); // add padding so its not close to description
+        gtk_tree_view_column_set_sort_column_id(column, DOWNLOADED_COL_AMOUNT_DOUBLE);
+    }
+    else
+        gtk_tree_view_column_set_sort_column_id(column, col_num);
+
     g_object_set(G_OBJECT(column),
                  "reorderable", TRUE,
                  "resizable", TRUE,
@@ -680,20 +695,22 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
     GtkTreeSelection *selection;
 
     view = info->view;
-    store = gtk_list_store_new(NUM_DOWNLOADED_COLS,
-                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+    store = gtk_list_store_new(NUM_DOWNLOADED_COLS, G_TYPE_STRING, G_TYPE_INT64,
+                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE,
                                G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN,
                                G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING,
                                GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_STRING);
     gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
     g_object_unref(store);
 
+    /* prevent the rows being dragged to a different order */
+    gtk_tree_view_set_reorderable (view, FALSE);
+
     /* Add the columns *
      * (keep the line break below to avoid a translator comment) */
-    add_text_column(view,
-                    _("Date"), DOWNLOADED_COL_DATE);
-    column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT);
-    gtk_tree_view_column_set_visible(column, show_account);
+    add_text_column(view, _("Date"), DOWNLOADED_COL_DATE_TXT);
+    info->account_column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT);
+    gtk_tree_view_column_set_visible(info->account_column, show_account);
     add_text_column(view, _("Amount"), DOWNLOADED_COL_AMOUNT);
     add_text_column(view, _("Description"), DOWNLOADED_COL_DESCRIPTION);
     add_text_column(view, _("Memo"), DOWNLOADED_COL_MEMO);
@@ -731,6 +748,10 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
                  NULL);
     gtk_tree_view_append_column(info->view, column);
 
+    /* default sort order */
+    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
+                                          DOWNLOADED_COL_DATE_INT64,
+                                          GTK_SORT_ASCENDING);
 
     selection = gtk_tree_view_get_selection(info->view);
     g_signal_connect(info->view, "row-activated",
@@ -744,7 +765,13 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
                      G_CALLBACK(gnc_gen_trans_onPopupMenu_cb), info);
 }
 
-
+static void
+show_account_column_toggled_cb (GtkToggleButton *togglebutton,
+                                GNCImportMainMatcher *info)
+{
+    gtk_tree_view_column_set_visible (info->account_column,
+         gtk_toggle_button_get_active (togglebutton));
+}
 
 GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
         const gchar* heading,
@@ -758,6 +785,7 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     gboolean show_update;
     GtkStyleContext *stylectxt;
     GdkRGBA color;
+    GtkWidget *button;
 
     info = g_new0 (GNCImportMainMatcher, 1);
     info->pending_matches = gnc_import_PendingMatches_new();
@@ -786,6 +814,11 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     info->view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "downloaded_view"));
     g_assert (info->view != NULL);
 
+    button = GTK_WIDGET(gtk_builder_get_object (builder, "show_source_account_button"));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), all_from_same_account);
+    g_signal_connect(G_OBJECT(button), "toggled",
+                     G_CALLBACK(show_account_column_toggled_cb), info);
+
     show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
     gnc_gen_trans_init_view(info, all_from_same_account, show_update);
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
@@ -825,6 +858,7 @@ GNCImportMainMatcher * gnc_gen_trans_assist_new (GtkWidget *parent,
     gboolean show_update;
     GtkStyleContext *stylectxt;
     GdkRGBA color;
+    GtkWidget *button;
 
     info = g_new0 (GNCImportMainMatcher, 1);
     info->pending_matches = gnc_import_PendingMatches_new();
@@ -853,6 +887,11 @@ GNCImportMainMatcher * gnc_gen_trans_assist_new (GtkWidget *parent,
     info->view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "downloaded_view"));
     g_assert (info->view != NULL);
 
+    button = GTK_WIDGET(gtk_builder_get_object (builder, "show_source_account_button"));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), all_from_same_account);
+    g_signal_connect(G_OBJECT(button), "toggled",
+                     G_CALLBACK(show_account_column_toggled_cb), info);
+
     show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
     gnc_gen_trans_init_view(info, all_from_same_account, show_update);
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
@@ -926,6 +965,8 @@ refresh_model_row (GNCImportMainMatcher *gui,
     gchar *int_required_class, *int_prob_required_class, *int_not_required_class;
     gchar *class_extension = NULL;
     Split *split;
+    time64 date;
+    gnc_numeric amount;
     g_assert (gui);
     g_assert (model);
     g_assert (info);
@@ -948,16 +989,17 @@ refresh_model_row (GNCImportMainMatcher *gui,
     gtk_list_store_set(store, iter, DOWNLOADED_COL_ACCOUNT, ro_text, -1);
 
     /*Date*/
-    text = qof_print_date ( xaccTransGetDate( gnc_import_TransInfo_get_trans(info) ) );
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE, text, -1);
+    date = xaccTransGetDate (gnc_import_TransInfo_get_trans(info));
+    text = qof_print_date (date);
+    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE_TXT, text, -1);
+    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE_INT64, date, -1);
     g_free(text);
 
     /*Amount*/
-    ro_text = xaccPrintAmount
-              (xaccSplitGetAmount (split),
-               gnc_split_amount_print_info(split, TRUE)
-              );
+    amount = xaccSplitGetAmount (split);
+    ro_text = xaccPrintAmount (amount, gnc_split_amount_print_info(split, TRUE));
     gtk_list_store_set(store, iter, DOWNLOADED_COL_AMOUNT, ro_text, -1);
+    gtk_list_store_set(store, iter, DOWNLOADED_COL_AMOUNT_DOUBLE, gnc_numeric_to_double (amount), -1);
 
     /*Description*/
     ro_text = xaccTransGetDescription(gnc_import_TransInfo_get_trans(info) );

commit 520f350a99a652ea7cea0d8e2b3b76ef5a518a1b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Jun 7 16:57:14 2019 +0200

    Readd byte-order-mark (BOM) to windows README files
    
    Without this mark the inno setup install won't recognize these files as UTF-8

diff --git a/doc/README-ca.win32-bin.txt b/doc/README-ca.win32-bin.txt
index 6aec2e0ee..c8614f239 100644
--- a/doc/README-ca.win32-bin.txt
+++ b/doc/README-ca.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
+GnuCash és un programa de comptabilitat lliure, de codi obert publicat sota la
 Llicència Pública General GNU (GPL) i disponible per a GNU / Linux, *BSD,
 Solaris, Mac OSX i Microsoft Windows.
 
@@ -49,4 +49,4 @@ va ser l'any 1998.
 
 -------------------
 
-Aquesta és la traducció al català del fitxer README GnuCash 2.2.x per als paquets binaris de Windows.
\ No newline at end of file
+Aquesta és la traducció al català del fitxer README GnuCash 2.2.x per als paquets binaris de Windows.
diff --git a/doc/README-de.win32-bin.txt b/doc/README-de.win32-bin.txt
index 50b9f21e7..942b9e410 100644
--- a/doc/README-de.win32-bin.txt
+++ b/doc/README-de.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
 erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
 Solaris, Mac OSX und Microsoft Windows.
 
diff --git a/doc/README-fr.win32-bin.txt b/doc/README-fr.win32-bin.txt
index 826a8e7b5..33691ed00 100644
--- a/doc/README-fr.win32-bin.txt
+++ b/doc/README-fr.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash est un logiciel de comptabilité gratuit et de source
+GnuCash est un logiciel de comptabilité gratuit et de source
 libre, émis sous licence GNU Public Licence (GPL) et disponible
 sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
 
diff --git a/doc/README-hr.win32-bin.txt b/doc/README-hr.win32-bin.txt
index dab03e19c..adfdebeb4 100644
--- a/doc/README-hr.win32-bin.txt
+++ b/doc/README-hr.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash je besplatan računovodstveni program otvorenog koda, izdan pod GNU općom javnom licencom (GPL). Dostupan za sustave GNU/Linux, *BSD, Solaris, Mac OSX i Microsoft Windows.
+GnuCash je besplatan računovodstveni program otvorenog koda, izdan pod GNU općom javnom licencom (GPL). Dostupan za sustave GNU/Linux, *BSD, Solaris, Mac OSX i Microsoft Windows.
 
 Osmišljen da bude jednostavan u upotrebi, istovremeno moćan i prilagodljiv, GnuCash ti omogućava praćenje bankovnih računa, dionica, prihoda i rashoda. GnuCash se zasniva na profesionalnim računovodstvenim načelima kao što je dvojno knjigovodstvo, te osigurava bilancirane knjige i točne izvještaje.
 
diff --git a/doc/README-it.win32-bin.txt b/doc/README-it.win32-bin.txt
index 118fa7230..896614bff 100644
--- a/doc/README-it.win32-bin.txt
+++ b/doc/README-it.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
+GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
 licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
 Solaris, Mac OSX e Microsoft Windows.
 
diff --git a/doc/README-lv.win32-bin.txt b/doc/README-lv.win32-bin.txt
index dc3592feb..6d8793e39 100644
--- a/doc/README-lv.win32-bin.txt
+++ b/doc/README-lv.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
+GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
 GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
 *BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
 
diff --git a/doc/README-nl.win32-bin.txt b/doc/README-nl.win32-bin.txt
index 64330d279..a85ac38f8 100644
--- a/doc/README-nl.win32-bin.txt
+++ b/doc/README-nl.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
+GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
 onder de GNU General Public License (GPL) en is beschikbaar voor
 GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
 
diff --git a/doc/README-zh_CN.win32-bin.txt b/doc/README-zh_CN.win32-bin.txt
index e559e6c1f..3928235aa 100644
--- a/doc/README-zh_CN.win32-bin.txt
+++ b/doc/README-zh_CN.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
+GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
 
 致力于易于使用,但功能强大而且灵活。GnuCash 允许您跟踪银行账户、股票、收入和支出。就像账簿一样快捷而且直观,它是基于专业的会计理念来确保平衡的账簿和准确的报告。
 
diff --git a/doc/README-zh_TW.win32-bin.txt b/doc/README-zh_TW.win32-bin.txt
index 312599398..9934308a0 100644
--- a/doc/README-zh_TW.win32-bin.txt
+++ b/doc/README-zh_TW.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
+GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
 
 GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以追蹤銀行帳戶、股票、收入與支出,就像用帳簿一樣快捷、直覺。基於專業的會計原則確保帳目平衡並提供準確的報表。
 

commit 9752daa88c4c11cbfc8087690eb338a1a3d02c12
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Jun 7 21:11:55 2019 +0800

    [i18n] fix translator comments to be visible to gettext
    
    Part of Bug 797270 - Budget Chart report - translation of header and
    dates
    
    Previously, the translator comments were on the same line and were not
    processed into .po clues -- this commit fixes it.

diff --git a/gnucash/report/standard-reports/budget.scm b/gnucash/report/standard-reports/budget.scm
index fa82bd9ff..bcbaa9979 100644
--- a/gnucash/report/standard-reports/budget.scm
+++ b/gnucash/report/standard-reports/budget.scm
@@ -476,15 +476,18 @@
               (when show-budget?
                 (gnc:html-table-set-cell/tag!
                  html-table 1 col0 "centered-label-cell"
-                 (_ "Bgt"))) ;; Translators: Abbreviation for "Budget"
+                 ;; Translators: Abbreviation for "Budget" amount
+                 (_ "Bgt")))
               (when show-actual?
                 (gnc:html-table-set-cell/tag!
                  html-table 1 col1 "centered-label-cell"
-                 (_ "Act"))) ;; Translators: Abbreviation for "Actual"
+                 ;; Translators: Abbreviation for "Actual" amount
+                 (_ "Act")))
               (when show-diff?
                 (gnc:html-table-set-cell/tag!
                  html-table 1 col2 "centered-label-cell"
-                 (_ "Diff"))) ;; Translators: Abbreviation for "Difference"
+                 ;; Translators: Abbreviation for "Difference" amount
+                 (_ "Diff")))
               (loop (cdr column-list)
                     col3))))))
 

commit 15a35e6a3b0f78f3566eb6c126612a872be3527c
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jun 6 15:49:22 2019 +0200

    Housekeeping - replace plenty of http links with https
    
    There are more, but these are most common ones.
    There are also a number of urls that don't behave well when https, so those are skipped
    At some point I have also started marking non-working URLs as [DEAD LINK], though
    that's not a full coverage.

diff --git a/AUTHORS b/AUTHORS
index 8fb5c97d4..c03cf4139 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,8 +1,8 @@
 GETTING HELP: If you need help with GnuCash, please do not contact any
-of the Authors directly. Instead, first look at the <a href="http://wiki.gnucash.org/wiki/FAQ">FAQ</a> to see if your question
+of the Authors directly. Instead, first look at the <a href="https://wiki.gnucash.org/wiki/FAQ">FAQ</a> to see if your question
 is common and is answered there. If that doesn't help, there are mailing
 lists in English, Dutch, French, German, Italian, Portuguese and an English
-IRC channel. More information can be found at for <a href="http://wiki.gnucash.org/wiki/Mailing_Lists">Mailing List</a> and <a href="http://wiki.gnucash.org/wiki/IRC">IRC</a>.
+IRC channel. More information can be found at for <a href="https://wiki.gnucash.org/wiki/Mailing_Lists">Mailing List</a> and <a href="https://wiki.gnucash.org/wiki/IRC">IRC</a>.
 
 Current Project Team:
 =====================
@@ -185,7 +185,7 @@ Dave Freese  for leap-year fix
 Todd T. Fries  OpenBSD fix
 John Goerzen  file i/o fix for 64-bit architectures
 Jeff Green  Python bindings, with grant funding from
-  <a href="http://assiniboine.mb.ca/">Assiniboine Credit Union</a>
+  <a href="https://assiniboine.mb.ca/">Assiniboine Credit Union</a>
 Hans de Graaff  XML patches
 Daniel Hagerty  patch to balance sheet report
 Mitsuo Hamada  messages Japanese translations
@@ -206,8 +206,8 @@ Tomokazu Iwashita  Japanese translation of xea
 Geert Janssens  GUI fixes for Lots, autocompletion in gnc-general-search, several small fixes
 David Jafferian  Delete account query code.
 Mark Jenkins  Python bindings, with grant funding from
-  <a href="http://assiniboine.mb.ca/">Assiniboine Credit Union</a> and
-  <a href="http://www.legalaid.mb.ca/">Legal Aid Manitoba</a>
+  <a href="https://assiniboine.mb.ca/">Assiniboine Credit Union</a> and
+  <a href="https://www.legalaid.mb.ca/">Legal Aid Manitoba</a>
 Rich Johnson  Mac OS X patch
 Miquel Jordana Vilamitjana  Spanish translation of manual
 Prakash Kailasa  for gnome build fixes
diff --git a/DOCUMENTERS b/DOCUMENTERS
index aa127b8cd..606b9fafc 100644
--- a/DOCUMENTERS
+++ b/DOCUMENTERS
@@ -1,8 +1,8 @@
 GETTING HELP: If you need help with GnuCash, please do not contact any
-of the Documentors directly. Instead, first look at the <a href="http://wiki.gnucash.org/wiki/FAQ">FAQ</a> to see if your question
+of the Documentors directly. Instead, first look at the <a href="https://wiki.gnucash.org/wiki/FAQ">FAQ</a> to see if your question
 is common and is answered there. If that doesn't help, there are mailing
 lists in English, Dutch, French, German, Italian, Portuguese and an English
-IRC channel. More information can be found at for <a href="http://wiki.gnucash.org/wiki/Mailing_Lists">Mailing List</a> and <a href="http://wiki.gnucash.org/wiki/IRC">IRC</a>.
+IRC channel. More information can be found at for <a href="https://wiki.gnucash.org/wiki/Mailing_Lists">Mailing List</a> and <a href="https://wiki.gnucash.org/wiki/IRC">IRC</a>.
 
 Contributors:
 
diff --git a/NEWS b/NEWS
index dcc646699..1d7da6d40 100644
--- a/NEWS
+++ b/NEWS
@@ -1014,7 +1014,7 @@ New Features for Users:
         6-digit-maximum fraction is now 9-digits, and prices may have up
         to 18 digit precision.
     Chart Reports appearance is improved, including more modern chart colours
-        as suggested by http://clrs.cc/.
+        as suggested by https://clrs.cc/.
     Transaction Report improvements, including regular expression filtering
         and many more options and features including a "Subtotal Summary Grid"
         The subtotal summary-grid will tabulate subtotals - prime-sortkey
@@ -1306,7 +1306,7 @@ Updated Translations: Spanish
 
 New Features For Users:
     Modernise chart colours from the dated CSS defaults to
-        modern colours as suggested by http://clrs.cc/.
+        modern colours as suggested by https://clrs.cc/.
     Add "Subtotal Summary Grid" to the Transaction Report.
         The subtotal summary-grid will tabulate subtotals - prime-sortkey
         vertically, sec-sortkey horizontally. This will be useful, for
@@ -3563,7 +3563,7 @@ Concurrent with the release of Gnucash 2.6.4 we're pleased to also release a new
 	 https://bugs.gnucash.org/enter_bug.cgi
 	 o If you have the urge to help beyond testing please get involved in
 	 the discussions on the GnuCash mailing lists which you will find at
-	 http://www.gnucash.org.  Please see http://wiki.gnucash.org/wiki/Development
+	 https://www.gnucash.org.  Please see https://wiki.gnucash.org/wiki/Development
 	 on how to get involved.
 	 o Major new features:
 	    * All features, including business features, are supported by a new
@@ -4233,9 +4233,9 @@ Concurrent with the release of Gnucash 2.6.4 we're pleased to also release a new
 	 https://bugs.gnucash.org/enter_bug.cgi
 	 o If you have the urge to help beyond testing please get involved in
 	 the discussions on the GnuCash mailing lists which you will find at
-	 http://www.gnucash.org. We especially need people to help with
+	 https://www.gnucash.org. We especially need people to help with
 	 updating the documentation as all texts refer currently to the 1.8.x
-	 series. Please see http://wiki.gnucash.org/wiki/Development on how to
+	 series. Please see https://wiki.gnucash.org/wiki/Development on how to
 	 get involved.
 	 o PS I'm not going to list the many features changed or updated in
 	 this release because obviously there is so much that has changed.
@@ -4618,9 +4618,9 @@ Concurrent with the release of Gnucash 2.6.4 we're pleased to also release a new
 	 https://bugs.gnucash.org/enter_bug.cgi
 	 o If you have the urge to help beyond testing please get involved in
 	 the discussions on the GnuCash mailing lists which you will find at
-	 http://www.gnucash.org. We especially need people to help with
+	 https://www.gnucash.org. We especially need people to help with
 	 updating the documentation as all texts refer currently to the 1.8.x
-	 series. Please see http://wiki.gnucash.org/wiki/Development on how to
+	 series. Please see https://wiki.gnucash.org/wiki/Development on how to
 	 get involved.
 	 o PS I'm not going to list the many features changed or updated in
 	 this release because obviously there is so much that has changed.
@@ -4713,7 +4713,7 @@ Concurrent with the release of Gnucash 2.6.4 we're pleased to also release a new
 	 at the end of the split list.
 	 o Major change for HBCI, back-ported from HEAD. The HBCI online
 	 banking is no longer based on the openhbci library but instead on the
-	 aqbanking library http://sf.net/projects/aqbanking which is Martin
+	 aqbanking library https://sf.net/projects/aqbanking which is Martin
 	 Preuss' successor of openhbci. This means that now aqbanking-0.9.5 is
 	 required instead of any openhbci package.
 	 o Fixes for x86_64
@@ -4913,7 +4913,7 @@ Concurrent with the release of Gnucash 2.6.4 we're pleased to also release a new
 	 o Improve HBCI error handling. Add more user feedback functions.
 	 o Add support for KtoBlzCheck, a small checking package for
 	   destination account numbers for German banks. Very small, very useful
-	   http://sourceforge.net/projects/ktoblzcheck
+	   https://sourceforge.net/projects/ktoblzcheck
 	 o TRANSLATION_HOWTO: Added, by Jon Lapham
 	 o Add API to the plugin modules to allow post-processing (scrubbing)
 	   of the book after it is loaded from XML.  This allows a plug-in to
diff --git a/README.dependencies b/README.dependencies
index 42b28344c..75e0cea40 100644
--- a/README.dependencies
+++ b/README.dependencies
@@ -1,7 +1,7 @@
 GnuCash Compiler Dependency
 ---------------------------
 
-The GnuCash developers use gcc (http://gcc.gnu.org) for developing and
+The GnuCash developers use gcc (https://gcc.gnu.org) for developing and
 testing GnuCash.  For convenience, we have relied on certain features
 of gcc that are not part of any official standard and may not be
 available with other standard-compliant compilers.  Anyone desiring to
@@ -40,7 +40,7 @@ strongly discouraged and actively removed whenever it's caught.
 Important notice
 ----------------
 You can find the most recent version of the following part at 
-http://wiki.gnucash.org/wiki/Dependencies.
+https://wiki.gnucash.org/wiki/Dependencies.
 
 GnuCash Library Dependency Policy
 ---------------------------------
diff --git a/README.git b/README.git
index 14c13d67c..cd92bc5c0 100644
--- a/README.git
+++ b/README.git
@@ -20,7 +20,7 @@ When making changes to GnuCash and trying to commit to the repository:
 
    If you are making changes to gnucash, you should be subscribed
    to gnucash-devel at gnucash.org and to gnucash-changes at gnucash.org.
-   (Subscription address: http://www.gnucash.org/en/lists.phtml)
+   (Subscription address: https://www.gnucash.org/en/lists.phtml)
    gnucash-devel at gnucash.org is a good place to ask about intended
    changes.
 
diff --git a/bindings/python/example_scripts/get_quotes.pl b/bindings/python/example_scripts/get_quotes.pl
index 7e5f0c554..84fca6801 100644
--- a/bindings/python/example_scripts/get_quotes.pl
+++ b/bindings/python/example_scripts/get_quotes.pl
@@ -14,7 +14,7 @@
 #   @endcode 
 # 
 #   For explanation of use have a look at the wiki:
-#   http://wiki.gnucash.org/wiki/Stocks/get_prices
+#   https://wiki.gnucash.org/wiki/Stocks/get_prices
 #
 #   @cond PERL
 
diff --git a/bindings/python/example_scripts/invoice_export_doxygen.txt b/bindings/python/example_scripts/invoice_export_doxygen.txt
index ca72c9c81..dbd04b6a0 100644
--- a/bindings/python/example_scripts/invoice_export_doxygen.txt
+++ b/bindings/python/example_scripts/invoice_export_doxygen.txt
@@ -36,7 +36,7 @@ LaTeX or other output formats as desired.
 - Internationalization - currencies, formatting of numbers, templates
 - Providing data of gnucash owner. 
 
-  At the moment this has to be put into the invoices (template/final file) by hand. Access of this data is in KVPs. No support in python-bindings at the moment. c-API to access these values is work in progress. A fork to access these is https://github.com/c-holtermann/gnucash/tree/python-kvp. This is very much work in progress. A discussion can be found in thread http://lists.gnucash.org/pipermail/gnucash-devel/2014-June/037768.html.
+  At the moment this has to be put into the invoices (template/final file) by hand. Access of this data is in KVPs. No support in python-bindings at the moment. c-API to access these values is work in progress. A fork to access these is https://github.com/c-holtermann/gnucash/tree/python-kvp. This is very much work in progress. A discussion can be found in thread https://lists.gnucash.org/pipermail/gnucash-devel/2014-June/037768.html.
 - A jinja2 template mimicking the original html invoices
 
 \par See also:
diff --git a/bindings/python/example_scripts/latex_invoices.py b/bindings/python/example_scripts/latex_invoices.py
index f754bc1d2..2937c980a 100644
--- a/bindings/python/example_scripts/latex_invoices.py
+++ b/bindings/python/example_scripts/latex_invoices.py
@@ -29,19 +29,19 @@
 # Additional information :
 #
 # - Doxygen docs: see page \ref py_invoice_export at https://code.gnucash.org/docs/MAINT or MASTER
-# - http://www.uweziegenhagen.de/latex/documents/rechnung/rechnungen.pdf (german)
+# - https://www.uweziegenhagen.de/latex/documents/rechnung/rechnungen.pdf (german)
 #
 # Credits to and ideas from
 #
 # - Main function as proposed by Guido van Rossum
-#   at http://www.artima.com/weblogs/viewpost.jsp?thread=4829
+#   at https://www.artima.com/weblogs/viewpost.jsp?thread=4829
 # - Invoice.tex is derived from\n
 #   scrlttr2.tex v0.3. (c) by Juergen Fenn <juergen.fenn at gmx.de>\n
-#   http://www.komascript.de/node/355\n
+#   https://www.komascript.de/node/355\n
 #   english translation: ftp://ftp.dante.de/tex-archive/info/templates/fenn/scrlttr2en.tex
 # - rechnung.sty\n
 #   from M G Berberich (berberic at fmi.uni-passau.de) and Ulrich Sibiller (uli42 at web.de)
-#   Ver3.10 from http://www.forwiss.uni-passau.de/~berberic/TeX/Rechnung/index.html
+#   Ver3.10 from https://www.forwiss.uni-passau.de/~berberic/TeX/Rechnung/index.html
 #
 # To Do:
 #
diff --git a/bindings/python/example_scripts/quotes_historic.py b/bindings/python/example_scripts/quotes_historic.py
index 16394b189..77781b30a 100644
--- a/bindings/python/example_scripts/quotes_historic.py
+++ b/bindings/python/example_scripts/quotes_historic.py
@@ -14,7 +14,7 @@
 #   @endcode first to achieve data into file INTC which can thereafter be imported to GnuCash using this script.
 # 
 #   For explanation of use have a look at the wiki:
-#   http://wiki.gnucash.org/wiki/Stocks/get_prices
+#   https://wiki.gnucash.org/wiki/Stocks/get_prices
 #
 
 from gnucash import Session, Account, Split
diff --git a/bindings/python/gnucash_core.py b/bindings/python/gnucash_core.py
index 80dcbf678..9b1416f9d 100644
--- a/bindings/python/gnucash_core.py
+++ b/bindings/python/gnucash_core.py
@@ -350,7 +350,7 @@ class GncPrice(GnuCashCoreClass):
       commodity with respect to another commodity.
       For example, a given price might represent the value of LNUX in USD on 2001-02-03.
 
-      See also http://code.gnucash.org/docs/head/group__Price.html
+      See also https://code.gnucash.org/docs/head/group__Price.html
     '''
     _new_instance = 'gnc_price_create'
 GncPrice.add_methods_with_prefix('gnc_price_')
@@ -369,7 +369,7 @@ class GncPriceDB(GnuCashCoreClass):
     Every QofBook contains a GNCPriceDB, accessible via gnc_pricedb_get_db.
 
     Definition in file gnc-pricedb.h.
-    See also http://code.gnucash.org/docs/head/gnc-pricedb_8h.html
+    See also https://code.gnucash.org/docs/head/gnc-pricedb_8h.html
     '''
 
 GncPriceDB.add_methods_with_prefix('gnc_pricedb_')
diff --git a/borrowed/README b/borrowed/README
index 091ec5ea1..8aca8e740 100644
--- a/borrowed/README
+++ b/borrowed/README
@@ -1,11 +1,2 @@
 This directory is intended to hold any external code that is needed in
 order to build gnucash, but isn't considered widely available.
-
-------------------------------------------------
-
-Finance::Quote
---------------
-
-Available from http://finance-quote.sourceforge.net.
-
-------------------------------------------------
diff --git a/cmake/README_CMAKE.txt b/cmake/README_CMAKE.txt
index c0ca35da4..deb9b1e9c 100644
--- a/cmake/README_CMAKE.txt
+++ b/cmake/README_CMAKE.txt
@@ -5,7 +5,7 @@ Using CMake to build GnuCash
 
 As part of his CuteCash experiment (now removed from the repository),
 Christian Stimming added support for using
-http://www.cmake.org[CMake] to build the part of GnuCash that
+https://www.cmake.org[CMake] to build the part of GnuCash that
 went into CuteCash. This work extends the use of CMake to cover all of
 GnuCash proper such that GnuCash itself can be fully compiled with
 CMake.
@@ -23,7 +23,7 @@ Some advantages of using CMake:
  * The CMake language, though with significant issues, is still
    easier to maintain than autotools.
 
-This setup also uses the http://www.ninja-build.org[Ninja] build
+This setup also uses the https://www.ninja-build.org[Ninja] build
 system to enable fast and parallel builds on Windows. (On POSIX
 systems [OS X, Linux, FreeBSD, etc.] Ninja does not seem significantly
 faster than using the default Makefile generator to me.)
diff --git a/common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt b/common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt
index 62c38b02c..3e3454026 100644
--- a/common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt
+++ b/common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt
@@ -1,7 +1,7 @@
 The copyright notice below applies to all files in the cmake_modules/
 directory. Some of them were published on
-http://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules, others on
-http://cmake-modules.googlecode.com/svn/trunk/Modules/.
+https://websvn.kde.org/trunk/KDE/kdelibs/cmake/modules, others on
+https://cmake-modules.googlecode.com/svn/trunk/Modules/.
 
 
 
diff --git a/contrib/README b/contrib/README
index 860fd9f02..252312b25 100644
--- a/contrib/README
+++ b/contrib/README
@@ -2,7 +2,7 @@ GC-export_en.xls
 ----------------
 
 From: Jannick Asmus <jannick.news gmail com>
-http://lists.gnucash.org/pipermail/gnucash-devel/2008-January/022342.html
+https://lists.gnucash.org/pipermail/gnucash-devel/2008-January/022342.html
 
 I have attached an Excel2003 file for exporting data out of GC to Excel. It
 works pretty easily - even for non-advanced users. I checked it for Excel2003
diff --git a/contrib/art/tango/README b/contrib/art/tango/README
index e0a19bce4..f71a11668 100644
--- a/contrib/art/tango/README
+++ b/contrib/art/tango/README
@@ -1 +1 @@
-See <http://lists.gnucash.org/pipermail/gnucash-devel/2006-November/019137.html> for submission details.
+See <https://lists.gnucash.org/pipermail/gnucash-devel/2006-November/019137.html> for submission details.
diff --git a/contrib/gnuc2ooo.py b/contrib/gnuc2ooo.py
index 5f67524ca..9eaeadcc0 100644
--- a/contrib/gnuc2ooo.py
+++ b/contrib/gnuc2ooo.py
@@ -31,7 +31,7 @@
 #   License along with this library; if not, write to the Free Software
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-#   See:  http://www.gnu.org/licenses/lgpl.html
+#   See:  https://www.gnu.org/licenses/lgpl.html
 #
 #**********************************************************************
 #   Acknowledgements: Special thanks go to the authors on OpenOffice.org
diff --git a/data/accounts/de_DE/acctchrt_skr04.gnucash-xea b/data/accounts/de_DE/acctchrt_skr04.gnucash-xea
index 832a337b8..5324ab9df 100644
--- a/data/accounts/de_DE/acctchrt_skr04.gnucash-xea
+++ b/data/accounts/de_DE/acctchrt_skr04.gnucash-xea
@@ -39,7 +39,7 @@
     Standardkontenrahmen SKR04, Stand 2005
   </gnc-act:short-description>
   <gnc-act:long-description>
-    BETA-Version eines Kontenrahmes SKR04 für 2005.  Mehr Informationen unter http://wiki.gnucash.org/wiki/De/SKR04
+    BETA-Version eines Kontenrahmes SKR04 für 2005.  Mehr Informationen unter https://wiki.gnucash.org/wiki/De/SKR04
   </gnc-act:long-description>
   <gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
 
diff --git a/doc/README-ca.win32-bin.txt b/doc/README-ca.win32-bin.txt
index d5c3fba08..6aec2e0ee 100644
--- a/doc/README-ca.win32-bin.txt
+++ b/doc/README-ca.win32-bin.txt
@@ -11,9 +11,9 @@ principis comptables professionals per assegurar balanços de comptes i informes
 
 Opcions d'assistència disponibles:
 
-Preguntes freqüents en línia: http://wiki.gnucash.org/wiki/FAQ
-Llistes de correu: http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també http://wiki.gnucash.org/wiki/IRC
+Preguntes freqüents en línia: https://wiki.gnucash.org/wiki/FAQ
+Llistes de correu: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Xat): canal #gnucash al servidor irc.gnome.org, vegeu també https://wiki.gnucash.org/wiki/IRC
 
 Si trobeu errors o problemes, no dubteu a informar-los
 a la nostra eina de seguiment d'errors "Bugzilla":
diff --git a/doc/README-de.win32-bin.txt b/doc/README-de.win32-bin.txt
index eb9e9114e..50b9f21e7 100644
--- a/doc/README-de.win32-bin.txt
+++ b/doc/README-de.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
+GnuCash ist eine freie OpenSource-Finanzverwaltung, kostenlos
 erhältlich unter der GNU GPL Lizenz für GNU/Linux, Unix, BSD,
 Solaris, Mac OSX und Microsoft Windows.
 
@@ -12,10 +12,10 @@ erfüllen kann. Auch Onlinebanking über HBCI wird unterstützt.
 
 Verfügbarer Support
 
-Englische FAQ-Seite:  http://wiki.gnucash.org/wiki/FAQ
-Deutsche Mailingliste:  http://lists.gnucash.org/mailman/listinfo/gnucash-de
+Englische FAQ-Seite:  https://wiki.gnucash.org/wiki/FAQ
+Deutsche Mailingliste:  https://lists.gnucash.org/mailman/listinfo/gnucash-de
 IRC (Online-Chat):   Channel #gnucash auf Server irc.gnome.org, auch
-beschrieben auf http://wiki.gnucash.org/wiki/IRC
+beschrieben auf https://wiki.gnucash.org/wiki/IRC
 
 Sollten Probleme auftreten, bitten die Entwickler darum, diese als
 englischsprachigen Fehlerbericht in »Bugzilla« einzutragen:
diff --git a/doc/README-fr.win32-bin.txt b/doc/README-fr.win32-bin.txt
index 02f7c3451..826a8e7b5 100644
--- a/doc/README-fr.win32-bin.txt
+++ b/doc/README-fr.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash est un logiciel de comptabilité gratuit et de source
+GnuCash est un logiciel de comptabilité gratuit et de source
 libre, émis sous licence GNU Public Licence (GPL) et disponible
 sous GNU/Linux, *BSD, Solaris, Mac OSX et Microsoft Windows.
 
@@ -13,10 +13,10 @@ précis.
 
 Sources disponibles d'assistance :
 
-FAQ en ligne:		http://wiki.gnucash.org/wiki/FAQ
-Listes de diffusions:	http://wiki.gnucash.org/wiki/Mailing_Lists
+FAQ en ligne:		https://wiki.gnucash.org/wiki/FAQ
+Listes de diffusions:	https://wiki.gnucash.org/wiki/Mailing_Lists
 IRC (Chat):		Canal #gnucash sur le serveur irc.gnome.org,
-Aussi à consulter:		http://wiki.gnucash.org/wiki/IRC
+Aussi à consulter:		https://wiki.gnucash.org/wiki/IRC
 
 N'hésitez pas à rapporter toute erreur ou tout problème rencontré
 sur notre outil de suivi des bogues "Bugzilla":
diff --git a/doc/README-hr.win32-bin.txt b/doc/README-hr.win32-bin.txt
index 652071d6a..dab03e19c 100644
--- a/doc/README-hr.win32-bin.txt
+++ b/doc/README-hr.win32-bin.txt
@@ -6,12 +6,12 @@ Osmišljen da bude jednostavan u upotrebi, istovremeno moćan i prilagodljiv, Gn
 
 Dostupna pomoć
 
-Mrežne FAQ stranice: http://wiki.gnucash.org/wiki/FAQ
-Pretplatničke liste: http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat): Kanal #gnucash na serveru irc.gnome.org, vidi također http://wiki.gnucash.org/wiki/IRC
+Mrežne FAQ stranice: https://wiki.gnucash.org/wiki/FAQ
+Pretplatničke liste: https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat): Kanal #gnucash na serveru irc.gnome.org, vidi također https://wiki.gnucash.org/wiki/IRC
 
 Ako primijetiš greške ili naiđeš na probleme, slobodno ih prijavi na našu „Bugzilla”-stranicu za praćenje grešaka:
-http://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
 
 -------------------
 
diff --git a/doc/README-it.win32-bin.txt b/doc/README-it.win32-bin.txt
index 629e808b9..118fa7230 100644
--- a/doc/README-it.win32-bin.txt
+++ b/doc/README-it.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
+GnuCash è un programma di contabilità libero e a codice aperto rilasciato con
 licenza GNU Public Licence (GPL) e disponibile per i sistemi GNU/Linux, *BSD,
 Solaris, Mac OSX e Microsoft Windows.
 
@@ -11,9 +11,9 @@ contabilità assicurando il bilancio dei conti e l'accurattezza dei resoconti.
 
 Disponibilità di supporto
 
-FAQ online (in inglese):    http://wiki.gnucash.org/wiki/FAQ
-Mailing List:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche http://wiki.gnucash.org/wiki/IRC
+FAQ online (in inglese):    https://wiki.gnucash.org/wiki/FAQ
+Mailing List:  https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    canale #gnucash sul server irc.gnome.org; vedere anche https://wiki.gnucash.org/wiki/IRC
 
 Se si riscontrassero dei problemi o dei bug utilizzando il programma, è possibile comunicarli nel sistema
 di tracciamento dei bug di GnuCash denominato "Bugzilla":
diff --git a/doc/README-lv.win32-bin.txt b/doc/README-lv.win32-bin.txt
index 43f2cbf6f..dc3592feb 100644
--- a/doc/README-lv.win32-bin.txt
+++ b/doc/README-lv.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
+GnuCash ir bezmaksas grāmatvedības programma, ko izplata saskaņā ar
 GNU General Public License (GPL) licenci. To var izmantot uz GNU/Linux,
 *BSD, Solaris, Mac OSX un Microsoft Windows datoriem.
 
@@ -13,9 +13,9 @@ precīzus pārskatus.
 
 Tehniskā palīdzība
 
-Tiešsaistes palīdzība:    http://wiki.gnucash.org/wiki/FAQ
-VÄ“stkopas:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī http://wiki.gnucash.org/wiki/IRC
+Tiešsaistes palīdzība:    https://wiki.gnucash.org/wiki/FAQ
+VÄ“stkopas:  https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (sazņa): #gnucash on server irc.gnome.org, skatīt arī https://wiki.gnucash.org/wiki/IRC
 
 Ja atklājat kļūdas vai problēmas, nekautrējieties tās reģistrēt "Bugzilla" kļūdu apstrādes 
 sistēmā https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
diff --git a/doc/README-nl.win32-bin.txt b/doc/README-nl.win32-bin.txt
index ba9069355..64330d279 100644
--- a/doc/README-nl.win32-bin.txt
+++ b/doc/README-nl.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
+GnuCash is een vrij, open source boekhoudprogramma, uitgegeven
 onder de GNU General Public License (GPL) en is beschikbaar voor
 GNU/Linux, *BSD, Solaris, Mac OSX, en Microsoft Windows.
 
@@ -12,9 +12,9 @@ balans en nauwkeurige rapporten te verzekeren.
 
 Beschikbare bronnen voor ondersteuning
 
-Online veel gestelde vragen (FAQ):    http://wiki.gnucash.org/wiki/FAQ
-Mailing Lijsten:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
+Online veel gestelde vragen (FAQ):    https://wiki.gnucash.org/wiki/FAQ
+Mailing Lijsten:  https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also https://wiki.gnucash.org/wiki/IRC
 
 Als je programmafouten (bugs) of problemen ervaart, aarzel niet om deze te melden in ons
 bug opvolgsysteem "Bugzilla":
diff --git a/doc/README-zh_CN.win32-bin.txt b/doc/README-zh_CN.win32-bin.txt
index 93e7872e3..e559e6c1f 100644
--- a/doc/README-zh_CN.win32-bin.txt
+++ b/doc/README-zh_CN.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
+GnuCash 是一个免费的、开放源代码的理财软件,它使用 GNU 通用公共许可证(GPL),可运行于 GNU/Linux、*BSD、Solaris、Mac OSX以及微软 Windows。
 
 致力于易于使用,但功能强大而且灵活。GnuCash 允许您跟踪银行账户、股票、收入和支出。就像账簿一样快捷而且直观,它是基于专业的会计理念来确保平衡的账簿和准确的报告。
 
@@ -6,9 +6,9 @@
 
 您可以获得支持的途径
 
-在线常见问题解答:    http://wiki.gnucash.org/wiki/FAQ
-邮件列表:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道,另见 http://wiki.gnucash.org/wiki/IRC
+在线常见问题解答:    https://wiki.gnucash.org/wiki/FAQ
+邮件列表:  https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (聊天):   irc.gnome.org 服务器的 #gnucash 频道,另见 https://wiki.gnucash.org/wiki/IRC
 
 如果您遇到了任何 bug 或者问题,请不要犹豫,将它们报告到我们的 bug 跟踪工具“Bugzilla”:https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
 
diff --git a/doc/README-zh_TW.win32-bin.txt b/doc/README-zh_TW.win32-bin.txt
index e3a76906c..312599398 100644
--- a/doc/README-zh_TW.win32-bin.txt
+++ b/doc/README-zh_TW.win32-bin.txt
@@ -1,4 +1,4 @@
-GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
+GnuCash 是一個自由、開放原始碼的帳務軟體,它使用 GNU 通用公共許可證(GPL),支援 GNU/Linux, *BSD, Solaris, Mac OSX 及微軟 Windows。
 
 GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以追蹤銀行帳戶、股票、收入與支出,就像用帳簿一樣快捷、直覺。基於專業的會計原則確保帳目平衡並提供準確的報表。
 
@@ -6,9 +6,9 @@ GnuCash 不僅設計成易於使用,而且功能強大又有彈性。它可以
 
 可獲得支援的管道
 
-常見問題解答:   http://wiki.gnucash.org/wiki/FAQ
-通信論壇:       http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (聊天):     irc.gnome.org 伺服器的 #gnucash 頻道,見 http://wiki.gnucash.org/wiki/IRC
+常見問題解答:   https://wiki.gnucash.org/wiki/FAQ
+通信論壇:       https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (聊天):     irc.gnome.org 伺服器的 #gnucash 頻道,見 https://wiki.gnucash.org/wiki/IRC
 
 如果您遇到了任何 bug 或問題,請不要遲疑,將問題報告到我們的 bug 追蹤系統 "Bugzilla": (請用英文)
 https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
diff --git a/doc/README.HBCI b/doc/README.HBCI
index e7d2e2443..21c25ce00 100644
--- a/doc/README.HBCI
+++ b/doc/README.HBCI
@@ -17,8 +17,8 @@ support. This makes it the world's first *free* HBCI-enabled personal
 finance manager. 
 
 Many additional information about GnuCash and HBCI can be found in
-German language on http://linuxwiki.de/GnuCash,
-http://linuxwiki.de/AqBanking, and http://linuxwiki.de/OpenHBCI.
+German language on https://linuxwiki.de/GnuCash,
+https://linuxwiki.de/AqBanking, and https://linuxwiki.de/OpenHBCI.
 
 HBCI (Home Banking Computer Interface) is a standard used by German
 banks for offering online banking service. Through this standard,
@@ -39,12 +39,12 @@ HBCI for now.
 2. Requirements
 ------------
 
-See also http://linuxwiki.de/AqBanking
+See also https://linuxwiki.de/AqBanking
 
 Required packages:
 
 AqBanking 1.3.0, or any later version: Get aqbanking from
-http://sourceforge.net/projects/aqbanking . (Historical note:
+https://sourceforge.net/projects/aqbanking . (Historical note:
 Until gnucash-1.8.9, the library "openhbci" had been used, but
 with gnucash-1.8.10, gnucash switched to the successor of openhbci
 which is aqbanking/aqhbci.) (Second historical note: The library
@@ -56,11 +56,11 @@ package.)
 which in turn requires: 
 
 Gwenhywfar 1.16.0, or any later version,
-http://sourceforge.net/projects/gwenhywfar, which in turn requires
-OpenSSL any 0.9.x, http://www.openssl.org .
+https://sourceforge.net/projects/gwenhywfar, which in turn requires
+OpenSSL any 0.9.x, https://www.openssl.org .
 
 If you want chipcard support, you also need libchipcard version
-2.0.0 or later, http://sourceforge.net/projects/libchipcard
+2.0.0 or later, https://sourceforge.net/projects/libchipcard
 
 (Note: Not all arbitrary version combinations between aqbanking
 and gwenhywfar will work! Only those versions that have been
@@ -150,7 +150,7 @@ Gnucash/AqBanking (or OpenHBCI) is successfully being used with:
 
 If you encounter an error, you can report it in German language on
 gnucash-de at gnucash.org (Subscriber-only list; please subscribe on
-http://www.gnucash.org/cgi-bin/mailman/listinfo/gnucash-de ) and on on
+https://www.gnucash.org/cgi-bin/mailman/listinfo/gnucash-de ) and on on
 openhbci-general at lists.sf.net. Please remember to include the version
 numbers of gnucash and aqbanking as well as any console output and/or
 HBCI connection log (can be obtained through the HBCI Verbose Debug
diff --git a/doc/README.OFX b/doc/README.OFX
index 9e8b2727d..d4f54ac63 100644
--- a/doc/README.OFX
+++ b/doc/README.OFX
@@ -28,10 +28,10 @@ as other services, such as bill payment.  Features requiring direct access
 ------------
 
 LibOFX 0.7.0 or later 
-http://libofx.sourceforge.net/
+https://libofx.sourceforge.net/
 
 which in turn requires:
-OpenSP 1.3.x or later, http://openjade.sourceforge.net/
+OpenSP 1.3.x or later, https://openjade.sourceforge.net/
 
 Then you enable OFX support by building GnuCash with:
 
@@ -182,7 +182,7 @@ order of effectiveness for you, but ANY report is apreciated):
 * Open a bug at https://bugs.gnucash.org/
 * gnucash-devel at gnucash.org or gnucash-user at gnucash.org (Subscriber-only list;
 please subscribe on https://lists.gnucash.org/mailman/listinfo/ )
-* http://lists.sourceforge.net/lists/listinfo/libofx-devel/ if ofxdump doesn't
+* https://lists.sourceforge.net/lists/listinfo/libofx-devel/ if ofxdump doesn't
 give you the expected data.
 * many developers hang on the IRC channel #gnucash on irc.gnome.org
 
@@ -246,7 +246,7 @@ frequently by banks all over the world.
 The main author of LibOFX managed to find
 specs, but needs the OFC DTD (Data Type Definition) to add support.  That file
 is supposed to be available from a link an this page:
-http://support.microsoft.com/default.aspx?scid=kb%3Ben-us%3B162872
+https://support.microsoft.com/default.aspx?scid=kb%3Ben-us%3B162872
 
 However, despite numerous requests to Microsoft to either fix the broken link or
 send him a copy of the file, they still haven't done so.  That file is probably
diff --git a/doc/README.francais b/doc/README.francais
index ba42a76ff..fb01b5c53 100644
--- a/doc/README.francais
+++ b/doc/README.francais
@@ -7,15 +7,15 @@ Sommaire:
 ---------
 
   - Vue d'ensemble
-  - Mise à jour depuis la version 1.8.x
-  - Dépendances
+  - Mise � jour depuis la version 1.8.x
+  - D�pendances
   - Mise en route
   - Internationalisation
   - Compilation et installation
-  - plates-formes supportées
-  - Sites de téléchargement miroirs
-  - Récupérer les sources avec SVN
-  - Développement de GnuCash
+  - plates-formes support�es
+  - Sites de t�l�chargement miroirs
+  - R�cup�rer les sources avec SVN
+  - D�veloppement de GnuCash
 
 
 ##############
@@ -23,119 +23,119 @@ Vue d'ensemble
 --------------
 
 GnuCash est un gestionnaire de finances personnelles. Une interface graphique
-d'enregistrement ressemblant au talon de votre chéquier vous permet d'entrer et
-de suivre vos comptes bancaires, actions, revenus et même vos opérations
-boursières. L'interface est conçue pour être simple et facile à utiliser, mais
-elle est adossée aux principes de comptabilité de la partie double pour assurer
-l'équilibre des comptes.
-
-Quelques une de ces caractéristiques sont:
-
-* Une interface facile à utiliser.  Si vous savez utiliser le talon de votre
-chéquier, vous savez utiliser GnuCash. Tapez directement dans le registre,
-déplacez vous entre les champs, et utilisez quick-fill (saisie rapide) pour
-compléter automatiquement la transaction. L'interface est personnalisable depuis
-l'application elle-même (pas de fichiers de config à modifier :) ).
-* Transactions récurrentes : GnuCash a la possibilité de générer automatiquement
-des transactions, de rappeler leur échéance, de proposer de la valider ou de la
-retarder et également de les supprimer après un certain temps.
-* Importation de fichiers OFX : GnuCash est le premier logiciel libre à
-supporter le protocole « Open Financial Exchange » qui est de plus en plus
-utilisé par les banques. Le développement du support OFX et HBCI a permis une
-amélioration du mécanisme permettant de retrouver des transactions homologues
+d'enregistrement ressemblant au talon de votre ch�quier vous permet d'entrer et
+de suivre vos comptes bancaires, actions, revenus et m�me vos op�rations
+boursi�res. L'interface est con�ue pour �tre simple et facile � utiliser, mais
+elle est adoss�e aux principes de comptabilit� de la partie double pour assurer
+l'�quilibre des comptes.
+
+Quelques une de ces caract�ristiques sont:
+
+* Une interface facile � utiliser.  Si vous savez utiliser le talon de votre
+ch�quier, vous savez utiliser GnuCash. Tapez directement dans le registre,
+d�placez vous entre les champs, et utilisez quick-fill (saisie rapide) pour
+compl�ter automatiquement la transaction. L'interface est personnalisable depuis
+l'application elle-m�me (pas de fichiers de config � modifier :) ).
+* Transactions r�currentes : GnuCash a la possibilit� de g�n�rer automatiquement
+des transactions, de rappeler leur �ch�ance, de proposer de la valider ou de la
+retarder et �galement de les supprimer apr�s un certain temps.
+* Importation de fichiers OFX : GnuCash est le premier logiciel libre �
+supporter le protocole � Open Financial Exchange � qui est de plus en plus
+utilis� par les banques. Le d�veloppement du support OFX et HBCI a permis une
+am�lioration du m�canisme permettant de retrouver des transactions homologues
 et les doublons.
-* Support de l'HBCI : GnuCash est le premier logiciel libre à supporter le
-protocole allemand d'opérations bancaires en ligne
+* Support de l'HBCI : GnuCash est le premier logiciel libre � supporter le
+protocole allemand d'op�rations bancaires en ligne
 * Importation de fichiers Quicken: Importation de fichiers au format QIF de
-Quicken. Les fichiers QIF sont automatiquement fusionnés pour éliminer les
-transactions dupliquées.
-* La fenêtre de rapprochement avec les soldes actuels rapprochés et pointés rend
+Quicken. Les fichiers QIF sont automatiquement fusionn�s pour �liminer les
+transactions dupliqu�es.
+* La fen�tre de rapprochement avec les soldes actuels rapproch�s et point�s rend
 le rapprochement facile.
 * Portefeuille d'actions/fonds de placements (SICAV et FCP en France): suivi
 d'actions individuellement (une par compte) ou dans un portefeuille de comptes
-(un groupe de comptes qui peuvent être affichés ensemble).
-* Récupération des cours des actions et fonds communs (FCP et SICAV) depuis
-différents sites Web, mise à jour automatique du portefeuille.
-* Rapports : affichent le bilan , les pertes et profits, évaluation du
+(un groupe de comptes qui peuvent �tre affich�s ensemble).
+* R�cup�ration des cours des actions et fonds communs (FCP et SICAV) depuis
+diff�rents sites Web, mise � jour automatique du portefeuille.
+* Rapports : affichent le bilan , les pertes et profits, �valuation du
 portefeuille, rapports de transactions, ou suivi du solde du compte, ou
-exportation de ceux-ci en HTML. Vous pouvez écrire votre propre rapport
-personnalisé si vous connaissez un peu le langage Scheme. Les rapports peuvent
-maintenant être réalisés sur une période comptable.
-* Monnaies/devises multiples et Marché des changes : de multiple monnaies sont
-supportées et peuvent être achetées et vendues (faire du commerce avec elles).
-Les mouvements monétaires entre comptes sont totalement équilibrés quand la
-partie double est activée. Les transferts en devises multiples sont supportés.
-* Tableau de comptes : un compte maître/principal peut avoir une arborescence
-de comptes détaillés en dessous de lui. Cela permet d'avoir des types de
-comptes similaires (par exemple Liquidités, Banque, Actions) groupés dans un
-compte maître (par exemple Avoirs).
-* Transactions réparties : une simple transaction peut être répartie en
-plusieurs morceaux pour enregistrer les impôts, paiements, et autres entrées
-composées.
-* Partie double: Quand elle est activée, chaque transaction doit débiter un
-compte et créditer un autre d'un montant équivalent. Cela permet de s'assurer
-que les "livres sont équilibrés" : c'est à dire que la différence entre les
-revenus et les sorties est exactement égale à la somme de tous les avoirs,
-qu'ils soient bancaire, liquidités, actions ou autre.
-* Types de comptes Revenus/Dépenses (Catégories) : ils ne servent pas uniquement
-à catégoriser votre flux de liquidités/argent, mais quand ils sont utilisés avec
-la fonction de la partie double, ceux-ci peuvent fournir un état exact des
-pertes et profits et donc du résultat de la période.
-* Extrait de compte/grand livre : de multiples comptes peuvent être affichés
-dans une fenêtre registre/d'enregistrement au même moment. Cela peut faciliter
-l'ennui de la recherche/vérification des erreurs de frappe/d'entrée. Il fournit
-aussi une manière agréable de visualiser un portefeuille de beaucoup d'actions,
+exportation de ceux-ci en HTML. Vous pouvez �crire votre propre rapport
+personnalis� si vous connaissez un peu le langage Scheme. Les rapports peuvent
+maintenant �tre r�alis�s sur une p�riode comptable.
+* Monnaies/devises multiples et March� des changes : de multiple monnaies sont
+support�es et peuvent �tre achet�es et vendues (faire du commerce avec elles).
+Les mouvements mon�taires entre comptes sont totalement �quilibr�s quand la
+partie double est activ�e. Les transferts en devises multiples sont support�s.
+* Tableau de comptes : un compte ma�tre/principal peut avoir une arborescence
+de comptes d�taill�s en dessous de lui. Cela permet d'avoir des types de
+comptes similaires (par exemple Liquidit�s, Banque, Actions) group�s dans un
+compte ma�tre (par exemple Avoirs).
+* Transactions r�parties : une simple transaction peut �tre r�partie en
+plusieurs morceaux pour enregistrer les imp�ts, paiements, et autres entr�es
+compos�es.
+* Partie double: Quand elle est activ�e, chaque transaction doit d�biter un
+compte et cr�diter un autre d'un montant �quivalent. Cela permet de s'assurer
+que les "livres sont �quilibr�s" : c'est � dire que la diff�rence entre les
+revenus et les sorties est exactement �gale � la somme de tous les avoirs,
+qu'ils soient bancaire, liquidit�s, actions ou autre.
+* Types de comptes Revenus/D�penses (Cat�gories) : ils ne servent pas uniquement
+� cat�goriser votre flux de liquidit�s/argent, mais quand ils sont utilis�s avec
+la fonction de la partie double, ceux-ci peuvent fournir un �tat exact des
+pertes et profits et donc du r�sultat de la p�riode.
+* Extrait de compte/grand livre : de multiples comptes peuvent �tre affich�s
+dans une fen�tre registre/d'enregistrement au m�me moment. Cela peut faciliter
+l'ennui de la recherche/v�rification des erreurs de frappe/d'entr�e. Il fournit
+aussi une mani�re agr�able de visualiser un portefeuille de beaucoup d'actions,
 en montrant toutes les transactions dans ce portefeuille.
-* Écrit en C avec un support étendu de Scheme via Guile.
-* L'accès au fichier est verrouillé par un drapeau de sécurité réseau, prévenant
-des dommages accidentels si plusieurs utilisateurs essaient d'accéder au même
-fichier, même si le fichier est monté par NFS.
-* Fournit un format de flux de données (byte-stream format), qui permet aux
-comptes et groupes de comptes d'être transmis par d'autres processus via pipes
+* �crit en C avec un support �tendu de Scheme via Guile.
+* L'acc�s au fichier est verrouill� par un drapeau de s�curit� r�seau, pr�venant
+des dommages accidentels si plusieurs utilisateurs essaient d'acc�der au m�me
+fichier, m�me si le fichier est mont� par NFS.
+* Fournit un format de flux de donn�es (byte-stream format), qui permet aux
+comptes et groupes de comptes d'�tre transmis par d'autres processus via pipes
 ou sockets.
-* Chargement de la date au format européen, traductions diverses.
-* Nouveau manuel utilisateur : une toute nouvelle aide en ligne a été écrite :
+* Chargement de la date au format europ�en, traductions diverses.
+* Nouveau manuel utilisateur : une toute nouvelle aide en ligne a �t� �crite :
 elle se focalise sur comment faire les actions en relation avec un tutoriel et
 un guide des concepts.
-* De nouveaux menus : les menus de GnuCash ont été revus pour se conformer aux
+* De nouveaux menus : les menus de GnuCash ont �t� revus pour se conformer aux
 principes d'interface de Gnome.
 
 
 Home Page:
 
-http://gnucash.org/ (site officiel - version anglaise)
+https://www.gnucash.org/ (site officiel - version anglaise)
 
-Binaires précompilés / exécutables:
-http://www.gnucash.org/pub/gnucash/
+Binaires pr�compil�s / ex�cutables:
+https://www.gnucash.org/pub/gnucash/
 
-Versions de développement:
-http://www.gnucash.org/en/hacking.phtml
+Versions de d�veloppement:
+https://www.gnucash.org/en/hacking.phtml
 
 ###################################
-Mise à jour depuis la version 1.8.x
+Mise � jour depuis la version 1.8.x
 -----------------------------------
 
-Il y a beaucoup, beaucoup de changements depuis la série 1.8 -
-Jetez un coup d'oeil au fichier NEWS si vous voulez plus de détails.
+Il y a beaucoup, beaucoup de changements depuis la s�rie 1.8 -
+Jetez un coup d'oeil au fichier NEWS si vous voulez plus de d�tails.
 
-- GnuCash nécessite g-wrap version 1.3.4 ou supérieur. Consultez la section «
-Dépendances » pour plus de détails.
+- GnuCash n�cessite g-wrap version 1.3.4 ou sup�rieur. Consultez la section �
+D�pendances � pour plus de d�tails.
 
-- Les données ne sont plus accessibles à partir de la version 1.6 une fois de
-nouvelles fonctionnalités utilisées : il n'y a pas de compatibilité
-descendante. Sauvegardez vos données!!
+- Les donn�es ne sont plus accessibles � partir de la version 1.6 une fois de
+nouvelles fonctionnalit�s utilis�es : il n'y a pas de compatibilit�
+descendante. Sauvegardez vos donn�es!!
 
-- La documentation de GnuCash est désormais déplacée dans un package séparé
-(gnucash-docs). si vous voyez un message du type « URL non trouvée », en
+- La documentation de GnuCash est d�sormais d�plac�e dans un package s�par�
+(gnucash-docs). si vous voyez un message du type � URL non trouv�e �, en
 cliquant un item du menu Aide, vous devrez installer la package gnucash-docs.
 
-Nous espérons que vous vous apprécierez toutes les nouvelles fonctionnalités!
+Nous esp�rons que vous vous appr�cierez toutes les nouvelles fonctionnalit�s!
 
 ############
-Dépendances
+D�pendances
 ------------
 
-Les packages suivants sont requis et doivent être installés pour faire
+Les packages suivants sont requis et doivent �tre install�s pour faire
 fonctionner GnuCash:
 
 [Consultez le fichier README.dependencies]
@@ -145,33 +145,33 @@ fonctionner GnuCash:
 Mise en route
 -------------
 
-Pour les détails d'invocation/de lancement de GnuCash, regardez les pages de
+Pour les d�tails d'invocation/de lancement de GnuCash, regardez les pages de
 man dans doc/gnucash.1.
-Vous pouvez également taper gnucash --help sur la ligne de commande.
+Vous pouvez �galement taper gnucash --help sur la ligne de commande.
 
-Vous pouvez démarrer GnuCash en ligne de commande, avec « gnucash » ou « gnucash
-<nom du fichier> », où <nom du fichier> est un fichier de données de GnuCash.
+Vous pouvez d�marrer GnuCash en ligne de commande, avec � gnucash � ou � gnucash
+<nom du fichier> �, o� <nom du fichier> est un fichier de donn�es de GnuCash.
 
-Des exemples de comptes peuvent être trouvés dans le sous-répertoire "data".
-Les fichiers *.xac sont les comptes de GnuCash qui peuvent être ouverts avec
-le menu « Fichier/Ouvrir ».
-Les fichiers *.qif sont des fichiers au format Quicken qui peuvent être ouverts
-par le menu « Fichier/Importer QIF ».
+Des exemples de comptes peuvent �tre trouv�s dans le sous-r�pertoire "data".
+Les fichiers *.xac sont les comptes de GnuCash qui peuvent �tre ouverts avec
+le menu � Fichier/Ouvrir �.
+Les fichiers *.qif sont des fichiers au format Quicken qui peuvent �tre ouverts
+par le menu � Fichier/Importer QIF �.
 
-GnuCash répond aux variables d'environnement suivantes :
+GnuCash r�pond aux variables d'environnement suivantes :
 
   GNC_BOOTSTRAP_SCM - l'emplacement du code scheme initial de bootstrapping.
 
-  GUILE_LOAD_PATH - Pour surpasser le chemin de GnuCash utilisé pour le
-  chargement de fichiers Scheme. C'est une variable de la même forme que les
+  GUILE_LOAD_PATH - Pour surpasser le chemin de GnuCash utilis� pour le
+  chargement de fichiers Scheme. C'est une variable de la m�me forme que les
   variables d'environnement PATH ou LIBRARY_PATH.
 
-  GNC_MODULE_PATH - Pour surpasser le chemin de GnuCash utilisé pour le
-  chargement de modules GnuCash. C'est une variable de la même forme que les
+  GNC_MODULE_PATH - Pour surpasser le chemin de GnuCash utilis� pour le
+  chargement de modules GnuCash. C'est une variable de la m�me forme que les
   variables d'environnement PATH ou LIBRARY_PATH.
 
-  GNC_DEBUG - active la sortie de débogage. Cela vous permet d'activer
-  le débogage dans le processus de démarrageplus rapidement qu'avec l'option
+  GNC_DEBUG - active la sortie de d�bogage. Cela vous permet d'activer
+  le d�bogage dans le processus de d�marrageplus rapidement qu'avec l'option
   --debug.
 
 
@@ -179,13 +179,13 @@ GnuCash r
 Internationalisation (i18n)
 ---------------------------
 
-Des traductions (fichiers .po) existent pour différentes langues. Ceux-ci
-sont activés avec les variables d'environnement. Par exemple,
+Des traductions (fichiers .po) existent pour diff�rentes langues. Ceux-ci
+sont activ�s avec les variables d'environnement. Par exemple,
 
-En français, avec bash:
+En fran�ais, avec bash:
     export LANG=fr_FR
 
-En français, avec tcsh:
+En fran�ais, avec tcsh:
     setenv LANG fr_FR
 
 Pour la version allemande:
@@ -196,37 +196,37 @@ Pour la version allemande:
 Compilation et installation
 ---------------------------
 
-[Pour plus de détails sur la compilation, lisez doc/README.build-system]
+[Pour plus de d�tails sur la compilation, lisez doc/README.build-system]
 
 GnuCash utilise GNU Automake pour traiter le processus de compilation, donc
-pour plus de détails, regardez les instructions générales dans INSTALL.
+pour plus de d�tails, regardez les instructions g�n�rales dans INSTALL.
 
-Ci-dessous nous détaillons les parties spécifiques de GnuCash.
+Ci-dessous nous d�taillons les parties sp�cifiques de GnuCash.
 
 
 Avant de compiler GnuCash, vous devrez obtenir et installer les packages
 suivants:
 
-libtool : Disponible à ftp://ftp.gnu.org/gnu.
+libtool : Disponible � ftp://ftp.gnu.org/gnu.
           Les RPMs et debs sont largement disponibles avec la plupart des
 	     distributions.
 
-système de développement gnome: en-têtes (headers), librairies, etc.
+syst�me de d�veloppement gnome: en-t�tes (headers), librairies, etc.
 
 libxml:   disponible sur ftp.gnome.org
 
-g-wrap  : Les RPM's, debs, et sources sont disponibles à
-	     http://www.gnucash.org/pub/g-wrap.
-	     vous devrez utilisez g-wrap 1.3.4 ou supérieur
+g-wrap  : Les RPM's, debs, et sources sont disponibles �
+	     https://www.gnucash.org/pub/g-wrap.
+	     vous devrez utilisez g-wrap 1.3.4 ou sup�rieur
 
 texinfo: Si vous compilez depuis svn, vous avez besoin du package GNU texinfo,
-	    version 4.0 ou ultérieure.
+	    version 4.0 ou ult�rieure.
 
 
-Ce que vous aurez besoin de récupérer et d'installer pour être sûr d'avoir
-tous ces éléments correctement installés dépendra de votre système
+Ce que vous aurez besoin de r�cup�rer et d'installer pour �tre s�r d'avoir
+tous ces �l�ments correctement install�s d�pendra de votre syst�me
 d'exploitation , mais ici se trouve une liste partielle de ce que vous aurez
-besoin pour les systèmes que nous connaissons:
+besoin pour les syst�mes que nous connaissons:
 
   Debian/GNU/Linux: (cf README.dependencies)
     actuel:
@@ -238,49 +238,49 @@ besoin pour les syst
 
 
 GnuCash comprend quelques options non-standard de ./configure . Vous
-devriez lancer « ./configure --help » pour la liste la plus à jour des options
-supportées.
+devriez lancer � ./configure --help � pour la liste la plus � jour des options
+support�es.
 
-Si vous voulez seulement qu'une langue en particulier soit installée, vous
-pouvez définir la variable d'environnement LINGUAS avant de lancer ./configure.
-Par exemple, pour installer seulement les traductions française, lancez
+Si vous voulez seulement qu'une langue en particulier soit install�e, vous
+pouvez d�finir la variable d'environnement LINGUAS avant de lancer ./configure.
+Par exemple, pour installer seulement les traductions fran�aise, lancez
 
   $ export LINGUAS=fr
   $ ./configure
 
-Si vous voulez être sûr que toutes les langues soit installées, lancez
+Si vous voulez �tre s�r que toutes les langues soit install�es, lancez
 
   $ unset LINGUAS
   $ ./configure
 
-Bien que vous ayez besoin des librairies Gnome installées, vous n'avez pas
+Bien que vous ayez besoin des librairies Gnome install�es, vous n'avez pas
 besoin d'utiliser le bureau/interface Gnome.
 
-Les chemins de lancement et d'installations sont séparées.  Le --prefix que vous
-spécifiez à ./configure détermine le chemin où les exécutables chercheront des
-fichiers à leur lancement. Normalement, cela détermine où « make install »
-installera les fichiers. Cependant, automake supporte également des variables.
-DESTDIR est utilisée pendant le processus « make install » pour installer des
-objets dans un répertoire tampon. Chaque objet et chemin est préfixé avec la
-valeur de 'DESTDIR' avant d'être copié dans les répertoires d'installation.
+Les chemins de lancement et d'installations sont s�par�es.  Le --prefix que vous
+sp�cifiez � ./configure d�termine le chemin o� les ex�cutables chercheront des
+fichiers � leur lancement. Normalement, cela d�termine o� � make install �
+installera les fichiers. Cependant, automake supporte �galement des variables.
+DESTDIR est utilis�e pendant le processus � make install � pour installer des
+objets dans un r�pertoire tampon. Chaque objet et chemin est pr�fix� avec la
+valeur de 'DESTDIR' avant d'�tre copi� dans les r�pertoires d'installation.
 
    make DESTDIR=/tmp/staging install
 
-Cela place les objets d'installation dans une arborescence de répertoire
+Cela place les objets d'installation dans une arborescence de r�pertoire
 construit  sous `/tmp/staging'.
-Si `/gnu/bin/foo' et /gnu/share/aclocal/foo.m4' doivent être installés, la
+Si `/gnu/bin/foo' et /gnu/share/aclocal/foo.m4' doivent �tre install�s, la
 commande ci-dessus installera `/tmp/staging/gnu/bin/foo' et
 `/tmp/staging/gnu/share/aclocal/foo.m4'.
 
-DESTDIR peut être utile quand on essaie de construire des images d'installation
+DESTDIR peut �tre utile quand on essaie de construire des images d'installation
 et des packages.
 
 
 ########################
-Plates-formes supportées
+Plates-formes support�es
 ------------------------
 
-La version 2.0.x de GnuCash est réputer fonctionner sur les systèmes
+La version 2.0.x de GnuCash est r�puter fonctionner sur les syst�mes
 d'exploitation suivants:
 
 GNU/Linux            -- x86, Sparc, Alpha
@@ -289,84 +289,57 @@ FreeBSD              -- x86
 OpenBSD              -- x86
 MacOS X		      -- PPC
 
-Les précédentes versions étaient réputées fonctionner sur les plateformes
-suivantes :
-
-SGI IRIX              -- MIPS
-IBM AIX 4.1.5         -- RS/6000   http://www-frec.bull.com/
-Unixware 7            -- Intel
-SCO OpenServer 5.0.4  -- Intel
-
 GnuCash peut probablement fonctionner avec la plupart des plateformes POSIX, si
 les librairies et les outils sont disponibles.
 
 
 ###############################
-Sites de téléchargement miroirs
+Sites de t�l�chargement miroirs
 -------------------------------
 
-Vous pouvez aussi télécharger GnuCash à partir de:
-
-  - http://download.sourceforge.net/gnucash
-
-
-Vous pouvez télécharger les packages Solaris de GnuCash à partir de:
+Vous pouvez aussi t�l�charger GnuCash � partir de:
 
-  - http://www.unixrealm.com/downloads/
+  - https://download.sourceforge.net/gnucash
 
-Vous pouvez récupérer les packages Mandriva de GnuCash sur les sites Cooker de
-Mandriva ou dans les dernières versions de la distribution)
+Vous pouvez r�cup�rer les packages Mandriva de GnuCash sur les sites Cooker de
+Mandriva ou dans les derni�res versions de la distribution)
 
 
 #####################################
-Récupérer les sources avec Subversion
+R�cup�rer les sources avec git
 -------------------------------------
 
-Une version en lecture seule de l'arborescence Subversion est disponible à
+Une version en lecture seule de l'arborescence git est disponible �
 cette adresse :
 
-	http://svn.gnucash.org/repo/gnucash/
-
-Pour obtenir ce qui fut le CVS HEAD (et ce qui inclus maintenant ce qui était
-gnucash-gnome2-dev), vous devrez obtenir le svn TRUNK :
-
-	svn checkout http://svn.gnucash.org/repo/gnucash/trunk gnucash
-
-L'argument « gnucash » ci dessus peut être n'importe quel nom de répertoire sur
-votre disque local, et est optionnel. Si vous l'omettez, vous aurez un
-répertoire nommé « trunk » contenant les sources.
-
-Si vous voulez obtenir les derniers sources de la version 2.0.x, vous devrez
-les récupérer dans le branche 2.0, comme suit :
-
-	svn checkout http://svn.gnucash.org/repo/gnucash/branches/2.0 gnucash-2.0
+	https://github.com/Gnucash/gnucash/
 
 
 ########################
-Développement de GnuCash
+D�veloppement de GnuCash
 ------------------------
-Avant de démarrer à développer sur GnuCash, vous devriez faire les choses
+Avant de d�marrer � d�velopper sur GnuCash, vous devriez faire les choses
 suivantes:
 
 1. lisez le fichier src/doc/coding-style.txt pour apprendre les styles
-   de codage utilisés dans le code source de GnuCash. Lisez également
-   http://wiki.gnucash.org/wiki/Development
+   de codage utilis�s dans le code source de GnuCash. Lisez �galement
+   https://wiki.gnucash.org/wiki/Development
 
-2. Plusieurs des répertoires sous src contiennent des fichiers appellés
+2. Plusieurs des r�pertoires sous src contiennent des fichiers appell�s
    design.txt qui expliquent beaucoup des aspects de la conception de GnuCash.
    Lisez les.
 
 3. Allez sur le site web de GnuCash et survoler les archives de la liste de
-   diffusion du développement de GnuCash (gnucash-devel).
+   diffusion du d�veloppement de GnuCash (gnucash-devel).
 
-   4. Rejoignez la liste de diffusion de développement de GnuCash
-   (gnucash-devel). Regardez le site web de GnuCash pour des détails sur la
-   méthode pour y parvenir.
+   4. Rejoignez la liste de diffusion de d�veloppement de GnuCash
+   (gnucash-devel). Regardez le site web de GnuCash pour des d�tails sur la
+   m�thode pour y parvenir.
 
 
 Soumettre un patch
 
-Lisez SVP le fichier README sur les méthodes utilisées pour transmettre un
-patch à l'équipe de développement de GnuCash.
+Lisez SVP le fichier README sur les m�thodes utilis�es pour transmettre un
+patch � l'�quipe de d�veloppement de GnuCash.
 
 Merci,
diff --git a/doc/README.german b/doc/README.german
index cc867473c..a04810ef7 100644
--- a/doc/README.german
+++ b/doc/README.german
@@ -4,53 +4,53 @@ Entwicklungsversionen. Sie koennen normal funktionieren, muessen aber
 nicht. Benutzung auf eigene Gefahr! 
  
 Die letzte stabile Version war gnucash-2.0.0. 
-Die nächste stabile Version wird gnucash-2.2.0 sein.
+Die n�chste stabile Version wird gnucash-2.2.0 sein.
 
 ##############################################
 
 GnuCash
 -------
 
-GnuCash ist die freie OpenSource-Finanzverwaltung für GNU/Linux
+GnuCash ist die freie OpenSource-Finanzverwaltung f�r GNU/Linux
 und Unix. 
 
-Das Programm ist eine Komplettlösung zur Verwaltung der Finanzen
+Das Programm ist eine Komplettl�sung zur Verwaltung der Finanzen
 von Privatanwendern und Kleinbetrieben. Das aus dem Rechnungswesen
-bekannte Prinzip der doppelten Buchführung wird in GnuCash
-konsequent umgesetzt, so dass GnuCash höchste Ansprüche an die
-Kontenführung erfüllen kann. Auch Homebanking über HBCI ist
-möglich, wenn die Bibliothek AqBanking installiert ist. Für den
-Geschäftsverkehr ist die Verwaltung von Kunden, Lieferanten und
+bekannte Prinzip der doppelten Buchf�hrung wird in GnuCash
+konsequent umgesetzt, so dass GnuCash h�chste Anspr�che an die
+Kontenf�hrung erf�llen kann. Auch Homebanking �ber HBCI ist
+m�glich, wenn die Bibliothek AqBanking installiert ist. F�r den
+Gesch�ftsverkehr ist die Verwaltung von Kunden, Lieferanten und
 Rechnungen enthalten. Weitere Features sind terminierte Buchungen,
 Import von OFX-Dateien und QIF-Dateien, zahlreiche Berichte und
 Grafiken mit Torten- und Balkendiagrammen und eine
-benutzerdefinierbare Oberfläche.
+benutzerdefinierbare Oberfl�che.
  
-Für Neueinsteiger ist ein Assistent zur Kontenerstellung
+F�r Neueinsteiger ist ein Assistent zur Kontenerstellung
 vorhanden. Bestehende Dateien mit Finanzdaten z.B. aus Quicken
-oder Microsoft Money können problemlos über den QIF-Import
+oder Microsoft Money k�nnen problemlos �ber den QIF-Import
 eingelesen werden.
 
 Bei Fragen zur Installation und zur Benutzung steht eine
-deutschsprachige Mailingliste gnucash-de zur Verfügung. 
+deutschsprachige Mailingliste gnucash-de zur Verf�gung. 
 
-Homepage: http://www.gnucash.org
+Homepage: https://www.gnucash.org
 
-Deutsche Wiki-Seite: http://linuxwiki.de/GnuCash
+Deutsche Wiki-Seite: https://linuxwiki.de/GnuCash
 
-Übersetzungen der englischen Stichworte siehe po/glossary/de.po.
+�bersetzungen der englischen Stichworte siehe po/glossary/de.po.
 
 
-Benötigte Pakete: 
+Ben�tigte Pakete: 
 -----------------
 
 Siehe README.dependencies; im wesentlichen alle
 Gnome2-Entwickler-Pakete sowie guile, slib und swig. (g-wrap wurde
 mit gnucash-2.2.0 durch swig ersetzt und wird nicht mehr benutzt.)
 
-Für die HBCI-Funktionen muss außerdem das Paket aqbanking
+F�r die HBCI-Funktionen muss au�erdem das Paket aqbanking
 installiert sein, welches noch ein Paket namens gwenhywfar
-benötigt. Siehe auch doc/README.HBCI.
+ben�tigt. Siehe auch doc/README.HBCI.
 
 
 Starten von GnuCash:
@@ -62,13 +62,13 @@ gespeicherten Gnucash-Daten-Files sein muss.
 
 
 
-Übersetzung und Installation
+�bersetzung und Installation
 ----------------------------
 
-Diese Schritte sind nur für die Sourcedistribution erforderlich, nicht
-für die Binärdistribution.
+Diese Schritte sind nur f�r die Sourcedistribution erforderlich, nicht
+f�r die Bin�rdistribution.
 
-Siehe auch http://www.linuxwiki.de/GnuCash/SourceInstall
+Siehe auch https://www.linuxwiki.de/GnuCash/SourceInstall
 
 Nur beim Uebersetzen von GnuCash braucht man zusaetzlich die folgenden 
 Pakete: 
@@ -76,7 +76,7 @@ Pakete:
 libtool -- Erhaeltlich bei ftp://ftp.gnu.org/gnu.
            RPM's und deb's sind in ihrer Betriebssystem-Distribution.
 
-Normalerweise wird GnuCash wie folgt übersetzt und installiert:
+Normalerweise wird GnuCash wie folgt �bersetzt und installiert:
 
   # ./configure
   # make
@@ -91,7 +91,7 @@ An GnuCash mitentwickeln :
 
 Bevor Sie an GnuCash mitentickeln , sollten sie folgendes tun:
 
-1. Lesen von: http://wiki.gnucash.org/wiki/Development
+1. Lesen von: https://wiki.gnucash.org/wiki/Development
 
 2. Viele der Verzeichnisse unter 'src' enthalten desing.txt-Dateien,
    die viele Aspekte des GnuCash-Designs erklaeren. Auch lesen.
diff --git a/doc/README.win32-bin.txt b/doc/README.win32-bin.txt
index 60431a44b..eabd62772 100644
--- a/doc/README.win32-bin.txt
+++ b/doc/README.win32-bin.txt
@@ -11,13 +11,13 @@ accounting principles to ensure balanced books and accurate reports.
 
 Available Support Options
 
-Online FAQ:    http://wiki.gnucash.org/wiki/FAQ
-Mailing Lists:  http://wiki.gnucash.org/wiki/Mailing_Lists
-IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also http://wiki.gnucash.org/wiki/IRC
+Online FAQ:    https://wiki.gnucash.org/wiki/FAQ
+Mailing Lists:  https://wiki.gnucash.org/wiki/Mailing_Lists
+IRC (Chat):    Channel #gnucash on server irc.gnome.org, see also https://wiki.gnucash.org/wiki/IRC
 
 If you encounter any bugs or problems, do not hesitate to report them
 into our bug tracking tool "Bugzilla":
-http://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
+https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash
 
 -------------------
 
diff --git a/doc/TRANSLATION_HOWTO b/doc/TRANSLATION_HOWTO
index 4b7b42e11..d7aaa3ce5 100644
--- a/doc/TRANSLATION_HOWTO
+++ b/doc/TRANSLATION_HOWTO
@@ -41,17 +41,17 @@ out there and are eager to help.  Go to the #gnucash channel at
 #gnucash".
 
 The main gnucash web site is loaded with information:
-http://www.gnucash.org/
+https://www.gnucash.org/
 
 The GNU Translation Project is another way to submit translations:
-http://www.iro.umontreal.ca/contrib/po/HTML/
+https://translationproject.org/html/welcome.html
 
 ==============================================================================
 2) Get the source
 
 The first thing to do is to download the latest STABLE branch of gnucash.
 This could be easily done by visiting
-http://www.gnucash.org/pub/gnucash/sources/stable/
+https://www.gnucash.org/pub/gnucash/sources/stable/
 and grab the latest stable source package.
 
 Please do not use the HEAD branch from SVN, since the text in the HEAD branch 
@@ -177,7 +177,7 @@ If your language file does exist, update it using the msgmerge program:
 The top of the .po file should be editted somewhat.  The comments at the 
 top of the file should be changed to be current:
 
-# Messages in Deutsch für GnuCash
+# Messages in Deutsch f�r GnuCash
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Jan-Uwe Finck <Jan-Uwe.Finck at bigfoot.de>, 1999.
 
@@ -193,7 +193,7 @@ Finally.  You are ready to do some translating!
 
 There are many transaltion editors, KBabel, for example, works well for 
 GnuCash.  Some Editors are noted here:
-http://translationproject.org/html/software.html
+https://translationproject.org/html/software.html
 
 If you are familiar with a text editor, e.g. vim or emacs, you can also 
 manually edit the .po files.  Here is an example of translating some text 
@@ -213,7 +213,7 @@ msgid ""
 "The GnuCash personal finance manager.\n"
 "The GNU way to manage your money!"
 msgstr ""
-"GnuCash: Ihr persönlicher Finanzmanager.\n"
+"GnuCash: Ihr pers�nlicher Finanzmanager.\n"
 "Der GNU-Weg, ihr Geld zu verwalten !"
 
 You should read through every translation in the .po file at least once.  
@@ -235,7 +235,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Es gab einen Fehler beim Öffnen der Datei. \n"
+"Es gab einen Fehler beim �ffnen der Datei. \n"
 "     %s."
 
 You need to correct the translated string and remove the 'fuzzy' keyword.
@@ -249,7 +249,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Es gab einen Fehler beim Öffnen der Datei. \n"
+"Es gab einen Fehler beim �ffnen der Datei. \n"
 "     %s."
 
 Notice that the comment "c-format" was not removed.  That is correct, you 
diff --git a/doc/build-aix.txt b/doc/build-aix.txt
deleted file mode 100644
index 0a5cc78fc..000000000
--- a/doc/build-aix.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-pre-compiled SMIT-installable binaries for AIX 4.1.5 are available
-from 
-
-http://www-frec.bull.com/ 
-
-and 
-
-http://www.bull.de/pub/
-
-courtesy of BULL and Ciaran Deignan <Ciaran.Deignan at bull.net> 
-January 1998
diff --git a/doc/gnucash.1.in b/doc/gnucash.1.in
index a1cc1e9d6..e5e87f0f1 100644
--- a/doc/gnucash.1.in
+++ b/doc/gnucash.1.in
@@ -72,7 +72,7 @@ has extensive on-line help available from the "help" menu.
 
 Additional information and the latest version is available
 at the web site:
-.B http://www.gnucash.org
+.B https://www.gnucash.org
 
 .SH AUTHOR
 Robert Merkel <rgmerk at mira.net> wrote this manpage.  
diff --git a/doc/guile-hackers.txt b/doc/guile-hackers.txt
index df53925cc..5fafed157 100644
--- a/doc/guile-hackers.txt
+++ b/doc/guile-hackers.txt
@@ -39,7 +39,7 @@ While the Guile documentation (in info format) explains
 Guile specifics, it doesn't have much information about Scheme,
 the language.  The Internet Scheme Repository:
 
-http://www.cs.indiana.edu/scheme-repository/home.html
+https://www.cs.indiana.edu/scheme-repository/home.html [DEAD LINK]
 
 has quite a useful collection of information, including 
 FAQs, online copies of the Scheme standard (which is actually
diff --git a/doc/projects.html b/doc/projects.html
index 46e8d685c..c81655258 100644
--- a/doc/projects.html
+++ b/doc/projects.html
@@ -13,7 +13,7 @@
 
   <body bgcolor="#d6dacb" fgcolor="#000000">
 
-    <div align=center><a href="http://www.gnucash.org/" target="_top">
+    <div align=center><a href="https://www.gnucash.org/" target="_top">
     <img border=0 width=470 height=62 alt="GnuCash Personal Finance Manager"
      src="GnuCash_Long.jpg"></a><br>
     </div>
@@ -21,7 +21,7 @@
     <h1>GnuCash Project Goals</h1>
 
     <p>
-    The people behind <a href="http://www.gnucash.org">GnuCash</a>
+    The people behind <a href="https://www.gnucash.org">GnuCash</a>
     aim to create a world-class GPL'ed Open Source Personal
     Financial Application for GNU/Linux and other Unix's. This page
     reviews some of the technical issues and development status
@@ -29,8 +29,8 @@
     developers and contributors, providing status, and suggesting
     directions and technologies for deploying new features. If you
     simply want to get a better idea of what <a href=
-    "http://www.gnucash.org">GnuCash</a> is and what it does, visit its
-    <a href="http://www.gnucash.org">home page</a>. The home page
+    "https://www.gnucash.org">GnuCash</a> is and what it does, visit its
+    <a href="https://www.gnucash.org">home page</a>. The home page
     contains screen shots, news items, and mailing list
     archives.
     </p>
@@ -44,8 +44,8 @@
 
     <ul>
       <li>The current stable, production release is gnucash-1.6.0 and
-          is based on the <a href= "http://www.gnome.org">Gnome</a> / 
-          <a href= "http://www.gtk.org">GTK</a> libraries.
+          is based on the <a href= "https://www.gnome.org">Gnome</a> /
+          <a href= "https://www.gtk.org">GTK</a> libraries.
       </li>
 
       <li>The 1.7.x releases focus on adding new features and
@@ -236,12 +236,12 @@
     In order to facilitate the gluing together of these parts, as
     well as simplify the questions of customizability, change and
     rapid development, GnuCash makes use of the 
-    <a href= "http://www.swiss.ai.mit.edu/projects/scheme/index.html">
+    <a href= "https://www.swiss.ai.mit.edu/projects/scheme/index.html">
     Scheme</a> extension language (as implemented in the FSF 
-    <a href="http://www.gnu.org/software/guile/guile.html">Guile</a>
+    <a href="https://www.gnu.org/software/guile/guile.html">Guile</a>
     interpreter), to glue the pieces together. (Note that the
     engine interface is also available with 
-    <a href="http://www.perl.org">Perl</a> interfaces, thanks to a 
+    <a href="https://www.perl.org">Perl</a> interfaces, thanks to a
     <a href="http://starship.skyport.net/crew/beazley/swig.html">SWIG</a>
     wrapper.
     </p>
@@ -251,7 +251,7 @@
     <p>More and more finacial data is moving onto the web.  
     People shop on-line. They pay bills on-line.  There are
     even some promising e-wallet systems (such as 
-    <a href="http://www.webfunds.org">WebFunds</a>).  For GnuCash
+    <a href="https://www.webfunds.org">WebFunds</a>).  For GnuCash
     to be relevant in this on-line world, it must be able to interact
     with these systems.  There are several steps that can be taken
     along this path.  First, it must be possible to simply and
@@ -1079,7 +1079,7 @@
               href="http://www.jclark.com/jade/">Jade (James DSSSL
               Engine)</a> can be used to convert to RTF, Postscript, etc.
               Add to this the consideration that XML is the basis for the
-              <a href="http://www.w3.org/DOM/">Document Object Model</a>,
+              <a href="https://www.w3.org/DOM/">Document Object Model</a>,
               which is being integrated into many web-based applications,
               and we can see that XML is an increasingly significant
               format as we look to the future.
@@ -1103,7 +1103,7 @@
         <b>Status:</b>
         <ul>
           <li>Different graphing packages were evaluated, 
-              <a href="http://www.gnome.org/guppi/">GUPPI</a>.
+              <a href="https://www.gnome.org/guppi/">GUPPI</a>.
               Guppi was chosen.  Considered & rejected were
               plotutils, gnumeric graphing code (Miguel says 
               they'll replace gnumeric code with guppi.)
@@ -2011,7 +2011,7 @@
 
         <ul>
           <li>
-          <a href="http://sourceforge.net/project/?group_id=4232">
+          <a href="https://sourceforge.net/project/?group_id=4232">
           Finance::Quote.pm</a> is now a separate development project at
           SourceForge.  Its a perl module.
           It can obtain stock quotes from Yahoo 
@@ -2029,7 +2029,7 @@
           </li>
 
           <li>A separate, historical-quote module can be found at the
-          <a href="http://sourceforge.net/project/?group_id=2403">QuoteHist</a>
+          <a href="https://sourceforge.net/project/?group_id=2403">QuoteHist</a>
           sourceforge site.  It might be a good idea to fold this
           together with the Quote.pm  module !?
           </li>
@@ -2069,7 +2069,7 @@
            is working in multiple currencies on a regular basis.
         </p>
         <p>
-           <a href="http://www.cloanto.com/specs/seriff.html">SERIFF</a>
+           <a href="https://www.cloanto.com/specs/seriff.html">SERIFF</a>
            Simple Exchange Rate Information File Format.  Completely
            *.ini-centric in layout and design, but otherwise seemingly
            quite complete. 
@@ -2168,8 +2168,8 @@
 
       <dd>Need to add a 'meta keyword' tag to the documentation
         pages, this will help the search engine (<em>e.g.</em> 
-        <a href="http://www.htdig.org/">htdig</a>) better categorize the
-        help. <a href="http://www.senga.org/mifluz/html/">Mifluz</a>
+        <a href="https://www.htdig.org/">htdig [DEAD LINK]</a>) better categorize the
+        help. <a href="https://www.senga.org/mifluz/html/">Mifluz [DEAD LINK]</a>
         might be more embeddable ... I am told that htdig-API is in
         good solid condition for this, but undocumented.
         <p>
@@ -2393,7 +2393,7 @@ next due date mm/dd/yy
         <a href=
         "ftp://ftp.linux.it/pub/database/RDB/nosql-0.8.tar.gz">
         NoSQL.</a> (NoSQL is available as part of the <a href=
-        "http://www.debian.org">Debian GNU/Linux</a> distribution,
+        "https://www.debian.org">Debian GNU/Linux</a> distribution,
         for instance.)</p>
 
         <p>The <tt>/rdb</tt> format is thus:</p>
@@ -2549,7 +2549,7 @@ etc ...
         SQL database, and for that database to be updated. 
         There has been <em>much</em> discussion about this on
         mailing lists both for GnuCash and 
-        <a href="http://www.menet.umn.edu/~curt/cbb/">CBB.</a> 
+        <a href="http://www.menet.umn.edu/~curt/cbb/">CBB [DEAD LINK]</a>.
         Major points have included:
 
         <br>
@@ -2611,15 +2611,15 @@ Password:
 
           <li>
             It might be useful to use an embedded database engine
-            like unto <a href="http://www.sleepycat.com/">Sleepycat
-            DB</a>, 
+            like unto <a href="https://www.sleepycat.com/">Sleepycat
+            DB [DEAD LINK, now owned by Oracle]</a>,
             <a href="ftp://koobera.math/uic.edu/www.cdb.html">cdb</a>,
             or something like 
-            <a href="http://www.opengroup.org/public/prods/dmm4.htm">
+            <a href="https://www.opengroup.org/public/prods/dmm4.htm">
             ISAM</a> (Note CQL++ supports ISAM access methods), or
             even an embedded SQL engine such as 
-            <a href="http://www.ispras.ru/~knizhnik/gigabase.html">
-            GigaBASE</a>. 
+            <a href="https://www.ispras.ru/~knizhnik/gigabase.html">
+            GigaBASE [DEAD LINK]</a>.
             The reasons to do so include ... ???
           </li>
 
@@ -2832,8 +2832,8 @@ Password:
 
     <h1>References</h1>
     All software and technical standard references have been moved to
-    <a href="http://www.gnucash.org/links.php3">
-    http://www.gnucash.org/links.php3</a>
+    <a href="https://www.gnucash.org/links.php3">
+    https://www.gnucash.org/links.php3</a>
 
     <hr>
     Draft version 0.51 -- June 2001 
diff --git a/gnucash/gnome-utils/gnc-dense-cal.c b/gnucash/gnome-utils/gnc-dense-cal.c
index 1f505471b..eb7864d8b 100644
--- a/gnucash/gnome-utils/gnc-dense-cal.c
+++ b/gnucash/gnome-utils/gnc-dense-cal.c
@@ -1330,7 +1330,7 @@ gnc_dense_cal_motion_notify(GtkWidget *widget,
     if (!dcal->showPopup)
         return FALSE;
 
-    /* As per http://www.gtk.org/tutorial/sec-eventhandling.html */
+    /* As per https://www.gtk.org/tutorial/sec-eventhandling.html */
     if (event->is_hint)
     {
 #if GTK_CHECK_VERSION(3,20,0)
diff --git a/gnucash/gnome-utils/gnc-keyring.c b/gnucash/gnome-utils/gnc-keyring.c
index 7906cd167..a3a0ea08c 100644
--- a/gnucash/gnome-utils/gnc-keyring.c
+++ b/gnucash/gnome-utils/gnc-keyring.c
@@ -340,7 +340,7 @@ gboolean gnc_keyring_get_password ( GtkWidget *parent,
     else
         db_path = g_strdup_printf ( "%s://%s:%d/%s", access_method, server, port, service );
     heading = g_strdup_printf ( /* Translators: %s is a path to a database or any other url,
-                like mysql://user@server.somewhere/somedb, http://www.somequotes.com/thequotes */
+                like mysql://user@server.somewhere/somedb, https://www.somequotes.com/thequotes */
                     _("Enter a user name and password to connect to: %s"),
                     db_path );
 
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index a15c5ef7b..3d9f14cb8 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -1201,7 +1201,7 @@ gsr_default_associate_handler_location (GNCSplitReg *gsr, Transaction *trans, gb
         gtk_entry_set_text (GTK_ENTRY (entry), xaccTransGetAssociation (trans));
     }
     else
-        label = gtk_label_new (_("Enter URL like http://www.gnucash.org:"));
+        label = gtk_label_new (_("Enter URL like https://www.gnucash.org:"));
 
     // pack label and entry to content area
     gnc_label_set_alignment (label, 0.0, 0.5);
diff --git a/gnucash/html/gnc-html.c b/gnucash/html/gnc-html.c
index bff658a64..d9f44567f 100644
--- a/gnucash/html/gnc-html.c
+++ b/gnucash/html/gnc-html.c
@@ -22,9 +22,6 @@
  * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
  ********************************************************************/
 
-// libgtkhtml docs:
-// http://www.fifi.org/doc/libgtkhtml-dev/html/
-
 #include <config.h>
 
 #include <platform.h>
diff --git a/gnucash/import-export/aqb/gnc-ab-getbalance.c b/gnucash/import-export/aqb/gnc-ab-getbalance.c
index 83c7e0b81..03164c57f 100644
--- a/gnucash/import-export/aqb/gnc-ab-getbalance.c
+++ b/gnucash/import-export/aqb/gnc-ab-getbalance.c
@@ -131,7 +131,7 @@ gnc_ab_getbalance(GtkWidget *parent, Account *gnc_acc)
     /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
      * status always describes better whether the job was actually
      * transferred to and accepted by the bank.  See also
-     * http://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
+     * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
      */
 #ifdef AQBANKING6
 #else
diff --git a/gnucash/import-export/aqb/gnc-ab-gettrans.c b/gnucash/import-export/aqb/gnc-ab-gettrans.c
index 411a5ba9a..b084aa2fb 100644
--- a/gnucash/import-export/aqb/gnc-ab-gettrans.c
+++ b/gnucash/import-export/aqb/gnc-ab-gettrans.c
@@ -211,7 +211,7 @@ gnc_ab_gettrans(GtkWidget *parent, Account *gnc_acc)
     /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
      * status always describes better whether the job was actually
      * transferred to and accepted by the bank.  See also
-     * http://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
+     * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
      */
 #ifdef AQBANKING6
     job_status = AB_Transaction_GetStatus(job);
diff --git a/gnucash/import-export/aqb/gnc-ab-transfer.c b/gnucash/import-export/aqb/gnc-ab-transfer.c
index 421916e5c..928d97cef 100644
--- a/gnucash/import-export/aqb/gnc-ab-transfer.c
+++ b/gnucash/import-export/aqb/gnc-ab-transfer.c
@@ -282,7 +282,7 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
             /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
              * status always describes better whether the job was actually
              * transferred to and accepted by the bank.  See also
-             * http://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
+             * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
              */
 #ifdef AQBANKING6
             job_status = AB_Transaction_GetStatus(job);
diff --git a/gnucash/import-export/aqb/gnc-file-aqb-import.c b/gnucash/import-export/aqb/gnc-file-aqb-import.c
index 1d8ff43a5..2a247bd22 100644
--- a/gnucash/import-export/aqb/gnc-file-aqb-import.c
+++ b/gnucash/import-export/aqb/gnc-file-aqb-import.c
@@ -252,7 +252,7 @@ gnc_file_aqbanking_import(GtkWindow *parent,
             /* Ignore the return value of AB_Banking_ExecuteJobs(), as the job's
              * status always describes better whether the job was actually
              * transferred to and accepted by the bank.  See also
-             * http://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
+             * https://lists.gnucash.org/pipermail/gnucash-de/2008-September/006389.html
              */
 
             /* So we must go through all jobs and check AB_Job_GetStatus(job)
diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index 97e4f47cf..2c6908239 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -15,7 +15,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/gnucash/import-export/csv-imp/test/test-tx-import.cpp b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
index 60d7ec164..e9a559aa1 100644
--- a/gnucash/import-export/csv-imp/test/test-tx-import.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tx-import.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/gnucash/import-export/import-backend.c b/gnucash/import-export/import-backend.c
index e5385631e..ebc37c3a7 100644
--- a/gnucash/import-export/import-backend.c
+++ b/gnucash/import-export/import-backend.c
@@ -908,7 +908,7 @@ gnc_import_process_trans_item (GncImportMatchMap *matchmap,
                (gnc_import_TransInfo_get_trans (trans_info)));*/
             {
                 /* This is a quick workaround for the bug described in
-                		 http://gnucash.org/pipermail/gnucash-devel/2003-August/009982.html
+                		 http://lists.gnucash.org/pipermail/gnucash-devel/2003-August/009982.html
                        Assume that importers won't create transactions involving two or more
                        currencies so we can use xaccTransGetImbalanceValue. */
                 imbalance_value =
diff --git a/gnucash/python/pycons/ishell.py b/gnucash/python/pycons/ishell.py
index 30e6ea404..93612ce67 100644
--- a/gnucash/python/pycons/ishell.py
+++ b/gnucash/python/pycons/ishell.py
@@ -10,7 +10,7 @@
 #
 # All rights reserved. This program and the accompanying materials are made 
 # available under the terms of the BSD which accompanies this distribution, and 
-# is available at U{http://www.opensource.org/licenses/bsd-license.php}
+# is available at U{https://www.opensource.org/licenses/bsd-license.php}
 #
 
 import os
diff --git a/gnucash/python/pycons/setup.py b/gnucash/python/pycons/setup.py
index 21a0bbced..422e4188c 100644
--- a/gnucash/python/pycons/setup.py
+++ b/gnucash/python/pycons/setup.py
@@ -33,7 +33,7 @@ setup(name='PyCons',
       description='IPython/Python/Pylab GTK Console',
       author='Nicolas Rougier',
       author_email='Nicolas.Rougier at loria.fr',
-      url='http://www.loria.fr/~rougier/pycons.html',
+      url='http://www.loria.fr/~rougier/pycons.html [DEAD LINK]',
       packages=['pycons'],
       package_dir = {'pycons': '.'},
       scripts=['pycons']
diff --git a/gnucash/report/business-reports/taxinvoice.scm b/gnucash/report/business-reports/taxinvoice.scm
index e4338699c..58a588ee3 100644
--- a/gnucash/report/business-reports/taxinvoice.scm
+++ b/gnucash/report/business-reports/taxinvoice.scm
@@ -21,7 +21,7 @@
 ; - copy the report to your .gnucash directory
 ; - specify a different module name below (eg mytaxinvoice)
 ; - refer to it from .gnucash/config.user
-; (see http://wiki.gnucash.org/wiki/Custom_Reports )
+; (see https://wiki.gnucash.org/wiki/Custom_Reports )
 (define-module (gnucash report taxinvoice))
 
 (use-modules (ice-9 local-eval))  ; for the-environment
diff --git a/gnucash/report/locale-specific/us/taxtxf-de_DE.scm b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
index 26e281f87..207f7cb37 100644
--- a/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
@@ -14,7 +14,7 @@
 ;; Kennzahlen (from txf-de_DE.scm) as assigned to the different
 ;; accounts, and will write it to some XML file as required by
 ;; e.g. the Winston software
-;; http://www.felfri.de/winston/schnittstellen.htm
+;; https://www.felfri.de/winston/schnittstellen.htm
 ;;
 ;; This file might still contain a lot of US-TXF related stuff. This
 ;; can surely be thrown out once someone was able to actually use this
diff --git a/gnucash/report/report-system/eguile-gnc.scm b/gnucash/report/report-system/eguile-gnc.scm
index 012b42708..9a9e130c8 100644
--- a/gnucash/report/report-system/eguile-gnc.scm
+++ b/gnucash/report/report-system/eguile-gnc.scm
@@ -221,7 +221,7 @@
   ; stack, so we can capture it. The above handler will then be called
   ; to actually handle the exception. This technique is based on the
   ; example in the guile manual. See:
-  ; http://www.gnu.org/software/guile/manual/html_node/Debug-on-Error.html
+  ; https://www.gnu.org/software/guile/manual/html_node/Debug-on-Error.html
   (define (pre-unwind-handler key . rest)
     ; Save the current stack. Note that this will include a couple of
     ; extra entries (this error handler, the call to make-stack and
diff --git a/gnucash/report/report-system/test/test-report-html.scm b/gnucash/report/report-system/test/test-report-html.scm
index 966a63da3..a367b4a56 100644
--- a/gnucash/report/report-system/test/test-report-html.scm
+++ b/gnucash/report/report-system/test/test-report-html.scm
@@ -529,7 +529,7 @@ HTML Document Title</title></head><body></body>\n\
 
   (test-equal "HTML Text Object - Image"
     (string-append html-doc-header-no-title
-                   "<img src=\"http://www.gnucash.org/images/banner5.png\" width=\"72\" height=\"48\" alt=\"GunCash web site\"  />"
+                   "<img src=\"https://www.gnucash.org/images/banner5.png\" width=\"72\" height=\"48\" alt=\"GunCash web site\"  />"
                    html-doc-tail
     )
     (let (
@@ -539,7 +539,7 @@ HTML Document Title</title></head><body></body>\n\
         (list 
           (gnc:make-html-text
             (gnc:html-markup-img
-              "http://www.gnucash.org/images/banner5.png"
+              "https://www.gnucash.org/images/banner5.png"
               '("width" "72")
               '("height" "48")
               '("alt" "GunCash web site")
diff --git a/gnucash/report/utility-reports/hello-world.scm b/gnucash/report/utility-reports/hello-world.scm
index 55e8f3c6f..182d72ca5 100644
--- a/gnucash/report/utility-reports/hello-world.scm
+++ b/gnucash/report/utility-reports/hello-world.scm
@@ -349,8 +349,8 @@ new, totally cool report, consult the mailing list ~a.")
           (gnc:html-markup-anchor 
            "mailto:gnucash-devel at gnucash.org"
            (gnc:html-markup-tt "gnucash-devel at gnucash.org")))
-         (_ "For details on subscribing to that list, see <http://www.gnucash.org/>.")
-         (_ "You can learn more about writing scheme at <http://www.scheme.com/tspl2d/>."))
+         (_ "For details on subscribing to that list, see <https://www.gnucash.org/>.")
+         (_ "You can learn more about writing scheme at <https://www.scheme.com/tspl2d/>."))
 
         (gnc:html-markup-p
          (gnc:html-markup/format
diff --git a/libgnucash/app-utils/fin.scm b/libgnucash/app-utils/fin.scm
index 4ffc3c1fa..857db25b9 100644
--- a/libgnucash/app-utils/fin.scm
+++ b/libgnucash/app-utils/fin.scm
@@ -51,7 +51,7 @@
 )
 
 ;; 2 functions from
-;; http://lists.gnucash.org/pipermail/gnucash-user/2005-February/012964.html
+;; https://lists.gnucash.org/pipermail/gnucash-user/2005-February/012964.html
 ;; future value of deposits with compound interests:
 (define (gnc:futureValue a r n t)
     ;; Parameters:
@@ -60,7 +60,7 @@
     ;; n: frequency per year
     ;; t: time
     ;;
-    ;; formula from http://www.riskglossary.com/articles/compounding.htm
+    ;; formula from https://www.riskglossary.com/articles/compounding.htm [DEAD LINK]
   (* a (expt (+ 1 (/ r n)) (* n t))))
 
 (define (gnc:computeInterestIncrement pv ann-rate compounds period)
diff --git a/libgnucash/app-utils/test/test-gnc-ui-util.c b/libgnucash/app-utils/test/test-gnc-ui-util.c
index 565fc832f..2be3250a5 100644
--- a/libgnucash/app-utils/test/test-gnc-ui-util.c
+++ b/libgnucash/app-utils/test/test-gnc-ui-util.c
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/app-utils/test/test-option-util.cpp b/libgnucash/app-utils/test/test-option-util.cpp
index d0fff4e87..c00f32978 100644
--- a/libgnucash/app-utils/test/test-option-util.cpp
+++ b/libgnucash/app-utils/test/test-option-util.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/core-utils/gnc-glib-utils.h b/libgnucash/core-utils/gnc-glib-utils.h
index a381825a9..7f1d1dd2e 100644
--- a/libgnucash/core-utils/gnc-glib-utils.h
+++ b/libgnucash/core-utils/gnc-glib-utils.h
@@ -63,7 +63,7 @@ int safe_utf8_collate (const char *str1, const char *str2);
  * @brief Validates UTF-8 encoded text for use in GnuCash.
  *
  * Validates the strict subset of UTF-8 that is valid XML text, as detailed in
- * http://www.w3.org/TR/REC-xml/#NT-Char linked from bug #346535.
+ * https://www.w3.org/TR/REC-xml/#NT-Char linked from bug #346535.
  *
  * <em>Copied from g_utf8_validate():</em>
  *
@@ -92,7 +92,7 @@ gboolean gnc_utf8_validate(const gchar *str, gssize max_len, const gchar **end);
  *  a new string.  This allows it to operate on strings that are
  *  defined as character arrays in a larger data structure.  Note that
  *  it also removes some subset of invalid XML characters, too.
- *  See http://www.w3.org/TR/REC-xml/#NT-Char linked from bug #346535
+ *  See https://www.w3.org/TR/REC-xml/#NT-Char linked from bug #346535
  *
  *  @param str A pointer to the string to strip of invalid
  *  characters. */
@@ -102,7 +102,7 @@ void gnc_utf8_strip_invalid (gchar *str);
  * non-UTF-8 character stripped from it.
  *
  * Note that it also removes some subset of invalid XML characters,
- * too.  See http://www.w3.org/TR/REC-xml/#NT-Char linked from bug
+ * too.  See https://www.w3.org/TR/REC-xml/#NT-Char linked from bug
  * #346535
  *
  * @param str A pointer to the string to be copied and stripped of
diff --git a/libgnucash/core-utils/gnc-jalali.c b/libgnucash/core-utils/gnc-jalali.c
index 9f53c1560..2cd85dd16 100644
--- a/libgnucash/core-utils/gnc-jalali.c
+++ b/libgnucash/core-utils/gnc-jalali.c
@@ -14,7 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You can receive a copy of GNU Lesser General Public License at the
- * World Wide Web address <http://www.gnu.org/licenses/lgpl.html>.
+ * World Wide Web address <https://www.gnu.org/licenses/lgpl.html>.
  *
  * For licensing issues, contact The FarsiWeb Project Group,
  * Computing Center, Sharif University of Technology,
diff --git a/libgnucash/doc/design/fdl.texi b/libgnucash/doc/design/fdl.texi
index cf56a18d3..beeb6666f 100644
--- a/libgnucash/doc/design/fdl.texi
+++ b/libgnucash/doc/design/fdl.texi
@@ -341,7 +341,7 @@ The Free Software Foundation may publish new, revised versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/copyleft/.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
diff --git a/libgnucash/doc/design/top-level.texi b/libgnucash/doc/design/top-level.texi
index 31406a08a..f8021ef60 100644
--- a/libgnucash/doc/design/top-level.texi
+++ b/libgnucash/doc/design/top-level.texi
@@ -108,7 +108,7 @@ subsections to see a detail graph or report of that particular
 subsection.
 
 This module is implemented using the GUPPI library being developed by
-Jon Trowbridge (@url{http://www.gnome.org/guppi}).
+Jon Trowbridge (@url{https://www.gnome.org/guppi}).
 
 
 @section Price Quotes
diff --git a/libgnucash/doc/doxygen.cfg.in b/libgnucash/doc/doxygen.cfg.in
index 36c39ba45..d2ca1dc91 100644
--- a/libgnucash/doc/doxygen.cfg.in
+++ b/libgnucash/doc/doxygen.cfg.in
@@ -18,7 +18,7 @@
 # that follow. The default is UTF-8 which is also the encoding used for all
 # text before the first occurrence of this tag. Doxygen uses libiconv (or the
 # iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# https://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
@@ -661,7 +661,7 @@ INPUT                  = ${CMAKE_SOURCE_DIR}/libgnucash \
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
 # also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# into libc) for the transcoding. See https://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
@@ -832,7 +832,7 @@ REFERENCES_LINK_SOURCE = YES
 # If the USE_HTAGS tag is set to YES then the references to source code
 # will point to the HTML generated by the htags(1) tool instead of doxygen
 # built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# tagging system (see https://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
@@ -1188,7 +1188,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
+# (see https://www.mathjax.org) which uses client side Javascript for the
 # rendering instead of using prerendered bitmaps. Use this if you do not
 # have LaTeX installed or if you want to formulas look prettier in the HTML
 # output. When enabled you may also need to install MathJax separately and
@@ -1211,7 +1211,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # the MathJax Content Delivery Network so you can quickly see the result without
 # installing MathJax.
 # However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
+# copy of MathJax from https://www.mathjax.org before deployment.
 
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 
diff --git a/libgnucash/doc/doxygen_main_page.c b/libgnucash/doc/doxygen_main_page.c
index d4efc450a..282ecdb34 100644
--- a/libgnucash/doc/doxygen_main_page.c
+++ b/libgnucash/doc/doxygen_main_page.c
@@ -15,7 +15,7 @@ The documentation is organised in a rough sequence:
 \subsection manualguide External documentation.
 
 Please refer to the main
-<a href="http://www.gnucash.org/docs.phtml">documentation
+<a href="https://www.gnucash.org/docs.phtml">documentation
 page</a> on the gnucash website which includes links to the
 GnuCash Manual and the Concepts Guide in various formats.
 
@@ -249,27 +249,27 @@ the declaration. Doxygen will accept both valid C struct definition formats.
 - \ref tipshints Tips and hints for using doxygen
 - \ref stylediscussion Long comments, pages, editors
 
-The Doxygen web site (http://www.stack.nl/~dimitri/doxygen/) has a
+The Doxygen web site (https://www.stack.nl/~dimitri/doxygen/ [DEAD LINK]) has a
 complete user manual.  For the impatient, here are the most
 interesting sections:
 
 - How to write grouped documentation for files, functions, variables,
-etc.: http://www.stack.nl/~dimitri/doxygen/grouping.html .  Do not
+etc.: https://www.stack.nl/~dimitri/doxygen/grouping.html [DEAD LINK] .  Do not
 forget to add a file documentation block (\@file) at the top of your
 file. Otherwise, all documentation in that file will <i>not</i> appear
 in the html output.
 
 - List of the special commands you can use within your documentation
-blocks: http://www.stack.nl/~dimitri/doxygen/commands.html
+blocks: https://www.stack.nl/~dimitri/doxygen/commands.html [DEAD LINK]
 
 \section contact Contacts
 
 \subsection web Web Site
-News about GnuCash as well as the latest version can always be found at http://www.gnucash.org/
+News about GnuCash as well as the latest version can always be found at https://www.gnucash.org/
 
 \subsection email Email
 If you have any suggestions concerning this documentation, do not hesitate to send suggestions to
-gnucash-devel (see http://www.gnucash.org/en/lists.phtml for details)
+gnucash-devel (see https://www.gnucash.org/en/lists.phtml for details)
 
 Benoit Grégoire <bock at step.polymtl.ca>
 Neil Williams <linux at codehelp.co.uk>
diff --git a/libgnucash/doc/loans.txt b/libgnucash/doc/loans.txt
index 873596f97..ef024f4be 100644
--- a/libgnucash/doc/loans.txt
+++ b/libgnucash/doc/loans.txt
@@ -1,5 +1,5 @@
 /** \page loanhandling Handling loan repayment in GnuCash::Scheduled Transactions
-\sa The original email thread at <http://lists.gnucash.org/pipermail/gnucash-devel/2002-July/006438.html>.
+\sa The original email thread at <https://lists.gnucash.org/pipermail/gnucash-devel/2002-July/006438.html>.
 
 July, 2002 - jsled at asynchronous.org
 
diff --git a/libgnucash/doc/python-bindings-doxygen.py b/libgnucash/doc/python-bindings-doxygen.py
index 78118a9e1..1f85e6be8 100644
--- a/libgnucash/doc/python-bindings-doxygen.py
+++ b/libgnucash/doc/python-bindings-doxygen.py
@@ -128,7 +128,7 @@
 #
 #   @li The documentation you just read uses doxygen. It collects documentation in GnuCash's sources. Besides that there is
 #   @li the classic python-documentation using help() and docstrings. Have a look at both.
-#   @li There is a page in the GnuCash wiki at http://wiki.gnucash.org/wiki/Python
+#   @li There is a page in the GnuCash wiki at https://wiki.gnucash.org/wiki/Python
 #   @li You may also have a look into the archives of gnucash-devel at gnucash.org. 
 #   @li On Bugzilla there is also some interesting talk regarding the development process. 
 #   @li Then you can use the abilities of git to see the history of the code by @code git log @endcode done in the directory of the python-bindings.
diff --git a/libgnucash/doc/sx.rst b/libgnucash/doc/sx.rst
index a648bd190..ac9c0417b 100644
--- a/libgnucash/doc/sx.rst
+++ b/libgnucash/doc/sx.rst
@@ -87,9 +87,9 @@ TODO
 
   - [x] no way to clear a variable entry [ve20070209]_
 
-.. [dh20070120] http://lists.gnucash.org/pipermail/gnucash-devel/2007-January/019667.html
-.. [ve20070209] http://lists.gnucash.org/pipermail/gnucash-devel/2007-February/019834.html
-.. [ve20070303] http://lists.gnucash.org/pipermail/gnucash-devel/2007-March/020069.html
+.. [dh20070120] https://lists.gnucash.org/pipermail/gnucash-devel/2007-January/019667.html
+.. [ve20070209] https://lists.gnucash.org/pipermail/gnucash-devel/2007-February/019834.html
+.. [ve20070303] https://lists.gnucash.org/pipermail/gnucash-devel/2007-March/020069.html
 
 - sx list page
 
@@ -281,9 +281,9 @@ Notes::
   - [x] ui: add 'review created transactions' checkbox to SLR dialog
         using txn search.
 
-.. [tw20070614] http://lists.gnucash.org/pipermail/gnucash-devel/2007-June/020718.html
-.. [tw20070614-2] http://lists.gnucash.org/pipermail/gnucash-devel/2007-June/020729.html
-.. [tw20070619] http://lists.gnucash.org/pipermail/gnucash-devel/2007-June/020757.html
+.. [tw20070614] https://lists.gnucash.org/pipermail/gnucash-devel/2007-June/020718.html
+.. [tw20070614-2] https://lists.gnucash.org/pipermail/gnucash-devel/2007-June/020729.html
+.. [tw20070619] https://lists.gnucash.org/pipermail/gnucash-devel/2007-June/020757.html
 
 - destroy/cleanup, notes:
 
diff --git a/libgnucash/engine/qoflog.h b/libgnucash/engine/qoflog.h
index e441c6319..f7d6cbd35 100644
--- a/libgnucash/engine/qoflog.h
+++ b/libgnucash/engine/qoflog.h
@@ -27,7 +27,7 @@
  * @{
  * @ingroup QOF
  * @brief Logging and tracing facility.
- * @sa "Logging overhaul" announcement <http://lists.gnucash.org/pipermail/gnucash-devel/2007-February/019836.html>
+ * @sa "Logging overhaul" announcement <https://lists.gnucash.org/pipermail/gnucash-devel/2007-February/019836.html>
  *
  * qof_log_init(void) installs a handler that interprets the "log_domain"
  * as a "."-separated path.  Log level thresholds can be set for each level
diff --git a/libgnucash/engine/test/test-gnc-date.c b/libgnucash/engine/test/test-gnc-date.c
index 6fde09229..d4352f088 100644
--- a/libgnucash/engine/test/test-gnc-date.c
+++ b/libgnucash/engine/test/test-gnc-date.c
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/test-gnc-guid-old.cpp b/libgnucash/engine/test/test-gnc-guid-old.cpp
index df2d543ea..1ce3456d7 100644
--- a/libgnucash/engine/test/test-gnc-guid-old.cpp
+++ b/libgnucash/engine/test/test-gnc-guid-old.cpp
@@ -13,7 +13,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/test-gnc-guid.cpp b/libgnucash/engine/test/test-gnc-guid.cpp
index e164662a0..65c9f341b 100644
--- a/libgnucash/engine/test/test-gnc-guid.cpp
+++ b/libgnucash/engine/test/test-gnc-guid.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/test-kvp-frame.cpp b/libgnucash/engine/test/test-kvp-frame.cpp
index 7ad855da6..9746f1482 100644
--- a/libgnucash/engine/test/test-kvp-frame.cpp
+++ b/libgnucash/engine/test/test-kvp-frame.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/test-kvp-value.cpp b/libgnucash/engine/test/test-kvp-value.cpp
index b89a40881..b4b8772b6 100644
--- a/libgnucash/engine/test/test-kvp-value.cpp
+++ b/libgnucash/engine/test/test-kvp-value.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/test-qofsession.cpp b/libgnucash/engine/test/test-qofsession.cpp
index 4e7fd9844..fd53b1ce2 100644
--- a/libgnucash/engine/test/test-qofsession.cpp
+++ b/libgnucash/engine/test/test-qofsession.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/utest-Split.cpp b/libgnucash/engine/test/utest-Split.cpp
index 2f04308a3..18286e283 100644
--- a/libgnucash/engine/test/utest-Split.cpp
+++ b/libgnucash/engine/test/utest-Split.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/utest-Transaction.cpp b/libgnucash/engine/test/utest-Transaction.cpp
index d8cc90bfc..21d830e5a 100644
--- a/libgnucash/engine/test/utest-Transaction.cpp
+++ b/libgnucash/engine/test/utest-Transaction.cpp
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/engine/test/utest-gnc-pricedb.c b/libgnucash/engine/test/utest-gnc-pricedb.c
index 5d1aec75f..0afeb86c1 100644
--- a/libgnucash/engine/test/utest-gnc-pricedb.c
+++ b/libgnucash/engine/test/utest-gnc-pricedb.c
@@ -14,7 +14,7 @@
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/libgnucash/tax/us/txf-de_DE.scm b/libgnucash/tax/us/txf-de_DE.scm
index fffe9b13a..c3df5342b 100644
--- a/libgnucash/tax/us/txf-de_DE.scm
+++ b/libgnucash/tax/us/txf-de_DE.scm
@@ -23,7 +23,7 @@
 ;; numbers for these Kennzahlen from the actual accounts for a given
 ;; time period, and will write it to some XML file as required by
 ;; e.g. the Winston software
-;; http://www.felfri.de/winston/schnittstellen.htm
+;; https://www.felfri.de/winston/schnittstellen.htm
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; This program is free software; you can redistribute it and/or
diff --git a/libgnucash/tax/us/txf.scm b/libgnucash/tax/us/txf.scm
index ff6680f23..ffdb6f78d 100644
--- a/libgnucash/tax/us/txf.scm
+++ b/libgnucash/tax/us/txf.scm
@@ -4,7 +4,7 @@
 ;; These are TXF codes and a brief description of each. See taxtxf.scm
 ;; and txf-export-help.scm
 ;;
-;; See also http://www.turbotax.com/txf/
+;; See also https://www.turbotax.com/txf/ [DEAD LINK]
 ;;
 ;; Updated Jan 2019 to include codes for version 42, although new codes not
 ;;   implemented yet because data not available
diff --git a/po/README b/po/README
index c98c6c913..872d7caa8 100644
--- a/po/README
+++ b/po/README
@@ -3,7 +3,7 @@ Notes on I18n for GnuCash
 
 A HOWTO for translators, including instructions about what to do with .po files,
 can be found here:
-http://wiki.gnucash.org/wiki/Translation
+https://wiki.gnucash.org/wiki/Translation
 
 Notes for this directory
 ------------------------
diff --git a/test-templates/README b/test-templates/README
index bfabd7c57..3bd2a8f77 100644
--- a/test-templates/README
+++ b/test-templates/README
@@ -42,10 +42,10 @@ Run autogen.sh and configure. "make check" will run all tests; "make test" will
 run only the GLib unit tests not guarded by conditionals (see test-suite.c). For
 more control, use gtester as documented in the GLib docs.
 
-See http://www.mail-archive.com/gtk-devel-list@gnome.org/msg06994.html
-and http://library.gnome.org/devel/glib/stable/glib-Testing.html
+See https://www.mail-archive.com/gtk-devel-list@gnome.org/msg06994.html
+and https://developer.gnome.org/glib/stable/glib-Testing.html
 for detailed documentation.
 
 There are some helpful macros and message-trapping functions in
 src/test-core/unittest-support.h, whose Doxygen documentation is at
-http://code.gnucash.org/docs/head/unittest-support_8h_source.html
+https://code.gnucash.org/docs/head/unittest-support_8h_source.html
diff --git a/test-templates/make-testfile b/test-templates/make-testfile
index 2e989ad54..cc710a471 100755
--- a/test-templates/make-testfile
+++ b/test-templates/make-testfile
@@ -245,7 +245,7 @@ sub print_preamble {
  *                                                                  *
  * You should have received a copy of the GNU General Public License*
  * along with this program; if not, you can retrieve it from        *
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
+ * https://www.gnu.org/licenses/old-licenses/gpl-2.0.html            *
  * or contact:                                                      *
  *                                                                  *
  * Free Software Foundation           Voice:  +1-617-542-5942       *
diff --git a/util/src-count/count.dat b/util/src-count/count.dat
index 916134db8..05f24c0ec 100644
--- a/util/src-count/count.dat
+++ b/util/src-count/count.dat
@@ -3,7 +3,7 @@
 #
 # Raw data for the number of KLOC of code in gnucash,
 # as a function of date.  Taken from the web page
-# http://www.gnucash.org/en/sizing.phtml
+# https://www.gnucash.org/en/sizing.phtml
 # format: day/month/year <tab> KLOC
 # plot this by saying "gnuplot count.gplot" at the command line
 #

commit fd6ce1612bf54b53f695474ffb1ec4ac67e414e8
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jun 5 17:38:29 2019 +0200

    Readd the Export To Pdf function for Webkit1 based builds

diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index 6c1ede21a..1cfc747b0 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -420,6 +420,7 @@ gnc_plugin_page_report_create_widget( GncPluginPage *page )
     GncPluginPageReportPrivate *priv;
     GncMainWindow  *window;
     GtkWindow *topLvl;
+    GtkAction *action;
     URLType type;
     char * id_name;
     char * child_name;
@@ -428,6 +429,13 @@ gnc_plugin_page_report_create_widget( GncPluginPage *page )
 
     ENTER("page %p", page);
 
+#ifndef WEBKIT1
+    /* Hide the ExportPdf action for Webkit2 */
+    action = gnc_plugin_page_get_action (page, "FilePrintPDFAction");
+    gtk_action_set_sensitive (action, FALSE);
+    gtk_action_set_visible (action, FALSE);
+#endif
+
     report = GNC_PLUGIN_PAGE_REPORT(page);
     priv = GNC_PLUGIN_PAGE_REPORT_GET_PRIVATE(report);
 
@@ -458,7 +466,7 @@ gnc_plugin_page_report_create_widget( GncPluginPage *page )
     gnc_html_set_urltype_cb(priv->html, gnc_plugin_page_report_check_urltype);
     gnc_html_set_load_cb(priv->html, gnc_plugin_page_report_load_cb, report);
 
-    /* We need to call the load call back so the report appears to of been run
+    /* We need to call the load call back so the report appears to have been run
      so it will get saved properly if the report is not realized in session */
     id_name = g_strdup_printf("id=%d", priv->reportId );
     child_name = gnc_build_url( URL_TYPE_REPORT, id_name, NULL );
@@ -1166,6 +1174,11 @@ gnc_plugin_page_report_constr_init(GncPluginPageReport *plugin_page, gint report
             N_("Print the current report"),
             G_CALLBACK(gnc_plugin_page_report_print_cb)
         },
+        {
+            "FilePrintPDFAction", GNC_ICON_PDF_EXPORT, N_("Export as P_DF..."), NULL,
+            N_("Export the current report as a PDF document"),
+            G_CALLBACK(gnc_plugin_page_report_exportpdf_cb)
+        },
 
         {
             "EditCutAction", "edit-cut", N_("Cu_t"), "<primary>X",

commit 5f51fc5406e55308c983f5a39616caf7d8975989
Author: David Cousens <davidcousens at bigpond.com>
Date:   Tue May 28 13:38:42 2019 +1000

    ImportMatcherMultiSelect
    
    Mods to import-main-matcher.c and dialog-import.glade to implement multi-selection of transactions to import and assignment of a single transfer account to the selection
    
    Silence Deprecation Warning
    
    Added conditional replacement of gtk_menu_popup in import-main-matcher.c and reapplied changes to treeview to current version of dialog-import.glade from maint branch.
    
    ImportMatcherMultiSelect #497  Fixes
    
    fixed GTK deprecation selection to use GTK_CHECK_VERSION, deleted g-list-free(l..., , added check for  a selection before popping
    ImportMatcherMultiSelect #497 GTKFix
    
    Fix to mixup of deprecated and replacement GTK function for popup menu
     Open ImportMatcherMultiSelect #497 Delet g_list_free..

diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index 3aebe4943..2059fee79 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -1143,8 +1143,11 @@
             <property name="reorderable">True</property>
             <property name="rules_hint">True</property>
             <property name="enable_search">False</property>
+            <property name="rubber_banding">True</property>
             <child internal-child="selection">
-              <object class="GtkTreeSelection" id="treeview-selection3"/>
+              <object class="GtkTreeSelection" id="treeview-selection3">
+                <property name="mode">multiple</property>
+              </object>
             </child>
           </object>
         </child>
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 773429602..48aa5ff75 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -64,16 +64,13 @@ struct _main_matcher_info
     GNCTransactionProcessedCB transaction_processed_cb;
     gpointer user_data;
     GNCImportPendingMatches *pending_matches;
-    GtkTreeViewColumn *account_column;
 };
 
 enum downloaded_cols
 {
-    DOWNLOADED_COL_DATE_TXT = 0,
-    DOWNLOADED_COL_DATE_INT64,
+    DOWNLOADED_COL_DATE = 0,
     DOWNLOADED_COL_ACCOUNT,
     DOWNLOADED_COL_AMOUNT,
-    DOWNLOADED_COL_AMOUNT_DOUBLE,
     DOWNLOADED_COL_DESCRIPTION,
     DOWNLOADED_COL_MEMO,
     DOWNLOADED_COL_ACTION_ADD,
@@ -98,9 +95,28 @@ void on_matcher_help_clicked (GtkButton *button, gpointer user_data);
 void on_matcher_help_close_clicked (GtkButton *button, gpointer user_data);
 
 /* Local prototypes */
-static void
-refresh_model_row(GNCImportMainMatcher *gui, GtkTreeModel *model,
+static void gnc_gen_trans_assign_transfer_account(
+                                                GtkTreeView *treeview, 
+                                                gboolean *first,
+                                                gboolean *is_selection,
+                                                GtkTreePath *path,
+                                                Account **new_acc,
+                                                GNCImportMainMatcher *info);
+static void gnc_gen_trans_assign_transfer_account_to_selection_cb (
+                                          GtkMenuItem *menuitem,
+                                          GNCImportMainMatcher *info);
+static void gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, 
+                                          GdkEvent *event,
+                                          GNCImportMainMatcher *info);
+static gboolean gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
+                                                  GdkEvent *event,
+                                                  GNCImportMainMatcher *info);
+static gboolean gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
+                                              GdkEvent *event, 
+                                              GNCImportMainMatcher *info);
+static void refresh_model_row(GNCImportMainMatcher *gui, GtkTreeModel *model,
                   GtkTreeIter *iter, GNCImportTransInfo *info);
+/* end local prototypes */
 
 void gnc_gen_trans_list_delete (GNCImportMainMatcher *info)
 {
@@ -361,54 +377,254 @@ gnc_gen_trans_update_toggled_cb (GtkCellRendererToggle *cell_renderer,
 }
 
 static void
-gnc_gen_trans_row_activated_cb (GtkTreeView           *view,
-                                GtkTreePath           *path,
-                                GtkTreeViewColumn     *column,
-                                GNCImportMainMatcher  *gui)
+gnc_gen_trans_assign_transfer_account(GtkTreeView *treeview, 
+                                      gboolean *first,
+                                      gboolean *is_selection,
+                                      GtkTreePath *path,
+                                      Account **new_acc,
+                                      GNCImportMainMatcher *info)
 {
     GtkTreeModel *model;
     GtkTreeIter iter;
     GNCImportTransInfo *trans_info;
+    Account *old_acc;
+    gboolean ok_pressed;
 
-    model = gtk_tree_view_get_model(gui->view);
-    if (!gtk_tree_model_get_iter(model, &iter, path))
-        return;
-    gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
+    ENTER("");
+    DEBUG("first = %s",*first?"true":"false");
+    DEBUG("is_selection = %s",*is_selection?"true":"false");
+    DEBUG("path  = %s", gtk_tree_path_to_string(path));
+    DEBUG("account passed in = %s", gnc_get_account_name_for_register(*new_acc));
+    model = gtk_tree_view_get_model(treeview);
+    if (gtk_tree_model_get_iter(model, &iter, path))
+    {
+        gtk_tree_model_get(model, &iter, DOWNLOADED_COL_DATA, &trans_info, -1);
 
-    switch (gnc_import_TransInfo_get_action (trans_info))
+        switch (gnc_import_TransInfo_get_action (trans_info))
+        {
+        case GNCImport_ADD:
+            if (gnc_import_TransInfo_is_balanced(trans_info) == FALSE)
+            {
+                ok_pressed = TRUE;
+                old_acc  = gnc_import_TransInfo_get_destacc (trans_info);
+                if (*first)
+                {
+                    ok_pressed = FALSE;
+                    *new_acc = gnc_import_select_account(info->main_widget,
+                        NULL,
+                        TRUE,
+                        _("Destination account for the auto-balance split."),
+                        xaccTransGetCurrency(
+                              gnc_import_TransInfo_get_trans(trans_info)),
+                        ACCT_TYPE_NONE,
+                        old_acc,
+                        &ok_pressed);
+                    *first = FALSE;
+                    DEBUG("account selected = %s", 
+                            gnc_account_get_full_name(*new_acc));                    
+                }
+                if (ok_pressed)
+                        gnc_import_TransInfo_set_destacc (trans_info, 
+                                                    *new_acc, TRUE);
+            }
+            break;
+        case GNCImport_CLEAR:
+        case GNCImport_UPDATE:
+            if (first && !is_selection) run_match_dialog (info, trans_info);
+            break;
+        case GNCImport_SKIP:        
+            break;
+        default:
+            PERR("InvalidGNCImportValue");
+            break;
+        }
+        refresh_model_row(info, model, &iter, trans_info);
+    }
+    LEAVE("");
+}
+
+static void
+gnc_gen_trans_assign_transfer_account_to_selection_cb (GtkMenuItem *menuitem,
+                                             GNCImportMainMatcher *info)
+{
+    GtkTreeView *treeview;
+    GtkTreeSelection *selection;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    GNCImportTransInfo *trans_info;
+    Account *assigned_account;
+    GList *selected_rows, *l;
+    gboolean first, is_selection;
+
+    ENTER("");
+    treeview = GTK_TREE_VIEW(info->view);
+    model = gtk_tree_view_get_model(treeview);
+    selection = gtk_tree_view_get_selection(treeview);
+    selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
+    assigned_account = NULL;
+    first = TRUE;
+    is_selection = TRUE;    
+    DEBUG("Rows in selection = %i",
+          gtk_tree_selection_count_selected_rows(selection));
+    DEBUG("Entering loop over selection");
+
+    if (gtk_tree_selection_count_selected_rows(selection) > 0)
     {
-    case GNCImport_ADD:
-        if (gnc_import_TransInfo_is_balanced(trans_info) == FALSE)
+        for (l = selected_rows; l != NULL; l = l->next)
         {
-            run_account_picker_dialog (gui, model, &iter, trans_info);
+            DEBUG("passing first = %s",
+                                                first?"true":"false");
+            DEBUG("passing is_selection = %s",
+                                                is_selection?"true":"false");
+            DEBUG("passing path = %s",
+                           gtk_tree_path_to_string(l->data));
+            DEBUG("passing account value = %s",
+                        gnc_account_get_full_name(assigned_account));
+            gnc_gen_trans_assign_transfer_account(treeview,
+                           &first, &is_selection, l->data, &assigned_account, info);
+            DEBUG("returned value of account = %s", 
+                        gnc_account_get_full_name(assigned_account));
+            DEBUG("returned value of first = %s",first?"true":"false");
+            if (assigned_account == NULL) break;
+            gtk_tree_selection_unselect_path(selection, l->data);
         }
-        break;
-    case GNCImport_CLEAR:
-    case GNCImport_UPDATE:
-        run_match_dialog (gui, trans_info);
-        break;
-    case GNCImport_SKIP:
-        /*The information displayed is only informative, until you select an action*/
-        break;
-    default:
-        PERR("I don't know what to do! (Yet...)");
-        break;
     }
-    refresh_model_row(gui, model, &iter, trans_info);
+    g_list_free_full (selected_rows, (GDestroyNotify) gtk_tree_path_free);
+    LEAVE("");
+}
+
+static void
+gnc_gen_trans_row_activated_cb (GtkTreeView *treeview,
+                                GtkTreePath *path,
+                                GtkTreeViewColumn *column,
+                                GNCImportMainMatcher *info)
+{
+    Account *assigned_account;
+    gboolean first, is_selection;
+
+    ENTER("");
+    assigned_account = NULL;
+    first = TRUE;
+    is_selection = FALSE;
+    gnc_gen_trans_assign_transfer_account(treeview, 
+                            &first,  &is_selection, path,
+                            &assigned_account, info);
+    DEBUG("account returned = %s", gnc_account_get_full_name(assigned_account));
+    LEAVE("");
 }
 
 static void
 gnc_gen_trans_row_changed_cb (GtkTreeSelection *selection,
-                              GNCImportMainMatcher *gui)
+                              GNCImportMainMatcher *info)
 {
     GtkTreeModel *model;
     GtkTreeIter iter;
+    GtkSelectionMode mode;
 
-    if (!gtk_tree_selection_get_selected(selection, &model, &iter))
-        return;
-    gtk_tree_selection_unselect_iter(selection, &iter);
+    ENTER("");
+    mode = gtk_tree_selection_get_mode(selection);
+    switch (mode)
+    {
+        case GTK_SELECTION_MULTIPLE:
+            DEBUG("mode = GTK_SELECTION_MULTIPLE, no action");
+            break;
+        case GTK_SELECTION_NONE:
+            DEBUG("mode = GTK_SELECTION_NONE, no action");
+            break;
+        case GTK_SELECTION_BROWSE:
+            DEBUG("mode = GTK_SELECTION_BROWSE->default");
+        case GTK_SELECTION_SINGLE:
+            DEBUG("mode = GTK_SELECTION_SINGLE->default");
+        default:
+            DEBUG("mode = default unselect selected row");
+            if (gtk_tree_selection_get_selected(selection, &model, &iter))
+            {
+                gtk_tree_selection_unselect_iter(selection, &iter);
+            }
+    }
+    LEAVE("");
+}
+
+static void
+gnc_gen_trans_view_popup_menu (GtkTreeView *treeview, 
+                               GdkEvent *event,
+                               GNCImportMainMatcher *info)
+{    
+    GtkWidget *menu, *menuitem;
+    GdkEventButton *event_button;
+
+    ENTER ("");
+    menu = gtk_menu_new();
+    menuitem = gtk_menu_item_new_with_label(_("Assign a transfer account."));
+    g_signal_connect(menuitem, "activate",
+                     G_CALLBACK(
+                     gnc_gen_trans_assign_transfer_account_to_selection_cb),
+                     info);
+    DEBUG("Callback to assign destination account to selection connected");
+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+    gtk_widget_show_all(menu);
+    event_button = (GdkEventButton *) event;
+    /* Note: event can be NULL here when called from view_onPopupMenu;
+     *  gdk_event_get_time() accepts a NULL argument */
+    /* replace deprecated function for GTK versions >=3.22 */
+#if GTK_CHECK_VERSION(3,22,0)
+   gtk_menu_popup_at_pointer(GTK_MENU(menu),(GdkEvent*)event);
+#else
+    gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 
+                    (event_button != NULL) ? event_button->button : 0, 
+                    gdk_event_get_time((GdkEvent*)event)); 
+#endif  
+    LEAVE ("");
 }
 
+static gboolean
+gnc_gen_trans_onButtonPressed_cb (GtkTreeView *treeview,
+                                  GdkEvent *event,
+                                  GNCImportMainMatcher *info)
+{
+    GdkEventButton *event_button;
+    GtkTreeSelection *selection;
+    ENTER("");
+    g_return_val_if_fail (treeview != NULL, FALSE);
+    g_return_val_if_fail (event != NULL, FALSE);
+    /* handle single click with the right mouse button? */
+    if (event->type == GDK_BUTTON_PRESS)
+    {
+        event_button = (GdkEventButton *) event;
+        if (event_button->button == GDK_BUTTON_SECONDARY)
+        {
+            DEBUG("Right mouseClick detected- popup the menu.");
+            selection = gtk_tree_view_get_selection(treeview);
+            if (gtk_tree_selection_count_selected_rows(selection) > 0)
+            {
+              gnc_gen_trans_view_popup_menu(treeview, event, info);
+            }
+            LEAVE("return TRUE");
+            return TRUE;
+        }
+    }
+    LEAVE("return FALSE");
+    return FALSE;
+}
+
+static gboolean
+gnc_gen_trans_onPopupMenu_cb (GtkTreeView *treeview,
+                              GdkEvent *event, 
+                              GNCImportMainMatcher *info)
+{
+    GtkTreeSelection *selection;
+    ENTER("");
+    /* respond to Shift-F10 popup menu hotkey */
+    selection = gtk_tree_view_get_selection(treeview);
+    if (gtk_tree_selection_count_selected_rows(selection) > 0)
+    {
+      gnc_gen_trans_view_popup_menu(treeview, NULL, info);
+    }
+    LEAVE ("");
+    return TRUE;
+}
+
+
 static GtkTreeViewColumn *
 add_text_column(GtkTreeView *view, const gchar *title, int col_num)
 {
@@ -421,19 +637,7 @@ add_text_column(GtkTreeView *view, const gchar *title, int col_num)
               "text", col_num,
               "background", DOWNLOADED_COL_COLOR,
               NULL);
-
-    // If date column, use the time64 value for the sorting.
-    if (col_num == DOWNLOADED_COL_DATE_TXT)
-        gtk_tree_view_column_set_sort_column_id(column, DOWNLOADED_COL_DATE_INT64);
-    else if (col_num == DOWNLOADED_COL_AMOUNT) // If amount column, use double value
-    {
-        gtk_cell_renderer_set_alignment (renderer, 1.0, 0.5); // right align amount column
-        gtk_cell_renderer_set_padding (renderer, 5, 0); // add padding so its not close to description
-        gtk_tree_view_column_set_sort_column_id(column, DOWNLOADED_COL_AMOUNT_DOUBLE);
-    }
-    else
-        gtk_tree_view_column_set_sort_column_id(column, col_num);
-
+    gtk_tree_view_column_set_sort_column_id(column, col_num);
     g_object_set(G_OBJECT(column),
                  "reorderable", TRUE,
                  "resizable", TRUE,
@@ -476,23 +680,20 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
     GtkTreeSelection *selection;
 
     view = info->view;
-    store = gtk_list_store_new(NUM_DOWNLOADED_COLS, G_TYPE_STRING, G_TYPE_INT64,
-                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE,
+    store = gtk_list_store_new(NUM_DOWNLOADED_COLS,
+                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
                                G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN,
                                G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING,
                                GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_STRING);
     gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
     g_object_unref(store);
 
-    /* prevent the rows being dragged to a different order */
-    gtk_tree_view_set_reorderable (view, FALSE);
-
     /* Add the columns *
      * (keep the line break below to avoid a translator comment) */
     add_text_column(view,
-                    _("Date"), DOWNLOADED_COL_DATE_TXT);
-    info->account_column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT);
-    gtk_tree_view_column_set_visible(info->account_column, show_account);
+                    _("Date"), DOWNLOADED_COL_DATE);
+    column = add_text_column(view, _("Account"), DOWNLOADED_COL_ACCOUNT);
+    gtk_tree_view_column_set_visible(column, show_account);
     add_text_column(view, _("Amount"), DOWNLOADED_COL_AMOUNT);
     add_text_column(view, _("Description"), DOWNLOADED_COL_DESCRIPTION);
     add_text_column(view, _("Memo"), DOWNLOADED_COL_MEMO);
@@ -536,16 +737,15 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
                      G_CALLBACK(gnc_gen_trans_row_activated_cb), info);
     g_signal_connect(selection, "changed",
                      G_CALLBACK(gnc_gen_trans_row_changed_cb), info);
-}
 
-static void
-show_account_column_toggled_cb (GtkToggleButton *togglebutton,
-               GNCImportMainMatcher *info)
-{
-    gtk_tree_view_column_set_visible (info->account_column,
-         gtk_toggle_button_get_active (togglebutton));
+    g_signal_connect(view, "button-press-event", 
+                     G_CALLBACK(gnc_gen_trans_onButtonPressed_cb), info);
+    g_signal_connect(view, "popup-menu", 
+                     G_CALLBACK(gnc_gen_trans_onPopupMenu_cb), info);
 }
 
+
+
 GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
         const gchar* heading,
         gboolean all_from_same_account,
@@ -558,7 +758,6 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     gboolean show_update;
     GtkStyleContext *stylectxt;
     GdkRGBA color;
-    GtkWidget *button;
 
     info = g_new0 (GNCImportMainMatcher, 1);
     info->pending_matches = gnc_import_PendingMatches_new();
@@ -587,11 +786,6 @@ GNCImportMainMatcher *gnc_gen_trans_list_new (GtkWidget *parent,
     info->view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "downloaded_view"));
     g_assert (info->view != NULL);
 
-    button = GTK_WIDGET(gtk_builder_get_object (builder, "show_source_account_button"));
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), all_from_same_account);
-    g_signal_connect(G_OBJECT(button), "toggled",
-                     G_CALLBACK(show_account_column_toggled_cb), info);
-
     show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
     gnc_gen_trans_init_view(info, all_from_same_account, show_update);
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
@@ -631,7 +825,6 @@ GNCImportMainMatcher * gnc_gen_trans_assist_new (GtkWidget *parent,
     gboolean show_update;
     GtkStyleContext *stylectxt;
     GdkRGBA color;
-    GtkWidget *button;
 
     info = g_new0 (GNCImportMainMatcher, 1);
     info->pending_matches = gnc_import_PendingMatches_new();
@@ -660,11 +853,6 @@ GNCImportMainMatcher * gnc_gen_trans_assist_new (GtkWidget *parent,
     info->view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "downloaded_view"));
     g_assert (info->view != NULL);
 
-    button = GTK_WIDGET(gtk_builder_get_object (builder, "show_source_account_button"));
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), all_from_same_account);
-    g_signal_connect(G_OBJECT(button), "toggled",
-                     G_CALLBACK(show_account_column_toggled_cb), info);
-
     show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
     gnc_gen_trans_init_view(info, all_from_same_account, show_update);
     heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
@@ -738,8 +926,6 @@ refresh_model_row (GNCImportMainMatcher *gui,
     gchar *int_required_class, *int_prob_required_class, *int_not_required_class;
     gchar *class_extension = NULL;
     Split *split;
-    time64 date;
-    gnc_numeric amount;
     g_assert (gui);
     g_assert (model);
     g_assert (info);
@@ -762,17 +948,16 @@ refresh_model_row (GNCImportMainMatcher *gui,
     gtk_list_store_set(store, iter, DOWNLOADED_COL_ACCOUNT, ro_text, -1);
 
     /*Date*/
-    date = xaccTransGetDate (gnc_import_TransInfo_get_trans(info));
-    text = qof_print_date (date);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE_TXT, text, -1);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE_INT64, date, -1);
+    text = qof_print_date ( xaccTransGetDate( gnc_import_TransInfo_get_trans(info) ) );
+    gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE, text, -1);
     g_free(text);
 
     /*Amount*/
-    amount = xaccSplitGetAmount (split);
-    ro_text = xaccPrintAmount (amount, gnc_split_amount_print_info(split, TRUE));
+    ro_text = xaccPrintAmount
+              (xaccSplitGetAmount (split),
+               gnc_split_amount_print_info(split, TRUE)
+              );
     gtk_list_store_set(store, iter, DOWNLOADED_COL_AMOUNT, ro_text, -1);
-    gtk_list_store_set(store, iter, DOWNLOADED_COL_AMOUNT_DOUBLE, gnc_numeric_to_double (amount), -1);
 
     /*Description*/
     ro_text = xaccTransGetDescription(gnc_import_TransInfo_get_trans(info) );
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c34a88d6f..a8d79d06b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # This is a list of files which contain translatable strings.
 # This file was autogenerated by cmake.
-bindings/python/gnucash_core.c
 borrowed/goffice/go-charmap-sel.c
 borrowed/goffice/go-glib-extras.c
 borrowed/goffice/go-optionmenu.c
@@ -194,7 +193,6 @@ gnucash/gnome-utils/search-param.c
 gnucash/gnome-utils/tree-view-utils.c
 gnucash/gnome-utils/window-main-summarybar.c
 gnucash/gnucash-bin.c
-gnucash/gnucash-gresources.c
 gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in

commit cc12fcf32203c2067b6dff843c5423decb163004
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Jun 4 10:33:30 2019 +0100

    Add new function named similar to remove class function
    
    The existing function name to add CSS classes for style contexts was
    not correct so add a new function gnc_widget_style_context_add_class
    named similar to remove function and use it for the existing
    'gnc-class-highlight'. Change old function to use this new one with the
    old one being removed in master.

diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
index 834f47802..b1e94e999 100644
--- a/gnucash/gnome-utils/dialog-utils.c
+++ b/gnucash/gnome-utils/dialog-utils.c
@@ -72,12 +72,12 @@ gnc_set_label_color(GtkWidget *label, gnc_numeric value)
     if (deficit)
     {
         gnc_widget_style_context_remove_class (GTK_WIDGET(label), "default-color");
-        gnc_widget_set_style_context (GTK_WIDGET(label), "negative-numbers");
+        gnc_widget_style_context_add_class (GTK_WIDGET(label), "negative-numbers");
     }
     else
     {
         gnc_widget_style_context_remove_class (GTK_WIDGET(label), "negative-numbers");
-        gnc_widget_set_style_context (GTK_WIDGET(label), "default-color");
+        gnc_widget_style_context_add_class (GTK_WIDGET(label), "default-color");
     }
 }
 
@@ -369,6 +369,12 @@ gnc_tree_view_get_grid_lines_pref (void)
 \********************************************************************/
 void
 gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class)
+{
+    gnc_widget_style_context_add_class (widget, gnc_class);
+}
+
+void
+gnc_widget_style_context_add_class (GtkWidget *widget, const char *gnc_class)
 {
     GtkStyleContext *context = gtk_widget_get_style_context (widget);
     gtk_style_context_add_class (context, gnc_class);
diff --git a/gnucash/gnome-utils/dialog-utils.h b/gnucash/gnome-utils/dialog-utils.h
index 942ffb1f7..c30571d18 100644
--- a/gnucash/gnome-utils/dialog-utils.h
+++ b/gnucash/gnome-utils/dialog-utils.h
@@ -90,6 +90,7 @@ GtkTreeViewGridLines gnc_tree_view_get_grid_lines_pref (void);
  * Returns:  nothing                                                *
 \********************************************************************/
 void gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class);
+void gnc_widget_style_context_add_class (GtkWidget *widget, const char *gnc_class);
 
 /********************************************************************\
  * Remove a style context class from a Widget                       *
diff --git a/gnucash/gnome/dialog-invoice.c b/gnucash/gnome/dialog-invoice.c
index d1ae2447b..573293926 100644
--- a/gnucash/gnome/dialog-invoice.c
+++ b/gnucash/gnome/dialog-invoice.c
@@ -2313,7 +2313,7 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
     iw->paid_label = GTK_WIDGET (gtk_builder_get_object (builder, "paid_label"));
 
     // Set the style context for this label so it can be easily manipulated with css
-    gnc_widget_set_style_context (GTK_WIDGET(iw->paid_label), "gnc-class-highlight");
+    gnc_widget_style_context_add_class (GTK_WIDGET(iw->paid_label), "gnc-class-highlight");
 
     /* grab the project widgets */
     iw->proj_frame = GTK_WIDGET (gtk_builder_get_object (builder, "page_proj_frame"));
diff --git a/gnucash/gnome/dialog-trans-assoc.c b/gnucash/gnome/dialog-trans-assoc.c
index d85998953..8d8f3b6f6 100644
--- a/gnucash/gnome/dialog-trans-assoc.c
+++ b/gnucash/gnome/dialog-trans-assoc.c
@@ -528,7 +528,7 @@ gnc_assoc_dialog_create (GtkWindow *parent, AssocDialog *assoc_dialog)
     }
 
     // Set the style context for this label so it can be easily manipulated with css
-    gnc_widget_set_style_context (GTK_WIDGET(path_head), "gnc-class-highlight");
+    gnc_widget_style_context_add_class (GTK_WIDGET(path_head), "gnc-class-highlight");
 
     /* Need to add toggle renderers here to get the xalign to work. */
     tree_column = gtk_tree_view_column_new();
diff --git a/gnucash/gnome/gnc-split-reg.c b/gnucash/gnome/gnc-split-reg.c
index 5f7f0767c..a15c5ef7b 100644
--- a/gnucash/gnome/gnc-split-reg.c
+++ b/gnucash/gnome/gnc-split-reg.c
@@ -1096,7 +1096,7 @@ gsr_default_associate_handler_file (GNCSplitReg *gsr, Transaction *trans, gboole
             gtk_label_set_ellipsize (GTK_LABEL(label), PANGO_ELLIPSIZE_START);
 
             // Set the style context for this label so it can be easily manipulated with css
-            gnc_widget_set_style_context (GTK_WIDGET(label), "gnc-class-highlight");
+            gnc_widget_style_context_add_class (GTK_WIDGET(label), "gnc-class-highlight");
             gtk_file_chooser_set_uri (GTK_FILE_CHOOSER(dialog), file_uri);
 
             g_free (uri_label);
@@ -2311,8 +2311,8 @@ gsr_create_summary_bar( GNCSplitReg *gsr )
     gsr->sort_arrow = gtk_image_new_from_icon_name ("image-missing", GTK_ICON_SIZE_SMALL_TOOLBAR);
     gsr->sort_label = add_summary_label (summarybar, FALSE, _("Sort By: "), gsr->sort_arrow);
 
-    gnc_widget_set_style_context (GTK_WIDGET(gsr->filter_label), "gnc-class-highlight");
-    gnc_widget_set_style_context (GTK_WIDGET(gsr->sort_arrow), "gnc-class-highlight");
+    gnc_widget_style_context_add_class (GTK_WIDGET(gsr->filter_label), "gnc-class-highlight");
+    gnc_widget_style_context_add_class (GTK_WIDGET(gsr->sort_arrow), "gnc-class-highlight");
 
     gsr->summarybar = summarybar;
 

commit a22ad2e0b82f440634fd96debbbeacadcd9c850b
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Jun 4 10:28:03 2019 +0100

    Bug 797246 - Cleared Balance Remains Red After Turning Positive
    
    When changing the negative numbers to red a CSS class is added to set
    the colour but it is not removed when changing the number becomes
    positive. Add function to remove a CSS class if present and use in the
    gnc_set_label_color function.

diff --git a/gnucash/gnome-utils/dialog-utils.c b/gnucash/gnome-utils/dialog-utils.c
index caf2b26aa..834f47802 100644
--- a/gnucash/gnome-utils/dialog-utils.c
+++ b/gnucash/gnome-utils/dialog-utils.c
@@ -70,9 +70,15 @@ gnc_set_label_color(GtkWidget *label, gnc_numeric value)
     deficit = gnc_numeric_negative_p (value);
 
     if (deficit)
+    {
+        gnc_widget_style_context_remove_class (GTK_WIDGET(label), "default-color");
         gnc_widget_set_style_context (GTK_WIDGET(label), "negative-numbers");
+    }
     else
+    {
+        gnc_widget_style_context_remove_class (GTK_WIDGET(label), "negative-numbers");
         gnc_widget_set_style_context (GTK_WIDGET(label), "default-color");
+    }
 }
 
 
@@ -368,6 +374,22 @@ gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class)
     gtk_style_context_add_class (context, gnc_class);
 }
 
+/********************************************************************\
+ * Remove a style context class from a Widget                       *
+ *                                                                  *
+ * Args:    widget - widget to remove style class from              *
+ *       gnc_class - character string for css class name            *
+ * Returns:  nothing                                                *
+\********************************************************************/
+void
+gnc_widget_style_context_remove_class (GtkWidget *widget, const char *gnc_class)
+{
+    GtkStyleContext *context = gtk_widget_get_style_context (widget);
+
+    if (gtk_style_context_has_class (context, gnc_class))
+        gtk_style_context_remove_class (context, gnc_class);
+}
+
 /********************************************************************\
  * Draw an arrow on a Widget so it can be altered with css          *
  *                                                                  *
diff --git a/gnucash/gnome-utils/dialog-utils.h b/gnucash/gnome-utils/dialog-utils.h
index 908b7e6aa..942ffb1f7 100644
--- a/gnucash/gnome-utils/dialog-utils.h
+++ b/gnucash/gnome-utils/dialog-utils.h
@@ -91,6 +91,15 @@ GtkTreeViewGridLines gnc_tree_view_get_grid_lines_pref (void);
 \********************************************************************/
 void gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class);
 
+/********************************************************************\
+ * Remove a style context class from a Widget                       *
+ *                                                                  *
+ * Args:    widget - widget to remove style class from              *
+ *       gnc_class - character string for css class name            *
+ * Returns:  nothing                                                *
+\********************************************************************/
+void gnc_widget_style_context_remove_class (GtkWidget *widget, const char *gnc_class);
+
 /********************************************************************\
  * Draw an arrow on a Widget so it can be altered with css          *
  *                                                                  *

commit 9056b14d9e62bf49216684ca782e4577f133d088
Merge: c140563e1 69ea174cd
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 3 10:19:02 2019 -0700

    Merge Adrién Panella's 'budget'into maint.


commit c140563e107aba266ef70b14a52d4ba53145b72e
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 3 10:12:42 2019 -0700

    Typedef GNCSearchOwnerPrivate only once.

diff --git a/gnucash/gnome/search-owner.c b/gnucash/gnome/search-owner.c
index fbd375106..fc49a9e8a 100644
--- a/gnucash/gnome/search-owner.c
+++ b/gnucash/gnome/search-owner.c
@@ -49,8 +49,6 @@ static void gnc_search_owner_class_init (GNCSearchOwnerClass *klass);
 static void gnc_search_owner_init   (GNCSearchOwner *gspaper);
 static void gnc_search_owner_finalize   (GObject *obj);
 
-typedef struct _GNCSearchOwnerPrivate GNCSearchOwnerPrivate;
-
 typedef struct _GNCSearchOwnerPrivate
 {
     GncOwner    owner;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a8d79d06b..c34a88d6f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # This is a list of files which contain translatable strings.
 # This file was autogenerated by cmake.
+bindings/python/gnucash_core.c
 borrowed/goffice/go-charmap-sel.c
 borrowed/goffice/go-glib-extras.c
 borrowed/goffice/go-optionmenu.c
@@ -193,6 +194,7 @@ gnucash/gnome-utils/search-param.c
 gnucash/gnome-utils/tree-view-utils.c
 gnucash/gnome-utils/window-main-summarybar.c
 gnucash/gnucash-bin.c
+gnucash/gnucash-gresources.c
 gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
 gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in

commit 727348eff38c38c774789ecf93a540f5565b38cf
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jun 3 11:14:17 2019 +0200

    Restructure shell detection code
    
    It will now first check for an environment variable GNC_SHELL and use
    that if it exists. Then hardcode a shell if cmake detects the old
    mingw environment (not mingw64), and finally fall back to cmake's
    built-in method of finding bash.
    This requires a fix in gnucash-on-osx for the build on that platform
    to continue to work: on that platform, we should set GNC_SHELL
    before starting the build. A patch has been submitted to do that
    automatically for the user.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97440f8d7..34d9c24ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,21 +109,30 @@ set(SYSCONFDIR_BUILD ${CMAKE_BINARY_DIR}/etc)
 set(LIBEXECDIR_BUILD ${CMAKE_BINARY_DIR}/libexec)
 set(BINDIR_BUILD     ${CMAKE_BINARY_DIR}/bin)
 
-set(SHELL_FROM_ENV $ENV{SHELL})
-set(SHELL /bin/bash)
-#We need to distinguish between MinGW.org and MinGW-w64:
-
+# We need to distinguish between MinGW.org and MinGW-w64:
 if (MINGW)
   string(FIND ${CMAKE_C_COMPILER} "msys2" IS_MSYS2)
   if(${IS_MSYS2} GREATER_EQUAL 0)
     set(MINGW64 ON)
   endif()
 endif(MINGW)
-if (MINGW AND NOT MINGW64) # /bin/bash will work fine on MinGW
+
+# Find a proper bash executable
+
+set(GNC_SHELL $ENV{GNC_SHELL})
+if (GNC_SHELL) # Replacing this with if ($ENV{GNC_SHELL}) doesn't work.
+  # Allow shell override by setting the GNC_SHELL environment variable
+  set(SHELL ${GNC_SHELL})
+elseif (MINGW AND NOT MINGW64)
+  # Old mingw's bash is on on the path, so hard-code it for now
   set(SHELL ${CMAKE_PREFIX_PATH}/mingw/msys/1.0/bin/bash.exe)
-endif()
-if (SHELL_FROM_ENV) # Replacing this with if ($ENV{SHELL}) doesn't work.
-  set(SHELL ${SHELL_FROM_ENV})
+else()
+  find_package(UnixCommands)
+  if (BASH)
+    set(SHELL ${BASH})
+  else()
+    message(SEND_ERROR "Can't find a suitable bash executable. Please set GNC_SHELL.")
+  endif()
 endif()
 
 # Determine whether we are building from a VCS or from a tarball

commit 170651602c7844de256b4b05008d7edad431163a
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 1 12:55:50 2019 -0700

    Restore WEBKIT1 function call, removed by mistake.

diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index 5140a99bf..6c1ede21a 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -1866,9 +1866,11 @@ gnc_plugin_page_report_print_cb( GtkAction *action, GncPluginPageReport *report
 
     //g_warning("Setting job name=%s", job_name);
 
-
+#ifdef WEBKIT1
+    gnc_html_print (priv->html, job_name, FALSE);
+#else
     gnc_html_print (priv->html, job_name);
-
+#endif
 
     g_free (job_name);
 }

commit 3a91eedb455760da008386a44c02f8b9796e9a9b
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 1 12:55:17 2019 -0700

    Fix new gcc-8 warning about strncat.
    
    gcc-8 wants us to use strcat for string constants.

diff --git a/borrowed/libc/strptime.c b/borrowed/libc/strptime.c
index 0d212a901..7db05e6d9 100644
--- a/borrowed/libc/strptime.c
+++ b/borrowed/libc/strptime.c
@@ -643,7 +643,7 @@ start_over:
                 char *posix_d_t_fmt;
 
                 strncpy (d_t_fmt, date_locale_string, date_len);
-                strncat (d_t_fmt, " ", 1);
+                strcat (d_t_fmt, " ");
                 strncat (d_t_fmt, time_locale_string, time_len);
                 free (date_locale_string);
                 free (time_locale_string);
@@ -888,7 +888,7 @@ match_century:
                 char *posix_t_p_fmt;
 
                 strncpy (t_p_fmt, locale_string, locale_len);
-                strncat (t_p_fmt, " tt", 3);
+                strcat (t_p_fmt, " tt");
 
                 posix_t_p_fmt = translate_win32_picture (t_p_fmt);
 

commit 69ea174cd106da81c2b5b34a3f6d080327c24eb7
Author: Adrian Panella <ianchi74 at outlook.com>
Date:   Sat May 25 01:00:08 2019 -0500

    Bug 689753- Budget Report: Neg Num Not Colored Red
    
    Use consistent formating in budget/actual/difference
    showing negative budgets in red (same as actual/dif)

diff --git a/gnucash/report/standard-reports/budget.scm b/gnucash/report/standard-reports/budget.scm
index 2e6bacf0f..fa82bd9ff 100644
--- a/gnucash/report/standard-reports/budget.scm
+++ b/gnucash/report/standard-reports/budget.scm
@@ -367,7 +367,8 @@
                  (col3 (+ col2 (if show-diff? 1 0))))
             (if show-budget?
                 (gnc:html-table-set-cell/tag!
-                 html-table rownum col0 style-tag
+                 html-table rownum col0
+                 (if (negative? bgt-val) style-tag-neg style-tag)
                  (if (zero? bgt-val) "."
                      (gnc:make-gnc-monetary comm bgt-val))))
             (if show-actual?

commit f6d607d787690b77d1c2fe2e034a0199cbd99fce
Author: Adrian Panella <ianchi74 at outlook.com>
Date:   Sat May 25 00:31:07 2019 -0500

    Bug 624176 - budget report - rollup-budget ignored
    
    The report's logic needs to allways rollup budget ammounts
    so remove the option from the UI so as not to confuse the
    user (it wasn't used anyway)

diff --git a/gnucash/report/standard-reports/budget.scm b/gnucash/report/standard-reports/budget.scm
index 32028e86e..2e6bacf0f 100644
--- a/gnucash/report/standard-reports/budget.scm
+++ b/gnucash/report/standard-reports/budget.scm
@@ -60,8 +60,6 @@
 (define opthelp-show-difference (N_ "Display the difference as budget - actual."))
 (define optname-show-totalcol (N_ "Show Column with Totals"))
 (define opthelp-show-totalcol (N_ "Display a column with the row totals."))
-(define optname-rollup-budget (N_ "Roll up budget amounts to parent"))
-(define opthelp-rollup-budget (N_ "If parent account does not have its own budget value, use the sum of the child account budget values."))
 (define optname-show-zb-accounts (N_ "Include accounts with zero total balances and budget values"))
 (define opthelp-show-zb-accounts (N_ "Include accounts with zero total (recursive) balances and budget values in this report."))
 
@@ -262,10 +260,6 @@
      (gnc:make-simple-boolean-option
       gnc:pagename-display optname-show-totalcol
       "s4" opthelp-show-totalcol #f))
-    (add-option
-     (gnc:make-simple-boolean-option
-      gnc:pagename-display optname-rollup-budget
-      "s4" opthelp-rollup-budget #f))
     (add-option
      (gnc:make-simple-boolean-option
       gnc:pagename-display optname-show-zb-accounts
@@ -292,7 +286,6 @@
          (show-budget? (get-val params 'show-budget))
          (show-diff? (get-val params 'show-difference))
          (show-totalcol? (get-val params 'show-totalcol))
-         (rollup-budget? (get-val params 'rollup-budget))
          (use-ranges? (get-val params 'use-ranges))
          (num-rows (gnc:html-acct-table-num-rows acct-table))
          (numcolumns (gnc:html-table-num-columns html-table))
@@ -347,11 +340,9 @@
     ;;   colnum - starting column number
     ;;   budget - budget to use
     ;;   acct - account being displayed
-    ;;   rollup-budget? - rollup budget values for account children
-    ;;                    if account budget not set
     ;;   exchange-fn - exchange function (not used)
     (define (gnc:html-table-add-budget-line!
-             html-table rownum colnum budget acct rollup-budget?
+             html-table rownum colnum budget acct
              column-list exchange-fn)
       (let* ((comm (xaccAccountGetCommodity acct))
              (reverse-balance? (gnc-reverse-balance acct))
@@ -605,7 +596,7 @@
                  (acct (get-val env 'account))
                  (exchange-fn (get-val env 'exchange-fn)))
             (gnc:html-table-add-budget-line!
-             html-table rownum colnum budget acct rollup-budget?
+             html-table rownum colnum budget acct
              column-info-list exchange-fn)
             (loop (1+ rownum)))))
 
@@ -634,8 +625,6 @@
          (accounts (get-option gnc:pagename-accounts
                                optname-accounts))
          (bottom-behavior (get-option gnc:pagename-accounts optname-bottom-behavior))
-         (rollup-budget? (get-option gnc:pagename-display
-                                     optname-rollup-budget))
          (show-zb-accts? (get-option gnc:pagename-display
                                      optname-show-zb-accounts))
          (use-ranges? (get-option gnc:pagename-general optname-use-budget-period-range))
@@ -696,8 +685,6 @@
                      (get-option gnc:pagename-display optname-show-difference))
                (list 'show-totalcol
                      (get-option gnc:pagename-display optname-show-totalcol))
-               (list 'rollup-budget
-                     (get-option gnc:pagename-display optname-rollup-budget))
                (list 'use-ranges use-ranges?)
                (list 'collapse-before include-collapse-before?)
                (list 'collapse-after include-collapse-after?)

commit 885689b42d56d295c0354990f20d73c73ca860c8
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Mar 27 19:32:22 2019 +0800

    [options] bugfix don't override inbuilt list keyword
    
    fixing a 17 year old bug.
    
    previous version had defined (save-acc list count) and (save-item list
    count) thereby overwriting the inbuilt 'list' keyword, and tried to use
    the it later on with (list key)... best rewrite with neater code.

diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index 48b84e525..7c1622566 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -744,31 +744,22 @@ the option '~a'."))
      (lambda () (map convert-to-account (default-getter)))
      (gnc:restore-form-generator value->string)
      (lambda (b p)
-       (define (save-acc list count)
-         (if (not (null? list))
-             (let ((key (string-append "acc" (gnc:value->string count))))
-               (qof-book-set-option b (car list) (append p (list key)))
-               (save-acc (cdr list) (+ 1 count)))))
-
-       (if option-set
-           (begin
-             (qof-book-set-option b (length option)
-                                             (append p '("len")))
-             (save-acc option 0))))
+       (when option-set
+         (qof-book-set-option b (length option) (append p '("len")))
+         (let loop ((option option) (idx 0))
+           (unless (null? option)
+             (qof-book-set-option
+              b (car option) (append p (list (format #f "acc~a" idx))))
+             (loop (cdr option) (1+ idx))))))
      (lambda (b p)
        (let ((len (qof-book-get-option b (append p '("len")))))
-         (define (load-acc count)
-           (if (< count len)
-               (let* ((key (string-append "acc" (gnc:value->string count)))
-                      (guid (qof-book-get-option
-                             b (append p (list key)))))
-                 (cons guid (load-acc (+ count 1))))
-               '()))
-         
-         (if (and len (integer? len))
-             (begin
-               (set! option (load-acc 0))
-               (set! option-set #t)))))
+         (when (and len (integer? len))
+           (set! option
+             (map
+              (lambda (idx)
+                (qof-book-get-option b (append p (list (format #f "acc~a" idx)))))
+              (iota len)))
+           (set! option-set #t))))
      validator
      (cons multiple-selection acct-type-list) #f #f #f)))
 
@@ -1090,25 +1081,20 @@ the option '~a'."))
      (lambda () default-value)
      (gnc:restore-form-generator value->string)
      (lambda (b p)
-       (define (save-item list count)
-         (if (not (null? list))
-             (let ((key (string-append "item" (gnc:value->string count))))
-               (qof-book-set-option b (car list) (append p (list key)))
-               (save-item (cdr list) (+ 1 count)))))
        (qof-book-set-option b (length value) (append p '("len")))
-       (save-item value 0))
+       (let loop ((value value) (idx 0))
+         (unless (null? value)
+           (qof-book-set-option
+            b (caar value) (append p (list (format #f "item~a" idx))))
+           (loop (cdr value) (1+ idx)))))
      (lambda (b p)
        (let ((len (qof-book-get-option b (append p '("len")))))
-         (define (load-item count)
-           (if (< count len)
-               (let* ((key (string-append "item" (gnc:value->string count)))
-                      (val (qof-book-get-option
-                            b (append p (list key)))))
-                 (cons val (load-item (+ count 1))))
-               '()))
-
          (if (and len (integer? len))
-             (set! value (load-item 0)))))
+             (set! value
+               (map
+                (lambda (idx)
+                  (qof-book-get-option b (append p (list (format #f "item~a" idx)))))
+                (iota len))))))
      (lambda (x)
        (if (list-legal x)
            (list #t x)

commit 6bca71f03b5de484b43d77d4c21d517893830b8a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Mar 30 20:12:20 2019 +0800

    [view-column] various modernisation fixes

diff --git a/gnucash/report/utility-reports/view-column.scm b/gnucash/report/utility-reports/view-column.scm
index 4cfdb8419..b9ab5848d 100644
--- a/gnucash/report/utility-reports/view-column.scm
+++ b/gnucash/report/utility-reports/view-column.scm
@@ -144,9 +144,7 @@
 
 	 ;; increment the alloc number for each occupied row
 	 (let loop ((row current-row-num))
-	   (let ((allocation (hash-ref column-allocs row)))
-	     (if (not allocation) 
-		 (set! allocation 0))
+	   (let ((allocation (hash-ref column-allocs row 0)))
 	     (hash-set! column-allocs row (+ colspan allocation))
 	     (if (< (+ 1 (- row current-row-num)) rowspan)
 		 (loop (+ 1 row)))))
@@ -166,16 +164,14 @@
 		 (gnc:html-markup-anchor
 		  (gnc-build-url
 		   URL-TYPE-OPTIONS
-		   (string-append "report-id=" 
-				  (format #f "~a" (car report-info)))
+		   (format #f "report-id=~a" (car report-info))
 		   "")
 		  (_ "Edit Options"))
-		 " "
+		 " "
 		 (gnc:html-markup-anchor
 		  (gnc-build-url
 		   URL-TYPE-REPORT
-		   (string-append "id=" 
-				  (format #f "~a" (car report-info)))
+		   (format #f "id=~a" (car report-info))
 		   "")
 		  (_ "Single Report")))))
 

commit 528d4b52b8d98b2ab01668138dc279c3a06fce8f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Mar 30 20:04:41 2019 +0800

    [view-column] compact loops, eradicate set!
    
    simple modernising loops

diff --git a/gnucash/report/utility-reports/view-column.scm b/gnucash/report/utility-reports/view-column.scm
index 49a300ddd..4cfdb8419 100644
--- a/gnucash/report/utility-reports/view-column.scm
+++ b/gnucash/report/utility-reports/view-column.scm
@@ -85,24 +85,21 @@
 	 (current-row-num 0))
 
     ;; make sure each subreport has an option change callback that 
-    ;; pings the parent 
-    (let ((new-reports '()))
-      (for-each 
-       (lambda (report-info)
-	 (let ((child (car report-info))
-	       (rowspan (cadr report-info))
-	       (colspan (caddr report-info))
-	       (callback (cadddr report-info)))
-	   (if (not callback)
-	       (begin 
-		 (set! callback 
-		       (make-child-options-callback
-			report (gnc-report-find child)))
-		 (set! report-info 
-		       (list child rowspan colspan callback))))
-	   (set! new-reports (cons report-info new-reports))))
-       reports)
-      (gnc:option-set-value report-opt (reverse new-reports)))
+    ;; pings the parent
+    (let loop ((new-reports '())
+               (reports reports))
+      (if (null? reports)
+          (gnc:option-set-value report-opt (reverse new-reports))
+          (let* ((report-info (car reports))
+                 (child (car report-info))
+                 (rowspan (cadr report-info))
+                 (colspan (caddr report-info))
+                 (callback (or (cadddr report-info)
+                               (make-child-options-callback
+                                report (gnc-report-find child)))))
+            (loop (cons (list child rowspan colspan callback)
+                        new-reports)
+                  (cdr reports)))))
     
     ;; we really would rather do something smart here with the
     ;; report's cached text if possible.  For the moment, we'll have
@@ -223,19 +220,18 @@
 
 (define (cleanup-options report)
   (let* ((options (gnc:report-options report))
-	 (report-opt (gnc:lookup-option options "__general" "report-list"))
-	 (reports (gnc:option-value report-opt))
-	 (new-reports '()))
-    (for-each 
-     (lambda (report-info)
-       (let ((rep (car report-info))
-	     (rowspan (cadr report-info))
-	     (colspan (caddr report-info)))
-	 (set! report-info 
-	       (list rep rowspan colspan #f))
-	 (set! new-reports (cons report-info new-reports))))
-     reports)
-    (gnc:option-set-value report-opt (reverse new-reports))))
+	 (report-opt (gnc:lookup-option options "__general" "report-list")))
+    (let loop ((new-reports '())
+               (reports (gnc:option-value report-opt)))
+      (if (null? reports)
+          (gnc:option-set-value report-opt (reverse new-reports))
+          (let* ((report-info (car reports))
+                 (child (car report-info))
+                 (rowspan (cadr report-info))
+                 (colspan (caddr report-info)))
+            (loop (cons (list child rowspan colspan #f)
+                        new-reports)
+                  (cdr reports)))))))
 
 ;; define the view now.
 (gnc:define-report 

commit dfc3d2749017cfeac6d3f5e86db353ca150022be
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu May 30 14:58:41 2019 +0200

    Bug 797104 - Translations not showing in receipt options
    
    Mark thank you string as translatable as well.

diff --git a/gnucash/report/business-reports/receipt.scm b/gnucash/report/business-reports/receipt.scm
index 4f2079e95..3c0f1db6e 100644
--- a/gnucash/report/business-reports/receipt.scm
+++ b/gnucash/report/business-reports/receipt.scm
@@ -185,7 +185,7 @@
                 headingpage2 optname-amount-due "b" "" (_ "Amount Due")))
   (add-option (gnc:make-string-option
                 headingpage2 optname-payment-recd "c" ""
-                (N_ "Payment received, thank you!")))
+                (_ "Payment received, thank you!")))
 
   (add-option (gnc:make-text-option
                 notespage optname-extra-notes "a"

commit 51ffcae9b886b54a43343ba7fd6b37911b945ce1
Merge: 4ffc4d046 9e43f6bc4
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue May 28 17:48:18 2019 +0200

    Merge branch 'Bug-787018' of https://github.com/EvansMike/gnucash into maint


commit 4ffc4d046f3d7aac80b6bff31b46449fa35df936
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue May 28 16:43:01 2019 +0200

    GncEntry - Fix inverted comparison

diff --git a/libgnucash/engine/gncEntry.c b/libgnucash/engine/gncEntry.c
index dc6ad8be0..785255a41 100644
--- a/libgnucash/engine/gncEntry.c
+++ b/libgnucash/engine/gncEntry.c
@@ -1334,7 +1334,7 @@ gncEntryRecomputeValues (GncEntry *entry)
     if (entry->b_tax_table)
     {
         time64 modtime = gncTaxTableLastModifiedSecs (entry->b_tax_table);
-        if (entry->b_taxtable_modtime == modtime)
+        if (entry->b_taxtable_modtime != modtime)
         {
             entry->values_dirty = TRUE;
             entry->b_taxtable_modtime = modtime;

commit 5873980c0cba4a3d0193a81d6028c58f47ae2ac2
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon May 27 22:43:05 2019 +0800

    replace guile strftime with gnc-print-time64
    
    addendum to ed42f8ac
    
    guile's strftime is/was buggy; cannot handle non-UTF8 locales. Use
    gnc_print_time64 instead. see the following
    
    http://lists.gnu.org/archive/html/bug-guile/2019-05/msg00003.html

diff --git a/gnucash/import-export/qif-imp/qif-parse.scm b/gnucash/import-export/qif-imp/qif-parse.scm
index 5a6ca6453..1a636694d 100644
--- a/gnucash/import-export/qif-imp/qif-parse.scm
+++ b/gnucash/import-export/qif-imp/qif-parse.scm
@@ -643,7 +643,7 @@
     (set-tm:mday tm (car date-list))
     (set-tm:mon tm (- (cadr date-list) 1))
     (set-tm:year tm (- (caddr date-list) 1900))
-    (strftime "%a %B %d %Y" tm)))
+    (gnc-print-time64 (gnc-mktime tm) "%a %B %d %Y")))
 
 (define (qif-parse:print-number num)
   (with-output-to-string
diff --git a/gnucash/report/business-reports/customer-summary.scm b/gnucash/report/business-reports/customer-summary.scm
index 80df98c12..bb3ec87dc 100644
--- a/gnucash/report/business-reports/customer-summary.scm
+++ b/gnucash/report/business-reports/customer-summary.scm
@@ -270,10 +270,8 @@
     (gnc:html-table-append-row! table (list (string-expand
                                              (if addy addy "")
                                              #\newline "<br/>")))
-    (gnc:html-table-append-row! table (list
-                                       (strftime
-                                        date-format
-                                        (localtime (gnc:get-today)))))
+    (gnc:html-table-append-row!
+     table (list (gnc-print-time64 (gnc:get-today) date-format)))
 
     (gnc:html-table-set-style!
      table-outer "table"
diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index 0a6db327f..73e53b11c 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -718,8 +718,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
    (string-append label ":")
    (gnc:make-html-div/markup
     "div-align-right"
-    (strftime date-format
-              (localtime date)))))
+    (gnc-print-time64 date date-format))))
 
 (define (make-company-table book)
   ;; single-column table. my name, address, and printdate
diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm
index e8a7ef84e..e1901eed4 100644
--- a/gnucash/report/business-reports/job-report.scm
+++ b/gnucash/report/business-reports/job-report.scm
@@ -512,10 +512,8 @@
     (gnc:html-table-append-row! table (list (string-expand
 					     (if addy addy "")
 					     #\newline "<br/>")))
-    (gnc:html-table-append-row! table (list
-				       (strftime
-					date-format
-					(gnc-localtime (current-time)))))
+    (gnc:html-table-append-row!
+     table (list (gnc-print-time64 (current-time) date-format)))
     table))
 
 (define (make-break! document)
diff --git a/gnucash/report/business-reports/owner-report.scm b/gnucash/report/business-reports/owner-report.scm
index 787c998ab..8c4284e44 100644
--- a/gnucash/report/business-reports/owner-report.scm
+++ b/gnucash/report/business-reports/owner-report.scm
@@ -722,10 +722,8 @@
     (gnc:html-table-append-row! table (list (string-expand
                          (if addy addy "")
                          #\newline "<br/>")))
-    (gnc:html-table-append-row! table (list
-                       (strftime
-                    date-format
-                    (gnc-localtime (gnc:get-today)))))
+    (gnc:html-table-append-row!
+     table (list (gnc-print-time64 (gnc:get-today) date-format)))
     table))
 
 (define (make-break! document)
diff --git a/gnucash/report/business-reports/receipt.eguile.scm b/gnucash/report/business-reports/receipt.eguile.scm
index 60b0150fa..155b42dcd 100644
--- a/gnucash/report/business-reports/receipt.eguile.scm
+++ b/gnucash/report/business-reports/receipt.eguile.scm
@@ -140,7 +140,7 @@
   <!-- header texts -->
 
   <h1><?scm:d (nbsp (_ "Invoice No.")) ?> <?scm:d invoiceid ?></h1>
-  <h2><?scm:d (strftime	opt-date-format (localtime (gnc:get-today))) ?></h2>
+  <h2><?scm:d (gnc-print-time64 (gnc:get-today) opt-date-format) ?></h2>
   <p> </p>
   <?scm (if (not (string=? billcontact "")) (begin ?>
     <p>Attn: <?scm:d billcontact ?></p><br>
diff --git a/gnucash/report/business-reports/taxinvoice.eguile.scm b/gnucash/report/business-reports/taxinvoice.eguile.scm
index 4a81bec0e..70d7b491c 100644
--- a/gnucash/report/business-reports/taxinvoice.eguile.scm
+++ b/gnucash/report/business-reports/taxinvoice.eguile.scm
@@ -252,13 +252,11 @@
       <?scm ) (begin ?>
         <tr>
            <td align="right"><?scm:d (nbsp (_ "Invoice Date")) ?>: </td>
-           <td align="right"><?scm:d (nbsp (strftime dateformat
-                                            (localtime postdate))) ?></td>
+           <td align="right"><?scm:d (nbsp (gnc-print-time64 postdate dateformat)) ?></td>
         </tr>
         <tr>
            <td align="right"><?scm:d (nbsp (_ "Due Date")) ?>: </td>
-           <td align="right"><?scm:d (nbsp (strftime dateformat
-                                            (localtime duedate))) ?></td>
+           <td align="right"><?scm:d (nbsp (gnc-print-time64 duedate dateformat)) ?></td>
         </tr> <?scm )) ?>
         <?scm (if (not (string=? billingid "")) (begin ?>
           <tr>
diff --git a/gnucash/report/locale-specific/us/taxtxf-de_DE.scm b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
index 908c8fe3b..26e281f87 100644
--- a/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/gnucash/report/locale-specific/us/taxtxf-de_DE.scm
@@ -320,10 +320,10 @@
         (let* ((type (xaccAccountGetType account))
                (code (gnc:account-get-txf-code account))
                (date-str (if date
-                             (strftime "%d.%m.%Y" (gnc-localtime date))
+                             (gnc-print-time64 date "%d.%m.%Y")
                              #f))
                (x-date-str (if x-date
-                               (strftime "%d.%m.%Y" (gnc-localtime x-date))
+                               (gnc-print-time64 x-date "%d.%m.%Y")
                                #f))
                ;; Only formats 1,3 implemented now! Others are treated as 1.
                (format (gnc:get-txf-format code (eq? type ACCT-TYPE-INCOME)))
@@ -408,7 +408,7 @@
 (define (render-level-x-account table level max-level account lx-value
                                 suppress-0 full-names txf-date)
   (let* ((account-name (if txf-date	; special split
-                           (strftime "%d.%m.%Y" (gnc-localtime txf-date))
+                           (gnc-print-time64 txf-date "%d.%m.%Y")
                            (if (or full-names (equal? level 1))
                                (gnc-account-get-full-name account)
                                (xaccAccountGetName account))))
@@ -767,13 +767,11 @@
             ;; Ignore
             '())))
 
-    (let ((from-date  (strftime "%d.%m.%Y" (gnc-localtime from-value)))
-          (to-date    (strftime "%d.%m.%Y" (gnc-localtime to-value)))
-	  (to-year    (strftime "%Y" (gnc-localtime to-value)))
-          (today-date (strftime "%d.%m.%Y" 
-                                (gnc-localtime 
-                                 (time64CanonicalDayTime
-                                       (current-time)))))
+    (let ((from-date  (gnc-print-time64 from-value "%d.%m.%Y"))
+          (to-date    (gnc-print-time64 to-value "%d.%m.%Y"))
+	  (to-year    (gnc-print-time64 to-value "%Y"))
+          (today-date (gnc-print-time64 (time64CanonicalDayTime (current-time))
+                                        "%d.%m.%Y"))
 	  (tax-nr (unless book
                       (or
                        (gnc:option-get-value book gnc:*tax-label* gnc:*tax-nr-label*)
diff --git a/gnucash/report/locale-specific/us/taxtxf.scm b/gnucash/report/locale-specific/us/taxtxf.scm
index 2a61b242b..0a9ce8cdc 100644
--- a/gnucash/report/locale-specific/us/taxtxf.scm
+++ b/gnucash/report/locale-specific/us/taxtxf.scm
@@ -487,10 +487,10 @@
     (if (and txf?
              (not (gnc-numeric-zero-p account-value)))
         (let* ((date-str (if date
-                             (strftime "%m/%d/%Y" (gnc-localtime date))
+                             (gnc-print-time64 date "%m/%d/%Y")
                              #f))
                (x-date-str (if x-date
-                               (strftime "%m/%d/%Y" (gnc-localtime x-date))
+                               (gnc-print-time64 x-date "%m/%d/%Y")
                                #f))
                ;; Only formats 1,3,4,6 implemented now! Others are treated as 1.
                (format_type (get-acct-txf-info 'format type code))
@@ -758,8 +758,8 @@
                                )
                                (string-append
                                  " on "
-                                 (strftime "%Y-%b-%d"
-                                    (gnc-localtime pricedb-lookup-price-time))
+                                 (gnc-print-time64 pricedb-lookup-price-time
+                                                   "%Y-%b-%d")
                                  ")"
                                )
                                ""))
@@ -912,8 +912,7 @@
                                                     "Not Available"))
                                              (list (gnc:make-html-table-cell/markup
                                                     "text-cell-center"
-                                                  (strftime "%Y-%b-%d" (gnc-localtime
-                                                            trans-date))))
+                                                  (gnc-print-time64 trans-date "%Y-%b-%d")))
                                              (list (gnc:make-html-table-cell/markup
                                                     "number-cell-bot"
                                                     (xaccPrintAmount
@@ -1197,9 +1196,9 @@
                                  (not transaction-details?))
                             ""
                             (string-append "Balance on "
-                                         (strftime "%Y-%b-%d"
-                                            (gnc-localtime (gnc:time64-previous-day
-                                                                  from-value)))
+                                           (gnc-print-time64
+                                            (gnc:time64-previous-day from-value)
+                                            "%Y-%b-%d")
                                          (if (string=? curr-conv-note "")
                                              ":"
                                              (string-append  " " curr-conv-note)
@@ -1430,8 +1429,7 @@
                             date-table
                             (gnc:make-html-table-cell/markup
                                          "date-cell"
-                                         (strftime "%Y-%b-%d"
-                                                 (gnc-localtime trans-date))))
+                                         (gnc-print-time64 trans-date "%Y-%b-%d")))
                        (gnc:html-table-set-style! num-table "table" 
                                           'attribute (list "border" "0")
                                           'attribute (list "cellspacing" "0")
@@ -1622,14 +1620,14 @@
                                     #f
                                     (if (txf-beg-bal-only? tax-code)
                                         (string-append "Balance on "
-                                           (strftime "%Y-%b-%d" (gnc-localtime 
-                                                (gnc:time64-previous-day
-                                                                  from-value)))
+                                                       (gnc-print-time64
+                                                        (gnc:time64-previous-day
+                                                         from-value)
+                                                        "%Y-%b-%d")
                                            " For "
                                         )
                                         (string-append "Balance on "
-                                           (strftime "%Y-%b-%d"
-                                                     (gnc-localtime to-value))
+                                           (gnc-print-time64 to-value "%Y-%b-%d")
                                            " For "
                                         )
                                     )
@@ -2328,13 +2326,11 @@
           ) ;; end of let*
     )
 
-    (let ((from-date  (strftime "%Y-%b-%d" (gnc-localtime from-value)))
-          (to-date    (strftime "%Y-%b-%d" (gnc-localtime to-value)))
-          (today-date (strftime "D%m/%d/%Y"
-                                (gnc-localtime
-                                 (time64CanonicalDayTime
-                                  (current-time)))))
-          (tax-year   (strftime "%Y" (gnc-localtime from-value)))
+    (let ((from-date  (gnc-print-time64 from-value "%Y-%b-%d"))
+          (to-date    (gnc-print-time64 to-value "%Y-%b-%d"))
+          (today-date (gnc-print-time64 (time64CanonicalDayTime (current-time))
+                                        "D%m/%d/%Y"))
+          (tax-year   (gnc-print-time64 from-value "%Y"))
           (tax-entity-type (gnc-get-current-book-tax-type))
           (tax-entity-type-valid? #f)
           (prior-form-schedule "")
diff --git a/gnucash/report/stylesheets/stylesheet-head-or-tail.scm b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
index ad755094c..be64e663b 100644
--- a/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
+++ b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
@@ -463,7 +463,7 @@
                    (_ "Report Creation Date: ")
                    (qof-print-date (gnc:get-today))
                    " "
-                   (strftime "%X %Z" (localtime (current-time)))
+                   (gnc-print-time64 (current-time) "%X %Z")
                    )
                   (gnc:html-markup-br)
                   )
@@ -588,7 +588,7 @@
                  (_ "Report Creation Date: ")
                  (qof-print-date (gnc:get-today))
                  " "
-                 (strftime "%X %Z" (localtime (current-time)))
+                 (gnc-print-time64 (current-time) "%X %Z")
                  )
                 (gnc:html-markup-br)
                 )
diff --git a/gnucash/report/utility-reports/hello-world.scm b/gnucash/report/utility-reports/hello-world.scm
index d14988879..55e8f3c6f 100644
--- a/gnucash/report/utility-reports/hello-world.scm
+++ b/gnucash/report/utility-reports/hello-world.scm
@@ -268,12 +268,11 @@ option like this.")
     ;; these are samples of different date options. for a simple
     ;; date with day, month, and year but no time you should use
     ;; qof-print-date
-    (let ((time-string (strftime "%X" (gnc-localtime (current-time))))
-          (date-string (strftime "%x" (gnc-localtime date-val)))
-          (date-string2 (strftime "%x %X" (gnc-localtime date2-val)))
-          (rel-date-string (strftime "%x" (gnc-localtime rel-date-val)))
-          (combo-date-string
-           (strftime "%x" (gnc-localtime combo-date-val))))
+    (let ((time-string (gnc-print-time64 (current-time) "%X"))
+          (date-string (gnc-print-time64 date-val "%x"))
+          (date-string2 (gnc-print-time64 date2-val "%x %X"))
+          (rel-date-string (gnc-print-time64 rel-date-val "%x"))
+          (combo-date-string (gnc-print-time64 combo-date-val "%x")))
 
       ;; Here's where we fill the report document with content.  We
       ;; do this by adding 'html objects' such as text, tables, and

commit 957df9a32b6db7ef06c49f671183bf7c83521155
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon May 27 14:14:53 2019 -0700

    Add a +0000 offset to ISO8601 timestamps in the XML backend.
    
    Apparently GnuCash for Android hard-coded the offset spec into their
    parser, so it can't import XML files without it.

diff --git a/libgnucash/backend/xml/sixtp-dom-generators.cpp b/libgnucash/backend/xml/sixtp-dom-generators.cpp
index 4ddd0bf4c..d8a58eda0 100644
--- a/libgnucash/backend/xml/sixtp-dom-generators.cpp
+++ b/libgnucash/backend/xml/sixtp-dom-generators.cpp
@@ -140,6 +140,7 @@ time64_to_dom_tree (const char* tag, const time64 time)
     auto date_str = GncDateTime(time).format_iso8601();
     if (date_str.empty())
         return NULL;
+    date_str += " +0000"; //Tack on a UTC offset to mollify GnuCash for Android
     ret = xmlNewNode (NULL, BAD_CAST tag);
     xmlNewTextChild (ret, NULL, BAD_CAST "ts:date",
                      checked_char_cast (const_cast<char*>(date_str.c_str())));

commit f76226f912d40439712c489f9243049a1bc8d70a
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon May 27 14:50:51 2019 -0700

    Fix broken CSV Import tests.

diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index b5b7fe0bd..97e4f47cf 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -144,7 +144,8 @@ TEST_F (GncTokenizerTest, tokenize_from_csv_file)
  * and parser option combinations.
  */
 void
-GncTokenizerTest::test_gnc_tokenize_helper (const std::string& separators, tokenize_csv_test_data* test_data)
+GncTokenizerTest::test_gnc_tokenize_helper (const std::string& separators,
+                                            tokenize_csv_test_data* test_data)
 {
 
     GncCsvTokenizer *csvtok = dynamic_cast<GncCsvTokenizer*>(csv_tok.get());
@@ -172,7 +173,7 @@ GncTokenizerTest::test_gnc_tokenize_helper (const std::string& separators, token
 
 static tokenize_csv_test_data comma_separated [] = {
         { "Date,Num,Description,Notes,Account,Deposit,Withdrawal,Balance", 8, { "Date","Num","Description","Notes","Account","Deposit","Withdrawal","Balance" } },
-        { "05/01/15,45,Typical csv import line - including quoted empty field,,Miscellaneous,\"\",\"1,100.00\",", 8, { "05/01/15","45","Acme Inc.","","Miscellaneous","","1,100.00","" } },
+        { "05/01/15,45,Typical csv import line - including quoted empty field,,Miscellaneous,\"\",\"1,100.00\",", 8, { "05/01/15","45","Typical csv import line - including quoted empty field","","Miscellaneous","","1,100.00","" } },
         { "05/01/15,45,Acme Inc.,,Miscellaneous,", 6, { "05/01/15","45","Acme Inc.","","Miscellaneous","",NULL,NULL } },
         { "Test\\ with backslash,nextfield", 2, { "Test\\ with backslash","nextfield",NULL,NULL,NULL,NULL,NULL,NULL } },
         { "Test with \\\" escaped quote,nextfield", 2, { "Test with \" escaped quote","nextfield",NULL,NULL,NULL,NULL,NULL,NULL } },
@@ -188,7 +189,7 @@ TEST_F (GncTokenizerTest, tokenize_comma_sep)
 
 static tokenize_csv_test_data semicolon_separated [] = {
         { "Date;Num;Description;Notes;Account;Deposit;Withdrawal;Balance", 8, { "Date","Num","Description","Notes","Account","Deposit","Withdrawal","Balance" } },
-        { "05/01/15;45;Typical csv import line - including quoted empty field;;Miscellaneous;\"\";\"1,100.00\";", 8, { "05/01/15","45","Acme Inc.","","Miscellaneous","","1,100.00","" } },
+        { "05/01/15;45;Typical csv import line - including quoted empty field;;Miscellaneous;\"\";\"1,100.00\";", 8, { "05/01/15","45","Typical csv import line - including quoted empty field","","Miscellaneous","","1,100.00","" } },
         { "05/01/15;45;Acme Inc.;;Miscellaneous;", 6, { "05/01/15","45","Acme Inc.","","Miscellaneous","",NULL,NULL } },
         { NULL, 0, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } },
 };

commit e557b021d3bf1840f97222fa059d70179e42b330
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon May 27 17:24:23 2019 +0200

    CsvImport - Fix mishandling of quoted empty fields

diff --git a/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
index bb4f8c89f..d1a87f5ac 100644
--- a/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
+++ b/gnucash/import-export/csv-imp/gnc-tokenizer-csv.cpp
@@ -82,8 +82,20 @@ int GncCsvTokenizer::tokenize()
             bs_pos = line.find ("\"\"");
             while (bs_pos != std::string::npos)
             {
-                line.replace (bs_pos, 2, "\\\"");
-                bs_pos = line.find ("\"\"");
+                // Only make changes in case the double quotes are part of a larger field
+                // In other words a field which only contains two double quotes represent an
+                // empty field. We don't need to touch those.
+                // The way to determine whether the double quotes represent an empty string
+                // is by checking whether the character in front or after are either
+                // a field separator or the beginning or end of of the string.
+                if (!(((bs_pos == 0) ||                                          // quotes are at start of line
+                       (m_sep_str.find (line[bs_pos-1]) != std::string::npos))    // quotes preceeded by field separator
+                      &&
+                      ((bs_pos + 2 >= line.length()) ||                          // quotes are at end of line
+                       (m_sep_str.find (line[bs_pos+2]) != std::string::npos))))   // quotes followed by field separator
+                    // Only make changes in case the double quotes are not an empty field
+                    line.replace (bs_pos, 2, "\\\"");
+                bs_pos = line.find ("\"\"", bs_pos + 2);
             }
 
             Tokenizer tok(line, sep);
diff --git a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
index 2a861ae6b..b5b7fe0bd 100644
--- a/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
+++ b/gnucash/import-export/csv-imp/test/test-tokenizer.cpp
@@ -172,7 +172,7 @@ GncTokenizerTest::test_gnc_tokenize_helper (const std::string& separators, token
 
 static tokenize_csv_test_data comma_separated [] = {
         { "Date,Num,Description,Notes,Account,Deposit,Withdrawal,Balance", 8, { "Date","Num","Description","Notes","Account","Deposit","Withdrawal","Balance" } },
-        { "05/01/15,45,Acme Inc.,,Miscellaneous,,\"1,100.00\",", 8, { "05/01/15","45","Acme Inc.","","Miscellaneous","","1,100.00","" } },
+        { "05/01/15,45,Typical csv import line - including quoted empty field,,Miscellaneous,\"\",\"1,100.00\",", 8, { "05/01/15","45","Acme Inc.","","Miscellaneous","","1,100.00","" } },
         { "05/01/15,45,Acme Inc.,,Miscellaneous,", 6, { "05/01/15","45","Acme Inc.","","Miscellaneous","",NULL,NULL } },
         { "Test\\ with backslash,nextfield", 2, { "Test\\ with backslash","nextfield",NULL,NULL,NULL,NULL,NULL,NULL } },
         { "Test with \\\" escaped quote,nextfield", 2, { "Test with \" escaped quote","nextfield",NULL,NULL,NULL,NULL,NULL,NULL } },
@@ -188,7 +188,7 @@ TEST_F (GncTokenizerTest, tokenize_comma_sep)
 
 static tokenize_csv_test_data semicolon_separated [] = {
         { "Date;Num;Description;Notes;Account;Deposit;Withdrawal;Balance", 8, { "Date","Num","Description","Notes","Account","Deposit","Withdrawal","Balance" } },
-        { "05/01/15;45;Acme Inc.;;Miscellaneous;;\"1,100.00\";", 8, { "05/01/15","45","Acme Inc.","","Miscellaneous","","1,100.00","" } },
+        { "05/01/15;45;Typical csv import line - including quoted empty field;;Miscellaneous;\"\";\"1,100.00\";", 8, { "05/01/15","45","Acme Inc.","","Miscellaneous","","1,100.00","" } },
         { "05/01/15;45;Acme Inc.;;Miscellaneous;", 6, { "05/01/15","45","Acme Inc.","","Miscellaneous","",NULL,NULL } },
         { NULL, 0, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } },
 };

commit ed42f8acb62b03634abd54201a9e8424752277fb
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon May 27 20:58:54 2019 +0800

    Bug 797197 - Transaction report: Error message when sorting on month
    
    guile's strftime is/was buggy; cannot handle non-UTF8 locales. Use
    gnc_print_time64 instead. see the following
    
    http://lists.gnu.org/archive/html/bug-guile/2019-05/msg00003.html

diff --git a/libgnucash/app-utils/date-utilities.scm b/libgnucash/app-utils/date-utilities.scm
index c83b518dd..f954d13fd 100644
--- a/libgnucash/app-utils/date-utilities.scm
+++ b/libgnucash/app-utils/date-utilities.scm
@@ -68,7 +68,7 @@
   (gnc:date-get-year-day (gnc-localtime t64)))
 
 (define (gnc:date-get-year-string datevec)
-  (gnc-locale-to-utf8 (strftime "%Y" datevec)))
+  (gnc-print-time64 (gnc-mktime datevec) "%Y"))
 
 (define (gnc:date-get-quarter-string datevec)
   (format #f "Q~d" (gnc:date-get-quarter datevec)))
@@ -80,10 +80,10 @@
    (gnc:date-get-year-string datevec)))
 
 (define (gnc:date-get-month-string datevec)
-  (gnc-locale-to-utf8 (strftime "%B" datevec)))
+  (gnc-print-time64 (gnc-mktime datevec) "%B"))
 
 (define (gnc:date-get-month-year-string datevec)
-  (gnc-locale-to-utf8 (strftime "%B %Y" datevec)))
+  (gnc-print-time64 (gnc-mktime datevec) "%B %Y"))
 
 (define (gnc:date-get-week-year-string datevec)
   (let* ((beginweekt64 (* (gnc:time64-get-week

commit 8447f42674d4ae60fff59cd8a957bb71d71af2cc
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon May 27 14:47:35 2019 +0200

    Bug 797126 - It is annoying to run cmake to get an updated mo file
    
    Add missing dependency in order to make the po-gmo and po-gmo-build targets acually work.

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 202ef7198..7c2aff7fd 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -35,6 +35,7 @@ foreach(lingua ${ALL_LINGUAS})
       COMMAND ${CMAKE_COMMAND} -E env
         ${GETTEXT_MSGFMT_EXECUTABLE}
             -o ${_OUTPUT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
   )
   set(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
   make_directory(${_BUILD_FILE_DIR})

commit 712714cf94fa7c952aef42d81cd0c31f3c5cfe84
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon May 27 14:01:05 2019 +0200

    Bug 797207 - Chart reports show blank when run from the build directory
    
    jqplot files were not copied to the build environment

diff --git a/gnucash/report/jqplot/CMakeLists.txt b/gnucash/report/jqplot/CMakeLists.txt
index eefd36092..1095938a4 100644
--- a/gnucash/report/jqplot/CMakeLists.txt
+++ b/gnucash/report/jqplot/CMakeLists.txt
@@ -31,5 +31,6 @@ set(gncjqplot_DATA
 )
 
 install(FILES ${gncjqplot_DATA} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/jqplot)
+file(COPY ${gncjqplot_DATA} DESTINATION ${DATADIR_BUILD}/gnucash/jqplot)
 
 set_dist_list(jqplot_DIST CMakeLists.txt jquery.js ${gncjqplot_DATA})

commit 49334906ae681495f128a45c969173b24619b709
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat May 25 21:47:57 2019 +0800

    [test-report-utilities] reactivate 'debugging tools' section
    
    This commit reactivates test section, which was disabled to hide a
    date-related test failure. See Bug 797139 for more details.

diff --git a/gnucash/report/report-system/test/test-report-utilities.scm b/gnucash/report/report-system/test/test-report-utilities.scm
index f58878fb1..9fd44504d 100644
--- a/gnucash/report/report-system/test/test-report-utilities.scm
+++ b/gnucash/report/report-system/test/test-report-utilities.scm
@@ -131,7 +131,8 @@
     (gnc:strify (cons 'a 2)))
   (test-equal "gnc:strify cons"
     "Proc<cons>"
-    (gnc:strify cons)))
+    (gnc:strify cons))
+  (test-end "debugging tools"))
 
 (define (test-commodity-collector)
   (test-group-with-cleanup "test-commodity-collector"

commit 6888bb30a2da250a5583e58f68876d2613d58296
Author: Adrian Panella <ianchi74 at outlook.com>
Date:   Sat May 25 00:16:54 2019 -0500

    [budget report] Fix multiple currency budget rollup

diff --git a/gnucash/report/report-system/report-utilities.scm b/gnucash/report/report-system/report-utilities.scm
index 5f7241547..e37ce42e2 100644
--- a/gnucash/report/report-system/report-utilities.scm
+++ b/gnucash/report/report-system/report-utilities.scm
@@ -981,14 +981,22 @@ flawed. see report-utilities.scm. please update reports.")
 ;;   budget - budget to use
 ;;   children - list of children
 ;;   period - budget period to use
+;;   currency - currency to use to accumulate the balances
 ;;
 ;; Return value:
 ;;   budget value to use for account for specified period.
-(define (budget-account-sum budget children period)
-  (apply + (map
-            (lambda (child)
-              (gnc:get-account-period-rolledup-budget-value budget child period))
-            children)))
+(define (budget-account-sum budget children period currency)
+  (let ((pricedb (gnc-pricedb-get-db (gnc-get-current-book)))
+        (start (gnc-budget-get-period-start-date budget period)))
+    (apply + (map
+              (lambda (child)
+                (gnc-pricedb-convert-balance-nearest-price-t64
+                  pricedb
+                  (gnc:get-account-period-rolledup-budget-value budget child period)
+                  (xaccAccountGetCommodity child)
+                  currency
+                  start))
+              children))))
 
 ;; Calculate the value to use for the budget of an account for a specific period.
 ;; - If the account has a budget value set for the period, use it
@@ -1004,10 +1012,11 @@ flawed. see report-utilities.scm. please update reports.")
 ;;   sum of all budgets for list of children for specified period.
 (define (gnc:get-account-period-rolledup-budget-value budget acct period)
   (let* ((bgt-set? (gnc-budget-is-account-period-value-set budget acct period))
-         (children (gnc-account-get-children acct)))
+         (children (gnc-account-get-children acct))
+         (currency (xaccAccountGetCommodity acct)))
     (cond
      (bgt-set? (gnc-budget-get-account-period-value budget acct period))
-     ((not (null? children)) (budget-account-sum budget children period))
+     ((not (null? children)) (budget-account-sum budget children period currency))
      (else 0))))
 
 ;; Sums rolled-up budget values for a single account from start-period (inclusive) to

commit 9e43f6bc42fd47c283b98fcb3344ba69ece24fc7
Author: Mike Evans <mikee at saxicola.co.uk>
Date:   Sun May 5 14:19:34 2019 +0100

    Implement "printing" to a pdf.
    
    This removes the export to PDF button and uses the standard print
    dialog with an option to print tp pdf.
    The filename is pre-populated, with the path set to the default, $HOME
    on linux.
    There is no remembering of past output directories.  Maybe a later
    update will do this.

diff --git a/gnucash/html/gnc-html-webkit2.c b/gnucash/html/gnc-html-webkit2.c
index b2ce26c64..d9ab09f45 100644
--- a/gnucash/html/gnc-html-webkit2.c
+++ b/gnucash/html/gnc-html-webkit2.c
@@ -56,6 +56,9 @@
 #include "gnc-html-webkit.h"
 #include "gnc-html-history.h"
 #include "print-session.h"
+#include "gnc-state.h"
+#include "print-session.h"
+
 
 G_DEFINE_TYPE(GncHtmlWebkit, gnc_html_webkit, GNC_TYPE_HTML )
 
@@ -119,7 +122,7 @@ static void impl_webkit_show_data( GncHtml* self, const gchar* data, int datalen
 static void impl_webkit_reload( GncHtml* self, gboolean force_rebuild );
 static void impl_webkit_copy_to_clipboard( GncHtml* self );
 static gboolean impl_webkit_export_to_file( GncHtml* self, const gchar* filepath );
-static void impl_webkit_print (GncHtml* self);
+static void impl_webkit_print (GncHtml* self,const gchar* jobname);
 static void impl_webkit_cancel( GncHtml* self );
 static void impl_webkit_set_parent( GncHtml* self, GtkWindow* parent );
 static void impl_webkit_default_zoom_changed(gpointer prefs, gchar *pref, gpointer user_data);
@@ -1112,20 +1115,44 @@ impl_webkit_export_to_file( GncHtml* self, const char *filepath )
  * webkit_web_view_get_snapshot for each page.
  */
 static void
-impl_webkit_print (GncHtml* self)
+impl_webkit_print (GncHtml* self,const gchar* jobname)
 {
      WebKitPrintOperation *op = NULL;
      GtkWindow *top = NULL;
      GncHtmlWebkitPrivate *priv;
-
+     GtkPrintSettings *print_settings = NULL;
+     WebKitPrintOperationResponse print_response;
+     gchar *export_dirname = NULL;
+     gchar *export_filename = NULL;
+     gchar* basename = NULL;
+     GKeyFile *state_file = gnc_state_get_current();
+     
      g_return_if_fail (self != NULL);
      g_return_if_fail (GNC_IS_HTML_WEBKIT (self));
-
      priv = GNC_HTML_WEBKIT_GET_PRIVATE (self);
      op = webkit_print_operation_new (priv->web_view);
-     top = GTK_WINDOW(priv->base.parent);
-     webkit_print_operation_run_dialog (op, top);
+     basename = g_path_get_basename(jobname);
+     print_settings = gtk_print_settings_new();
+     webkit_print_operation_set_print_settings(op, print_settings);
+     export_filename = g_strdup(jobname);
+     g_free(basename);
+     gtk_print_settings_set(print_settings,
+                    GTK_PRINT_SETTINGS_OUTPUT_BASENAME,
+                    export_filename);
+     webkit_print_operation_set_print_settings(op, print_settings);
+     // Open a print dialog
+     top = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->web_view)));
+     print_response = webkit_print_operation_run_dialog (op, top);
+     if (print_response == WEBKIT_PRINT_OPERATION_RESPONSE_PRINT)
+     {
+          // Get the newly updated print settings
+          g_object_unref(print_settings);
+          print_settings = g_object_ref(webkit_print_operation_get_print_settings(op));
+     }
+     g_free(export_dirname);
+     g_free(export_filename);
      g_object_unref (op);
+     g_object_unref (print_settings);
 }
 
 static void
diff --git a/gnucash/html/gnc-html-webkit2.h b/gnucash/html/gnc-html-webkit2.h
index c2cec5858..f19f234a3 100644
--- a/gnucash/html/gnc-html-webkit2.h
+++ b/gnucash/html/gnc-html-webkit2.h
@@ -39,6 +39,9 @@ typedef struct _GncHtmlWebkit GncHtmlWebkit;
 typedef struct _GncHtmlWebkitClass GncHtmlWebkitClass;
 typedef struct _GncHtmlWebkitPrivate GncHtmlWebkitPrivate;
 
+/** Key for saving the PDF-export directory in the print settings */
+#define GNC_GTK_PRINT_SETTINGS_EXPORT_DIR "gnc-pdf-export-directory"
+
 struct _GncHtmlWebkit
 {
     GncHtml parent_instance;
diff --git a/gnucash/html/gnc-html.c b/gnucash/html/gnc-html.c
index f2c8a535c..bff658a64 100644
--- a/gnucash/html/gnc-html.c
+++ b/gnucash/html/gnc-html.c
@@ -535,10 +535,11 @@ void
 gnc_html_print (GncHtml* self, const char *jobname, gboolean export_pdf)
 #else
 void
-gnc_html_print (GncHtml* self)
+gnc_html_print (GncHtml* self, const char *jobname)
 #endif
 {
     g_return_if_fail( self != NULL );
+     g_return_if_fail( jobname != NULL );
     g_return_if_fail( GNC_IS_HTML(self) );
 
     if ( GNC_HTML_GET_CLASS(self)->print != NULL )
@@ -546,7 +547,7 @@ gnc_html_print (GncHtml* self)
 #ifdef WEBKIT1
       GNC_HTML_GET_CLASS(self)->print (self, jobname, export_pdf);
 #else
-        GNC_HTML_GET_CLASS(self)->print (self);
+        GNC_HTML_GET_CLASS(self)->print (self, jobname);
 #endif
     }
     else
diff --git a/gnucash/html/gnc-html.h b/gnucash/html/gnc-html.h
index ffb8aebe7..67eaf7373 100644
--- a/gnucash/html/gnc-html.h
+++ b/gnucash/html/gnc-html.h
@@ -141,7 +141,7 @@ struct _GncHtmlClass
 #ifdef WEBKIT1
   void (*print) (GncHtml* html, const gchar* jobname, gboolean export_pdf);
 #else
-    void (*print) (GncHtml* html);
+    void (*print) (GncHtml* html, const gchar* jobname);
 #endif
     void (*cancel)( GncHtml* html );
     URLType (*parse_url)( GncHtml* html, const gchar* url,
@@ -220,7 +220,7 @@ void gnc_html_print (GncHtml* html, const char* jobname, gboolean export_pdf);
  *
  * @param html GncHtml object
  */
-void gnc_html_print (GncHtml* html);
+void gnc_html_print (GncHtml* html, const char* jobname);
 #endif
 /**
  * Cancels the current operation
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index be2997629..5140a99bf 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -1166,11 +1166,7 @@ gnc_plugin_page_report_constr_init(GncPluginPageReport *plugin_page, gint report
             N_("Print the current report"),
             G_CALLBACK(gnc_plugin_page_report_print_cb)
         },
-        {
-            "FilePrintPDFAction", GNC_ICON_PDF_EXPORT, N_("Export as P_DF..."), NULL,
-            N_("Export the current report as a PDF document"),
-            G_CALLBACK(gnc_plugin_page_report_exportpdf_cb)
-        },
+
         {
             "EditCutAction", "edit-cut", N_("Cu_t"), "<primary>X",
             N_("Cut the current selection and copy it to clipboard"),
@@ -1870,11 +1866,9 @@ gnc_plugin_page_report_print_cb( GtkAction *action, GncPluginPageReport *report
 
     //g_warning("Setting job name=%s", job_name);
 
-#ifdef WEBKIT1
-    gnc_html_print (priv->html, job_name, FALSE);
-#else
-    gnc_html_print (priv->html);
-#endif
+
+    gnc_html_print (priv->html, job_name);
+
 
     g_free (job_name);
 }
@@ -1916,7 +1910,7 @@ gnc_plugin_page_report_exportpdf_cb( GtkAction *action, GncPluginPageReport *rep
 #ifdef WEBKIT1
     gnc_html_print (priv->html, job_name, TRUE);
 #else
-    gnc_html_print (priv->html);
+    gnc_html_print (priv->html, job_name);
 #endif
 
     if (owner)



Summary of changes:
 AUTHORS                                            |  10 +-
 CMakeLists.txt                                     |  25 +-
 DOCUMENTERS                                        |   4 +-
 NEWS                                               |  18 +-
 README.dependencies                                |   4 +-
 README.git                                         |   2 +-
 bindings/python/example_scripts/get_quotes.pl      |   2 +-
 .../example_scripts/invoice_export_doxygen.txt     |   2 +-
 bindings/python/example_scripts/latex_invoices.py  |   8 +-
 bindings/python/example_scripts/quotes_historic.py |   2 +-
 bindings/python/gnucash_core.py                    |   4 +-
 borrowed/README                                    |   9 -
 borrowed/libc/strptime.c                           |   4 +-
 cmake/README_CMAKE.txt                             |   4 +-
 common/cmake_modules/COPYING-CMAKE-SCRIPTS.txt     |   4 +-
 contrib/README                                     |   2 +-
 contrib/art/tango/README                           |   2 +-
 contrib/gnuc2ooo.py                                |   2 +-
 data/accounts/de_DE/acctchrt_skr04.gnucash-xea     |   2 +-
 doc/README-ca.win32-bin.txt                        |  10 +-
 doc/README-de.win32-bin.txt                        |   6 +-
 doc/README-fr.win32-bin.txt                        |   6 +-
 doc/README-hr.win32-bin.txt                        |  10 +-
 doc/README-it.win32-bin.txt                        |   6 +-
 doc/README-lv.win32-bin.txt                        |   6 +-
 doc/README-nl.win32-bin.txt                        |   6 +-
 doc/README-zh_CN.win32-bin.txt                     |   6 +-
 doc/README-zh_TW.win32-bin.txt                     |   6 +-
 doc/README.HBCI                                    |  16 +-
 doc/README.OFX                                     |   8 +-
 doc/README.francais                                | 345 +++++-----
 doc/README.german                                  |  48 +-
 doc/README.win32-bin.txt                           |   8 +-
 doc/TRANSLATION_HOWTO                              |  16 +-
 doc/build-aix.txt                                  |  12 -
 doc/gnucash.1.in                                   |   2 +-
 doc/guile-hackers.txt                              |   2 +-
 doc/projects.html                                  |  52 +-
 gnucash/gnome-utils/dialog-utils.c                 |  32 +-
 gnucash/gnome-utils/dialog-utils.h                 |  10 +
 gnucash/gnome-utils/gnc-dense-cal.c                |   2 +-
 gnucash/gnome-utils/gnc-keyring.c                  |   2 +-
 gnucash/gnome-utils/gnc-tree-view-commodity.c      |   4 +-
 gnucash/gnome/dialog-invoice.c                     |   2 +-
 gnucash/gnome/dialog-trans-assoc.c                 |   2 +-
 gnucash/gnome/gnc-plugin-page-report.c             |  15 +-
 gnucash/gnome/gnc-split-reg.c                      |   8 +-
 gnucash/gnome/search-owner.c                       |   2 -
 gnucash/gtkbuilder/assistant-acct-period.glade     |  11 +-
 .../gtkbuilder/assistant-csv-account-import.glade  |  20 +-
 gnucash/gtkbuilder/assistant-csv-export.glade      |   3 +
 .../gtkbuilder/assistant-csv-price-import.glade    |  11 +-
 .../gtkbuilder/assistant-csv-trans-import.glade    |  32 +-
 gnucash/gtkbuilder/assistant-hierarchy.glade       |  10 +-
 gnucash/gtkbuilder/assistant-loan.glade            |  26 +-
 gnucash/gtkbuilder/assistant-qif-import.glade      |   4 +-
 gnucash/gtkbuilder/assistant-stock-split.glade     |  20 +-
 gnucash/gtkbuilder/assistant-xml-encoding.glade    |  23 +-
 gnucash/gtkbuilder/business-options-gnome.glade    |   5 +-
 gnucash/gtkbuilder/dialog-account.glade            | 174 ++---
 gnucash/gtkbuilder/dialog-bi-import-gui.glade      |   7 +-
 gnucash/gtkbuilder/dialog-billterms.glade          |  14 +-
 gnucash/gtkbuilder/dialog-book-close.glade         |   6 +-
 gnucash/gtkbuilder/dialog-choose-owner.glade       |   6 +-
 gnucash/gtkbuilder/dialog-commodity.glade          |  12 +-
 gnucash/gtkbuilder/dialog-custom-report.glade      |   8 +-
 .../gtkbuilder/dialog-customer-import-gui.glade    |   5 +-
 gnucash/gtkbuilder/dialog-customer.glade           |   5 +-
 gnucash/gtkbuilder/dialog-date-close.glade         |  10 +-
 gnucash/gtkbuilder/dialog-employee.glade           |   8 +-
 gnucash/gtkbuilder/dialog-file-access.glade        |   5 +-
 gnucash/gtkbuilder/dialog-fincalc.glade            |   7 +-
 gnucash/gtkbuilder/dialog-find-account.glade       |  12 +-
 gnucash/gtkbuilder/dialog-imap-editor.glade        |   8 +-
 gnucash/gtkbuilder/dialog-import.glade             |   9 +-
 gnucash/gtkbuilder/dialog-lot-viewer.glade         |   8 +-
 gnucash/gtkbuilder/dialog-new-user.glade           |  14 +-
 gnucash/gtkbuilder/dialog-object-references.glade  |   5 +-
 gnucash/gtkbuilder/dialog-options.glade            |  11 +-
 gnucash/gtkbuilder/dialog-order.glade              |   2 +-
 gnucash/gtkbuilder/dialog-payment.glade            |   5 +-
 gnucash/gtkbuilder/dialog-price.glade              |   4 +-
 gnucash/gtkbuilder/dialog-print-check.glade        |   8 +-
 gnucash/gtkbuilder/dialog-progress.glade           |   5 +-
 gnucash/gtkbuilder/dialog-query-view.glade         |   5 +-
 gnucash/gtkbuilder/dialog-report.glade             |  34 +-
 gnucash/gtkbuilder/dialog-reset-warnings.glade     |   5 +-
 gnucash/gtkbuilder/dialog-search.glade             |   7 +-
 gnucash/gtkbuilder/dialog-sx.glade                 |  17 +-
 gnucash/gtkbuilder/dialog-tax-info.glade           |   5 +-
 gnucash/gtkbuilder/dialog-tax-table.glade          |  36 +-
 gnucash/gtkbuilder/dialog-totd.glade               |   9 +-
 gnucash/gtkbuilder/dialog-trans-assoc.glade        |  10 +-
 gnucash/gtkbuilder/dialog-transfer.glade           |   9 +-
 gnucash/gtkbuilder/dialog-userpass.glade           |   6 +-
 gnucash/gtkbuilder/dialog-vendor.glade             |   5 +-
 gnucash/gtkbuilder/gnc-date-format.glade           |   7 +-
 gnucash/gtkbuilder/gnc-frequency.glade             |   5 +-
 gnucash/gtkbuilder/gnc-plugin-page-budget.glade    |  15 +-
 gnucash/gtkbuilder/gnc-plugin-page-register.glade  |  26 +-
 gnucash/gtkbuilder/gnc-plugin-page-register2.glade |  14 +-
 gnucash/gtkbuilder/gnc-recurrence.glade            |   5 +-
 gnucash/gtkbuilder/gnc-tree-view-owner.glade       |   6 +-
 gnucash/gtkbuilder/window-autoclear.glade          |   6 +-
 gnucash/gtkbuilder/window-reconcile.glade          |   6 +-
 gnucash/html/gnc-html-webkit2.c                    |  39 +-
 gnucash/html/gnc-html-webkit2.h                    |   3 +
 gnucash/html/gnc-html.c                            |   8 +-
 gnucash/html/gnc-html.h                            |   4 +-
 gnucash/import-export/aqb/dialog-ab-pref.glade     |   6 +-
 gnucash/import-export/aqb/dialog-ab.glade          |  62 +-
 gnucash/import-export/aqb/gnc-ab-getbalance.c      |   2 +-
 gnucash/import-export/aqb/gnc-ab-gettrans.c        |   2 +-
 gnucash/import-export/aqb/gnc-ab-transfer.c        |   2 +-
 gnucash/import-export/aqb/gnc-file-aqb-import.c    |   2 +-
 .../import-export/csv-imp/gnc-tokenizer-csv.cpp    |  16 +-
 .../import-export/csv-imp/test/test-tokenizer.cpp  |   9 +-
 .../import-export/csv-imp/test/test-tx-import.cpp  |   2 +-
 gnucash/import-export/import-backend.c             |   2 +-
 gnucash/import-export/import-main-matcher.c        | 726 ++++++++++++++-------
 gnucash/import-export/qif-imp/qif-parse.scm        |   2 +-
 gnucash/python/pycons/ishell.py                    |   2 +-
 gnucash/python/pycons/setup.py                     |   2 +-
 gnucash/report/jqplot/CMakeLists.txt               |   1 +
 gnucash/report/locale-specific/us/taxtxf-de_DE.scm |  20 +-
 gnucash/report/locale-specific/us/taxtxf.scm       |  42 +-
 gnucash/report/report-system/eguile-gnc.scm        |   2 +-
 gnucash/report/report-system/report-utilities.scm  |  23 +-
 .../test/test-html-utilities-srfi64.scm            |   2 +
 .../report/report-system/test/test-report-html.scm |   4 +-
 .../report-system/test/test-report-utilities.scm   |   3 +-
 gnucash/report/reports/sample/hello-world.scm      |  15 +-
 gnucash/report/reports/standard/budget.scm         |  29 +-
 .../report/reports/standard/customer-summary.scm   |   6 +-
 gnucash/report/reports/standard/invoice.scm        |   3 +-
 gnucash/report/reports/standard/job-report.scm     |   6 +-
 gnucash/report/reports/standard/owner-report.scm   |   6 +-
 gnucash/report/reports/standard/receipt.scm        |   2 +-
 gnucash/report/reports/standard/taxinvoice.scm     |   2 +-
 gnucash/report/reports/standard/view-column.scm    |  70 +-
 gnucash/report/reports/support/receipt.eguile.scm  |   2 +-
 .../report/reports/support/taxinvoice.eguile.scm   |   6 +-
 .../report/stylesheets/stylesheet-head-or-tail.scm |   4 +-
 libgnucash/app-utils/date-utilities.scm            |   6 +-
 libgnucash/app-utils/fin.scm                       |   4 +-
 libgnucash/app-utils/options.scm                   |  62 +-
 libgnucash/app-utils/test/test-gnc-ui-util.c       |   2 +-
 libgnucash/app-utils/test/test-option-util.cpp     |   2 +-
 libgnucash/backend/xml/sixtp-dom-generators.cpp    |   1 +
 libgnucash/core-utils/gnc-glib-utils.h             |   6 +-
 libgnucash/core-utils/gnc-jalali.c                 |   2 +-
 libgnucash/doc/design/fdl.texi                     |   2 +-
 libgnucash/doc/design/top-level.texi               |   2 +-
 libgnucash/doc/doxygen.cfg.in                      |  10 +-
 libgnucash/doc/doxygen_main_page.c                 |  12 +-
 libgnucash/doc/loans.txt                           |   2 +-
 libgnucash/doc/python-bindings-doxygen.py          |   2 +-
 libgnucash/doc/sx.rst                              |  12 +-
 libgnucash/engine/gncEntry.c                       |   2 +-
 libgnucash/engine/qoflog.h                         |   2 +-
 libgnucash/engine/test/test-gnc-date.c             |   2 +-
 libgnucash/engine/test/test-gnc-guid-old.cpp       |   2 +-
 libgnucash/engine/test/test-gnc-guid.cpp           |   2 +-
 libgnucash/engine/test/test-kvp-frame.cpp          |   2 +-
 libgnucash/engine/test/test-kvp-value.cpp          |   2 +-
 libgnucash/engine/test/test-qofsession.cpp         |   2 +-
 libgnucash/engine/test/utest-Split.cpp             |   2 +-
 libgnucash/engine/test/utest-Transaction.cpp       |   2 +-
 libgnucash/engine/test/utest-gnc-pricedb.c         |   2 +-
 libgnucash/tax/us/txf-de_DE.scm                    |   2 +-
 libgnucash/tax/us/txf.scm                          |   2 +-
 po/CMakeLists.txt                                  |   1 +
 po/README                                          |   2 +-
 test-templates/README                              |   6 +-
 test-templates/make-testfile                       |   2 +-
 util/src-count/count.dat                           |   2 +-
 176 files changed, 1582 insertions(+), 1244 deletions(-)
 delete mode 100644 doc/build-aix.txt



More information about the gnucash-changes mailing list