From a531e6a4a0d1d786a8ac6a8c4d21458af76babed Mon Sep 17 00:00:00 2001 From: Steven Roose Date: Mon, 30 Mar 2020 12:38:23 +0100 Subject: [PATCH] Replace some Bitcoin mentions with Elements --- src/qt/bitcoin.cpp | 2 +- src/qt/intro.cpp | 7 ++++--- src/qt/paymentserver.cpp | 4 ++-- src/qt/sendcoinsdialog.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 46a3ffe294..500916b1e6 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -390,7 +390,7 @@ void BitcoinApplication::shutdownResult() void BitcoinApplication::handleRunawayException(const QString &message) { - QMessageBox::critical(nullptr, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message); + QMessageBox::critical(nullptr, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Elements can no longer continue safely and will quit.") + QString("\n\n") + message); ::exit(EXIT_FAILURE); } diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 902c58b462..fc3bb7479e 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -129,8 +129,8 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz ui->lblExplanation1->setText(ui->lblExplanation1->text() .arg(tr(PACKAGE_NAME)) .arg(m_blockchain_size) - .arg(2009) - .arg(tr("Bitcoin")) + .arg(2018) + .arg(tr("Liquid")) ); ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME))); @@ -149,7 +149,8 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz } requiredSpace += m_chain_state_size; ui->sizeWarningLabel->setText( - tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " + + //ELEMENTS: the Bitcoin mention is removed here which breaks translations + tr("%1 will download and store a copy of the block chain.").arg(tr(PACKAGE_NAME)) + " " + storageRequiresMsg.arg(requiredSpace) + " " + tr("The wallet will also be stored in this directory.") ); diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 25e8e594cd..dc31ab1fb0 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -66,7 +66,7 @@ const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest" // static QString ipcServerName() { - QString name("BitcoinQt"); + QString name("ElementsQt"); // Append a simple hash of the datadir // Note that GetDataDir(true) returns a different path @@ -340,7 +340,7 @@ void PaymentServer::handleURIOrFile(const QString& s) } else Q_EMIT message(tr("URI handling"), - tr("URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."), + tr("URI cannot be parsed! This can be caused by an invalid address or malformed URI parameters."), CClientUIInterface::ICON_WARNING); return; diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index c2518932af..6cacda42aa 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -811,7 +811,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text) } else if (!IsValidDestination(dest)) // Invalid address { - ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Bitcoin address")); + ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid address")); } else // Valid address {