sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

strings/translation source fixes

Browse Source
This commit is contained in:
UdjinM6 2015-08-05 06:02:54 +03:00
parent 42d7223191
commit 9a9e7b7644
6 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/activemasternode.cpp
View File

@ -42,7 +42,7 @@ void CActiveMasternode::ManageStatus()
if(strMasterNodeAddr.empty()) {
if(!GetLocal(service)) {
notCapableReason = "Can't detect external address. Please use the Masternodeaddr configuration option.";
notCapableReason = "Can't detect external address. Please use the masternodeaddr configuration option.";
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
return;
}

2
src/darksend.cpp
View File

@ -1824,7 +1824,7 @@ bool CDarksendPool::IsCompatibleWithSession(int64_t nDenom, CTransaction txColla
LogPrintf("CDarksendPool::IsCompatibleWithSession - sessionDenom %d sessionUsers %d\n", sessionDenom, sessionUsers);
if (!unitTest && !IsCollateralValid(txCollateral)){
LogPrint("darksend", "GetInputDarksendRoundsCDarksendPool::IsCompatibleWithSession - collateral not valid!\n");
LogPrint("darksend", "CDarksendPool::IsCompatibleWithSession - collateral not valid!\n");
errorID = ERR_INVALID_COLLATERAL;
return false;
}

6
src/init.cpp
View File

@ -407,15 +407,15 @@ std::string HelpMessage(HelpMessageMode mode)
}
strUsage += " -shrinkdebugfile " + _("Shrink debug.log file on client startup (default: 1 when no -debug)") + "\n";
strUsage += " -testnet " + _("Use the test network") + "\n";
strUsage += " -litemode=<n> " + strprintf(_("Disable all Masternode and Darksend related functionality (0-1, default: %u)"), 0) + "\n";
strUsage += " -litemode=<n> " + strprintf(_("Disable all Dash specific functionality (Masernodes, Darksend, InstantX, Budgeting) (0-1, default: %u)"), 0) + "\n";
strUsage += "\n" + _("Masternode options:") + "\n";
strUsage += " -masternode=<n> " + strprintf(_("Enable the client to act as a masternode (0-1, default: %u)"), 0) + "\n";
strUsage += " -mnconf=<file> " + strprintf(_("Specify masternode configuration file (default: %s)"), "masternode.conf") + "\n";
strUsage += " -mnconflock=<n> " + strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1) + "\n";
strUsage += " -masternodeprivkey=<n> " + _("Set the masternode private key") + "\n";
strUsage += " -masternodeaddr=<n> " + _("Set external address:port to get to this masternode (example: address:port)") + "\n";
strUsage += " -budgetvotemode=<mode> " + _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)") + "\n";
strUsage += " -masternodeaddr=<n> " + strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999") + "\n";
strUsage += " -budgetvotemode=<mode> " + _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)") + "\n";
strUsage += "\n" + _("Darksend options:") + "\n";
strUsage += " -enabledarksend=<n> " + strprintf(_("Enable use of automated darksend for funds stored in this wallet (0-1, default: %u)"), 0) + "\n";

6
src/qt/clientmodel.cpp
View File

@ -69,9 +69,9 @@ int ClientModel::getNumConnections(unsigned int flags) const
QString ClientModel::getMasternodeCountString() const
{
return "Total: " + QString::number((int)mnodeman.size()) +
" (DS compatible: " + QString::number((int)mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION)) +
" / Enabled: " + QString::number((int)mnodeman.CountEnabled()) + ")";
return tr("Total: %1 (DS compatible: %2 / Enabled: %3)").arg(QString::number((int)mnodeman.size()))
.arg(QString::number((int)mnodeman.CountEnabled(MIN_POOL_PEER_PROTO_VERSION)))
.arg(QString::number((int)mnodeman.CountEnabled()));
}
int ClientModel::getNumBlocks() const

7
src/qt/dashstrings.cpp
View File

@ -48,7 +48,8 @@ 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 Masternode and Darksend related functionality (0-1, default: %u)"),
"Disable all Dash specific functionality (Masernodes, Darksend, InstantX, "
"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>."),
@ -130,8 +131,6 @@ QT_TRANSLATE_NOOP("dash-core", ""
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)"),
QT_TRANSLATE_NOOP("dash-core", ""
"Set the number of script verification threads (%u to %d, 0 = auto, <0 = "
@ -318,6 +317,7 @@ 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 is already in place."),
QT_TRANSLATE_NOOP("dash-core", "Lock masternodes from masternode configuration file (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Maintain at most <n> connections to peers (default: %u)"),
QT_TRANSLATE_NOOP("dash-core", "Masternode options:"),
@ -363,6 +363,7 @@ 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."),
QT_TRANSLATE_NOOP("dash-core", "Set database cache size in megabytes (%d to %d, default: %d)"),
QT_TRANSLATE_NOOP("dash-core", "Set external address:port to get to this masternode (example: %s)"),
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)"),
QT_TRANSLATE_NOOP("dash-core", "Set minimum block size in bytes (default: %u)"),

54
src/qt/locale/dash_en.ts
View File

@ -763,7 +763,12 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
<location filename="../clientmodel.cpp" line="+173"/>
<location filename="../clientmodel.cpp" line="+72"/>
<source>Total: %1 (DS compatible: %2 / Enabled: %3)</source>
<translation>Total: %1 (DS compatible: %2 / Enabled: %3)</translation>
</message>
<message>
<location line="+101"/>
<source>Network Alert</source>
<translation>Network Alert</translation>
</message>
@ -2823,7 +2828,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+633"/>
<location filename="../sendcoinsdialog.cpp" line="+635"/>
<location line="+12"/>
<source>Send Coins</source>
<translation>Send Coins</translation>
@ -3045,7 +3050,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Balance:</translation>
</message>
<message>
<location filename="../sendcoinsdialog.cpp" line="-562"/>
<location filename="../sendcoinsdialog.cpp" line="-564"/>
<source>Copy quantity</source>
<translation>Copy quantity</translation>
</message>
@ -3131,7 +3136,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>are added as transaction fee</translation>
</message>
<message>
<location line="+17"/>
<location line="+19"/>
<source>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</source>
<translation>Total Amount = &lt;b&gt;%1&lt;/b&gt;&lt;br /&gt;= %2</translation>
</message>
@ -4290,7 +4295,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Darksend uses exact denominated amounts to send funds, you might simply need to anonymize some more coins.</translation>
</message>
<message>
<location line="+17"/>
<location line="+18"/>
<source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
<translation>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</translation>
</message>
@ -4336,11 +4341,6 @@ https://www.transifex.com/projects/p/dash/</translation>
</message>
<message>
<location line="+7"/>
<source>Set external address:port to get to this masternode (example: address:port)</source>
<translation>Set external address:port to get to this masternode (example: address:port)</translation>
</message>
<message>
<location line="+2"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
<translation>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</translation>
</message>
@ -4605,7 +4605,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>If &lt;category&gt; is not supplied, output all debugging information.</translation>
</message>
<message>
<location line="-268"/>
<location line="-267"/>
<source>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</source>
<translation>(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)</translation>
</message>
@ -4650,12 +4650,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup</translation>
</message>
<message>
<location line="+3"/>
<source>Disable all Masternode and Darksend related functionality (0-1, default: %u)</source>
<translation>Disable all Masternode and Darksend related functionality (0-1, default: %u)</translation>
</message>
<message>
<location line="+2"/>
<location line="+6"/>
<source>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</source>
<translation>Distributed under the MIT software license, see the accompanying file COPYING or &lt;http://www.opensource.org/licenses/mit-license.php&gt;.</translation>
</message>
@ -4755,7 +4750,7 @@ https://www.transifex.com/projects/p/dash/</translation>
<translation>Send trace/debug info to console instead of debug.log file (default: %u)</translation>
</message>
<message>
<location line="+9"/>
<location line="+7"/>
<source>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</source>
<translation>Set the number of threads for coin generation if enabled (-1 = all cores, default: %d)</translation>
</message>
@ -5078,6 +5073,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Dash Alert&quot; admin@foo.com
</message>
<message>
<location line="+8"/>
<source>Lock is already in place.</source>
<translation>Lock is already in place.</translation>
</message>
<message>
<location line="+1"/>
<source>Lock masternodes from masternode configuration file (default: %u)</source>
<translation>Lock masternodes from masternode configuration file (default: %u)</translation>
</message>
@ -5168,6 +5168,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Dash Alert&quot; admin@foo.com
</message>
<message>
<location line="+4"/>
<source>Set external address:port to get to this masternode (example: %s)</source>
<translation>Set external address:port to get to this masternode (example: %s)</translation>
</message>
<message>
<location line="+1"/>
<source>Set key pool size to &lt;n&gt; (default: %u)</source>
<translation>Set key pool size to &lt;n&gt; (default: %u)</translation>
</message>
@ -5282,12 +5287,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Dash Alert&quot; admin@foo.com
<translation>Will retry...</translation>
</message>
<message>
<location line="-127"/>
<location line="-129"/>
<source>Invalid masternodeprivkey. Please see documenation.</source>
<translation>Invalid masternodeprivkey. Please see documenation.</translation>
</message>
<message>
<location line="-88"/>
<location line="-248"/>
<source>Disable all Dash specific functionality (Masernodes, Darksend, InstantX, Budgeting) (0-1, default: %u)</source>
<translation>Disable all Dash specific functionality (Masernodes, Darksend, InstantX, Budgeting) (0-1, default: %u)</translation>
</message>
<message>
<location line="+160"/>
<source>(must be 9999 for mainnet)</source>
<translation>(must be 9999 for mainnet)</translation>
</message>
@ -5392,7 +5402,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Dash Alert&quot; admin@foo.com
<translation>Loading wallet...</translation>
</message>
<message>
<location line="+3"/>
<location line="+4"/>
<source>Masternode options:</source>
<translation>Masternode options:</translation>
</message>
@ -5527,7 +5537,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Dash Alert&quot; admin@foo.com
<translation>Set database cache size in megabytes (%d to %d, default: %d)</translation>
</message>
<message>
<location line="+2"/>
<location line="+3"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation>Set maximum block size in bytes (default: %d)</translation>
</message>