Merge remote-tracking branch 'upstream/dev' into dev

res/zec_qt_wallet_de.ts

@@ -678,7 +678,7 @@
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
+        <source>Error paying Hush URI</source>
         <translation>Fehler bei der Bezahl HUSH URI</translation>
     </message>
     <message>

res/zec_qt_wallet_es.ts

@@ -634,7 +634,7 @@
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
+        <source>Error paying Hush URI</source>
         <translation>Error al pagar HUSH URI</translation>
     </message>
     <message>

res/zec_qt_wallet_fr.ts

@@ -664,7 +664,7 @@
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
+        <source>Error paying Hush URI</source>
         <translation>Erreur lors du paiement de l&apos;URI</translation>
     </message>
     <message>

res/zec_qt_wallet_it.ts

@@ -642,7 +642,7 @@
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
+        <source>Error paying Hush URI</source>
         <translation>Errore nel pagamento dell&apos;URI Hush</translation>
     </message>
     <message>

res/zec_qt_wallet_pt.ts

@@ -634,7 +634,7 @@
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
+        <source>Error paying Hush URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

res/zec_qt_wallet_template.ts

@@ -642,7 +642,7 @@
     </message>
     <message>
         <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
+        <source>Error paying Hush URI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/mainwindow.cpp

@@ -891,7 +891,7 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) {
     qDebug() << "Received URI " << uri;
     PaymentURI paymentInfo = Settings::parseURI(uri);
     if (!paymentInfo.error.isEmpty()) {
-        QMessageBox::critical(this, tr("Error paying pirate URI"), 
+        QMessageBox::critical(this, tr("Error paying Hush URI"), 
                 tr("URI should be of the form 'hush:<addr>?amt=x&memo=y") + "\n" + paymentInfo.error);
         return;
     }

src/websockets.cpp

@@ -112,7 +112,8 @@ void WormholeClient::connect() {
     QObject::connect(m_webSocket, &QWebSocket::connected, this, &WormholeClient::onConnected);
     QObject::connect(m_webSocket, &QWebSocket::disconnected, this, &WormholeClient::closed);
 
-    m_webSocket->open(QUrl("wss://wormhole.zecqtwallet.com:443"));
+    m_webSocket->open(QUrl("wss://wormhole.myhush.org:443"));
+    //TODO: use env var to over-ride
     //m_webSocket->open(QUrl("ws://127.0.0.1:7070"));
 }