From a9d6151802a7b804bd527be04fa91a1d0269168e Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 3 Jan 2017 15:01:46 +0100 Subject: [PATCH 1/2] qt,wallet: Fix a few typos in messages As reported by [yahoe.001](https://www.transifex.com/user/profile/yahoe.001/). --- src/qt/bitcoinstrings.cpp | 2 +- src/qt/guiutil.cpp | 4 ++-- src/wallet/wallet.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index baca95a0b..acd81a6b2 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -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"), diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 8132e4fe0..94b1b8abe 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -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) { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index e1c409097..fef0f9e58 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3399,7 +3399,7 @@ std::string CWallet::GetWalletHelpString(bool showDebug) strUsage += HelpMessageOpt("-dblogsize=", strprintf("Flush wallet database activity from memory to disk log every 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; From d45b21e2b35001c5fd1c1245c1ac4a883d8cbfc8 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 3 Jan 2017 15:03:37 +0100 Subject: [PATCH 2/2] qt: Fill in English numerusforms minute/minutes block/blocks and so forth. --- src/qt/locale/bitcoin_en.ts | 78 ++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 2d0cccb89..83dbeffd4 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1085,17 +1085,17 @@ %n GB of free space available - - - + + %n GB of free space available + %n GB of free space available (of %n GB needed) - - - + + (of %n GB needed) + (of %n GB needed) @@ -1792,18 +1792,18 @@ - %n seconds(s) - - - + %n second(s) + + %n second + %n seconds - %n minutes(s) - - - + %n minute(s) + + %n minute + %n minutes @@ -2807,9 +2807,9 @@ %n block(s) - - - + + %n block + %n blocks @@ -2820,9 +2820,9 @@ Estimated to begin confirmation within %n block(s). - - - + + Estimated to begin confirmation within %n block. + Estimated to begin confirmation within %n blocks. @@ -3175,9 +3175,9 @@ Open for %n more block(s) - - - + + Open for %n more block + Open for %n more blocks @@ -3238,9 +3238,9 @@ , broadcast through %n node(s) - - - + + , broadcast through %n node + , broadcast through %n nodes @@ -3305,9 +3305,9 @@ matures in %n more block(s) - - - + + matures in %n more block + matures in %n more blocks @@ -3444,9 +3444,9 @@ Open for %n more block(s) - - - + + Open for %n more block + Open for %n more blocks @@ -4014,7 +4014,12 @@ - + + Wallet will not create transactions that violate mempool chain limits (default: %u) + + + + You need to rebuild the database using -reindex-chainstate to change -txindex @@ -4719,12 +4724,7 @@ - - Wallet will not create transactions that violate mempool chain limits (default: %u - - - - + Warning: Unknown block versions being mined! It's possible unknown rules are in effect