diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-06-11 22:30:21 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-06-11 22:30:21 -0700 |
| commit | b6ef8d5a40066fedb771c68cd4a8088b06d3b665 (patch) | |
| tree | 286de979e1a62b77e78ec62fa2c39e9921861337 /src | |
| parent | 883a310904b3d36c9d74b887d47c14a072ebae7d (diff) | |
| parent | 40d23dafb70bc296ce33ea67503c16c7035664c0 (diff) | |
| download | bitcoin-b6ef8d5a40066fedb771c68cd4a8088b06d3b665.tar.xz | |
Merge pull request #1412 from Diapolo/string_wait_mature
GUI: update info strings for generated blocks
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 2 | ||||
| -rw-r--r-- | src/qt/transactiontablemodel.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 10bcef0d90..dc0f28de92 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -226,7 +226,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx) strHTML += QString("<b>") + tr("Transaction ID:") + "</b> " + wtx.GetHash().ToString().c_str() + "<br>"; if (wtx.IsCoinBase()) - strHTML += QString("<br>") + tr("Generated coins must wait 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it will change to \"not accepted\" and not be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.") + "<br>"; + strHTML += QString("<br>") + tr("Generated coins must mature 120 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, it's state will change to \"not accepted\" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours.") + "<br>"; // // Debug view 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; |