From 091867525cc2c4e25ecb18f05f7175d93bdf1a7b Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Sun, 2 Aug 2015 05:05:49 +0300 Subject: [PATCH] more info on ds progress / update tr strings / prepare dash_en.ts for translations --- src/init.cpp | 2 +- src/masternodeconfig.cpp | 2 +- src/qt/dashstrings.cpp | 22 +- src/qt/forms/optionsdialog.ui | 4 +- src/qt/locale/dash_en.ts | 418 ++++++++++++++++++++-------------- src/qt/overviewpage.cpp | 17 +- src/wallet.cpp | 6 +- 7 files changed, 281 insertions(+), 190 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 72a2023b5..04de0bd20 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -396,7 +396,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -maxsigcachesize= " + strprintf(_("Limit size of signature cache to entries (default: %u)"), 50000) + "\n"; } strUsage += " -minrelaytxfee= " + 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"; diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp index eb955d1a4..9f7fd2080 100644 --- a/src/masternodeconfig.cpp +++ b/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; } diff --git a/src/qt/dashstrings.cpp b/src/qt/dashstrings.cpp index 559df6e58..72794e44b 100644 --- a/src/qt/dashstrings.cpp +++ b/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", " 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 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=: '%s' (mus QT_TRANSLATE_NOOP("dash-core", "Invalid amount for -paytxfee=: '%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 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 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)"), QT_TRANSLATE_NOOP("dash-core", "Listen for connections on (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 network messages"), QT_TRANSLATE_NOOP("dash-core", "Randomly fuzz 1 of every 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 (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."), diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index fd0115762..07525ce5a 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -135,7 +135,7 @@ - <html><head/><body><p>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.</p></body></html> + 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 @@ -225,7 +225,7 @@ - <html><head/><body><p>If you disable the spending of unconfirmed change, the change from a transaction</p><p>cannot be used until that transaction has at least one confirmation.</p><p>This also affects how your balance is computed.</p></body></html> + If you disable the spending of unconfirmed change, the change from a transaction<br/>cannot be used until that transaction has at least one confirmation.<br/>This also affects how your balance is computed. &Spend unconfirmed change diff --git a/src/qt/locale/dash_en.ts b/src/qt/locale/dash_en.ts index a3dd90b3d..91900a175 100644 --- a/src/qt/locale/dash_en.ts +++ b/src/qt/locale/dash_en.ts @@ -297,12 +297,12 @@ BitcoinGUI - + Dash Core Dash Core - + Wallet Wallet @@ -312,7 +312,7 @@ Node - + &Overview &Overview @@ -763,7 +763,7 @@ Address: %4 ClientModel - + Network Alert Network Alert @@ -852,8 +852,8 @@ Address: %4 - Darksend Rounds - Darksend Rounds + DS Rounds + DS Rounds @@ -972,13 +972,13 @@ Address: %4 Can vary +/- %1 duff(s) per input. - + n/a n/a - + medium medium @@ -1450,12 +1450,7 @@ Address: %4 (0 = auto, <0 = leave that many cores free) - - <html><head/><body><p>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.</p></body></html> - <html><head/><body><p>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.</p></body></html> - - - + Darksend rounds to use Darksend rounds to use @@ -1475,7 +1470,12 @@ Address: %4 W&allet - + + If you disable the spending of unconfirmed change, the change from a transaction<br/>cannot be used until that transaction has at least one confirmation.<br/>This also affects how your balance is computed. + If you disable the spending of unconfirmed change, the change from a transaction<br/>cannot be used until that transaction has at least one confirmation.<br/>This also affects how your balance is computed. + + + Accept connections from outside Accept connections from outside @@ -1500,7 +1500,12 @@ Address: %4 Expert - + + 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. + 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. + + + Whether to show coin control features or not. Whether to show coin control features or not. @@ -1510,12 +1515,7 @@ Address: %4 Enable coin &control features - - If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed. - If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed. - - - + &Spend unconfirmed change &Spend unconfirmed change @@ -1618,6 +1618,11 @@ https://www.transifex.com/projects/p/dash/ + Decimal digits + Decimal digits + + + Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. @@ -1653,7 +1658,7 @@ https://www.transifex.com/projects/p/dash/ &Cancel - + default default @@ -1663,7 +1668,7 @@ https://www.transifex.com/projects/p/dash/ none - + Confirm options reset Confirm options reset @@ -1784,12 +1789,12 @@ https://www.transifex.com/projects/p/dash/ Status: - + Enabled/Disabled Enabled/Disabled - + Completion: Completion: @@ -1799,12 +1804,7 @@ https://www.transifex.com/projects/p/dash/ Darksend Balance: - - 0 DASH - 0 DASH - - - + Amount and Rounds: Amount and Rounds: @@ -1824,9 +1824,10 @@ https://www.transifex.com/projects/p/dash/ n/a - - - + + + + Darksend Darksend @@ -1842,12 +1843,12 @@ https://www.transifex.com/projects/p/dash/ Start/Stop Mixing - + The denominations you submitted to the Masternode.<br>To mix, other users must submit the exact same denominations. The denominations you submitted to the Masternode.<br>To mix, other users must submit the exact same denominations. - + (Last Message) (Last Message) @@ -1872,42 +1873,43 @@ https://www.transifex.com/projects/p/dash/ Reset - + out of sync out of sync - + - + Disabled Disabled - - - + + + Start Darksend Mixing Start Darksend Mixing - - + + Stop Darksend Mixing Stop Darksend Mixing - + + No inputs detected No inputs detected - - - + + + %n Rounds %n Round @@ -1915,30 +1917,45 @@ https://www.transifex.com/projects/p/dash/ - - Found unconfirmed denominated outputs, will wait till they confirm to recalculate. - Found unconfirmed denominated outputs, will wait till they confirm to recalculate. + + Not enough compatible inputs to anonymize <span style='color:red;'>%1</span>,<br>will anonymize <span style='color:red;'>%2</span> instead + Not enough compatible inputs to anonymize <span style='color:red;'>%1</span>,<br>will anonymize <span style='color:red;'>%2</span> instead + + + + Overall progress + Overall progress + + + + Denominated + Denominated + + + + Anonymized + Anonymized - - Progress: %1% (inputs have an average of %2 of %n rounds) + + Denominated inputs have %5 of %n rounds on average - Progress: %1% (inputs have an average of %2 of %n round) - Progress: %1% (inputs have an average of %2 of %n rounds) + Denominated inputs have %5 of %n rounds on average + - + Found enough compatible inputs to anonymize %1 Found enough compatible inputs to anonymize %1 - - Not enough compatible inputs to anonymize <span style='color:red;'>%1</span>,<br/>will anonymize <span style='color:red;'>%2</span> instead - Not enough compatible inputs to anonymize <span style='color:red;'>%1</span>,<br/>will anonymize <span style='color:red;'>%2</span> instead + + Mixed + Mixed - + Enabled Enabled @@ -1960,7 +1977,12 @@ https://www.transifex.com/projects/p/dash/ Darksend was successfully reset. - + + If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. + If you don't want to see internal Darksend fees/transactions select "Most Common" as Type on the "Transactions" tab. + + + Darksend requires at least %1 to use. Darksend requires at least %1 to use. @@ -2113,7 +2135,7 @@ https://www.transifex.com/projects/p/dash/ QObject - + Amount Amount @@ -2123,7 +2145,7 @@ https://www.transifex.com/projects/p/dash/ Enter a Dash address (e.g. %1) - + %1 d %1 d @@ -2204,12 +2226,7 @@ https://www.transifex.com/projects/p/dash/ &Information - - Masternode Count - Masternode Count - - - + General General @@ -2317,7 +2334,12 @@ https://www.transifex.com/projects/p/dash/ Block chain - + + Number of Masternodes + Number of Masternodes + + + &Console &Console @@ -2585,8 +2607,8 @@ https://www.transifex.com/projects/p/dash/ ReceiveCoinsDialog - Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before. - Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before. + Reuse one of the previously used receiving addresses.<br>Reusing addresses has security and privacy issues.<br>Do not use this unless re-generating a payment request made before. + Reuse one of the previously used receiving addresses.<br>Reusing addresses has security and privacy issues.<br>Do not use this unless re-generating a payment request made before. @@ -2595,12 +2617,11 @@ https://www.transifex.com/projects/p/dash/ - An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network. An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Dash network. - + &Message: &Message: @@ -2611,7 +2632,12 @@ https://www.transifex.com/projects/p/dash/ An optional label to associate with the new receiving address. - + + An optional message to attach to the payment request, which will be displayed when the request is opened.<br>Note: The message will not be sent with the payment over the Dash network. + An optional message to attach to the payment request, which will be displayed when the request is opened.<br>Note: The message will not be sent with the payment over the Dash network. + + + Use this form to request payments. All fields are <b>optional</b>. Use this form to request payments. All fields are <b>optional</b>. @@ -2797,7 +2823,7 @@ https://www.transifex.com/projects/p/dash/ SendCoinsDialog - + Send Coins Send Coins @@ -2904,32 +2930,32 @@ https://www.transifex.com/projects/p/dash/ - If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee, while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. - If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee, while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,<br />while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,<br />while "at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. - + + If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,<br />while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee,<br />while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. + + + + + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. + + + per kilobyte per kilobyte - - If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee, while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. - If the custom fee is set to 1000 duffs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 duffs in fee, while "total at least" pays 1000 duffs. For transactions bigger than a kilobyte both pay by kilobyte. - - - + total at least total at least - - - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. - Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for dash transactions than the network can process. - - - + (read the tooltip) (read the tooltip) @@ -2944,7 +2970,7 @@ https://www.transifex.com/projects/p/dash/ Custom: - + (Smart fee not initialized yet. This usually takes a few blocks...) (Smart fee not initialized yet. This usually takes a few blocks...) @@ -3019,7 +3045,7 @@ https://www.transifex.com/projects/p/dash/ Balance: - + Copy quantity Copy quantity @@ -3106,21 +3132,16 @@ https://www.transifex.com/projects/p/dash/ - Total Amount %1 (= %2) - Total Amount %1 (= %2) + Total Amount = <b>%1</b><br />= %2 + Total Amount = <b>%1</b><br />= %2 - - or - or - - - + Confirm send coins Confirm send coins - + A fee %1 times higher than %2 per kB is considered an insanely high fee. A fee %1 times higher than %2 per kB is considered an insanely high fee. @@ -3138,7 +3159,12 @@ https://www.transifex.com/projects/p/dash/ The recipient address is not valid, please recheck. - + + <b>(%1 of %2 entries displayed)</b> + <b>(%1 of %2 entries displayed)</b> + + + The amount to pay must be larger than 0. The amount to pay must be larger than 0. @@ -3960,7 +3986,7 @@ https://www.transifex.com/projects/p/dash/ TransactionView - + All All @@ -3996,12 +4022,12 @@ https://www.transifex.com/projects/p/dash/ Range... - + Most Common Most Common - + Received with Received with @@ -4051,7 +4077,7 @@ https://www.transifex.com/projects/p/dash/ Other - + Enter address or label to search Enter address or label to search @@ -4091,7 +4117,7 @@ https://www.transifex.com/projects/p/dash/ Show transaction details - + Export Transaction History Export Transaction History @@ -4156,7 +4182,7 @@ https://www.transifex.com/projects/p/dash/ The transaction history was successfully saved to %1. - + Range: Range: @@ -4211,7 +4237,12 @@ https://www.transifex.com/projects/p/dash/ Export the data in the current tab to a file - + + Selected amount: + Selected amount: + + + Backup Wallet Backup Wallet @@ -4284,12 +4315,7 @@ https://www.transifex.com/projects/p/dash/ Execute command when the best block changes (%s in cmd is replaced by block hash) - - Found unconfirmed denominated outputs, will wait till they confirm to continue. - Found unconfirmed denominated outputs, will wait till they confirm to continue. - - - + In this mode -genproclimit controls how many blocks are generated immediately. In this mode -genproclimit controls how many blocks are generated immediately. @@ -4309,7 +4335,7 @@ https://www.transifex.com/projects/p/dash/ Query for peer addresses via DNS lookup, if low on addresses (default: 1 unless -connect) - + Set external address:port to get to this masternode (example: address:port) Set external address:port to get to this masternode (example: address:port) @@ -4379,12 +4405,12 @@ https://www.transifex.com/projects/p/dash/ You must specify a masternodeprivkey in the configuration. Please see documentation for help. - + (default: 1) (default: 1) - + Accept command line and JSON-RPC commands Accept command line and JSON-RPC commands @@ -4424,7 +4450,7 @@ https://www.transifex.com/projects/p/dash/ Can't denominate: no compatible inputs left. - + Cannot downgrade wallet Cannot downgrade wallet @@ -4469,12 +4495,7 @@ https://www.transifex.com/projects/p/dash/ Corrupted block database detected - - Darksend is disabled. - Darksend is disabled. - - - + Darksend options: Darksend options: @@ -4554,7 +4575,7 @@ https://www.transifex.com/projects/p/dash/ Error - + Error: Disk space is low! Error: Disk space is low! @@ -4584,7 +4605,7 @@ https://www.transifex.com/projects/p/dash/ If <category> is not supplied, output all debugging information. - + (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) @@ -4669,7 +4690,12 @@ https://www.transifex.com/projects/p/dash/ Flush database activity from memory pool to disk log every <n> megabytes (default: %u) - + + Found unconfirmed denominated outputs, will wait till they confirm to continue. + Found unconfirmed denominated outputs, will wait till they confirm to continue. + + + How thorough the block verification of -checkblocks is (0-4, default: %u) How thorough the block verification of -checkblocks is (0-4, default: %u) @@ -4723,6 +4749,11 @@ https://www.transifex.com/projects/p/dash/ Require high priority for relaying free or low-fee transactions (default:%u) Require high priority for relaying free or low-fee transactions (default:%u) + + + Send trace/debug info to console instead of debug.log file (default: %u) + Send trace/debug info to console instead of debug.log file (default: %u) + Set the number of threads for coin generation if enabled (-1 = all cores, default: %d) @@ -4790,11 +4821,16 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com + (9999 could be used only on mainnet) + (9999 could be used only on mainnet) + + + (default: %s) (default: %s) - + <category> can be: <category> can be: @@ -4816,7 +4852,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Always query for peer addresses via DNS lookup (default: %u) - + Cannot resolve -whitebind address: '%s' Cannot resolve -whitebind address: '%s' @@ -4885,6 +4921,11 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Error: A fatal internal error occured, see debug.log for details Error: A fatal internal error occured, see debug.log for details + + + Error: Can't select current denominated inputs + Error: Can't select current denominated inputs + Error: Unsupported argument -tor found, use -onion. @@ -4927,11 +4968,6 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com - Ignore masternodes less than version (example: 70050; default: %u) - Ignore masternodes less than version (example: 70050; default: %u) - - - Importing... Importing... @@ -4980,11 +5016,6 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com InstantX options: InstantX options: - - - Insufficient funds - Insufficient funds - Insufficient funds. @@ -5026,7 +5057,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Invalid amount for -paytxfee=<amount>: '%s' - + Last successful Darksend action was too recent. Last successful Darksend action was too recent. @@ -5036,7 +5067,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Limit size of signature cache to <n> entries (default: %u) - + Listen for JSON-RPC connections on <port> (default: %u or testnet: %u) Listen for JSON-RPC connections on <port> (default: %u or testnet: %u) @@ -5046,7 +5077,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Listen for connections on <port> (default: %u or testnet: %u) - + Lock masternodes from masternode configuration file (default: %u) Lock masternodes from masternode configuration file (default: %u) @@ -5111,12 +5142,17 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Prepend debug output with timestamp (default: %u) - + Run a thread to flush wallet periodically (default: %u) Run a thread to flush wallet periodically (default: %u) - + + Send trace/debug info to debug.log file (default: %u) + Send trace/debug info to debug.log file (default: %u) + + + Send transactions as zero-fee transactions if possible (default: %u) Send transactions as zero-fee transactions if possible (default: %u) @@ -5131,12 +5167,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Server private key (default: %s) - - Session timed out, please resubmit. - Session timed out, please resubmit. - - - + Set key pool size to <n> (default: %u) Set key pool size to <n> (default: %u) @@ -5156,7 +5187,12 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Sets the DB_PRIVATE flag in the wallet db environment (default: %u) - + + Signing timed out. + Signing timed out. + + + Specify configuration file (default: %s) Specify configuration file (default: %s) @@ -5231,7 +5267,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Wallet needed to be rewritten: restart Dash Core to complete - + Warning: Unsupported argument -benchmark ignored, use -debug=bench. Warning: Unsupported argument -benchmark ignored, use -debug=bench. @@ -5246,15 +5282,40 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Will retry... - + Invalid masternodeprivkey. Please see documenation. Invalid masternodeprivkey. Please see documenation. + + + (must be 9999 for mainnet) + (must be 9999 for mainnet) + + + + Can't find random Masternode. + Can't find random Masternode. + + Can't mix while sync in progress. + Can't mix while sync in progress. + + + + Could not parse masternode.conf + Could not parse masternode.conf + + + Invalid netmask specified in -whitelist: '%s' Invalid netmask specified in -whitelist: '%s' + + + Invalid port detected in masternode.conf + Invalid port detected in masternode.conf + Invalid private key. @@ -5291,7 +5352,12 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Last Darksend was too recent. - + + Line: %d + Line: %d + + + Loading addresses... Loading addresses... @@ -5310,6 +5376,11 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Loading masternode cache... Loading masternode cache... + + + Loading masternode payment cache... + Loading masternode payment cache... + Loading wallet... (%3.2f %%) @@ -5410,6 +5481,11 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Rebuild block chain index from current blk000??.dat files Rebuild block chain index from current blk000??.dat files + + + Receive and display P2P network alerts (default: %u) + Receive and display P2P network alerts (default: %u) + Relay and mine data carrier transactions (default: %u) @@ -5436,17 +5512,17 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Run in the background as a daemon and accept commands - - Send trace/debug info to console instead of debug.log file - Send trace/debug info to console instead of debug.log file - - - + Session not complete! Session not complete! - + + Session timed out. + Session timed out. + + + Set database cache size in megabytes (%d to %d, default: %d) Set database cache size in megabytes (%d to %d, default: %d) @@ -5476,12 +5552,7 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Signing failed. - - Signing timed out, please resubmit. - Signing timed out, please resubmit. - - - + Signing transaction failed Signing transaction failed @@ -5630,6 +5701,11 @@ for example: alertnotify=echo %%s | mail -s "Dash Alert" admin@foo.com Wallet options: Wallet options: + + + Wallet window title + Wallet window title + Warning diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index 11da5599b..e07270549 100644 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -382,16 +382,21 @@ void OverviewPage::updateDarksendProgress() anonFullPart = anonFullPart > 1 ? 1 : anonFullPart; // apply some weights to them (sum should be <=100) and calculate the whole progress - denomPart = ceilf((denomPart * 20) * 100) / 100; - anonNormPart = ceilf((anonNormPart * 50) * 100) / 100; - anonFullPart = ceilf((anonFullPart * 30) * 100) / 100; - float progress = denomPart + anonNormPart + anonFullPart; + float denomPartCalc = ceilf((denomPart * 20) * 100) / 100; + float anonNormPartCalc = ceilf((anonNormPart * 50) * 100) / 100; + float anonFullPartCalc = ceilf((anonFullPart * 30) * 100) / 100; + float progress = denomPartCalc + anonNormPartCalc + anonFullPartCalc; if(progress >= 100) progress = 100; ui->darksendProgress->setValue(progress); - QString strToolPip = tr("Progress: %1% (%2% + %3% + %4%; denominated inputs have %5 of %n rounds on average)", "", nDarksendRounds) - .arg(progress).arg(denomPart).arg(anonNormPart).arg(anonFullPart).arg(pwalletMain->GetAverageAnonymizedRounds()); + QString strToolPip = ("" + tr("Overall progress") + ": %1%
" + + tr("Denominated") + ": %2%
" + + tr("Mixed") + ": %3%
" + + tr("Anonymized") + ": %4%
" + + tr("Denominated inputs have %5 of %n rounds on average", "", nDarksendRounds)) + .arg(progress).arg(denomPart * 100).arg(anonNormPart * 100).arg(anonFullPart * 100) + .arg(pwalletMain->GetAverageAnonymizedRounds()); ui->darksendProgress->setToolTip(strToolPip); } diff --git a/src/wallet.cpp b/src/wallet.cpp index 78e9af3ba..8408c9cb7 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -2162,11 +2162,11 @@ bool CWallet::CreateTransaction(const vector >& vecSend, strFailReason = _("Unable to locate enough Darksend 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 += " " + _("Darksend 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 += " " + _("InstantX requires inputs with at least 6 confirmations, you might need to wait a few minutes and try again."); } return false; @@ -2429,7 +2429,7 @@ string CWallet::PrepareDarksendDenominate(int minRounds, int maxRounds) */ if(minRounds >= 0){ if (!SelectCoinsByDenominations(darkSendPool.sessionDenom, 0.1*COIN, DARKSEND_POOL_MAX, vCoins, vCoins2, nValueIn, minRounds, maxRounds)) - return _("Error: can't select current denominated inputs"); + return _("Error: Can't select current denominated inputs"); } LogPrintf("PrepareDarksendDenominate - preparing darksend denominate . Got: %d \n", nValueIn);