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)

2 files changed, 3 insertions, 3 deletions

diff --git a/main.qml b/main.qml
index 5194683a..d7f76b91 100644
--- a/main.qml
+++ b/main.qml
@@ -468,7 +468,7 @@ ApplicationWindow {
                         + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId))
                         + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount)
                         + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee)
-                        + qsTr("\n\nMixin: ") + mixinCount
+                        + qsTr("\n\nRing size: ") + mixinCount + 1
                         + qsTr("\n\Number of transactions: ") + transaction.txCount
                         + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription))
                         + translationManager.emptyString
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))