Replace some Bitcoin mentions with Elements

ElementsProject · Mar 30, 2020 · eba5c4a · eba5c4a
1 parent 3c029f4
commit eba5c4a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git 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/guiconstants.h b/src/qt/guiconstants.h
@@ -46,14 +46,16 @@ static const int MAX_URI_LENGTH = 255;
 /* Number of frames in spinner animation */
 #define SPINNER_FRAMES 36
 
-#define QAPP_ORG_NAME "Bitcoin"
-#define QAPP_ORG_DOMAIN "bitcoin.org"
 
 #if LIQUID
+#define QAPP_ORG_NAME "Liquid"
+#define QAPP_ORG_DOMAIN "liquid.net"
 #define QAPP_APP_NAME_DEFAULT "Liquid-Qt"
 #define QAPP_APP_NAME_TESTNET "Liquid-Qt-testnet"
 #define QAPP_APP_NAME_REGTEST "Liquid-Qt-regtest"
 #else
+#define QAPP_ORG_NAME "Elements Project"
+#define QAPP_ORG_DOMAIN "elementsproject.org"
 #define QAPP_APP_NAME_DEFAULT "Elements-Qt"
 #define QAPP_APP_NAME_TESTNET "Elements-Qt-testnet"
 #define QAPP_APP_NAME_REGTEST "Elements-Qt-regtest"

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
@@ -130,7 +130,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
         .arg(tr(PACKAGE_NAME))
         .arg(m_blockchain_size)
         .arg(2009)
-        .arg(tr("Bitcoin"))
+        .arg(tr("")) //ELEMENTS: left blank on purpose
     );
     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
@@ -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
@@ -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
         {