zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #9460: Fix a few typos in translated strings 

d45b21e qt: Fill in English numerusforms (Wladimir J. van der Laan)
a9d6151 qt,wallet: Fix a few typos in messages (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2017-01-03 15:43:52 +01:00
parent 03e1d6ce34 d45b21e2b3
commit e0dc3d70c6
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/bitcoinstrings.cpp
View File

@ -191,7 +191,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", ""
"included in share/rpcuser. This option can be specified multiple times"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Wallet will not create transactions that violate mempool chain limits "
"(default: %u"),
"(default: %u)"),
QT_TRANSLATE_NOOP("bitcoin-core", ""
"Warning: Unknown block versions being mined! It's possible unknown rules are "
"in effect"),

4
src/qt/guiutil.cpp
View File

@ -961,11 +961,11 @@ QString formateNiceTimeOffset(qint64 secs)
const int YEAR_IN_SECONDS = 31556952; // Average length of year in Gregorian calendar
if(secs < 60)
{
timeBehindText = QObject::tr("%n seconds(s)","",secs);
timeBehindText = QObject::tr("%n second(s)","",secs);
}
else if(secs < 2*HOUR_IN_SECONDS)
{
timeBehindText = QObject::tr("%n minutes(s)","",secs/60);
timeBehindText = QObject::tr("%n minute(s)","",secs/60);
}
else if(secs < 2*DAY_IN_SECONDS)
{

78
src/qt/locale/bitcoin_en.ts
View File

@ -1085,17 +1085,17 @@
<message numerus="yes">
<location line="+9"/>
<source>%n GB of free space available</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>%n GB of free space available</numerusform>
<numerusform>%n GB of free space available</numerusform>
</translation>
</message>
<message numerus="yes">
<location line="+3"/>
<source>(of %n GB needed)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>(of %n GB needed)</numerusform>
<numerusform>(of %n GB needed)</numerusform>
</translation>
</message>
</context>
@ -1792,18 +1792,18 @@
</message>
<message numerus="yes">
<location line="+18"/>
<source>%n seconds(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<source>%n second(s)</source>
<translation>
<numerusform>%n second</numerusform>
<numerusform>%n seconds</numerusform>
</translation>
</message>
<message numerus="yes">
<location line="+4"/>
<source>%n minutes(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<source>%n minute(s)</source>
<translation>
<numerusform>%n minute</numerusform>
<numerusform>%n minutes</numerusform>
</translation>
</message>
<message numerus="yes">
@ -2807,9 +2807,9 @@
<message numerus="yes">
<location line="+67"/>
<source>%n block(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>%n block</numerusform>
<numerusform>%n blocks</numerusform>
</translation>
</message>
<message>
@ -2820,9 +2820,9 @@
<message numerus="yes">
<location line="+25"/>
<source>Estimated to begin confirmation within %n block(s).</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>Estimated to begin confirmation within %n block.</numerusform>
<numerusform>Estimated to begin confirmation within %n blocks.</numerusform>
</translation>
</message>
<message>
@ -3175,9 +3175,9 @@
<message numerus="yes">
<location filename="../transactiondesc.cpp" line="+30"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>Open for %n more block</numerusform>
<numerusform>Open for %n more blocks</numerusform>
</translation>
</message>
<message>
@ -3238,9 +3238,9 @@
<message numerus="yes">
<location line="+2"/>
<source>, broadcast through %n node(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>, broadcast through %n node</numerusform>
<numerusform>, broadcast through %n nodes</numerusform>
</translation>
</message>
<message>
@ -3305,9 +3305,9 @@
<message numerus="yes">
<location line="-144"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>matures in %n more block</numerusform>
<numerusform>matures in %n more blocks</numerusform>
</translation>
</message>
<message>
@ -3444,9 +3444,9 @@
<message numerus="yes">
<location line="+58"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
<translation>
<numerusform>Open for %n more block</numerusform>
<numerusform>Open for %n more blocks</numerusform>
</translation>
</message>
<message>
@ -4014,7 +4014,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+31"/>
<location line="+12"/>
<source>Wallet will not create transactions that violate mempool chain limits (default: %u)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+19"/>
<source>You need to rebuild the database using -reindex-chainstate to change -txindex</source>
<translation type="unfinished"></translation>
</message>
@ -4719,12 +4724,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Wallet will not create transactions that violate mempool chain limits (default: %u</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+3"/>
<location line="+7"/>
<source>Warning: Unknown block versions being mined! It&apos;s possible unknown rules are in effect</source>
<translation type="unfinished"></translation>
</message>

2
src/wallet/wallet.cpp
View File

@ -3399,7 +3399,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
strUsage += HelpMessageOpt("-dblogsize=<n>", strprintf("Flush wallet database activity from memory to disk log every <n> megabytes (default: %u)", DEFAULT_WALLET_DBLOGSIZE));
strUsage += HelpMessageOpt("-flushwallet", strprintf("Run a thread to flush wallet periodically (default: %u)", DEFAULT_FLUSHWALLET));
strUsage += HelpMessageOpt("-privdb", strprintf("Sets the DB_PRIVATE flag in the wallet db environment (default: %u)", DEFAULT_WALLET_PRIVDB));
strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
strUsage += HelpMessageOpt("-walletrejectlongchains", strprintf(_("Wallet will not create transactions that violate mempool chain limits (default: %u)"), DEFAULT_WALLET_REJECT_LONG_CHAINS));
}
return strUsage;