diff options
| author | Giel van Schijndel <me@mortis.eu> | 2012-06-17 14:30:37 +0200 |
|---|---|---|
| committer | Giel van Schijndel <me@mortis.eu> | 2012-06-17 14:30:37 +0200 |
| commit | 07368a9e3c60bbef8452501d34bb8d3688cbca13 (patch) | |
| tree | 963f2e56176451bfeb84e54d14bf726388407b7d /src/qt/transactiontablemodel.cpp | |
| parent | fbf9df2ea32528c71b58160283b4eb2c52e30ccb (diff) | |
| parent | fab7858a350d4650686b3aa07bd6277ce7c9685f (diff) | |
Merge branch 'master' into async-ipv6-rpc
Conflicts:
src/bitcoinrpc.cpp
Signed-off-by: Giel van Schijndel <me@mortis.eu>
Diffstat (limited to 'src/qt/transactiontablemodel.cpp')
| -rw-r--r-- | src/qt/transactiontablemodel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index d36bb495a0..a86b1f7c56 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -298,8 +298,7 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons switch(wtx->status.maturity) { case TransactionStatus::Immature: - status += "\n" + tr("Mined balance will be available in %n more blocks", "", - wtx->status.matures_in); + status += "\n" + tr("Mined balance will be available when it matures in %n more block(s)", "", wtx->status.matures_in); break; case TransactionStatus::Mature: break; |