set conf 2, merge upstream update

This commit is contained in:
DenioD
2019-10-31 17:23:44 +01:00
16 changed files with 521 additions and 56 deletions

View File

@@ -85,7 +85,7 @@
</font>
</property>
<property name="text">
<string>Verified</string>
<string>Notarized</string>
</property>
</widget>
</item>
@@ -324,7 +324,7 @@
</font>
</property>
<property name="text">
<string>Total verified funds available:</string>
<string>Total notarized funds available:</string>
</property>
</widget>
</item>
@@ -392,8 +392,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1162</width>
<height>344</height>
<width>1226</width>
<height>504</height>
</rect>
</property>
<layout class="QVBoxLayout" name="sendToLayout">
@@ -1088,7 +1088,7 @@
<x>0</x>
<y>0</y>
<width>1274</width>
<height>39</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -1129,6 +1129,9 @@
<addaction name="action_Address_Book"/>
<addaction name="actionSettings"/>
<addaction name="action_Recurring_Payments"/>
<addaction name="separator"/>
<addaction name="actionEncrypt_Wallet"/>
<addaction name="actionRemove_Wallet_Encryption"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menu_Edit"/>
@@ -1225,6 +1228,16 @@
<string>File a bug...</string>
</property>
</action>
<action name="actionEncrypt_Wallet">
<property name="text">
<string>Encrypt Wallet</string>
</property>
</action>
<action name="actionRemove_Wallet_Encryption">
<property name="text">
<string>Remove Wallet Encryption</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>