diff --git a/src/init.cpp b/src/init.cpp index 4f4609f0c..6e06d08b1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -610,7 +610,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-privatesendmultisession", strprintf(_("Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)"), DEFAULT_PRIVATESEND_MULTISESSION)); strUsage += HelpMessageOpt("-privatesendsessions=", strprintf(_("Use N separate masternodes in parallel to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_SESSIONS, MAX_PRIVATESEND_SESSIONS, DEFAULT_PRIVATESEND_SESSIONS)); strUsage += HelpMessageOpt("-privatesendrounds=", strprintf(_("Use N separate masternodes for each denominated input to mix funds (%u-%u, default: %u)"), MIN_PRIVATESEND_ROUNDS, MAX_PRIVATESEND_ROUNDS, DEFAULT_PRIVATESEND_ROUNDS)); - strUsage += HelpMessageOpt("-privatesendamount=", strprintf(_("Keep N DASH mixed (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT)); + strUsage += HelpMessageOpt("-privatesendamount=", strprintf(_("Target PrivateSend balance (%u-%u, default: %u)"), MIN_PRIVATESEND_AMOUNT, MAX_PRIVATESEND_AMOUNT, DEFAULT_PRIVATESEND_AMOUNT)); strUsage += HelpMessageOpt("-privatesenddenoms=", strprintf(_("Create up to N inputs of each denominated amount (%u-%u, default: %u)"), MIN_PRIVATESEND_DENOMS, MAX_PRIVATESEND_DENOMS, DEFAULT_PRIVATESEND_DENOMS)); #endif // ENABLE_WALLET diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index c8a550447..9dc421925 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -263,7 +263,7 @@ - Amount of Dash to keep mixed + Target PrivateSend balance diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index ed517a01b..9ca609426 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -428,8 +428,8 @@ void OverviewPage::updatePrivateSendProgress() QString strToolPip = ("" + tr("Overall progress") + ": %1%
" + tr("Denominated") + ": %2%
" + - tr("Mixed") + ": %3%
" + - tr("Anonymized") + ": %4%
" + + tr("Partially mixed") + ": %3%
" + + tr("Mixed") + ": %4%
" + tr("Denominated inputs have %5 of %n rounds on average", "", privateSendClient.nPrivateSendRounds)) .arg(progress).arg(denomPart).arg(anonNormPart).arg(anonFullPart) .arg(nAverageAnonymizedRounds); diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 6016f615b..97562dd14 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -378,9 +378,9 @@ void SendCoinsDialog::send(QList recipients) if(ctrl.IsUsingPrivateSend()) { - questionString.append(tr("using") + " " + tr("mixed funds") + ""); + questionString.append(tr("using") + " " + tr("PrivateSend funds only") + ""); } else { - questionString.append(tr("using") + " " + tr("any available funds (not mixed)") + ""); + questionString.append(tr("using") + " " + tr("any available funds") + ""); } if (displayedEntries < messageEntries) { diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 603e5682b..14ed9f8fd 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -64,7 +64,7 @@ UniValue getinfo(const JSONRPCRequest& request) " \"protocolversion\": xxxxx, (numeric) the protocol version\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" " \"balance\": xxxxxxx, (numeric) the total dash balance of the wallet\n" - " \"privatesend_balance\": xxxxxx, (numeric) the mixed dash balance of the wallet\n" + " \"privatesend_balance\": xxxxxx, (numeric) the PrivateSend balance in " + CURRENCY_UNIT + "\n" " \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n" " \"timeoffset\": xxxxx, (numeric) the time offset\n" " \"connections\": xxxxx, (numeric) the number of connections\n" diff --git a/src/rpc/privatesend.cpp b/src/rpc/privatesend.cpp index 4d8f1e487..bfcf1960d 100644 --- a/src/rpc/privatesend.cpp +++ b/src/rpc/privatesend.cpp @@ -93,7 +93,7 @@ UniValue getprivatesendinfo(const JSONRPCRequest& request) " \"multisession\": true|false, (bool) Whether PrivateSend Multisession option is enabled\n" " \"max_sessions\": xxx, (numeric) How many parallel mixing sessions can there be at once\n" " \"max_rounds\": xxx, (numeric) How many rounds to mix\n" - " \"max_amount\": xxx, (numeric) How many " + CURRENCY_UNIT + " to keep mixed\n" + " \"max_amount\": xxx, (numeric) Target PrivateSend balance in " + CURRENCY_UNIT + "\n" " \"max_denoms\": xxx, (numeric) How many inputs of each denominated amount to create\n" " \"queue_size\": xxx, (numeric) How many queues there are currently on the network\n" " \"sessions\": (array of json objects)\n" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index c418f61e0..0df163683 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -435,7 +435,7 @@ UniValue sendtoaddress(const JSONRPCRequest& request) "5. subtractfeefromamount (boolean, optional, default=false) The fee will be deducted from the amount being sent.\n" " The recipient will receive less amount of Dash than you enter in the amount field.\n" "6. \"use_is\" (bool, optional, default=false) Deprecated and ignored\n" - "7. \"use_ps\" (bool, optional, default=false) Use mixed funds only\n" + "7. \"use_ps\" (bool, optional, default=false) Use PrivateSend funds only\n" "8. conf_target (numeric, optional) Confirmation target (in blocks)\n" "9. \"estimate_mode\" (string, optional, default=UNSET) The fee estimate mode, must be one of:\n" " \"UNSET\"\n" @@ -1004,7 +1004,7 @@ UniValue sendmany(const JSONRPCRequest& request) " ,...\n" " ]\n" "7. \"use_is\" (bool, optional, default=false) Deprecated and ignored\n" - "8. \"use_ps\" (bool, optional, default=false) Use mixed funds only\n" + "8. \"use_ps\" (bool, optional, default=false) Use PrivateSend funds only\n" "9. conf_target (numeric, optional) Confirmation target (in blocks)\n" "10. \"estimate_mode\" (string, optional, default=UNSET) The fee estimate mode, must be one of:\n" " \"UNSET\"\n" @@ -2534,7 +2534,7 @@ UniValue getwalletinfo(const JSONRPCRequest& request) " \"walletname\": xxxxx, (string) the wallet name\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" " \"balance\": xxxxxxx, (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n" - " \"privatesend_balance\": xxxxxx, (numeric) the mixed dash balance of the wallet in " + CURRENCY_UNIT + "\n" + " \"privatesend_balance\": xxxxxx, (numeric) the PrivateSend balance in " + CURRENCY_UNIT + "\n" " \"unconfirmed_balance\": xxx, (numeric) the total unconfirmed balance of the wallet in " + CURRENCY_UNIT + "\n" " \"immature_balance\": xxxxxx, (numeric) the total immature balance of the wallet in " + CURRENCY_UNIT + "\n" " \"txcount\": xxxxxxx, (numeric) the total number of transactions in the wallet\n"