gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/2054e202 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1015c6aa (commit)
	from  https://github.com/Gnucash/gnucash/commit/0f9a9e3c (commit)



commit 2054e2022e54ebe1e696cf4ce157acd6eaf98d28
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 2 14:16:50 2020 -0700

    Restore call to resolve_conflicts().
    
    Lost in merging Bug 797730 PR.

diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 9f805d6d4..f1ff49d07 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -389,6 +389,7 @@ resolve_conflicts (GNCImportMainMatcher *info)
 void gnc_gen_trans_list_show_all(GNCImportMainMatcher *info)
 {
     gnc_gen_trans_list_create_matches (info);
+    resolve_conflicts (info);
     gtk_widget_show_all (GTK_WIDGET (info->main_widget));
 }
 

commit 1015c6aafdd3e1faa47d8e26b9a4972e2b9d19b3
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 2 14:15:20 2020 -0700

    Add new python example file to POTFILES.in.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d4b98009e..8ca39b3f1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,7 @@ bindings/python/app_utils.py
 bindings/python/deprecation.py
 bindings/python/example_scripts/account_analysis.py
 bindings/python/example_scripts/change_tax_code.py
+bindings/python/example_scripts/export_account_totals.py
 bindings/python/example_scripts/gnc_convenience.py
 bindings/python/example_scripts/gncinvoicefkt.py
 bindings/python/example_scripts/gncinvoice_jinja.py



Summary of changes:
 gnucash/import-export/import-main-matcher.c | 1 +
 po/POTFILES.in                              | 1 +
 2 files changed, 2 insertions(+)