Merge pull request #433

faeead2 Better placeholders (xmr-eric)
9425b77 Payment ID Placeholder: 64 characters only (xmr-eric)
ce87a1c Added AddressBook.qml placeholders (xmr-eric)
This commit is contained in:
Riccardo Spagni 2017-02-04 17:44:47 +02:00
commit f2a583fd49
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -90,6 +90,7 @@ Rectangle {
anchors.rightMargin: 17
anchors.topMargin: 5
error: true;
placeholderText: qsTr("4...") + translationManager.emptyString
}
Label {
@ -112,6 +113,7 @@ Rectangle {
anchors.leftMargin: 17
anchors.rightMargin: 17
anchors.topMargin: 5
placeholderText: qsTr("Paste 64 hexadecimal characters") + translationManager.emptyString
}
Label {
@ -120,7 +122,7 @@ Rectangle {
anchors.top: paymentIdLine.bottom
anchors.leftMargin: 17
anchors.topMargin: 17
text: qsTr("Description <font size='2'>(Local database)</font>") + translationManager.emptyString
text: qsTr("Description <font size='2'>(Optional)</font>") + translationManager.emptyString
fontSize: 14
tipText: qsTr("<b>Tip test test</b><br/><br/>test line 2") + translationManager.emptyString
}
@ -133,6 +135,7 @@ Rectangle {
anchors.leftMargin: 17
anchors.rightMargin: 17
anchors.topMargin: 5
placeholderText: qsTr("Give this entry a name or description") + translationManager.emptyString
}
StandardButton {