aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/qt/bitcoingui.cpp7
-rw-r--r--src/qt/transactiontablemodel.cpp6
-rw-r--r--src/qt/transactionview.cpp2
3 files changed, 8 insertions, 7 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index bf4aa320f4..3ac87262aa 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -47,7 +47,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
trayIcon(0)
{
resize(850, 550);
- setWindowTitle(tr("Bitcoin"));
+ setWindowTitle(tr("Bitcoin Wallet"));
setWindowIcon(QIcon(":icons/bitcoin"));
createActions();
@@ -170,11 +170,12 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
if(clientModel->isTestNet())
{
- setWindowTitle(tr("Bitcoin [testnet]"));
+ QString title_testnet = tr("Bitcoin Wallet [testnet]");
+ setWindowTitle(title_testnet);
setWindowIcon(QIcon(":icons/bitcoin_testnet"));
if(trayIcon)
{
- trayIcon->setToolTip(tr("Bitcoin [testnet]"));
+ trayIcon->setToolTip(title_testnet);
trayIcon->setIcon(QIcon(":/icons/toolbar_testnet"));
}
}
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 65e1632399..70dbd0ffec 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -286,11 +286,11 @@ QVariant TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) con
}
if(wtx->type == TransactionRecord::Generated)
{
- status += "\n";
+ status += "\n\n";
switch(wtx->status.maturity)
{
case TransactionStatus::Immature:
- status += tr("Generation matures in %n more blocks", "",
+ status += tr("Mined balance will be available in %n more blocks", "",
wtx->status.matures_in);
break;
case TransactionStatus::Mature:
@@ -360,7 +360,7 @@ QVariant TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
description = tr("Payment to yourself");
break;
case TransactionRecord::Generated:
- description = tr("Generated");
+ description = tr("Mined");
break;
}
return QVariant(description);
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index d024400fff..a3407e85de 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -53,7 +53,7 @@ TransactionView::TransactionView(QWidget *parent) :
typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |
TransactionFilterProxy::TYPE(TransactionRecord::SendToIP));
typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
- typeWidget->addItem(tr("Generated"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
+ typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));
hlayout->addWidget(typeWidget);