Merge branch 'v0.12.0.x' of https://github.com/dashpay/dash into v0.1…

…2.0.x

src/init.cpp

@@ -396,7 +396,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += "  -maxsigcachesize=<n>   " + strprintf(_("Limit size of signature cache to <n> entries (default: %u)"), 50000) + "\n";
     }
     strUsage += "  -minrelaytxfee=<amt>   " + strprintf(_("Fees (in DASH/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())) + "\n";
-    strUsage += "  -printtoconsole        " + _("Send trace/debug info to console instead of debug.log file") + "\n";
+    strUsage += "  -printtoconsole        " + strprintf(_("Send trace/debug info to console instead of debug.log file (default: %u)"), 0) + "\n";
     if (GetBoolArg("-help-debug", false))
     {
         strUsage += "  -printpriority         " + strprintf(_("Log transaction priority and fee per kB when mining blocks (default: %u)"), 0) + "\n";

src/masternodeconfig.cpp

@@ -49,7 +49,7 @@ bool CMasternodeConfig::read(std::string& strErr) {
         } else if(CService(ip).GetPort() == 9999) {
             strErr = _("Invalid port detected in masternode.conf") + "\n" +
                     strprintf(_("Line: %d"), linenumber) + "\n\"" + line + "\"" + "\n" +
-                    _(" (9999 could be used only on mainnet)");
+                    _("(9999 could be used only on mainnet)");
             streamConfig.close();
             return false;
         }

src/qt/dashstrings.cpp

@@ -128,6 +128,8 @@ QT_TRANSLATE_NOOP("dash-core", ""
 QT_TRANSLATE_NOOP("dash-core", ""
 "Require high priority for relaying free or low-fee transactions (default:%u)"),
 QT_TRANSLATE_NOOP("dash-core", ""
+"Send trace/debug info to console instead of debug.log file (default: %u)"),
+QT_TRANSLATE_NOOP("dash-core", ""
 "Set external address:port to get to this masternode (example: address:port)"),
 QT_TRANSLATE_NOOP("dash-core", ""
 "Set maximum size of high-priority/low-fee transactions in bytes (default: %d)"),
@@ -203,8 +205,10 @@ QT_TRANSLATE_NOOP("dash-core", ""
 QT_TRANSLATE_NOOP("dash-core", ""
 "You must specify a masternodeprivkey in the configuration. Please see "
 "documentation for help."),
+QT_TRANSLATE_NOOP("dash-core", "(9999 could be used only on mainnet)"),
 QT_TRANSLATE_NOOP("dash-core", "(default: %s)"),
 QT_TRANSLATE_NOOP("dash-core", "(default: 1)"),
+QT_TRANSLATE_NOOP("dash-core", "(must be 9999 for mainnet)"),
 QT_TRANSLATE_NOOP("dash-core", "<category> can be:\n"),
 QT_TRANSLATE_NOOP("dash-core", "Accept command line and JSON-RPC commands"),
 QT_TRANSLATE_NOOP("dash-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"),
@@ -217,6 +221,8 @@ QT_TRANSLATE_NOOP("dash-core", "Always query for peer addresses via DNS lookup (
 QT_TRANSLATE_NOOP("dash-core", "Attempt to recover private keys from a corrupt wallet.dat"),
 QT_TRANSLATE_NOOP("dash-core", "Block creation options:"),
 QT_TRANSLATE_NOOP("dash-core", "Can't denominate: no compatible inputs left."),
+QT_TRANSLATE_NOOP("dash-core", "Can't find random Masternode."),
+QT_TRANSLATE_NOOP("dash-core", "Can't mix while sync in progress."),
 QT_TRANSLATE_NOOP("dash-core", "Cannot downgrade wallet"),
 QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -bind address: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Cannot resolve -externalip address: '%s'"),
@@ -232,7 +238,7 @@ QT_TRANSLATE_NOOP("dash-core", "Copyright (C) 2009-%i The Bitcoin Core Developer
 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", "Darksend is disabled."),
+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:"),
@@ -257,6 +263,7 @@ QT_TRANSLATE_NOOP("dash-core", "Error reading from database, shutting down."),
 QT_TRANSLATE_NOOP("dash-core", "Error recovering public key."),
 QT_TRANSLATE_NOOP("dash-core", "Error"),
 QT_TRANSLATE_NOOP("dash-core", "Error: A fatal internal error occured, see debug.log for details"),
+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!"),
@@ -271,7 +278,6 @@ QT_TRANSLATE_NOOP("dash-core", "Found enough users, signing ..."),
 QT_TRANSLATE_NOOP("dash-core", "Generate coins (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "How many blocks to check at startup (default: %u, 0 = all)"),
 QT_TRANSLATE_NOOP("dash-core", "If <category> is not supplied, output all debugging information."),
-QT_TRANSLATE_NOOP("dash-core", "Ignore masternodes less than version (example: 70050; default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Importing..."),
 QT_TRANSLATE_NOOP("dash-core", "Imports blocks from external blk000??.dat file"),
 QT_TRANSLATE_NOOP("dash-core", "Include IP addresses in debug output (default: %u)"),
@@ -282,7 +288,6 @@ 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", "Insufficient funds"),
 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'"),
@@ -293,6 +298,7 @@ QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=<amount>: '%s' (mus
 QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=<amount>: '%s'"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid masternodeprivkey. Please see documenation."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid netmask specified in -whitelist: '%s'"),
+QT_TRANSLATE_NOOP("dash-core", "Invalid port detected in masternode.conf"),
 QT_TRANSLATE_NOOP("dash-core", "Invalid private key."),
 QT_TRANSLATE_NOOP("dash-core", "Invalid script detected."),
 QT_TRANSLATE_NOOP("dash-core", "KeePassHttp id for the established association"),
@@ -302,12 +308,14 @@ QT_TRANSLATE_NOOP("dash-core", "Keep at most <n> unconnectable transactions in m
 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", "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)"),
 QT_TRANSLATE_NOOP("dash-core", "Listen for connections on <port> (default: %u or testnet: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Loading addresses..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading block index..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading budget cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading masternode cache..."),
+QT_TRANSLATE_NOOP("dash-core", "Loading masternode payment cache..."),
 QT_TRANSLATE_NOOP("dash-core", "Loading wallet... (%3.2f %%)"),
 QT_TRANSLATE_NOOP("dash-core", "Loading wallet..."),
 QT_TRANSLATE_NOOP("dash-core", "Lock masternodes from masternode configuration file (default: %u)"),
@@ -341,18 +349,19 @@ QT_TRANSLATE_NOOP("dash-core", "RPC support for HTTP persistent connections (def
 QT_TRANSLATE_NOOP("dash-core", "Randomly drop 1 of every <n> network messages"),
 QT_TRANSLATE_NOOP("dash-core", "Randomly fuzz 1 of every <n> network messages"),
 QT_TRANSLATE_NOOP("dash-core", "Rebuild block chain index from current blk000??.dat files"),
+QT_TRANSLATE_NOOP("dash-core", "Receive and display P2P network alerts (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Relay and mine data carrier transactions (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Relay non-P2SH multisig (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Rescan the block chain for missing wallet transactions"),
 QT_TRANSLATE_NOOP("dash-core", "Rescanning..."),
 QT_TRANSLATE_NOOP("dash-core", "Run a thread to flush wallet periodically (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Run in the background as a daemon and accept commands"),
-QT_TRANSLATE_NOOP("dash-core", "Send trace/debug info to console instead of debug.log file"),
+QT_TRANSLATE_NOOP("dash-core", "Send trace/debug info to debug.log file (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Send transactions as zero-fee transactions if possible (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Server certificate file (default: %s)"),
 QT_TRANSLATE_NOOP("dash-core", "Server private key (default: %s)"),
 QT_TRANSLATE_NOOP("dash-core", "Session not complete!"),
-QT_TRANSLATE_NOOP("dash-core", "Session timed out, please resubmit."),
+QT_TRANSLATE_NOOP("dash-core", "Session timed out."),
 QT_TRANSLATE_NOOP("dash-core", "Set database cache size in megabytes (%d to %d, default: %d)"),
 QT_TRANSLATE_NOOP("dash-core", "Set key pool size to <n> (default: %u)"),
 QT_TRANSLATE_NOOP("dash-core", "Set maximum block size in bytes (default: %d)"),
@@ -363,7 +372,7 @@ QT_TRANSLATE_NOOP("dash-core", "Sets the DB_PRIVATE flag in the wallet db enviro
 QT_TRANSLATE_NOOP("dash-core", "Show all debugging options (usage: --help -help-debug)"),
 QT_TRANSLATE_NOOP("dash-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"),
 QT_TRANSLATE_NOOP("dash-core", "Signing failed."),
-QT_TRANSLATE_NOOP("dash-core", "Signing timed out, please resubmit."),
+QT_TRANSLATE_NOOP("dash-core", "Signing timed out."),
 QT_TRANSLATE_NOOP("dash-core", "Signing transaction failed"),
 QT_TRANSLATE_NOOP("dash-core", "Specify configuration file (default: %s)"),
 QT_TRANSLATE_NOOP("dash-core", "Specify connection timeout in milliseconds (minimum: 1, default: %d)"),
@@ -409,6 +418,7 @@ QT_TRANSLATE_NOOP("dash-core", "Wallet %s resides outside data directory %s"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet is locked."),
 QT_TRANSLATE_NOOP("dash-core", "Wallet needed to be rewritten: restart Dash Core to complete"),
 QT_TRANSLATE_NOOP("dash-core", "Wallet options:"),
+QT_TRANSLATE_NOOP("dash-core", "Wallet window title"),
 QT_TRANSLATE_NOOP("dash-core", "Warning"),
 QT_TRANSLATE_NOOP("dash-core", "Warning: This version is obsolete, upgrade required!"),
 QT_TRANSLATE_NOOP("dash-core", "Warning: Unsupported argument -benchmark ignored, use -debug=bench."),

src/qt/forms/optionsdialog.ui

@@ -135,7 +135,7 @@
          <item>
           <widget class="QLabel" name="label">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting determines the amount of individual masternodes that an input will be anonymized through. More rounds of anonymization gives a higher degree of privacy, but also costs more in fees.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <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>
@@ -225,7 +225,7 @@
           <item>
            <widget class="QCheckBox" name="spendZeroConfChange">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you disable the spending of unconfirmed change, the change from a transaction&lt;/p&gt;&lt;p&gt;cannot be used until that transaction has at least one confirmation.&lt;/p&gt;&lt;p&gt;This also affects how your balance is computed.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>If you disable the spending of unconfirmed change, the change from a transaction&lt;br/&gt;cannot be used until that transaction has at least one confirmation.&lt;br/&gt;This also affects how your balance is computed.</string>
             </property>
             <property name="text">
              <string>&amp;Spend unconfirmed change</string>