Merge pull request #2 from MyHush/dev

Dev update
5 years ago · 6f1cad1329
29 changed files with 6534 additions and 535 deletions
--- a/README.md
+++ b/README.md
@ -41,13 +41,12 @@ hushd, or compile hushd as well.

 ### Building on Linux

+
 ```
-sudo apt-get install qt5-default qt5-qmake libqt5websockets5-dev
+sudo apt-get install qt5-default qt5-qmake libqt5websockets5-dev qtcreator
 git clone https://github.com/MyHush/SilentDragon.git
 cd SilentDragon
-qmake silentdragon.pro CONFIG+=debug
-make -j$(nproc)
-
+./build.sh
 ./silentdragon
 ```

@ -70,8 +69,10 @@ c:\Qt5\bin\qmake.exe silentdragon.pro -tp vc CONFIG+=debug
 ```

 ### Building on macOS
+
 You need to install the Xcode app or the Xcode command line tools first, and then install Qt. 

+
 ```
 git clone https://github.com/MyHush/SilentDragon.git
 cd SilentDragon
@ -89,7 +90,6 @@ these four files in your Git repo:

 ```
    ln -s ../hush3/src/hushd
-    ln -s ../hush3/src/hush-cli
    ln -s ../hush3/src/komodod
    ln -s ../hush3/src/komodo-cli
 ```
--- a/application.qrc
+++ b/application.qrc
@ -19,5 +19,7 @@
        <file>res/zec_qt_wallet_pt.qm</file>
        <file>res/zec_qt_wallet_it.qm</file>
        <file>res/zec_qt_wallet_zh.qm</file>
+        <file>res/zec_qt_wallet_ru.qm</file>
+        <file>res/zec_qt_wallet_uk.qm</file>
    </qresource>
 </RCC>
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,25 @@
+#!/bin/bash
+# Copyright 2019 The Hush Developers
+
+UNAME=$(uname)
+
+if [ "$UNAME" == "Linux" ] ; then
+    JOBS=$(nproc)
+elif [ "$UNAME" == "FreeBSD" ] ; then
+    JOBS=$(nproc)
+elif [ "$UNAME" == "Darwin" ] ; then
+    JOBS=$(sysctl -n hw.ncpu)
+else
+    JOBS=1
+fi
+
+echo "Compiling with $JOBS threads..."
+
+if [ "$1" == "clean" ]; then
+   make clean
+elif [ "$1" == "cleanbuild" ]; then
+   make clean
+   qmake silentdragon.pro CONFIG+=debug; make -j$JOBS
+else
+   qmake silentdragon.pro CONFIG+=debug; make -j$JOBS
+fi
--- a/11
+++ b/11
@ -0,0 +1,11 @@
+#!/bin/bash
+# Copyright (c) 2019 Hush developers
+
+# set working directory to the location of this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+
+NAME=HUSH3
+
+CLI=${KOMODOCLI:-./komodo-cli}
+$CLI -ac_name=$NAME "$@"
--- a/res/logo.icns
+++ b/res/logo.icns
--- a/res/zec_qt_wallet_de.ts
+++ b/res/zec_qt_wallet_de.ts
@ -511,7 +511,7 @@
        <translation>Exportiere Transaktionen</translation>
    </message>
    <message>
-        <source>Pay zcash &amp;URI...</source>
+        <source>Pay HUSH &amp;URI...</source>
        <translation type="vanished">Bezahl HUSH &amp;URI...</translation>
    </message>
    <message>
@ -525,7 +525,7 @@
        <translation>Ctrl+M</translation>
    </message>
    <message>
-        <source>Request zcash...</source>
+        <source>Request HUSH...</source>
        <translation type="vanished">Fordere Hush an...</translation>
    </message>
    <message>
@ -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>
@ -1079,7 +1079,7 @@ Das sieht nicht wie eine sichere Adresse aus</translation>
    <message>
        <source>You have hushd set to start as a daemon, which can cause problems with ZecWallet

-.Please remove the following line from your zcash.conf and restart ZecWallet
+.Please remove the following line from your HUSH3.conf and restart ZecWallet
 daemon=1</source>
        <translation type="vanished">Sie haben hushd im Hintergrund gestartet, was zu Problemen führen kann. Bitte löschen Sie folgende Zeile aus Ihrer Hush3.conf: daemon=1</translation>
    </message>
@ -1088,13 +1088,13 @@ daemon=1</source>

 Please try restarting.

-If you previously started hushd with custom arguments, you might need to reset zcash.conf.
+If you previously started hushd with custom arguments, you might need to reset HUSH3.conf.

 If all else fails, please run hushd manually.</source>
        <translation type="vanished">Ich konnte den intergrierten hushd nicht starten. Wenn Sie hushd mit anderen Argumenten gestartet haben, müssen Sie die Hush3.conf resetten. Wenn dies nicht funktioniert, starten Sie hushd manuell</translation>
    </message>
    <message>
-        <source>Couldn&apos;t connect to hushd configured in zcash.conf.
+        <source>Couldn&apos;t connect to hushd configured in HUSH3.conf.

 Not starting embedded hushd because --no-embedded was passed</source>
        <translation type="vanished">Starte den internen hushd Node nicht --no-embedded wurde eingestellt.</translation>
@ -1388,7 +1388,7 @@ Please set the host/port and user/password in the Edit-&gt;Settings menu.</sourc
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="135"/>
-        <source>%1 doesn&apos;t seem to be a valid Zcash address.</source>
+        <source>%1 doesn&apos;t seem to be a valid Hush address.</source>
        <translation>%1 das scheint keine gültige Hush Adresse zu sein.</translation>
    </message>
    <message>
--- a/res/zec_qt_wallet_es.ts
+++ b/res/zec_qt_wallet_es.ts
--- a/res/zec_qt_wallet_fr.ts
+++ b/res/zec_qt_wallet_fr.ts
@ -37,11 +37,11 @@
    <message>
        <location filename="../src/connection.ui" line="58"/>
        <source>The Dragon Awakens...</source>
-        <translation type="unfinished"></translation>
+        <translation>Le dragon se réveille...</translation>
    </message>
    <message>
        <source>Starting Up</source>
-        <translation type="vanished">Démarrage</translation>
+        <translation>Démarrage</translation>
    </message>
 </context>
 <context>
@ -143,7 +143,7 @@
    <message>
        <location filename="../src/mainwindow.ui" line="487"/>
        <source>Upload File</source>
-        <translation type="unfinished"></translation>
+        <translation>Télécharger un fichier</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="500"/>
@ -166,7 +166,7 @@
    <message>
        <location filename="../src/mainwindow.ui" line="599"/>
        <source>Every month, starting 12-May-2012, for 6 payments</source>
-        <translation type="unfinished"></translation>
+        <translation>Chaque mois, à partir du 12 mai 2012, pour 6 paiements</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="606"/>
@ -203,39 +203,39 @@
    <message>
        <location filename="../src/mainwindow.ui" line="1381"/>
        <source>&amp;Send Duke Feedback</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Envoyer des commentaires à Duke</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1386"/>
        <source>&amp;Hush Discord</source>
-        <translation type="unfinished"></translation>
+        <translation>Discord Hush</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1391"/>
        <source>&amp;Hush Website</source>
-        <translation type="unfinished"></translation>
+        <translation>Site internet de Hush</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1445"/>
        <source>Pay HUSH &amp;URI...</source>
-        <translation type="unfinished"></translation>
+        <translation>Payer HUSH &amp;URI ...</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1463"/>
        <source>Validate Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Valider l'adresse</translation>
    </message>
    <message>
        <source>z-Addr(Sapling)</source>
-        <translation type="vanished">Adresse-z(Sapling)</translation>
+        <translation>Adresse-z(Sapling)</translation>
    </message>
    <message>
        <source>t-Addr</source>
-        <translation type="vanished">t-Adresse</translation>
+        <translation>t-Adresse</translation>
    </message>
    <message>
        <source>z-Addr(Sprout)</source>
-        <translation type="vanished">z-Adresse(Sprout)</translation>
+        <translation>z-Adresse(Sprout)</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="774"/>
@ -344,67 +344,67 @@
    <message>
        <location filename="../src/mainwindow.ui" line="737"/>
        <source>Shielded Address (Private, Anonymous)</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse privée (privée, anonyme)</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="750"/>
        <source>Transparent Address (Public, Metadata-Leaking)</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse transparente (publique, fuites de métadonnées)</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="781"/>
        <source>View All Addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Voir toutes les adresses</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1006"/>
        <source>Notarized Hash</source>
-        <translation type="unfinished"></translation>
+        <translation>Hachage notarisé</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1028"/>
        <source>Notarized txid</source>
-        <translation type="unfinished"></translation>
+        <translation>txid Notarisé</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1050"/>
        <source>Notarized Lag</source>
-        <translation type="unfinished"></translation>
+        <translation>Lag notarisé</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1072"/>
        <source>KMD Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version KMD</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1095"/>
        <source>Protocol Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version du protocole</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1118"/>
        <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1140"/>
        <source>P2P Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port P2P</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1163"/>
        <source>RPC Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Port RPC</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1185"/>
        <source>Client Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nopm du client</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1207"/>
        <source>Next Halving</source>
-        <translation type="unfinished"></translation>
+        <translation>Prochaine réduction</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="1317"/>
@ -640,47 +640,47 @@
    <message>
        <location filename="../src/mainwindow.cpp" line="630"/>
        <source>Some feedback about SilentDragon or Hush...</source>
-        <translation type="unfinished"></translation>
+        <translation>Quelques commentaires sur SilentDragon ou Hush ...</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="632"/>
        <source>Send Duke some private and shielded feedback about </source>
-        <translation type="unfinished"></translation>
+        <translation>Envoyez à Duke des commentaires privés et protégés sur</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="632"/>
        <source> or SilentDragon</source>
-        <translation type="unfinished"></translation>
+        <translation> ou SilentDragon</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="648"/>
        <source>Enter Address to validate</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrez l&apos;adresse pour valider</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="649"/>
        <source>Transparent or Shielded Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse transparente ou privée:</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="882"/>
-        <source>Error paying pirate URI</source>
-        <translation type="unfinished"></translation>
+        <source>Error paying Hush URI</source>
+        <translation>Erreur lors du paiement de l&apos;URI</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="918"/>
        <source>Please paste your private keys here, one per line</source>
-        <translation type="unfinished"></translation>
+        <translation>Veuillez coller vos clés privées ici, une par ligne</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="919"/>
        <source>The keys will be imported into your connected Hush node</source>
-        <translation type="unfinished"></translation>
+        <translation>Les clés seront importées dans votre nœud Hush connecté.</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="950"/>
-        <source>The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited</source>
-        <translation type="unfinished"></translation>
+        <source>Les clés ont été importées! Une nouvelle analyse de la blockchain peut prendre plusieurs minutes. Jusque-là, les fonctionnalités peuvent être limitées</source>
+        <translation></translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="969"/>
@ -779,12 +779,12 @@
    <message>
        <location filename="../src/mainwindow.cpp" line="1172"/>
        <source>Address Asset Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Addresse Asset Viewer</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="1178"/>
        <source>Convert Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse convertie</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="1187"/>
@ -819,7 +819,7 @@
    <message>
        <location filename="../src/mainwindow.cpp" line="1406"/>
        <source>Copy Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Copier l&apos;adresse</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.cpp" line="1472"/>
@ -840,7 +840,7 @@
        <location filename="../src/sendtab.cpp" line="282"/>
        <location filename="../src/sendtab.cpp" line="334"/>
        <source>File Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Fichier téléchargé</translation>
    </message>
    <message>
        <location filename="../src/sendtab.cpp" line="325"/>
@ -850,22 +850,22 @@
    <message>
        <location filename="../src/sendtab.cpp" line="345"/>
        <source>File size too large</source>
-        <translation type="unfinished"></translation>
+        <translation>La taille du fichier est trop grande</translation>
    </message>
    <message>
        <location filename="../src/sendtab.cpp" line="346"/>
        <source>The file size </source>
-        <translation type="unfinished"></translation>
+        <translation>La taille du fichier </translation>
    </message>
    <message>
        <location filename="../src/sendtab.cpp" line="346"/>
        <source> bytes is greater than </source>
-        <translation type="unfinished"></translation>
+        <translation>octets est supérieur à</translation>
    </message>
    <message>
        <location filename="../src/sendtab.cpp" line="346"/>
        <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation>octets</translation>
    </message>
    <message>
        <location filename="../src/sendtab.cpp" line="361"/>
@ -968,22 +968,22 @@ Cette adresse ne semble pas être de type z-Adresse</translation>
    <message>
        <location filename="../src/mobileappconnector.ui" line="49"/>
        <source>Connection String</source>
-        <translation type="unfinished"></translation>
+        <translation>Connection String</translation>
    </message>
    <message>
        <location filename="../src/mobileappconnector.ui" line="84"/>
        <source>Allow connections over the internet via SilentDragon wormhole</source>
-        <translation type="unfinished"></translation>
+        <translation>Autoriser les connexions sur Internet via SilentDragon wormhole</translation>
    </message>
    <message>
        <location filename="../src/mobileappconnector.ui" line="36"/>
        <source>Scan this QRCode from your SilentDragon companion app to connect your phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Scannez ce code QR à partir de votre application SilentDragon mobile pour connecter votre téléphone.</translation>
    </message>
    <message>
        <location filename="../src/mobileappconnector.ui" line="94"/>
        <source>SilentDragon Companion App</source>
-        <translation type="unfinished"></translation>
+        <translation>Application SilentDragon mobile</translation>
    </message>
    <message>
        <location filename="../src/mobileappconnector.ui" line="106"/>
@ -994,7 +994,7 @@ Cette adresse ne semble pas être de type z-Adresse</translation>
        <location filename="../src/mobileappconnector.ui" line="126"/>
        <location filename="../src/mobileappconnector.ui" line="160"/>
        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>TextLabel</translation>
    </message>
    <message>
        <location filename="../src/mobileappconnector.ui" line="136"/>
@ -1016,7 +1016,7 @@ Cette adresse ne semble pas être de type z-Adresse</translation>
    <message>
        <location filename="../src/privkey.ui" line="14"/>
        <source>Private Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Clés privées</translation>
    </message>
 </context>
 <context>
@ -1044,11 +1044,11 @@ Cette adresse ne semble pas être de type z-Adresse</translation>
    <message>
        <source>You have hushd set to start as a daemon, which can cause problems with SilentDragon

-.Please remove the following line from your zcash.conf and restart SilentDragon
+.Please remove the following line from your HUSH3.conf and restart SilentDragon
 daemon=1</source>
        <translation type="vanished">vous avez hushd configuré pour démarrer en tant que démon ce qui peut causer des problèmes avec SilentDragon

- Veuillez enlever la ligne suivante de votre fichier &quot;zcash.conf&quot; et redémarrer SilentDragon:
+ Veuillez enlever la ligne suivante de votre fichier &quot;HUSH3.conf&quot; et redémarrer SilentDragon:
 daemon=1</translation>
    </message>
    <message>
@ -1056,19 +1056,19 @@ daemon=1</translation>

 Please try restarting.

-If you previously started hushd with custom arguments, you might need to reset zcash.conf.
+If you previously started hushd with custom arguments, you might need to reset HUSH3.conf.

 If all else fails, please run hushd manually.</source>
        <translation type="vanished">Impossible de démarrer le hushd intégré.

 Veuillez essayer de redémarrer.

-Si vous avez précédemment démarré hushd avec des arguments, vous devrez peut-être réinitialiser le fichier zcash.conf.
+Si vous avez précédemment démarré hushd avec des arguments, vous devrez peut-être réinitialiser le fichier HUSH3.conf.

 Si tout échoue, exécutez hushd manuellement.</translation>
    </message>
    <message>
-        <source>Couldn&apos;t connect to hushd configured in zcash.conf.
+        <source>Couldn&apos;t connect to hushd configured in HUSH3.conf.

 Not starting embedded hushd because --no-embedded was passed</source>
        <translation type="vanished">Le démarrage de hushd n&apos;a pas eu lieu car l&apos;argument --no-embedded a été utilisé au lancement</translation>
@ -1109,7 +1109,10 @@ Not starting embedded hushd because --no-embedded was passed</source>

 .Please remove the following line from your HUSH3.conf and restart SilentDragon
 daemon=1</source>
-        <translation type="unfinished"></translation>
+        <translation>Hushd est configuré pour démarrer en tant que démon, ce qui peut entraîner des problèmes avec SilentDragon
+
+        .Veuillez supprimer la ligne suivante de votre fichier HUSH3.conf et redémarrer SilentDragon
+        démon = 1</translation>
    </message>
    <message>
        <location filename="../src/connection.cpp" line="85"/>
@ -1120,19 +1123,27 @@ Please try restarting.
 If you previously started hushd with custom arguments, you might need to  reset HUSH3.conf.

 If all else fails, please run hushd manually.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de démarrer le hushd intégré.
+
+        S&apos;il vous plaît essayez de redémarrer.
+        
+        Si vous avez déjà démarré hushd avec des arguments personnalisés, vous devrez peut-être réinitialiser le fichier HUSH3.conf.
+        
+        Si tout échoue, veuillez exécuter hushd manuellement.</translation>
    </message>
    <message>
        <location filename="../src/connection.cpp" line="96"/>
        <source>Couldn&apos;t connect to hushd configured in HUSH3.conf.

 Not starting embedded hushd because --no-embedded was passed</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de se connecter à hushd configuré dans HUSH3.conf.
+
+        Ne démarre pas hushd intégré car --no-embedded a été transmis</translation>
    </message>
    <message>
        <location filename="../src/connection.cpp" line="183"/>
        <source>Could not create HUSH3.conf.</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossible de créer le fichier HUSH3.conf.</translation>
    </message>
    <message>
        <location filename="../src/connection.cpp" line="290"/>
@ -1158,12 +1169,12 @@ Not starting embedded hushd because --no-embedded was passed</source>
    <message>
        <location filename="../src/connection.cpp" line="509"/>
        <source>This may take several hours, grab some popcorn</source>
-        <translation type="unfinished"></translation>
+        <translation>Cela peut prendre plusieurs heures. Prenez du pop-corn</translation>
    </message>
    <message>
        <location filename="../src/connection.cpp" line="769"/>
        <source>There was an error! : </source>
-        <translation type="unfinished"></translation>
+        <translation>Il y avait une erreur! :</translation>
    </message>
    <message>
        <location filename="../src/rpc.cpp" line="693"/>
@ -1235,7 +1246,7 @@ Not starting embedded hushd because --no-embedded was passed</source>
    <message>
        <location filename="../src/rpc.cpp" line="717"/>
        <source>hushd has no peer connections! Network issues?</source>
-        <translation type="unfinished"></translation>
+        <translation>hushd n&apos;a pas de connexion entre pairs! Problèmes de réseau?</translation>
    </message>
    <message>
        <location filename="../src/rpc.cpp" line="1031"/>
@ -1344,12 +1355,12 @@ Veuillez configurer l&apos;hôte/port et utilisateur/mot de passe dans le menu E
    <message>
        <location filename="../src/addressbook.cpp" line="128"/>
        <source>Address or Label Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur d&apos;adresse ou d&apos;étiquette</translation>
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="129"/>
        <source>Address or Label cannot be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>L&apos;adresse ou l&apos;étiquette ne peut pas être vide</translation>
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="134"/>
@ -1362,18 +1373,18 @@ Veuillez configurer l&apos;hôte/port et utilisateur/mot de passe dans le menu E
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="135"/>
-        <source>%1 doesn&apos;t seem to be a valid Zcash address.</source>
-        <translation type="unfinished"></translation>
+        <source>%1 doesn&apos;t seem to be a valid Hush address.</source>
+        <translation>%1 ne semble pas être une adresse Hush valide.</translation>
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="143"/>
        <source>Label Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erreur d&apos;étiquette</translation>
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="144"/>
        <source>The label &apos;%1&apos; already exists. Please remove the existing label.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le label %1 existe déjà. Veuillez supprimer l&apos;étiquette existante.</translation>
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="156"/>
@ -1465,7 +1476,7 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/websockets.cpp" line="652"/>
        <source>Node is still syncing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Le nœud est toujours en cours de synchronisation.</translation>
    </message>
    <message>
        <location filename="../src/websockets.cpp" line="676"/>
@ -1551,7 +1562,7 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/requestdialog.ui" line="209"/>
        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Texte du label</translation>
    </message>
    <message>
        <location filename="../src/requestdialog.ui" line="219"/>
@ -1561,12 +1572,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/requestdialog.cpp" line="50"/>
        <source>Error paying HUSH URI</source>
-        <translation type="unfinished">Erreur lors du payement du URI HUSH</translation>
+        <translation>Erreur lors du paiement de l&apos;URI</translation>
    </message>
    <message>
        <location filename="../src/requestdialog.cpp" line="51"/>
        <source>URI should be of the form &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</source>
-        <translation type="unfinished">Le format URI doit être comme suit: &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</translation>
+        <translation>Le format URI doit être comme suit: &apos;hush:&lt;addr&gt;?amt=x&amp;memo=y</translation>
    </message>
    <message>
        <location filename="../src/requestdialog.cpp" line="65"/>
@ -1779,17 +1790,17 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/validateaddress.ui" line="14"/>
        <source>Validate Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Valider l&apos;adresse</translation>
    </message>
    <message>
        <location filename="../src/validateaddress.ui" line="20"/>
        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Texte du label</translation>
    </message>
    <message>
        <location filename="../src/validateaddress.ui" line="27"/>
        <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse:</translation>
    </message>
 </context>
 <context>
@ -1797,12 +1808,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/validateaddress.cpp" line="6"/>
        <source>Property</source>
-        <translation type="unfinished"></translation>
+        <translation>Propriété</translation>
    </message>
    <message>
        <location filename="../src/validateaddress.cpp" line="6"/>
        <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valeur</translation>
    </message>
 </context>
 <context>
@ -1810,12 +1821,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/viewalladdresses.ui" line="14"/>
        <source>All Addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Toutes les adresses</translation>
    </message>
    <message>
        <location filename="../src/viewalladdresses.ui" line="30"/>
        <source>Export All Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Exporter toutes les clés</translation>
    </message>
 </context>
 <context>
@ -1823,12 +1834,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/viewalladdresses.cpp" line="6"/>
        <source>Address</source>
-        <translation type="unfinished">Adresse</translation>
+        <translation>Adresse</translation>
    </message>
    <message>
        <location filename="../src/viewalladdresses.cpp" line="6"/>
        <source>Balance (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Solde (%1)</translation>
    </message>
 </context>
 <context>
@ -1968,12 +1979,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi
    <message>
        <location filename="../src/newrecurring.ui" line="64"/>
        <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Texte du label</translation>
    </message>
    <message>
        <location filename="../src/newrecurring.ui" line="111"/>
        <source>From</source>
-        <translation type="unfinished">De</translation>
+        <translation>De</translation>
    </message>
    <message>
        <location filename="../src/newrecurring.ui" line="118"/>
--- a/res/zec_qt_wallet_it.ts
+++ b/res/zec_qt_wallet_it.ts
--- a/res/zec_qt_wallet_pt.ts
+++ b/res/zec_qt_wallet_pt.ts
@ -6,12 +6,12 @@
    <message>
        <location filename="../src/addressbook.cpp" line="11"/>
        <source>Label</source>
-        <translation type="unfinished">Etiqueta</translation>
+        <translation>Etiqueta</translation>
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="11"/>
        <source>Address</source>
-        <translation type="unfinished">Endereço</translation>
+        <translation>Endereço</translation>
    </message>
 </context>
 <context>
@ -37,7 +37,7 @@
    <message>
        <location filename="../src/connection.ui" line="58"/>
        <source>The Dragon Awakens...</source>
-        <translation type="unfinished"></translation>
+        <translation>O Dragão Desperta...</translation>
    </message>
    <message>
        <source>Starting Up</source>
@ -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>
@ -1015,10 +1015,10 @@ não se parece com um z-Address</translation>
    <message>
        <source>You have hushd set to start as a daemon, which can cause problems with SilentDragon

-.Please remove the following line from your zcash.conf and restart SilentDragon
+.Please remove the following line from your HUSH3.conf and restart SilentDragon
 daemon=1</source>
        <translation type="vanished">Você tem hushd configurado como daemon, o que pode causar problemas com a SilentDragon
- Por favor, remova a seguinte linha do seu zcash.conf e reinicie a SilentDragon:
+ Por favor, remova a seguinte linha do seu HUSH3.conf e reinicie a SilentDragon:
 daemon=1</translation>
    </message>
    <message>
@ -1026,20 +1026,20 @@ daemon=1</translation>

 Please try restarting.

-If you previously started hushd with custom arguments, you might need to reset zcash.conf.
+If you previously started hushd with custom arguments, you might need to reset HUSH3.conf.

 If all else fails, please run hushd manually.</source>
        <translation type="vanished">Não foi possível iniciar o hushd acoplado.
 Por favor, tenta reiniciar.
-Se você iniciou hushd anteriormente com parâmetros customizados você pode precisar resetar seu zcash.conf.
+Se você iniciou hushd anteriormente com parâmetros customizados você pode precisar resetar seu HUSH3.conf.

 Se ainda assim não der certo, por favor rode hushd manualmente.</translation>
    </message>
    <message>
-        <source>Couldn&apos;t connect to hushd configured in zcash.conf.
+        <source>Couldn&apos;t connect to hushd configured in HUSH3.conf.

 Not starting embedded hushd because --no-embedded was passed</source>
-        <translation type="vanished">Não foi possível conectar ao hushd configurado em zcash.conf.
+        <translation type="vanished">Não foi possível conectar ao hushd configurado em HUSH3.conf.

 Não iniciando hushd acoplado porque nenhum foi passado como parâmetro</translation>
    </message>
@ -1328,7 +1328,7 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar&gt;Preferências
    </message>
    <message>
        <location filename="../src/addressbook.cpp" line="135"/>
-        <source>%1 doesn&apos;t seem to be a valid Zcash address.</source>
+        <source>%1 doesn&apos;t seem to be a valid Hush address.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/res/zec_qt_wallet_ru.qm
+++ b/res/zec_qt_wallet_ru.qm
--- a/res/zec_qt_wallet_ru.ts
+++ b/res/zec_qt_wallet_ru.ts
--- a/res/zec_qt_wallet_template.ts
+++ b/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>
--- a/res/zec_qt_wallet_tr.ts
+++ b/res/zec_qt_wallet_tr.ts
--- a/res/zec_qt_wallet_uk.qm
+++ b/res/zec_qt_wallet_uk.qm
--- a/res/zec_qt_wallet_uk.ts
+++ b/res/zec_qt_wallet_uk.ts
--- a/res/zec_qt_wallet_zh.ts
+++ b/res/zec_qt_wallet_zh.ts
@ -214,7 +214,7 @@
    <message>
        <location filename="../src/mainwindow.ui" line="740"/>
        <source>View All Addresses</source>
-        <translation type="unfinished"></translation>
+        <translation>查看所有地址</translation>
    </message>
    <message>
        <location filename="../src/mainwindow.ui" line="758"/>
@ -878,7 +878,7 @@ doesn&apos;t look like a z-address</source>
    <message>
        <location filename="../src/privkey.ui" line="14"/>
        <source>Private Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>私钥</translation>
    </message>
 </context>
 <context>
--- a/silentdragon.pro
+++ b/silentdragon.pro
@ -116,7 +116,9 @@ TRANSLATIONS = res/zec_qt_wallet_es.ts \
               res/zec_qt_wallet_de.ts \
               res/zec_qt_wallet_pt.ts \
               res/zec_qt_wallet_it.ts \
-               res/zec_qt_wallet_zh.ts
+               res/zec_qt_wallet_zh.ts \
+               res/zec_qt_wallet_ru.ts \
+               res/zec_qt_wallet_uk.ts

 include(singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@ -132,7 +132,7 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target) {
        // Test if address is valid.
        if (!Settings::isValidAddress(addr)) {
            QMessageBox::critical(parent, QObject::tr("Address Format Error"), 
-                QObject::tr("%1 doesn't seem to be a valid Zcash address.")
+                QObject::tr("%1 doesn't seem to be a valid Hush address.")
                    .arg(addr), 
                QMessageBox::Ok);
            return;
--- a/src/connection.cpp
+++ b/src/connection.cpp
@ -336,7 +336,6 @@ bool ConnectionLoader::startEmbeddedZcashd() {
        }        
    }

-    // Finally, start hushd
    QDir appPath(QCoreApplication::applicationDirPath());
 #ifdef Q_OS_LINUX
    auto hushdProgram = appPath.absoluteFilePath("hushd");
@ -346,16 +345,19 @@ bool ConnectionLoader::startEmbeddedZcashd() {
 #elif defined(Q_OS_DARWIN)
    auto hushdProgram = appPath.absoluteFilePath("hushd");
 #elif defined(Q_OS_WIN64)
-    auto hushdProgram = appPath.absoluteFilePath("hushd.bat");
+    // we use the CLI directly
+    auto hushdProgram = appPath.absoluteFilePath("komodod.exe");
 #else
-    //TODO: Not Linux + not darwin DOES NOT EQUAL windows!!!
-    auto hushdProgram = appPath.absoluteFilePath("hushd");
+    main->logger->write("Unknown OS!");
+    auto hushdProgram = appPath.absoluteFilePath("komodod");
 #endif
    
    if (!QFile(hushdProgram).exists()) {
        qDebug() << "Can't find hushd at " << hushdProgram;
-        main->logger->write("Can't find hushd at " + hushdProgram); 
+        main->logger->write("Can't find hushd at " + hushdProgram);
        return false;
+    } else {
+        main->logger->write("Found hushd at " + hushdProgram);
    }

    ezcashd = std::shared_ptr<QProcess>(new QProcess(main));
@ -380,13 +382,26 @@ bool ConnectionLoader::startEmbeddedZcashd() {
        processStdErrOutput.append(output);
    });

+
+    // This string should be the exact arg list seperated by single spaces
+    QString params = "-ac_name=HUSH3 -ac_sapling=1 -ac_reward=0,1125000000,562500000 -ac_halving=129,340000,840000 -ac_end=128,340000,5422111 -ac_eras=3 -ac_blocktime=150 -ac_cc=2 -ac_ccenable=228,234,235,236,241 -ac_founders=1 -ac_supply=6178674 -ac_perc=11111111 -clientname=GoldenSandtrout -addnode=188.165.212.101 -addnode=136.243.227.142 -addnode=5.9.224.250 -ac_cclib=hush3 -ac_script=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac";
+    QStringList arguments = params.split(" ");
+    // Finally, actually start the full node
+
 #ifdef Q_OS_LINUX
+    main->logger->write("Starting on Linux");
    ezcashd->start(hushdProgram);
 #elif defined(Q_OS_DARWIN)
+    main->logger->write("Starting on Darwin");
    ezcashd->start(hushdProgram);
+#elif defined(Q_OS_WIN64)
+    main->logger->write("Starting on Win64 with params " + params);
+    ezcashd->setWorkingDirectory(appPath.absolutePath());
+    ezcashd->start(hushdProgram, arguments);
 #else
+    main->logger->write("Starting on Unknown OS with params " + params);
    ezcashd->setWorkingDirectory(appPath.absolutePath());
-    ezcashd->start(hushdProgram);
+    ezcashd->start(hushdProgram, arguments);
 #endif // Q_OS_LINUX


@ -567,7 +582,7 @@ QString ConnectionLoader::zcashParamsDir() {
        QDir().mkpath(paramsLocation.absolutePath());
    }

-    main->logger->write("Found Zcash params directory at " + paramsLocation.absolutePath());
+    main->logger->write("Found Hush params directory at " + paramsLocation.absolutePath());
    return paramsLocation.absolutePath();
 }

--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@ -137,9 +137,9 @@ MainWindow::MainWindow(QWidget *parent) :
 }
 
 void MainWindow::createWebsocket(QString wormholecode) {
-    qDebug() << "Listening for app connections on port 8237";
+    qDebug() << "Listening for app connections on port 8777";
    // Create the websocket server, for listening to direct connections
-    wsserver = new WSServer(8237, false, this);
+    wsserver = new WSServer(8777, false, this);

    if (!wormholecode.isEmpty()) {
        // Connect to the wormhole service
@ -479,6 +479,12 @@ void MainWindow::setupSettingsModal() {
        // Auto shielding
        settings.chkAutoShield->setChecked(Settings::getInstance()->getAutoShield());

+        // Check for updates
+        settings.chkCheckUpdates->setChecked(Settings::getInstance()->getCheckForUpdates());
+
+        // Fetch prices
+        settings.chkFetchPrices->setChecked(Settings::getInstance()->getAllowFetchPrices());
+
        // Use Tor
        bool isUsingTor = false;
        if (rpc->getConnection() != nullptr) {
@ -543,6 +549,12 @@ void MainWindow::setupSettingsModal() {
            // Auto shield
            Settings::getInstance()->setAutoShield(settings.chkAutoShield->isChecked());

+            // Check for updates
+            Settings::getInstance()->setCheckForUpdates(settings.chkCheckUpdates->isChecked());
+
+            // Allow fetching prices
+            Settings::getInstance()->setAllowFetchPrices(settings.chkFetchPrices->isChecked());
+
            if (!isUsingTor && settings.chkTor->isChecked()) {
                // If "use tor" was previously unchecked and now checked
                Settings::addToZcashConf(zcashConfLocation, "proxy=127.0.0.1:9050");
@ -879,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;
    }
@ -1344,6 +1356,7 @@ std::function<void(bool)> MainWindow::addZAddrsToComboList(bool sapling) {
 void MainWindow::setupReceiveTab() {
    auto addNewTAddr = [=] () {
        rpc->newTaddr([=] (json reply) {
+            qDebug() << "New addr button clicked";
            QString addr = QString::fromStdString(reply.get<json::string_t>());
            // Make sure the RPC class reloads the t-addrs for future use
            rpc->refreshAddresses();
@ -1360,8 +1373,7 @@ void MainWindow::setupReceiveTab() {

    // Connect t-addr radio button
    QObject::connect(ui->rdioTAddr, &QRadioButton::toggled, [=] (bool checked) { 
-        // Whenever the t-address is selected, we generate a new address, because we don't
-        // want to reuse t-addrs
+        qDebug() << "taddr radio toggled";
        if (checked && this->rpc->getUTXOs() != nullptr) { 
            updateTAddrCombo(checked);
        } 
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@ -1223,6 +1223,50 @@
              </widget>
             </item>

+             <item row="17" column="0">
+              <widget class="QLabel" name="localserviceslabel">
+               <property name="text">
+                <string>Local Services</string>
+               </property>
+              </widget>
+             </item>
+             <item row="17" column="2">
+              <widget class="QLabel" name="localservices">
+               <property name="text">
+                <string>Loading...</string>
+               </property>
+              </widget>
+             </item>
+             <item row="17" column="1">
+              <widget class="QLabel" name="localservicesspacer">
+               <property name="text">
+                <string>|</string>
+               </property>
+              </widget>
+             </item>
+
+             <item row="18" column="0">
+              <widget class="QLabel" name="longestchainlabel">
+               <property name="text">
+                <string>Longest Chain</string>
+               </property>
+              </widget>
+             </item>
+             <item row="18" column="2">
+              <widget class="QLabel" name="longestchain">
+               <property name="text">
+                <string>Loading...</string>
+               </property>
+              </widget>
+             </item>
+             <item row="18" column="1">
+              <widget class="QLabel" name="longestchainspacer">
+               <property name="text">
+                <string>|</string>
+               </property>
+              </widget>
+             </item>
+
             <item row="3" column="2">
              <widget class="QLabel" name="solrate">
               <property name="text">
--- a/src/mobileappconnector.ui
+++ b/src/mobileappconnector.ui
@ -33,7 +33,7 @@
      </sizepolicy>
     </property>
     <property name="text">
-      <string>Scan this QRCode from your SilentDragon companion app to connect your phone</string>
+      <string>Scan this QRCode in SilentDragonAndroid to connect your device</string>
     </property>
    </widget>
   </item>
@ -91,7 +91,7 @@
   <item row="1" column="2" rowspan="2">
    <widget class="QGroupBox" name="groupBox">
     <property name="title">
-      <string>SilentDragon Companion App</string>
+      <string>SilentDragonAndroid</string>
     </property>
     <layout class="QGridLayout" name="gridLayout_2">
      <item row="5" column="0">
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@ -585,6 +585,7 @@ void RPC::getInfoThenRefresh(bool force) {

        static int lastBlock    = 0;
        int curBlock            = reply["blocks"].get<json::number_integer_t>();
+        int longestchain        = reply["longestchain"].get<json::number_integer_t>();
        int version             = reply["version"].get<json::number_integer_t>();
        int p2pport             = reply["p2pport"].get<json::number_integer_t>();
        int rpcport             = reply["rpcport"].get<json::number_integer_t>();
@ -600,6 +601,7 @@ void RPC::getInfoThenRefresh(bool force) {

        Settings::getInstance()->setZcashdVersion(version);

+	ui->longestchain->setText(QString::number(longestchain));
        ui->notarizedhashvalue->setText( ntzhash );
        ui->notarizedtxidvalue->setText( ntztxid );
        ui->lagvalue->setText( QString::number(lag) );
@ -654,8 +656,10 @@ void RPC::getInfoThenRefresh(bool force) {

        conn->doRPCIgnoreError(payload, [=](const json& reply) {
            QString clientname    = QString::fromStdString( reply["subversion"].get<json::string_t>() );
+            QString localservices = QString::fromStdString( reply["localservices"].get<json::string_t>() );

            ui->clientname->setText(clientname);
+	    ui->localservices->setText(localservices);
        });

        // Call to see if the blockchain is syncing. 
--- a/src/settings.cpp
+++ b/src/settings.cpp
@ -14,6 +14,23 @@ Settings* Settings::getInstance() {
    return instance;
 }

+bool Settings::getCheckForUpdates() {
+    return QSettings().value("options/allowcheckupdates", true).toBool();
+}
+
+void Settings::setCheckForUpdates(bool allow) {
+     QSettings().setValue("options/allowcheckupdates", allow);
+}
+
+bool Settings::getAllowFetchPrices() {
+    return QSettings().value("options/allowfetchprices", true).toBool();
+}
+
+void Settings::setAllowFetchPrices(bool allow) {
+     QSettings().setValue("options/allowfetchprices", allow);
+}
+
+
 Config Settings::getSettings() {
    // Load from the QT Settings. 
    QSettings s;
--- a/src/settings.h
+++ b/src/settings.h
@ -62,6 +62,12 @@ public:

    bool    getAllowCustomFees();
    void    setAllowCustomFees(bool allow);
+
+    bool    getAllowFetchPrices();
+    void    setAllowFetchPrices(bool allow);
+
+    bool    getCheckForUpdates();
+    void    setCheckForUpdates(bool allow);
            
    bool    isSaplingActive();

--- a/src/settings.ui
+++ b/src/settings.ui
@ -26,7 +26,7 @@
   <item>
    <widget class="QTabWidget" name="tabWidget">
     <property name="currentIndex">
-      <number>2</number>
+      <number>1</number>
     </property>
     <widget class="QWidget" name="tab">
      <attribute name="title">
@ -145,32 +145,18 @@
       <string>Options</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout">
-       <item row="10" column="0" colspan="2">
-        <widget class="QLabel" name="lblTor">
-         <property name="text">
-          <string>Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.</string>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QPushButton" name="btnClearSaved">
-         <property name="text">
-          <string>Clear History</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="QLabel" name="label_5">
-         <property name="text">
-          <string>Shielded transactions are saved locally and shown in the transactions tab.  If you uncheck this, shielded transactions will not appear in the transactions tab.</string>
+       <item row="14" column="0" colspan="2">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
         </property>
-        </widget>
+        </spacer>
       </item>
       <item row="2" column="0">
        <spacer name="horizontalSpacer">
@ -185,21 +171,35 @@
         </property>
        </spacer>
       </item>
-       <item row="0" column="0" colspan="2">
-        <widget class="QCheckBox" name="chkSaveTxs">
+       <item row="7" column="0">
+        <widget class="QCheckBox" name="chkTor">
         <property name="text">
-          <string>Remember shielded transactions</string>
+          <string>Connect via Tor</string>
         </property>
        </widget>
       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="chkCustomFees">
+       <item row="9" column="0" colspan="2">
+        <widget class="QCheckBox" name="chkCheckUpdates">
         <property name="text">
-          <string>Allow custom fees</string>
+          <string>Check github for updates at startup</string>
         </property>
        </widget>
       </item>
-       <item row="7" column="0" colspan="2">
+       <item row="13" column="0" colspan="2">
+        <widget class="Line" name="line_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="chkSaveTxs">
+         <property name="text">
+          <string>Remember shielded transactions</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="2">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy.</string>
@ -209,61 +209,75 @@
         </property>
        </widget>
       </item>
-       <item row="11" column="0" colspan="2">
-        <widget class="Line" name="line_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+       <item row="4" column="0" colspan="2">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. </string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
         </property>
        </widget>
       </item>
-       <item row="12" column="0" colspan="2">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+       <item row="2" column="1">
+        <widget class="QPushButton" name="btnClearSaved">
+         <property name="text">
+          <string>Clear History</string>
         </property>
-        </spacer>
+        </widget>
       </item>
-       <item row="4" column="0" colspan="2">
-        <widget class="QLabel" name="label_6">
+       <item row="1" column="0" colspan="2">
+        <widget class="QLabel" name="label_5">
         <property name="text">
-          <string>Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. </string>
+          <string>Shielded transactions are saved locally and shown in the transactions tab.  If you uncheck this, shielded transactions will not appear in the transactions tab.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-       <item row="6" column="0" colspan="2">
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="chkCustomFees">
+         <property name="text">
+          <string>Allow custom fees</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="chkAutoShield">
         <property name="text">
          <string>Shield change from t-Addresses to your sapling address</string>
         </property>
        </widget>
       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_8">
+       <item row="8" column="0" colspan="2">
+        <widget class="QLabel" name="lblTor">
         <property name="text">
-          <string/>
+          <string>Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
         </property>
        </widget>
       </item>
-       <item row="9" column="0">
-        <widget class="QCheckBox" name="chkTor">
+       <item row="10" column="0" colspan="2">
+        <widget class="QLabel" name="label_8">
         <property name="text">
-          <string>Connect via Tor</string>
+          <string>Connect to github on startup to check for updates</string>
         </property>
        </widget>
       </item>
-       <item row="8" column="0">
+       <item row="12" column="0" colspan="2">
        <widget class="QLabel" name="label_10">
         <property name="text">
-          <string notr="true"/>
+          <string>Connect to the internet to fetch HUSH prices</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="0" colspan="2">
+        <widget class="QCheckBox" name="chkFetchPrices">
+         <property name="text">
+          <string>Fetch HUSH / USD prices</string>
         </property>
        </widget>
       </item>
--- a/src/version.h
+++ b/src/version.h
@ -1 +1 @@
-#define APP_VERSION "0.7.7"
+#define APP_VERSION "0.7.8"
--- a/src/websockets.cpp
+++ b/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"));
 }

@ -320,7 +321,7 @@ void AppDataServer::updateUIWithNewQRCode(MainWindow* mainwindow) {
    if (ipv4Addr.isEmpty())
        return;
    
-    QString uri = "ws://" + ipv4Addr + ":8237";
+    QString uri = "ws://" + ipv4Addr + ":8777";

    // Get a new secret
    unsigned char* secretBin = new unsigned char[crypto_secretbox_KEYBYTES];