From e44dab084aaf40890c747117e8174768b76c5c18 Mon Sep 17 00:00:00 2001 From: crowning- Date: Mon, 18 Apr 2016 23:46:51 +0200 Subject: [PATCH] [UI] Darksend changed to PrivacyProtect (UI+log) --- src/activemasternode.cpp | 2 +- src/darksend.cpp | 40 +++++++++++++++---------------- src/init.cpp | 12 +++++----- src/qt/coincontroldialog.cpp | 2 +- src/qt/darksendconfig.cpp | 12 +++++----- src/qt/dashstrings.cpp | 26 ++++++++++---------- src/qt/forms/coincontroldialog.ui | 2 +- src/qt/forms/darksendconfig.ui | 2 +- src/qt/forms/optionsdialog.ui | 4 ++-- src/qt/forms/overviewpage.ui | 10 ++++---- src/qt/forms/sendcoinsdialog.ui | 6 ++--- src/qt/overviewpage.cpp | 32 ++++++++++++------------- src/qt/transactiontablemodel.cpp | 12 +++++----- src/qt/transactionview.cpp | 10 ++++---- src/wallet/rpcwallet.cpp | 2 +- src/wallet/wallet.cpp | 12 +++++----- 16 files changed, 93 insertions(+), 93 deletions(-) mode change 100644 => 100755 src/activemasternode.cpp mode change 100644 => 100755 src/qt/overviewpage.cpp diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp old mode 100644 new mode 100755 index bcc61de06..7a9a5aaaa --- a/src/activemasternode.cpp +++ b/src/activemasternode.cpp @@ -206,7 +206,7 @@ bool CActiveMasternode::SendMasternodePing(std::string& errorMessage) { else { // Seems like we are trying to send a ping while the Masternode is not registered in the network - errorMessage = "Darksend Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString(); + errorMessage = "PrivacyProtect Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString(); status = ACTIVE_MASTERNODE_NOT_CAPABLE; notCapableReason = errorMessage; return false; diff --git a/src/darksend.cpp b/src/darksend.cpp index 5e51c7cca..88240b59e 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -132,7 +132,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand } if(state == POOL_STATUS_QUEUE){ - LogPrint("darksend", "Darksend queue is ready - %s\n", addr.ToString()); + LogPrint("darksend", "PrivacyProtect queue is ready - %s\n", addr.ToString()); PrepareDarksendDenominate(); } } else { @@ -151,7 +151,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand pmn->nLastDsq = mnodeman.nDsqCount; pmn->allowFreeTx = true; - LogPrint("darksend", "dsq - new Darksend queue object - %s\n", addr.ToString()); + LogPrint("darksend", "dsq - new PrivacyProtect queue object - %s\n", addr.ToString()); vecDarksendQueue.push_back(dsq); dsq.Relay(); dsq.time = GetTime(); @@ -242,7 +242,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand } if (nValueIn > DARKSEND_POOL_MAX) { - LogPrintf("dsi -- more than Darksend pool max! %s\n", tx.ToString()); + LogPrintf("dsi -- more than PrivacyProtect pool max! %s\n", tx.ToString()); errorID = ERR_MAXIMUM; pfrom->PushMessage(NetMsgType::DSSTATUSUPDATE, sessionID, GetState(), GetEntriesCount(), MASTERNODE_REJECTED, errorID); return; @@ -305,7 +305,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand LogPrint("darksend", "dssu - state: %i entriesCount: %i accepted: %i error: %s \n", state, entriesCount, accepted, GetMessageByID(errorID)); if((accepted != 1 && accepted != 0) && sessionID != sessionIDMessage){ - LogPrintf("dssu - message doesn't match current Darksend session %d %d\n", sessionID, sessionIDMessage); + LogPrintf("dssu - message doesn't match current PrivacyProtect session %d %d\n", sessionID, sessionIDMessage); return; } @@ -350,7 +350,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand vRecv >> sessionIDMessage >> txNew; if(sessionID != sessionIDMessage){ - LogPrint("darksend", "dsf - message doesn't match current Darksend session %d %d\n", sessionID, sessionIDMessage); + LogPrint("darksend", "dsf - message doesn't match current PrivacyProtect session %d %d\n", sessionID, sessionIDMessage); return; } @@ -375,7 +375,7 @@ void CDarksendPool::ProcessMessageDarksend(CNode* pfrom, std::string& strCommand vRecv >> sessionIDMessage >> error >> errorID; if(sessionID != sessionIDMessage){ - LogPrint("darksend", "dsc - message doesn't match current Darksend session %d %d\n", darkSendPool.sessionID, sessionIDMessage); + LogPrint("darksend", "dsc - message doesn't match current PrivacyProtect session %d %d\n", darkSendPool.sessionID, sessionIDMessage); return; } @@ -424,7 +424,7 @@ bool CDarksendPool::SetCollateralAddress(std::string strAddress){ CBitcoinAddress address; if (!address.SetString(strAddress)) { - LogPrintf("CDarksendPool::SetCollateralAddress - Invalid Darksend collateral address\n"); + LogPrintf("CDarksendPool::SetCollateralAddress - Invalid PrivacyProtect collateral address\n"); return false; } collateralPubKey = GetScriptForDestination(address.Get()); @@ -457,7 +457,7 @@ std::string CDarksendPool::GetStatus() } switch(state) { case POOL_STATUS_IDLE: - return _("Darksend is idle."); + return _("PrivacyProtect is idle."); case POOL_STATUS_ACCEPTING_ENTRIES: if(entriesCount == 0) { showingDarkSendMessage = 0; @@ -467,7 +467,7 @@ std::string CDarksendPool::GetStatus() lastEntryAccepted = 0; showingDarkSendMessage = 0; } - return _("Darksend request complete:") + " " + _("Your transaction was accepted into the pool!"); + return _("PrivacyProtect request complete:") + " " + _("Your transaction was accepted into the pool!"); } else { std::string suffix = ""; if( showingDarkSendMessage % 70 <= 40) return strprintf(_("Submitted following entries to masternode: %u / %d"), entriesCount, GetMaxPoolTransactions()); @@ -487,9 +487,9 @@ std::string CDarksendPool::GetStatus() case POOL_STATUS_FINALIZE_TRANSACTION: return _("Finalizing transaction."); case POOL_STATUS_ERROR: - return _("Darksend request incomplete:") + " " + lastMessage + " " + _("Will retry..."); + return _("PrivacyProtect request incomplete:") + " " + lastMessage + " " + _("Will retry..."); case POOL_STATUS_SUCCESS: - return _("Darksend request complete:") + " " + lastMessage; + return _("PrivacyProtect request complete:") + " " + lastMessage; case POOL_STATUS_QUEUE: if( showingDarkSendMessage % 70 <= 30) suffix = "."; else if(showingDarkSendMessage % 70 <= 50) suffix = ".."; @@ -1102,12 +1102,12 @@ bool CDarksendPool::SignaturesComplete(){ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector& vout, CAmount amount){ if(fMasterNode) { - LogPrintf("CDarksendPool::SendDarksendDenominate() - Darksend from a Masternode is not supported currently.\n"); + LogPrintf("CDarksendPool::SendDarksendDenominate() - PrivacyProtect from a Masternode is not supported currently.\n"); return; } if(txCollateral == CMutableTransaction()){ - LogPrintf ("CDarksendPool:SendDarksendDenominate() - Darksend collateral not set"); + LogPrintf ("CDarksendPool:SendDarksendDenominate() - PrivacyProtect collateral not set"); return; } @@ -1134,7 +1134,7 @@ void CDarksendPool::SendDarksendDenominate(std::vector& vin, std::vector< UnlockCoins(); SetNull(); fEnableDarksend = false; - LogPrintf("CDarksendPool::SendDarksendDenominate() - Not enough disk space, disabling Darksend.\n"); + LogPrintf("CDarksendPool::SendDarksendDenominate() - Not enough disk space, disabling PrivacyProtect.\n"); return; } @@ -1388,8 +1388,8 @@ bool CDarksendPool::DoAutomaticDenominating(bool fDryRun) } if(!fDarksendMultiSession && pCurrentBlockIndex->nHeight - cachedLastSuccess < minBlockSpacing) { - LogPrintf("CDarksendPool::DoAutomaticDenominating - Last successful Darksend action was too recent\n"); - strAutoDenomResult = _("Last successful Darksend action was too recent."); + LogPrintf("CDarksendPool::DoAutomaticDenominating - Last successful PrivacyProtect action was too recent\n"); + strAutoDenomResult = _("Last successful PrivacyProtect action was too recent."); return false; } @@ -1644,13 +1644,13 @@ bool CDarksendPool::PrepareDarksendDenominate() // Try to use only inputs with the same number of rounds starting from lowest number of rounds possible for(int i = 0; i < nDarksendRounds; i++) { strError = pwalletMain->PrepareDarksendDenominate(i, i+1); - LogPrintf("DoAutomaticDenominating : Running Darksend denominate for %d rounds. Return '%s'\n", i, strError); + LogPrintf("DoAutomaticDenominating : Running PrivacyProtect denominate for %d rounds. Return '%s'\n", i, strError); if(strError == "") return true; } // We failed? That's strange but let's just make final attempt and try to mix everything strError = pwalletMain->PrepareDarksendDenominate(0, nDarksendRounds); - LogPrintf("DoAutomaticDenominating : Running Darksend denominate for all rounds. Return '%s'\n", strError); + LogPrintf("DoAutomaticDenominating : Running PrivacyProtect denominate for all rounds. Return '%s'\n", strError); if(strError == "") return true; // Should never actually get here but just in case @@ -2029,13 +2029,13 @@ std::string CDarksendPool::GetMessageByID(int messageID) { case ERR_INVALID_INPUT: return _("Input is not valid."); case ERR_INVALID_SCRIPT: return _("Invalid script detected."); case ERR_INVALID_TX: return _("Transaction not valid."); - case ERR_MAXIMUM: return _("Value more than Darksend pool maximum allows."); + case ERR_MAXIMUM: return _("Value more than PrivacyProtect pool maximum allows."); case ERR_MN_LIST: return _("Not in the Masternode list."); case ERR_MODE: return _("Incompatible mode."); case ERR_NON_STANDARD_PUBKEY: return _("Non-standard public key detected."); case ERR_NOT_A_MN: return _("This is not a Masternode."); case ERR_QUEUE_FULL: return _("Masternode queue is full."); - case ERR_RECENT: return _("Last Darksend was too recent."); + case ERR_RECENT: return _("Last PrivacyProtect was too recent."); case ERR_SESSION: return _("Session not complete!"); case ERR_MISSING_TX: return _("Missing input transaction information."); case ERR_VERSION: return _("Incompatible version."); diff --git a/src/init.cpp b/src/init.cpp index 4cf49a845..890e25b1c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -538,7 +538,7 @@ std::string HelpMessage(HelpMessageMode mode) } strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)")); AppendParamsHelpMessages(strUsage, showDebug); - strUsage += HelpMessageOpt("-litemode=", strprintf(_("Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u)"), 0)); + strUsage += HelpMessageOpt("-litemode=", strprintf(_("Disable all Dash specific functionality (Masternodes, PrivacyProtect, InstantX, Budgeting) (0-1, default: %u)"), 0)); strUsage += HelpMessageGroup(_("Masternode options:")); strUsage += HelpMessageOpt("-masternode=", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0)); @@ -548,12 +548,12 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-masternodeaddr=", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999")); strUsage += HelpMessageOpt("-budgetvotemode=", _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)")); - strUsage += HelpMessageGroup(_("Darksend options:")); - strUsage += HelpMessageOpt("-enabledarksend=", strprintf(_("Enable use of automated darksend for funds stored in this wallet (0-1, default: %u)"), fEnableDarksend)); - strUsage += HelpMessageOpt("-darksendmultisession=", strprintf(_("Enable multiple darksend mixing sessions per block, experimental (0-1, default: %u)"), fDarksendMultiSession)); + strUsage += HelpMessageGroup(_("PrivacyProtect options:")); + strUsage += HelpMessageOpt("-enabledarksend=", strprintf(_("Enable use of automated PrivacyProtect for funds stored in this wallet (0-1, default: %u)"), fEnableDarksend)); + strUsage += HelpMessageOpt("-darksendmultisession=", strprintf(_("Enable multiple PrivacyProtect mixing sessions per block, experimental (0-1, default: %u)"), fDarksendMultiSession)); strUsage += HelpMessageOpt("-darksendrounds=", strprintf(_("Use N separate masternodes to anonymize funds (2-8, default: %u)"), nDarksendRounds)); strUsage += HelpMessageOpt("-anonymizedashamount=", strprintf(_("Keep N DASH anonymized (default: %u)"), nAnonymizeDashAmount)); - strUsage += HelpMessageOpt("-liquidityprovider=", strprintf(_("Provide liquidity to Darksend by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), nLiquidityProvider)); + strUsage += HelpMessageOpt("-liquidityprovider=", strprintf(_("Provide liquidity to PrivacyProtect by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), nLiquidityProvider)); strUsage += HelpMessageGroup(_("InstantX options:")); strUsage += HelpMessageOpt("-enableinstantx=", strprintf(_("Enable instantx, show confirmations for locked transactions (0-1, default: %u)"), fEnableInstantX)); @@ -1941,7 +1941,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) LogPrintf("fLiteMode %d\n", fLiteMode); LogPrintf("nInstantXDepth %d\n", nInstantXDepth); - LogPrintf("Darksend rounds %d\n", nDarksendRounds); + LogPrintf("PrivacyProtect rounds %d\n", nDarksendRounds); LogPrintf("Anonymize Dash Amount %d\n", nAnonymizeDashAmount); LogPrintf("Budget Mode %s\n", strBudgetMode); diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 5e2948381..27a284709 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -451,7 +451,7 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column) int rounds = pwalletMain->GetInputDarksendRounds(vin); if(coinControl->useDarkSend && rounds < nDarksendRounds) { QMessageBox::warning(this, windowTitle(), - tr("Non-anonymized input selected. Darksend will be disabled.

If you still want to use Darksend, please deselect all non-nonymized inputs first and then check Darksend checkbox again."), + tr("Non-anonymized input selected. PrivacyProtect will be disabled.

If you still want to use PrivacyProtect, please deselect all non-nonymized inputs first and then check PrivacyProtect checkbox again."), QMessageBox::Ok, QMessageBox::Ok); coinControl->useDarkSend = false; } diff --git a/src/qt/darksendconfig.cpp b/src/qt/darksendconfig.cpp index b117791e2..e9fa37d05 100644 --- a/src/qt/darksendconfig.cpp +++ b/src/qt/darksendconfig.cpp @@ -40,9 +40,9 @@ void DarksendConfig::clickBasic() QString strAmount(BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); - QMessageBox::information(this, tr("Darksend Configuration"), + QMessageBox::information(this, tr("PrivacyProtect Configuration"), tr( - "Darksend was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen." + "PrivacyProtect was successfully set to basic (%1 and 2 rounds). You can change this at any time by opening Dash's configuration screen." ).arg(strAmount) ); @@ -55,9 +55,9 @@ void DarksendConfig::clickHigh() QString strAmount(BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); - QMessageBox::information(this, tr("Darksend Configuration"), + QMessageBox::information(this, tr("PrivacyProtect Configuration"), tr( - "Darksend was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen." + "PrivacyProtect was successfully set to high (%1 and 8 rounds). You can change this at any time by opening Dash's configuration screen." ).arg(strAmount) ); @@ -70,9 +70,9 @@ void DarksendConfig::clickMax() QString strAmount(BitcoinUnits::formatWithUnit( model->getOptionsModel()->getDisplayUnit(), 1000 * COIN)); - QMessageBox::information(this, tr("Darksend Configuration"), + QMessageBox::information(this, tr("PrivacyProtect Configuration"), tr( - "Darksend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen." + "PrivacyProtect was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen." ).arg(strAmount) ); diff --git a/src/qt/dashstrings.cpp b/src/qt/dashstrings.cpp index feaba224a..289c04c0a 100644 --- a/src/qt/dashstrings.cpp +++ b/src/qt/dashstrings.cpp @@ -42,13 +42,13 @@ QT_TRANSLATE_NOOP("dash-core", "" "Create new files with system default permissions, instead of umask 077 (only " "effective with disabled wallet functionality)"), QT_TRANSLATE_NOOP("dash-core", "" -"Darksend uses exact denominated amounts to send funds, you might simply need " +"PrivacyProtect uses exact denominated amounts to send funds, you might simply need " "to anonymize some more coins."), QT_TRANSLATE_NOOP("dash-core", "" "Delete all wallet transactions and only recover those parts of the " "blockchain through -rescan on startup"), QT_TRANSLATE_NOOP("dash-core", "" -"Disable all Dash specific functionality (Masternodes, Darksend, InstantX, " +"Disable all Dash specific functionality (Masternodes, PrivacyProtect, InstantX, " "Budgeting) (0-1, default: %u)"), QT_TRANSLATE_NOOP("dash-core", "" "Distributed under the MIT software license, see the accompanying file " @@ -120,7 +120,7 @@ QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", "" "Output debugging information (default: %u, supplying is optional)"), QT_TRANSLATE_NOOP("dash-core", "" -"Provide liquidity to Darksend by infrequently mixing coins on a continual " +"Provide liquidity to PrivacyProtect by infrequently mixing coins on a continual " "basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, " "low fees)"), QT_TRANSLATE_NOOP("dash-core", "" @@ -164,9 +164,9 @@ QT_TRANSLATE_NOOP("dash-core", "" QT_TRANSLATE_NOOP("dash-core", "" "Unable to bind to %s on this computer. Dash Core is probably already running."), QT_TRANSLATE_NOOP("dash-core", "" -"Unable to locate enough Darksend denominated funds for this transaction."), +"Unable to locate enough PrivacyProtect denominated funds for this transaction."), QT_TRANSLATE_NOOP("dash-core", "" -"Unable to locate enough Darksend non-denominated funds for this transaction " +"Unable to locate enough PrivacyProtect non-denominated funds for this transaction " "that are not equal 1000 DASH."), QT_TRANSLATE_NOOP("dash-core", "" "Unable to locate enough funds for this transaction that are not equal 1000 " @@ -239,10 +239,10 @@ QT_TRANSLATE_NOOP("dash-core", "Copyright (C) 2014-%i The Dash Core Developers") QT_TRANSLATE_NOOP("dash-core", "Corrupted block database detected"), QT_TRANSLATE_NOOP("dash-core", "Could not parse -rpcbind value %s as network address"), QT_TRANSLATE_NOOP("dash-core", "Could not parse masternode.conf"), -QT_TRANSLATE_NOOP("dash-core", "Darksend is idle."), -QT_TRANSLATE_NOOP("dash-core", "Darksend options:"), -QT_TRANSLATE_NOOP("dash-core", "Darksend request complete:"), -QT_TRANSLATE_NOOP("dash-core", "Darksend request incomplete:"), +QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect is idle."), +QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect options:"), +QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect request complete:"), +QT_TRANSLATE_NOOP("dash-core", "PrivacyProtect request incomplete:"), QT_TRANSLATE_NOOP("dash-core", "Debugging/Testing options:"), QT_TRANSLATE_NOOP("dash-core", "Disable safemode, override a real safe mode event (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Discover own IP address (default: 1 when listening and no -externalip)"), @@ -267,7 +267,7 @@ QT_TRANSLATE_NOOP("dash-core", "Error: Can't select current denominated inputs") QT_TRANSLATE_NOOP("dash-core", "Error: Disk space is low!"), QT_TRANSLATE_NOOP("dash-core", "Error: Unsupported argument -tor found, use -onion."), QT_TRANSLATE_NOOP("dash-core", "Error: Wallet locked, unable to create transaction!"), -QT_TRANSLATE_NOOP("dash-core", "Error: You already have pending entries in the Darksend pool"), +QT_TRANSLATE_NOOP("dash-core", "Error: You already have pending entries in the PrivacyProtect pool"), QT_TRANSLATE_NOOP("dash-core", "Failed to listen on any port. Use -listen=0 if you want this."), QT_TRANSLATE_NOOP("dash-core", "Failed to read block"), QT_TRANSLATE_NOOP("dash-core", "Fee (in DASH/kB) to add to transactions you send (default: %s)"), @@ -305,8 +305,8 @@ QT_TRANSLATE_NOOP("dash-core", "KeePassHttp id for the established association") QT_TRANSLATE_NOOP("dash-core", "KeePassHttp key for AES encrypted communication with KeePass"), QT_TRANSLATE_NOOP("dash-core", "Keep N DASH anonymized (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Keep at most unconnectable transactions in memory (default: %u)"), -QT_TRANSLATE_NOOP("dash-core", "Last Darksend was too recent."), -QT_TRANSLATE_NOOP("dash-core", "Last successful Darksend action was too recent."), +QT_TRANSLATE_NOOP("dash-core", "Last PrivacyProtect was too recent."), +QT_TRANSLATE_NOOP("dash-core", "Last successful PrivacyProtect action was too recent."), QT_TRANSLATE_NOOP("dash-core", "Limit size of signature cache to entries (default: %u)"), QT_TRANSLATE_NOOP("dash-core", "Line: %d"), QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on (default: %u or testnet: %u)"), @@ -420,7 +420,7 @@ QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: %u) QT_TRANSLATE_NOOP("dash-core", "Use UPnP to map the listening port (default: 1 when listening)"), QT_TRANSLATE_NOOP("dash-core", "Use the test network"), QT_TRANSLATE_NOOP("dash-core", "Username for JSON-RPC connections"), -QT_TRANSLATE_NOOP("dash-core", "Value more than Darksend pool maximum allows."), +QT_TRANSLATE_NOOP("dash-core", "Value more than PrivacyProtect pool maximum allows."), QT_TRANSLATE_NOOP("dash-core", "Verifying blocks..."), QT_TRANSLATE_NOOP("dash-core", "Verifying wallet..."), QT_TRANSLATE_NOOP("dash-core", "Wallet %s resides outside data directory %s"), diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index a80652c3c..6ee72ee5b 100644 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -477,7 +477,7 @@ - DS Rounds + PP Rounds diff --git a/src/qt/forms/darksendconfig.ui b/src/qt/forms/darksendconfig.ui index 914431d61..61c8bb4e5 100644 --- a/src/qt/forms/darksendconfig.ui +++ b/src/qt/forms/darksendconfig.ui @@ -11,7 +11,7 @@ - Configure Darksend + Configure PrivacyProtect diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 70b2e0ac6..fe44bfae4 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -138,7 +138,7 @@ This setting determines the amount of individual masternodes that an input will be anonymized through.<br/>More rounds of anonymization gives a higher degree of privacy, but also costs more in fees. - Darksend rounds to use + PrivacyProtect rounds to use @@ -162,7 +162,7 @@ - This amount acts as a threshold to turn off Darksend once it's reached. + This amount acts as a threshold to turn off PrivacyProtect once it's reached. diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 2dd59d13c..9090a9db9 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -458,7 +458,7 @@ - Darksend Balance: + Privacy Balance: @@ -1025,7 +1025,7 @@ - Try to manually submit a Darksend request. + Try to manually submit a PrivacyProtect request. Try Mix @@ -1034,7 +1034,7 @@ - 230 + 220 319 221 28 @@ -1047,7 +1047,7 @@ - Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!) + Reset the current status of PrivacyProtect (can interrupt PrivacyProtect if it's in the process of Mixing, which can cost you money!) false @@ -1075,7 +1075,7 @@ - Darksend + PrivacyProtect diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 00286e500..364810807 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -616,8 +616,8 @@ 0 0 - 828 - 67 + 830 + 69 @@ -1324,7 +1324,7 @@ - Darksend + PrivacyProtect false diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp old mode 100644 new mode 100755 index 6162a08f3..57b2deee7 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -158,9 +158,9 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) ui->frameDarksend->setEnabled(false); } else { if(!fEnableDarksend){ - ui->toggleDarksend->setText(tr("Start Darksend Mixing")); + ui->toggleDarksend->setText(tr("Start PrivacyProtect Mixing")); } else { - ui->toggleDarksend->setText(tr("Stop Darksend Mixing")); + ui->toggleDarksend->setText(tr("Stop PrivacyProtect Mixing")); } timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(darkSendStatus())); @@ -448,7 +448,7 @@ void OverviewPage::darkSendStatus() ui->darksendEnabled->setText(tr("Disabled")); ui->darksendStatus->setText(""); - ui->toggleDarksend->setText(tr("Start Darksend Mixing")); + ui->toggleDarksend->setText(tr("Start PrivacyProtect Mixing")); } return; @@ -466,10 +466,10 @@ void OverviewPage::darkSendStatus() QString strStatus = QString(darkSendPool.GetStatus().c_str()); - QString s = tr("Last Darksend message:\n") + strStatus; + QString s = tr("Last PrivacyProtect message:\n") + strStatus; if(s != ui->darksendStatus->text()) - LogPrintf("Last Darksend message: %s\n", strStatus.toStdString()); + LogPrintf("Last PrivacyProtect message: %s\n", strStatus.toStdString()); ui->darksendStatus->setText(s); @@ -491,8 +491,8 @@ void OverviewPage::darksendAuto(){ void OverviewPage::darksendReset(){ darkSendPool.Reset(); - QMessageBox::warning(this, tr("Darksend"), - tr("Darksend was successfully reset."), + QMessageBox::warning(this, tr("PrivacyProtect"), + tr("PrivacyProtect was successfully reset."), QMessageBox::Ok, QMessageBox::Ok); } @@ -501,8 +501,8 @@ void OverviewPage::toggleDarksend(){ // Popup some information on first mixing QString hasMixed = settings.value("hasMixed").toString(); if(hasMixed.isEmpty()){ - QMessageBox::information(this, tr("Darksend"), - tr("If you don't want to see internal Darksend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), + QMessageBox::information(this, tr("PrivacyProtect"), + tr("If you don't want to see internal PrivacyProtect fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."), QMessageBox::Ok, QMessageBox::Ok); settings.setValue("hasMixed", "hasMixed"); } @@ -511,8 +511,8 @@ void OverviewPage::toggleDarksend(){ float minAmount = 1.49 * COIN; if(balance < minAmount){ QString strMinAmount(BitcoinUnits::formatWithUnit(nDisplayUnit, minAmount)); - QMessageBox::warning(this, tr("Darksend"), - tr("Darksend requires at least %1 to use.").arg(strMinAmount), + QMessageBox::warning(this, tr("PrivacyProtect"), + tr("PrivacyProtect requires at least %1 to use.").arg(strMinAmount), QMessageBox::Ok, QMessageBox::Ok); return; } @@ -525,10 +525,10 @@ void OverviewPage::toggleDarksend(){ { //unlock was cancelled darkSendPool.cachedNumBlocks = std::numeric_limits::max(); - QMessageBox::warning(this, tr("Darksend"), - tr("Wallet is locked and user declined to unlock. Disabling Darksend."), + QMessageBox::warning(this, tr("PrivacyProtect"), + tr("Wallet is locked and user declined to unlock. Disabling PrivacyProtect."), QMessageBox::Ok, QMessageBox::Ok); - if (fDebug) LogPrintf("Wallet is locked and user declined to unlock. Disabling Darksend.\n"); + if (fDebug) LogPrintf("Wallet is locked and user declined to unlock. Disabling PrivacyProtect.\n"); return; } } @@ -539,10 +539,10 @@ void OverviewPage::toggleDarksend(){ darkSendPool.cachedNumBlocks = std::numeric_limits::max(); if(!fEnableDarksend){ - ui->toggleDarksend->setText(tr("Start Darksend Mixing")); + ui->toggleDarksend->setText(tr("Start PrivacyProtect Mixing")); darkSendPool.UnlockCoins(); } else { - ui->toggleDarksend->setText(tr("Stop Darksend Mixing")); + ui->toggleDarksend->setText(tr("Stop PrivacyProtect Mixing")); /* show darksend configuration if client has defaults set */ diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 0277694b9..bcfd6f356 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -371,7 +371,7 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const case TransactionRecord::RecvFromOther: return tr("Received from"); case TransactionRecord::RecvWithDarksend: - return tr("Received via Darksend"); + return tr("Received via PrivacyProtect"); case TransactionRecord::SendToAddress: case TransactionRecord::SendToOther: return tr("Sent to"); @@ -381,15 +381,15 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const return tr("Mined"); case TransactionRecord::DarksendDenominate: - return tr("Darksend Denominate"); + return tr("PrivacyProtect Denominate"); case TransactionRecord::DarksendCollateralPayment: - return tr("Darksend Collateral Payment"); + return tr("PrivacyProtect Collateral Payment"); case TransactionRecord::DarksendMakeCollaterals: - return tr("Darksend Make Collateral Inputs"); + return tr("PrivacyProtect Make Collateral Inputs"); case TransactionRecord::DarksendCreateDenominations: - return tr("Darksend Create Denominations"); + return tr("PrivacyProtect Create Denominations"); case TransactionRecord::Darksent: - return tr("Darksent"); + return tr("PrivacyProtect"); default: return QString(); diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index ce3a7521e..203651dbb 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -92,11 +92,11 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther)); typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) | TransactionFilterProxy::TYPE(TransactionRecord::SendToOther)); - typeWidget->addItem(tr("Darksent"), TransactionFilterProxy::TYPE(TransactionRecord::Darksent)); - typeWidget->addItem(tr("Darksend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals)); - typeWidget->addItem(tr("Darksend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations)); - typeWidget->addItem(tr("Darksend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate)); - typeWidget->addItem(tr("Darksend Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCollateralPayment)); + typeWidget->addItem(tr("PrivacyProtect"), TransactionFilterProxy::TYPE(TransactionRecord::Darksent)); + typeWidget->addItem(tr("PrivacyProtect Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals)); + typeWidget->addItem(tr("PrivacyProtect Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations)); + typeWidget->addItem(tr("PrivacyProtect Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate)); + typeWidget->addItem(tr("PrivacyProtect Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCollateralPayment)); typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf)); typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated)); typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other)); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 57fa072ab..49b41de0a 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2008,7 +2008,7 @@ UniValue walletpassphrase(const UniValue& params, bool fHelp) "\nExamples:\n" "\nUnlock the wallet for 60 seconds\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") + - "\nUnlock the wallet for 60 seconds but allow Darksend mixing only\n" + "\nUnlock the wallet for 60 seconds but allow PrivacyProtect mixing only\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60 true") + "\nLock the wallet again (before 60 seconds)\n" + HelpExampleCli("walletlock", "") + diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index a1d3c0be7..57730af26 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2708,7 +2708,7 @@ bool CWallet::CreateCollateralTransaction(CMutableTransaction& txCollateral, std if (!SelectCoinsCollateral(vCoinsCollateral, nValueIn2)) { - strReason = "Error: Darksend requires a collateral transaction and could not locate an acceptable input!"; + strReason = "Error: PrivacyProtect requires a collateral transaction and could not locate an acceptable input!"; return false; } @@ -2918,10 +2918,10 @@ bool CWallet::CreateTransaction(const vector& vecSend, CWalletTx& wt } else if (coin_type == ONLY_NOT1000IFMN) { strFailReason = _("Unable to locate enough funds for this transaction that are not equal 1000 DASH."); } else if (coin_type == ONLY_NONDENOMINATED_NOT1000IFMN) { - strFailReason = _("Unable to locate enough Darksend non-denominated funds for this transaction that are not equal 1000 DASH."); + strFailReason = _("Unable to locate enough PrivacyProtect non-denominated funds for this transaction that are not equal 1000 DASH."); } else { - strFailReason = _("Unable to locate enough Darksend denominated funds for this transaction."); - strFailReason += " " + _("Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); + strFailReason = _("Unable to locate enough PrivacyProtect denominated funds for this transaction."); + strFailReason += " " + _("PrivacyProtect uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); } if(useIX){ @@ -3256,7 +3256,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) if(darkSendPool.GetState() != POOL_STATUS_ERROR && darkSendPool.GetState() != POOL_STATUS_SUCCESS) if(darkSendPool.GetEntriesCount() > 0) - return _("Error: You already have pending entries in the Darksend pool"); + return _("Error: You already have pending entries in the PrivacyProtect pool"); // ** find the coins we'll use std::vector vCoins; @@ -3275,7 +3275,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) return _("Error: Can't select current denominated inputs"); } - LogPrintf("PrepareDarksendDenominate - preparing darksend denominate . Got: %d \n", nValueIn); + LogPrintf("PrepareDarksendDenominate - preparing PrivacyProtect denominate . Got: %d \n", nValueIn); { LOCK(cs_wallet);