diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-05-21 23:06:22 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-05-21 23:06:22 -0500 |
| commit | 520a4f4260ad1d73167c119362ade39cfb05affa (patch) | |
| tree | c8a475dc29e31bd402bdc7eb1a35bdcf6ca7225e | |
| parent | 5732245daca340663f4b71ed98ca8762090fe8d7 (diff) | |
| parent | 290339a22d397de7d0091379a42093bfb0c403a9 (diff) | |
| download | monzero-gui-520a4f4260ad1d73167c119362ade39cfb05affa.tar.gz monzero-gui-520a4f4260ad1d73167c119362ade39cfb05affa.tar.xz monzero-gui-520a4f4260ad1d73167c119362ade39cfb05affa.zip | |
Merge pull request #1378
63478b1 fix typos in Receive.qml and SharedRingDB.qml
290339a missing <p>
| -rw-r--r-- | pages/Receive.qml | 4 | ||||
| -rw-r--r-- | pages/SharedRingDB.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pages/Receive.qml b/pages/Receive.qml index f5cac4a9..515c7e81 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -433,7 +433,7 @@ Rectangle { onLinkActivated: { receivePageDialog.title = qsTr("QR Code") + translationManager.emptyString; 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) " + "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 " + "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>" + - "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 " + "values you may want to wait for one or more confirmation(s).</p>" ) diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml index 1dce2b71..1be138c6 100644 --- a/pages/SharedRingDB.qml +++ b/pages/SharedRingDB.qml @@ -245,7 +245,7 @@ Rectangle { sharedRingDBDialog.text = qsTr( "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 " + - "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>" + "This will be done automatically by Monero and any key-reusing software which is not trying to actively strip " + "you of your privacy.<br>" + |
