Merge pull request #1378

63478b1 fix typos in Receive.qml and SharedRingDB.qml
290339a missing <p>
This commit is contained in:
luigi1111 2018-05-21 23:06:22 -05:00
commit 520a4f4260
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 3 additions and 3 deletions

View file

@ -433,7 +433,7 @@ Rectangle {
onLinkActivated: { onLinkActivated: {
receivePageDialog.title = qsTr("QR Code") + translationManager.emptyString; receivePageDialog.title = qsTr("QR Code") + translationManager.emptyString;
receivePageDialog.text = qsTr( receivePageDialog.text = qsTr(
"<p>This QR code includes the address you selected above and" + "<p>This QR code includes the address you selected above and " +
"the amount you entered below. Share it with others (right-click->Save) " + "the amount you entered below. Share it with others (right-click->Save) " +
"so they can more easily send you exact amounts.</p>" "so they can more easily send you exact amounts.</p>"
) )
@ -529,7 +529,7 @@ Rectangle {
"<p>This page will automatically scan the blockchain and the tx pool " + "<p>This page will automatically scan the blockchain and the tx pool " +
"for incoming transactions using this QR code. If you input an amount, it will also check " + "for incoming transactions using this QR code. If you input an amount, it will also check " +
"that incoming transactions total up to that amount.</p>" + "that incoming transactions total up to that amount.</p>" +
"It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be " + "<p>It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be " +
"confirmed in short order, but there is still a possibility they might not, so for larger " + "confirmed in short order, but there is still a possibility they might not, so for larger " +
"values you may want to wait for one or more confirmation(s).</p>" "values you may want to wait for one or more confirmation(s).</p>"
) )

View file

@ -245,7 +245,7 @@ Rectangle {
sharedRingDBDialog.text = qsTr( sharedRingDBDialog.text = qsTr(
"In order to avoid nullifying the protection afforded by Monero's ring signatures, an output should not " + "In order to avoid nullifying the protection afforded by Monero's ring signatures, an output should not " +
"be spent with different rings on different blockchains. While this is normally not a concern, it can become one " + "be spent with different rings on different blockchains. While this is normally not a concern, it can become one " +
"when a key-reusing Monero clone allows you do spend existing outputs. In this case, you need to ensure this " + "when a key-reusing Monero clone allows you to spend existing outputs. In this case, you need to ensure this " +
"existing outputs uses the same ring on both chains.<br>" + "existing outputs uses the same ring on both chains.<br>" +
"This will be done automatically by Monero and any key-reusing software which is not trying to actively strip " + "This will be done automatically by Monero and any key-reusing software which is not trying to actively strip " +
"you of your privacy.<br>" + "you of your privacy.<br>" +