Merge pull request #1681

9a09e61 Rename 'blackball' for clarity (moneromooo-monero)

1 files changed, 8 insertions, 8 deletions

diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml
index 2fc11f3f..82d4fd96 100644
--- a/pages/SharedRingDB.qml
+++ b/pages/SharedRingDB.qml
@@ -116,9 +116,9 @@ Rectangle {
             Layout.fillWidth: true
             textFormat: Text.RichText
             text: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style>" +
-                  qsTr("Blackballed outputs") + " <a href='#'>" + qsTr("Help") + "</a>" + translationManager.emptyString
+                  qsTr("Outputs marked as spent") + " <a href='#'>" + qsTr("Help") + "</a>" + translationManager.emptyString
             onLinkActivated: {
-                sharedRingDBDialog.title  = qsTr("Blackballed outputs") + translationManager.emptyString;
+                sharedRingDBDialog.title  = qsTr("Outputs marked as spent") + translationManager.emptyString;
                 sharedRingDBDialog.text = qsTr(
                     "In order to obscure which inputs in a Monero transaction are being spent, a third party should not be able " +
                     "to tell which inputs in a ring are already known to be spent. Being able to do so would weaken the protection " +
@@ -129,7 +129,7 @@ Rectangle {
                     "transactions. Such a list is maintained by the Monero project and is available on the getmonero.org website, " +
                     "and you can import this list here.<br>" +
                     "Alternatively, you can scan the blockchain (and the blockchain of key-reusing Monero clones) yourself " +
-                    "using the monero-blockchain-blackball tool to create a list of known spent outputs.<br>"
+                    "using the monero-blockchain-mark-spent-outputs tool to create a list of known spent outputs.<br>"
                 )
                 sharedRingDBDialog.icon = StandardIcon.Information
                 sharedRingDBDialog.open()
@@ -153,7 +153,7 @@ Rectangle {
 
             FileDialog {
                 id: loadBlackballFileDialog
-                title: qsTr("Please choose a file to load blackballed outputs from") + translationManager.emptyString;
+                title: qsTr("Please choose a file from which to load outputs to mark as spent") + translationManager.emptyString;
                 folder: "file://"
                 nameFilters: [ "*"]
 
@@ -171,7 +171,7 @@ Rectangle {
                     fontSize: mainLayout.lineEditFontSize
                     placeholderText: qsTr("Path to file") + "..." + translationManager.emptyString
                     labelFontSize: 14 * scaleRatio
-                    labelText: qsTr("Filename with outputs to blackball") + ":" + translationManager.emptyString
+                    labelText: qsTr("Filename with outputs to mark as spent") + ":" + translationManager.emptyString
                     copyButton: true
                     readOnly: false
                 }
@@ -211,7 +211,7 @@ Rectangle {
                     id: blackballOutputAmountLine
                     fontSize: mainLayout.lineEditFontSize
                     labelFontSize: 14 * scaleRatio
-                    labelText: qsTr("Or manually blackball/unblackball a single output:") + translationManager.emptyString
+                    labelText: qsTr("Or manually mark a single output as spent/unspent:") + translationManager.emptyString
                     placeholderText: qsTr("Paste output amount") + "..." + translationManager.emptyString
                     readOnly: false
                     width: mainLayout.editWidth / 2
@@ -235,7 +235,7 @@ Rectangle {
 
                 StandardButton {
                     id: blackballButton
-                    text: qsTr("Blackball") + translationManager.emptyString
+                    text: qsTr("Mark as spent") + translationManager.emptyString
                     small: true
                     enabled: !!appWindow.currentWallet && validUnsigned(blackballOutputAmountLine.text) && validUnsigned(blackballOutputOffsetLine.text)
                     onClicked: appWindow.currentWallet.blackballOutput(blackballOutputAmountLine.text, blackballOutputOffsetLine.text)
@@ -244,7 +244,7 @@ Rectangle {
                 StandardButton {
                     id: unblackballButton
                     anchors.right: parent.right
-                    text: qsTr("Unblackball") + translationManager.emptyString
+                    text: qsTr("Mark as unspent") + translationManager.emptyString
                     small: true
                     enabled: !!appWindow.currentWallet && validUnsigned(blackballOutputAmountLine.text) && validUnsigned(blackballOutputOffsetLine.text)
                     onClicked: appWindow.currentWallet.unblackballOutput(blackballOutputAmountLine.text, blackballOutputOffsetLine.text)