Merge pull request #760 from crowning-/UI_Enhancements

[UI] Rebranding: Darksend/InstantX changed to PrivateSend/InstantSend (UI+log)

src/Makefile.qt.include

@@ -413,6 +413,7 @@ endif
 RES_IMAGES = \
   qt/res/images/drkblue/about.png \
   qt/res/images/drkblue/splash.png \
+  qt/res/images/drkblue/splash_testnet.png \
   qt/res/images/drkblue/dash_logo_horizontal.png \
   qt/res/images/drkblue/drkblue_downArrow.png \
   qt/res/images/drkblue/drkblue_downArrow_small.png \
@@ -424,6 +425,7 @@ RES_IMAGES = \
   qt/res/images/drkblue/drkblue_walletFrame.png \
   qt/res/images/crownium/about.png \
   qt/res/images/crownium/splash.png \
+  qt/res/images/crownium/splash_testnet.png \
   qt/res/images/crownium/dash_logo_horizontal.png \
   qt/res/images/crownium/drkblue_downArrow.png \
   qt/res/images/crownium/drkblue_downArrow_small.png \
@@ -435,6 +437,7 @@ RES_IMAGES = \
   qt/res/images/crownium/drkblue_walletFrame.png \
   qt/res/images/light/about.png \
   qt/res/images/light/splash.png \
+  qt/res/images/light/splash_testnet.png \
   qt/res/images/light/dash_logo_horizontal.png \
   qt/res/images/light/drkblue_downArrow.png \
   qt/res/images/light/drkblue_downArrow_small.png \
@@ -446,6 +449,7 @@ RES_IMAGES = \
   qt/res/images/light/drkblue_walletFrame.png \
   qt/res/images/trad/about.png \
   qt/res/images/trad/splash.png \
+  qt/res/images/trad/splash_testnet.png \
   qt/res/images/trad/dash_logo_horizontal.png \
   qt/res/images/trad/drkblue_downArrow.png \
   qt/res/images/trad/drkblue_downArrow_small.png \

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 = "PrivateSend Masternode List doesn't include our Masternode, shutting down Masternode pinging service! " + vin.ToString();
         status = ACTIVE_MASTERNODE_NOT_CAPABLE;
         notCapableReason = errorMessage;
         return false;

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", "PrivateSend 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 PrivateSend 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 PrivateSend 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 PrivateSend 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 PrivateSend 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 PrivateSend 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 PrivateSend 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 _("PrivateSend 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 _("PrivateSend 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 _("PrivateSend request incomplete:") + " " + lastMessage + " " + _("Will retry...");
         case POOL_STATUS_SUCCESS:
-            return _("Darksend request complete:") + " " + lastMessage;
+            return _("PrivateSend 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<CTxIn>& vin, std::vector<CTxOut>& vout, CAmount amount){
 
     if(fMasterNode) {
-        LogPrintf("CDarksendPool::SendDarksendDenominate() - Darksend from a Masternode is not supported currently.\n");
+        LogPrintf("CDarksendPool::SendDarksendDenominate() - PrivateSend from a Masternode is not supported currently.\n");
         return;
     }
 
     if(txCollateral == CMutableTransaction()){
-        LogPrintf ("CDarksendPool:SendDarksendDenominate() - Darksend collateral not set");
+        LogPrintf ("CDarksendPool:SendDarksendDenominate() - PrivateSend collateral not set");
         return;
     }
 
@@ -1134,7 +1134,7 @@ void CDarksendPool::SendDarksendDenominate(std::vector<CTxIn>& 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 PrivateSend.\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");
+        LogPrintf("CDarksendPool::DoAutomaticDenominating - Last successful PrivateSend action was too recent\n");
-        strAutoDenomResult = _("Last successful Darksend action was too recent.");
+        strAutoDenomResult = _("Last successful PrivateSend 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 PrivateSend 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 PrivateSend 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 PrivateSend 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 PrivateSend 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.");

src/init.cpp

@@ -545,7 +545,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=<n>", strprintf(_("Disable all Dash specific functionality (Masternodes, Darksend, InstantX, Budgeting) (0-1, default: %u)"), 0));
+    strUsage += HelpMessageOpt("-litemode=<n>", strprintf(_("Disable all Dash specific functionality (Masternodes, PrivateSend, InstantSend, Budgeting) (0-1, default: %u)"), 0));
 
     strUsage += HelpMessageGroup(_("Masternode options:"));
     strUsage += HelpMessageOpt("-masternode=<n>", strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0));
@@ -555,15 +555,15 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999"));
     strUsage += HelpMessageOpt("-budgetvotemode=<mode>", _("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 += HelpMessageGroup(_("PrivateSend options:"));
-    strUsage += HelpMessageOpt("-enabledarksend=<n>", strprintf(_("Enable use of automated darksend for funds stored in this wallet (0-1, default: %u)"), fEnableDarksend));
+    strUsage += HelpMessageOpt("-enabledarksend=<n>", strprintf(_("Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)"), fEnableDarksend));
-    strUsage += HelpMessageOpt("-darksendmultisession=<n>", strprintf(_("Enable multiple darksend mixing sessions per block, experimental (0-1, default: %u)"), fDarksendMultiSession));
+    strUsage += HelpMessageOpt("-darksendmultisession=<n>", strprintf(_("Enable multiple PrivateSend mixing sessions per block, experimental (0-1, default: %u)"), fDarksendMultiSession));
     strUsage += HelpMessageOpt("-darksendrounds=<n>", strprintf(_("Use N separate masternodes to anonymize funds  (2-8, default: %u)"), nDarksendRounds));
     strUsage += HelpMessageOpt("-anonymizedashamount=<n>", strprintf(_("Keep N DASH anonymized (default: %u)"), nAnonymizeDashAmount));
-    strUsage += HelpMessageOpt("-liquidityprovider=<n>", 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=<n>", strprintf(_("Provide liquidity to PrivateSend 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 += HelpMessageGroup(_("InstantSend options:"));
-    strUsage += HelpMessageOpt("-enableinstantx=<n>", strprintf(_("Enable instantx, show confirmations for locked transactions (0-1, default: %u)"), fEnableInstantX));
+    strUsage += HelpMessageOpt("-enableinstantx=<n>", strprintf(_("Enable InstantSend, show confirmations for locked transactions (0-1, default: %u)"), fEnableInstantX));
     strUsage += HelpMessageOpt("-instantxdepth=<n>", strprintf(_("Show N confirmations for a successfully locked transaction (0-9999, default: %u)"), nInstantXDepth));
     strUsage += HelpMessageOpt("-ixnotify=<cmd>", _("Execute command when a wallet IX transaction is successfully locked (%s in cmd is replaced by TxID)"));
 
@@ -1912,7 +1912,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("PrivateSend rounds %d\n", nDarksendRounds);
     LogPrintf("Anonymize Dash Amount %d\n", nAnonymizeDashAmount);
     LogPrintf("Budget Mode %s\n", strBudgetMode);
 

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. <b>Darksend will be disabled.</b><br><br>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. <b>PrivateSend will be disabled.</b><br><br>If you still want to use PrivateSend, please deselect all non-nonymized inputs first and then check PrivateSend checkbox again."),
                     QMessageBox::Ok, QMessageBox::Ok);
                 coinControl->useDarkSend = false;
             }

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("PrivateSend 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."
+            "PrivateSend 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("PrivateSend 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."
+            "PrivateSend 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("PrivateSend 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."
+            "PrivateSend was successfully set to maximum (%1 and 16 rounds). You can change this at any time by opening Dash's configuration screen."
         ).arg(strAmount)
     );
 

src/qt/dash.qrc

@@ -215,6 +215,7 @@
         <file alias="drkblue_walletFrame_bg">res/images/drkblue/drkblue_walletFrame_bg.png</file>
         <file alias="drkblue_walletFrame">res/images/drkblue/drkblue_walletFrame.png</file>
         <file alias="splash">res/images/drkblue/splash.png</file>
+        <file alias="splash_testnet">res/images/drkblue/splash_testnet.png</file>
     </qresource>
     <qresource prefix="/images/crownium">
         <file alias="about">res/images/crownium/about.png</file>
@@ -228,6 +229,7 @@
         <file alias="drkblue_walletFrame_bg">res/images/crownium/drkblue_walletFrame_bg.png</file>
         <file alias="drkblue_walletFrame">res/images/crownium/drkblue_walletFrame.png</file>
         <file alias="splash">res/images/crownium/splash.png</file>
+        <file alias="splash_testnet">res/images/crownium/splash_testnet.png</file>
     </qresource>
     <qresource prefix="/images/light">
         <file alias="about">res/images/light/about.png</file>
@@ -241,6 +243,7 @@
         <file alias="drkblue_walletFrame_bg">res/images/light/drkblue_walletFrame_bg.png</file>
         <file alias="drkblue_walletFrame">res/images/light/drkblue_walletFrame.png</file>
         <file alias="splash">res/images/light/splash.png</file>
+        <file alias="splash_testnet">res/images/light/splash_testnet.png</file>
     </qresource>
     <qresource prefix="/images/trad">
         <file alias="about">res/images/trad/about.png</file>
@@ -254,6 +257,7 @@
         <file alias="drkblue_walletFrame_bg">res/images/trad/drkblue_walletFrame_bg.png</file>
         <file alias="drkblue_walletFrame">res/images/trad/drkblue_walletFrame.png</file>
         <file alias="splash">res/images/trad/splash.png</file>
+        <file alias="splash_testnet">res/images/trad/splash_testnet.png</file>
     </qresource>
     <qresource prefix="/movies">
         <file alias="spinner-000">res/movies/spinner-000.png</file>

src/qt/dashstrings.cpp

@@ -42,19 +42,19 @@ 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 "
+"PrivateSend 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, PrivateSend, InstantSend, "
 "Budgeting) (0-1, default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Distributed under the MIT software license, see the accompanying file "
 "COPYING or <http://www.opensource.org/licenses/mit-license.php>."),
 QT_TRANSLATE_NOOP("dash-core", ""
-"Enable instantx, show confirmations for locked transactions (bool, default: "
+"Enable InstantSend, show confirmations for locked transactions (bool, default: "
 "%s)"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Enable use of automated darksend for funds stored in this wallet (0-1, "
@@ -97,7 +97,7 @@ QT_TRANSLATE_NOOP("dash-core", ""
 "In this mode -genproclimit controls how many blocks are generated "
 "immediately."),
 QT_TRANSLATE_NOOP("dash-core", ""
-"InstantX requires inputs with at least 6 confirmations, you might need to "
+"InstantSend requires inputs with at least 6 confirmations, you might need to "
 "wait a few minutes and try again."),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay "
@@ -120,7 +120,7 @@ QT_TRANSLATE_NOOP("dash-core", ""
 QT_TRANSLATE_NOOP("dash-core", ""
 "Output debugging information (default: %u, supplying <category> is optional)"),
 QT_TRANSLATE_NOOP("dash-core", ""
-"Provide liquidity to Darksend by infrequently mixing coins on a continual "
+"Provide liquidity to PrivateSend 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 PrivateSend 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 PrivateSend 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", "PrivateSend is idle."),
-QT_TRANSLATE_NOOP("dash-core", "Darksend options:"),
+QT_TRANSLATE_NOOP("dash-core", "PrivateSend options:"),
-QT_TRANSLATE_NOOP("dash-core", "Darksend request complete:"),
+QT_TRANSLATE_NOOP("dash-core", "PrivateSend request complete:"),
-QT_TRANSLATE_NOOP("dash-core", "Darksend request incomplete:"),
+QT_TRANSLATE_NOOP("dash-core", "PrivateSend 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 PrivateSend 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)"),
@@ -287,7 +287,7 @@ QT_TRANSLATE_NOOP("dash-core", "Incorrect or no genesis block found. Wrong datad
 QT_TRANSLATE_NOOP("dash-core", "Information"),
 QT_TRANSLATE_NOOP("dash-core", "Initialization sanity check failed. Dash Core is shutting down."),
 QT_TRANSLATE_NOOP("dash-core", "Input is not valid."),
-QT_TRANSLATE_NOOP("dash-core", "InstantX options:"),
+QT_TRANSLATE_NOOP("dash-core", "InstantSend options:"),
 QT_TRANSLATE_NOOP("dash-core", "Insufficient funds."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid -onion address: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid -proxy address: '%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 <n> unconnectable transactions in memory (default: %u)"),
-QT_TRANSLATE_NOOP("dash-core", "Last Darksend was too recent."),
+QT_TRANSLATE_NOOP("dash-core", "Last PrivateSend was too recent."),
-QT_TRANSLATE_NOOP("dash-core", "Last successful Darksend action was too recent."),
+QT_TRANSLATE_NOOP("dash-core", "Last successful PrivateSend action was too recent."),
 QT_TRANSLATE_NOOP("dash-core", "Limit size of signature cache to <n> entries (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Line: %d"),
 QT_TRANSLATE_NOOP("dash-core", "Listen for JSON-RPC connections on <port> (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 PrivateSend 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"),

src/qt/forms/coincontroldialog.ui

@@ -477,7 +477,7 @@
      </column>
      <column>
       <property name="text">
-       <string>DS Rounds</string>
+       <string>PS Rounds</string>
       </property>
      </column>
      <column>

src/qt/forms/darksendconfig.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Configure Darksend</string>
+   <string>Configure PrivateSend</string>
   </property>
   <widget class="QPushButton" name="buttonBasic">
    <property name="geometry">

src/qt/forms/optionsdialog.ui

@@ -138,7 +138,7 @@
             <string>This setting determines the amount of individual masternodes that an input will be anonymized through.&lt;br/&gt;More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.</string>
            </property>
            <property name="text">
-            <string>Darksend rounds to use</string>
+            <string>PrivateSend rounds to use</string>
            </property>
           </widget>
          </item>
@@ -162,7 +162,7 @@
          <item>
           <widget class="QLabel" name="label_2">
            <property name="toolTip">
-            <string>This amount acts as a threshold to turn off Darksend once it's reached.</string>
+            <string>This amount acts as a threshold to turn off PrivateSend once it's reached.</string>
            </property>
            <property name="statusTip">
             <string notr="true"/>

src/qt/forms/overviewpage.ui

@@ -458,7 +458,7 @@
            <item row="2" column="0">
             <widget class="QLabel" name="labelAnonymizedText">
              <property name="text">
-              <string>Darksend Balance:</string>
+              <string>PrivateSend Balance:</string>
              </property>
             </widget>
            </item>
@@ -1025,7 +1025,7 @@
            </sizepolicy>
           </property>
           <property name="toolTip">
-           <string>Try to manually submit a Darksend request.</string>
+           <string>Try to manually submit a PrivateSend request.</string>
           </property>
           <property name="text">
            <string>Try Mix</string>
@@ -1034,7 +1034,7 @@
          <widget class="QPushButton" name="darksendReset">
           <property name="geometry">
            <rect>
-            <x>230</x>
+            <x>220</x>
             <y>319</y>
             <width>221</width>
             <height>28</height>
@@ -1047,7 +1047,7 @@
            </sizepolicy>
           </property>
           <property name="toolTip">
-           <string>Reset the current status of Darksend (can interrupt Darksend if it's in the process of Mixing, which can cost you money!)</string>
+           <string>Reset the current status of PrivateSend (can interrupt PrivateSend if it's in the process of Mixing, which can cost you money!)</string>
           </property>
           <property name="autoFillBackground">
            <bool>false</bool>
@@ -1075,7 +1075,7 @@
               </font>
              </property>
              <property name="text">
-              <string>Darksend</string>
+              <string>PrivateSend</string>
              </property>
             </widget>
            </item>

src/qt/forms/sendcoinsdialog.ui

@@ -616,8 +616,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>828</width>
+        <width>830</width>
-        <height>67</height>
+        <height>69</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
@@ -1324,7 +1324,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Darksend</string>
+          <string>PrivateSend</string>
          </property>
          <property name="checked">
           <bool>false</bool>

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 Mixing"));
             } else {
-                ui->toggleDarksend->setText(tr("Stop Darksend Mixing"));
+                ui->toggleDarksend->setText(tr("Stop 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 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 PrivateSend message:\n") + strStatus;
 
     if(s != ui->darksendStatus->text())
-        LogPrintf("Last Darksend message: %s\n", strStatus.toStdString());
+        LogPrintf("Last PrivateSend 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"),
+    QMessageBox::warning(this, tr("PrivateSend"),
-        tr("Darksend was successfully reset."),
+        tr("PrivateSend 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"),
+        QMessageBox::information(this, tr("PrivateSend"),
-                tr("If you don't want to see internal Darksend fees/transactions select \"Most Common\" as Type on the \"Transactions\" tab."),
+                tr("If you don't want to see internal PrivateSend 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"),
+            QMessageBox::warning(this, tr("PrivateSend"),
-                tr("Darksend requires at least %1 to use.").arg(strMinAmount),
+                tr("PrivateSend 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<int>::max();
-                QMessageBox::warning(this, tr("Darksend"),
+                QMessageBox::warning(this, tr("PrivateSend"),
-                    tr("Wallet is locked and user declined to unlock. Disabling Darksend."),
+                    tr("Wallet is locked and user declined to unlock. Disabling PrivateSend."),
                     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 PrivateSend.\n");
                 return;
             }
         }
@@ -539,10 +539,10 @@ void OverviewPage::toggleDarksend(){
     darkSendPool.cachedNumBlocks = std::numeric_limits<int>::max();
 
     if(!fEnableDarksend){
-        ui->toggleDarksend->setText(tr("Start Darksend Mixing"));
+        ui->toggleDarksend->setText(tr("Start Mixing"));
         darkSendPool.UnlockCoins();
     } else {
-        ui->toggleDarksend->setText(tr("Stop Darksend Mixing"));
+        ui->toggleDarksend->setText(tr("Stop Mixing"));
 
         /* show darksend configuration if client has defaults set */
 

src/qt/sendcoinsdialog.cpp

@@ -272,7 +272,7 @@ void SendCoinsDialog::on_sendButton_clicked()
     if(ui->checkInstantX->isChecked()) {
         recipients[0].useInstantX = true;
         strFunds += " ";
-        strFunds += tr("and InstantX");
+        strFunds += tr("and InstantSend");
     } else {
         recipients[0].useInstantX = false;
     }

src/qt/splashscreen.cpp

@@ -47,8 +47,15 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
 
     QString font            = QApplication::font().toString();
 
+    // networkstyle.cpp can't (yet) read themes, so we do it here to get the correct Splash-screen
+    QString splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash";
+    if(GetBoolArg("-regtest", false))
+        splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash_testnet";
+    if(GetBoolArg("-testnet", false))
+        splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash_testnet";
+
     // load the bitmap for writing some text over it
-    pixmap     = networkStyle->getSplashImage();
+    pixmap = QPixmap(splashScreenPath);
 
     QPainter pixPaint(&pixmap);
     pixPaint.setPen(QColor(100,100,100));

src/qt/transactiondesc.cpp

@@ -43,30 +43,30 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
                 if (nDepth < 0)
                     return tr("conflicted");
                 else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
-                    return tr("%1/offline (verified via instantx)").arg(nDepth);
+                    return tr("%1/offline (verified via InstantSend)").arg(nDepth);
                 else if (nDepth < 6)
-                    return tr("%1/confirmed (verified via instantx)").arg(nDepth);
+                    return tr("%1/confirmed (verified via InstantSend)").arg(nDepth);
                 else
-                    return tr("%1 confirmations (verified via instantx)").arg(nDepth);
+                    return tr("%1 confirmations (verified via InstantSend)").arg(nDepth);
             } else {
                 if(!IsTransactionLockTimedOut(wtx.GetHash())){
                     int nDepth = wtx.GetDepthInMainChain();
                     if (nDepth < 0)
                         return tr("conflicted");
                     else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
-                        return tr("%1/offline (InstantX verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL);
+                        return tr("%1/offline (InstantSend verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL);
                     else if (nDepth < 6)
-                        return tr("%1/confirmed (InstantX verification in progress - %2 of %3 signatures )").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL);
+                        return tr("%1/confirmed (InstantSend verification in progress - %2 of %3 signatures )").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL);
                     else
-                        return tr("%1 confirmations (InstantX verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL);
+                        return tr("%1 confirmations (InstantSend verification in progress - %2 of %3 signatures)").arg(nDepth).arg(signatures).arg(INSTANTX_SIGNATURES_TOTAL);
                 } else {
                     int nDepth = wtx.GetDepthInMainChain();
                     if (nDepth < 0)
                         return tr("conflicted");
                     else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
-                        return tr("%1/offline (InstantX verification failed)").arg(nDepth);
+                        return tr("%1/offline (InstantSend verification failed)").arg(nDepth);
                     else if (nDepth < 6)
-                        return tr("%1/confirmed (InstantX verification failed)").arg(nDepth);
+                        return tr("%1/confirmed (InstantSend verification failed)").arg(nDepth);
                     else
                         return tr("%1 confirmations").arg(nDepth);
                 }

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 PrivateSend");
     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("PrivateSend Denominate");
     case TransactionRecord::DarksendCollateralPayment:
-        return tr("Darksend Collateral Payment");
+        return tr("PrivateSend Collateral Payment");
     case TransactionRecord::DarksendMakeCollaterals:
-        return tr("Darksend Make Collateral Inputs");
+        return tr("PrivateSend Make Collateral Inputs");
     case TransactionRecord::DarksendCreateDenominations:
-        return tr("Darksend Create Denominations");
+        return tr("PrivateSend Create Denominations");
     case TransactionRecord::Darksent:
-        return tr("Darksent");
+        return tr("PrivateSend");
 
     default:
         return QString();

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("PrivateSend"), TransactionFilterProxy::TYPE(TransactionRecord::Darksent));
-    typeWidget->addItem(tr("Darksend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals));
+    typeWidget->addItem(tr("PrivateSend Make Collateral Inputs"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendMakeCollaterals));
-    typeWidget->addItem(tr("Darksend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations));
+    typeWidget->addItem(tr("PrivateSend Create Denominations"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCreateDenominations));
-    typeWidget->addItem(tr("Darksend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate));
+    typeWidget->addItem(tr("PrivateSend Denominate"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendDenominate));
-    typeWidget->addItem(tr("Darksend Collateral Payment"), TransactionFilterProxy::TYPE(TransactionRecord::DarksendCollateralPayment));
+    typeWidget->addItem(tr("PrivateSend 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));

src/qt/walletmodel.cpp

@@ -294,7 +294,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
         CReserveKey *keyChange = transaction.getPossibleKeyChange();
 
         if(recipients[0].useInstantX && total > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){
-            Q_EMIT message(tr("Send Coins"), tr("InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(GetSporkValue(SPORK_5_MAX_VALUE)),
+            Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(GetSporkValue(SPORK_5_MAX_VALUE)),
                          CClientUIInterface::MSG_ERROR);
             return TransactionCreationFailed;
         }
@@ -305,7 +305,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
             transaction.reassignAmounts(nChangePosRet);
 
         if(recipients[0].useInstantX && newTx->GetValueOut() > GetSporkValue(SPORK_5_MAX_VALUE)*COIN){
-            Q_EMIT message(tr("Send Coins"), tr("InstantX doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(GetSporkValue(SPORK_5_MAX_VALUE)),
+            Q_EMIT message(tr("Send Coins"), tr("InstantSend doesn't support sending values that high yet. Transactions are currently limited to %1 DASH.").arg(GetSporkValue(SPORK_5_MAX_VALUE)),
                          CClientUIInterface::MSG_ERROR);
             return TransactionCreationFailed;
         }

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 PrivateSend mixing only\n"
             + HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60 true") +
             "\nLock the wallet again (before 60 seconds)\n"
             + HelpExampleCli("walletlock", "") +

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: PrivateSend requires a collateral transaction and could not locate an acceptable input!";
         return false;
     }
 
@@ -2918,14 +2918,14 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& 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 PrivateSend 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 = _("Unable to locate enough PrivateSend denominated funds for this transaction.");
-                        strFailReason += " " + _("Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.");
+                        strFailReason += " " + _("PrivateSend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.");
                     }
 
                     if(useIX){
-                        strFailReason += " " + _("InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again.");
+                        strFailReason += " " + _("InstantSend requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again.");
                     }
 
                     return false;
@@ -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 PrivateSend pool");
 
     // ** find the coins we'll use
     std::vector<CTxIn> 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 PrivateSend denominate . Got: %d \n", nValueIn);
 
     {
         LOCK(cs_wallet);