gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/25152f10 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/03ddbbcd (commit)
	from  https://github.com/Gnucash/gnucash/commit/c07998cb (commit)



commit 25152f10beea561261303d56d1a101b52711c364
Merge: c07998cbe 03ddbbcd0
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Mar 7 13:20:47 2022 -0800

    Merge Chris Good's 'maintPrefUPDATE+CLEAR' into maint.


commit 03ddbbcd0ca8584ed912c0cdd89c2f34fa7cebf8
Author: goodvibes2 <goodchris96 at gmail.com>
Date:   Wed Mar 2 18:01:51 2022 +1100

    Preferences, Import: UPDATE AND RECONCILE should be UPDATE AND CLEAR
    
    on preference "Enable update match action" tooltip text.

diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 0ef979875..e70b898eb 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -2294,8 +2294,8 @@ many months before the current month</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
                     <property name="has-tooltip">True</property>
-                    <property name="tooltip-markup">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
-                    <property name="tooltip-text" translatable="yes">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
+                    <property name="tooltip-markup">Enable the UPDATE AND CLEAR action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
+                    <property name="tooltip-text" translatable="yes">Enable the UPDATE AND CLEAR action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
                     <property name="halign">start</property>
                     <property name="use-underline">True</property>
                     <property name="draw-indicator">True</property>



Summary of changes:
 gnucash/gtkbuilder/dialog-preferences.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)