Merge branch 'patch-2' of https://github.com/xmr-eric/monero-core into xmr-eric-patch-2

This commit is contained in:
luigi1111 2017-01-30 16:19:24 -06:00
commit 0e70e63e0a

View File

@ -340,7 +340,7 @@ Rectangle {
anchors.rightMargin: 17 anchors.rightMargin: 17
anchors.topMargin: 17 anchors.topMargin: 17
fontSize: 14 fontSize: 14
text: qsTr("Description <font size='2'>( Optional - saved to local wallet history )</font>") text: qsTr("Description <font size='2'>( Optional )</font>")
+ translationManager.emptyString + translationManager.emptyString
} }
@ -352,6 +352,7 @@ Rectangle {
anchors.leftMargin: 17 anchors.leftMargin: 17
anchors.rightMargin: 17 anchors.rightMargin: 17
anchors.topMargin: 5 anchors.topMargin: 5
placeholderText: qsTr("Saved to local wallet history") + translationManager.emptyString
} }
function checkInformation(amount, address, payment_id, testnet) { function checkInformation(amount, address, payment_id, testnet) {