diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-04 17:44:20 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-04 17:44:20 +0200 |
| commit | 488e4e2b86faf5f5749aed9d932b74006e2256dc (patch) | |
| tree | 4ab24f292dcc1514887cf2e274b4cf19a5ba9416 /pages | |
| parent | 7e8b6de186e00668a8b4436262b99302067d57de (diff) | |
| parent | 4e2e262f6a1e5a8b34eef234ca888f7cef3ac110 (diff) | |
| download | monzero-gui-488e4e2b86faf5f5749aed9d932b74006e2256dc.tar.gz monzero-gui-488e4e2b86faf5f5749aed9d932b74006e2256dc.tar.xz monzero-gui-488e4e2b86faf5f5749aed9d932b74006e2256dc.zip | |
Merge pull request #430
4e2e262 Main.qml: Ringsize equals mixin +1 (xmr-eric)
f1327ac Ringsize equals mixin +1 (xmr-eric)
2d12a3c Main.qml: Changed mixin to ring size (xmr-eric)
16f5889 Transfer.qml: Changed mixin to ring size (xmr-eric)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Transfer.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 9df4c4a3..28eebc22 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -74,7 +74,7 @@ Rectangle { var mixin = scaleValueToMixinCount(fillLevel) print ("PrivacyLevel changed:" + fillLevel) print ("mixin count: " + mixin) - privacyLabel.text = qsTr("Privacy level (mixin %1)").arg(mixin) + translationManager.emptyString + privacyLabel.text = qsTr("Privacy level (ring size %1)").arg(mixin+1) + translationManager.emptyString } function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) { @@ -588,7 +588,7 @@ Rectangle { + (transaction.paymentId[i] == "" ? "" : qsTr("\n\payment ID: ") + transaction.paymentId[i]) + qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount(i)) + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee(i)) - + qsTr("\nMixin: ") + transaction.mixin(i) + + qsTr("\nRing size: ") + transaction.mixin(i+1) // TODO: add descriptions to unsigned_tx_set? // + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription)) |