Revert "Merge pull request #2526"

This reverts commit 457b1dee49, reversing
changes made to 7cca39ad48.
This commit is contained in:
luigi1111 2019-12-05 09:03:56 -06:00
parent 648b775a25
commit 8cd32987d4

View file

@ -52,7 +52,7 @@ Rectangle {
property int mixin: 10 // (ring size 11) property int mixin: 10 // (ring size 11)
property string warningContent: "" property string warningContent: ""
property string sendButtonWarning: "" property string sendButtonWarning: ""
property string startLinkText: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> </font><a href='#'>(Start daemon)</a>") + translationManager.emptyString property string startLinkText: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font>") + translationManager.emptyString
property bool showAdvanced: false property bool showAdvanced: false
// @TODO: remove after pid removal hardfork // @TODO: remove after pid removal hardfork
property bool warningLongPidTransfer: false property bool warningLongPidTransfer: false
@ -166,7 +166,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
inlineIcon: true inlineIcon: true
labelText: qsTr("<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style>\ labelText: qsTr("<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style>\
Amount <font size='2'> </font> <a href='#'>(Change account)</a>") Amount <font size='2'> ( </font> <a href='#'>Change account</a><font size='2'> )</font>")
+ translationManager.emptyString + translationManager.emptyString
copyButton: !isNaN(amountLine.text) && persistentSettings.fiatPriceEnabled copyButton: !isNaN(amountLine.text) && persistentSettings.fiatPriceEnabled
copyButtonText: fiatApiCurrencySymbol() + " ~" + fiatApiConvertToFiat(amountLine.text) copyButtonText: fiatApiCurrencySymbol() + " ~" + fiatApiConvertToFiat(amountLine.text)
@ -250,7 +250,7 @@ Rectangle {
spacing: 0 spacing: 0
fontBold: true fontBold: true
labelText: qsTr("<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style>\ labelText: qsTr("<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style>\
Address <font size='2'> </font> <a href='#'>(Address book)</a>") Address <font size='2'> ( </font> <a href='#'>Address book</a><font size='2'> )</font>")
+ translationManager.emptyString + translationManager.emptyString
labelButtonText: qsTr("Resolve") + translationManager.emptyString labelButtonText: qsTr("Resolve") + translationManager.emptyString
placeholderText: { placeholderText: {