Merge branch 'maint'

Resolved conflicts:
	gnucash/gnome/gtkbuilder/dialog-fincalc.glade
This commit is contained in:
Geert Janssens committed 2017-08-21 22:40:16 +02:00
commit 7d3dab21df
1 file changed
+4 -4
@@ -278,7 +278,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="tooltip_text" translatable="yes">Clear the entry.</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
</object>
@@ -335,7 +335,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="tooltip_text" translatable="yes">Clear the entry.</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
</object>
@@ -392,7 +392,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="tooltip_text" translatable="yes">Clear the entry.</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
</object>
@@ -449,7 +449,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear the entry</property>
<property name="tooltip_text" translatable="yes">Clear the entry.</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="fincalc_amount_clear_clicked_cb" swapped="no"/>
</object>