diff --git a/res/SIGNATURES_README b/res/SIGNATURES_README deleted file mode 100644 index f569f99..0000000 --- a/res/SIGNATURES_README +++ /dev/null @@ -1,13 +0,0 @@ -This directory contains the hashes and signatures for SilentDargon - -Verify the hashes by running: -sha256sum -c sha256sum-vX.Y.Z.txt - -Verify signatures: -1. First, import the public key (Available on GitHub - at https://github.com/ZcashFoundation/zecwallet/blob/master/public_key.asc) -gpg --import public_key.asc - -2. Verify signature -gpg --verify - diff --git a/res/silentdragon_bg.ts b/res/silentdragon_bg.ts index 27262dd..2449588 100644 --- a/res/silentdragon_bg.ts +++ b/res/silentdragon_bg.ts @@ -347,6 +347,11 @@ Notarized Lag + + + &Report a bug + + Check git.hush.is for &updates @@ -447,11 +452,6 @@ &About - - - &Report a bug on Github - - &Settings @@ -1219,48 +1219,48 @@ Not starting embedded hushd because --no-embedded was passed - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu - + Your hushd is starting up. Please wait. - + This may take several hours, grab some popcorn - + Connection Error - + Transaction Error - + There was an error! : diff --git a/res/silentdragon_de.qm b/res/silentdragon_de.qm index 80d8506..28d0b32 100644 Binary files a/res/silentdragon_de.qm and b/res/silentdragon_de.qm differ diff --git a/res/silentdragon_de.ts b/res/silentdragon_de.ts index eabbf31..f2fbf8c 100644 --- a/res/silentdragon_de.ts +++ b/res/silentdragon_de.ts @@ -255,9 +255,8 @@ &Beenden - &Report a bug on Github - &Melde einen Fehler über Github + &Melde einen Fehler über Github @@ -506,6 +505,11 @@ &About &Über + + + &Report a bug + + &Settings @@ -521,8 +525,8 @@ &Spenden - Check github.com for &updates - Besuche github.com für weitere &updates + Check git for &updates + Besuche git für weitere &updates @@ -1306,12 +1310,12 @@ If all else fails, please run hushd manually. MB bei - + This may take several hours, grab some popcorn Dies kann einige Stunden dauern, machen Sie sich einen Kaffee - + There was an error! : Es gab einen Fehler! : @@ -1443,26 +1447,26 @@ Would you like to visit the releases page? Hushd fehler - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. Eine manuelle Verbinung wurde angefragt, aber nicht konfiguriert. Bitte tragen Sie den Host/Port und Benutzer/Passwort im Einstellungsmenü ein. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. Konnte keine Verbindung zum konfigurierten hushd aufbauen. Bitte tragen Sie den Host/Port und Benutzer/Passwort im Einstellungsmenü ein. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Authentifizierung fehlgeschlagen. Der Benutzername / Passwort wurde nicht akzeptiert. Versuche Sie die Daten im Einstellunsgmenü zu ändern. - + Your hushd is starting up. Please wait. Hushd startet. Bitte warten @@ -1471,13 +1475,13 @@ Please set the host/port and user/password in the Edit->Settings menu.Dies kann einige Stunden dauern - + Connection Error Verbindungsfehler - + Transaction Error Transaktionsfehler @@ -1788,8 +1792,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Optionen - Check github for updates at startup - Besuche github.com für weitere &updates + Check git for updates at startup + Besuche git für weitere &updates @@ -2062,8 +2066,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Connect to github on startup to check for updates - Besuche github.com für weitere &updates + Connect to git on startup to check for updates + Besuche git für weitere &updates diff --git a/res/silentdragon_es.ts b/res/silentdragon_es.ts index 5051475..0d62bfb 100644 --- a/res/silentdragon_es.ts +++ b/res/silentdragon_es.ts @@ -244,11 +244,6 @@ TLS Support - - - &Report a bug on Github - - &Send Duke Feedback @@ -498,6 +493,11 @@ &About &Acerca de + + + &Report a bug + + &Settings @@ -513,8 +513,8 @@ &Donar - Check github.com for &updates - Consulte las actualizaciones en github.com + Check git for &updates + Consulte las actualizaciones en git @@ -1358,7 +1358,7 @@ Not starting embedded hushd because --no-embedded was passed MB a - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1367,7 +1367,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1377,12 +1377,12 @@ Por favor, especificar el host/puerta y usario/contraseña en el menú Editar-&g - + There was an error! : ¡Hubo un error! : - + Transaction Error Error De Transacción @@ -1418,22 +1418,22 @@ Si todo falla, por favor ejecutar hushd manualmente. error de hushd - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autenticación fallida. El usario/contraseña que epecificó no fue aceptado por hushd. Intenta cambiarlo en el menu Editar->Configuración. - + Your hushd is starting up. Please wait. Tu hushd se está iniciando. Por favor espera. - + This may take several hours, grab some popcorn Esto puede tomar varias horas, agarra algunas palomitas de maíz - + Connection Error Error de conexión diff --git a/res/silentdragon_fi.ts b/res/silentdragon_fi.ts index 1912463..f563980 100644 --- a/res/silentdragon_fi.ts +++ b/res/silentdragon_fi.ts @@ -247,11 +247,6 @@ TLS Support - - - &Report a bug on Github - - &Send Duke Feedback @@ -522,6 +517,11 @@ &About &Tietoja + + + &Report a bug + + &Settings @@ -537,8 +537,8 @@ &Lahjoita - Check github.com for &updates - Tarkista github.com &päivityksien varalta + Check git for &updates + Tarkista git &päivityksien varalta @@ -1267,7 +1267,7 @@ Integroitua hushdia ei käynnistetä, koska --ei-integroitu ohitettiinMT at - + There was an error! : Tapahtui virhe! : @@ -1401,7 +1401,7 @@ Haluaisitko vierailla lataus-sivulla? hushd virhe - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1410,7 +1410,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1419,28 +1419,28 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Todennus epäonnistui. Hushd ei hyväksynyt määrittämääsi käyttäjänimeä / salasanaa. Yritä muuttaa niitä Muokkaa-> Asetukset-valikosta - + Your hushd is starting up. Please wait. hushd on käynnistymässä. Ole hyvä ja odota. - + This may take several hours, grab some popcorn Tämä voi viedä useita tunteja, nappaa Fazerin sinistä - + Connection Error Yhteysvirhe - + Transaction Error Tapahtumavirhe @@ -1751,8 +1751,8 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen Valinnat - Check github for updates at startup - Tarkista päivitykset githubista käynnistyksen yhteydessä + Check git for updates at startup + Tarkista päivitykset gitista käynnistyksen yhteydessä @@ -2025,8 +2025,8 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen - Connect to github on startup to check for updates - Yhdistä githubiin käynnistäessä tarkistaaksesi päivitykset + Connect to git on startup to check for updates + Yhdistä gitiin käynnistäessä tarkistaaksesi päivitykset diff --git a/res/silentdragon_fil.ts b/res/silentdragon_fil.ts index cdba75b..8f6dd5e 100644 --- a/res/silentdragon_fil.ts +++ b/res/silentdragon_fil.ts @@ -256,6 +256,11 @@ You are currently not mining Kasalukuyan kang hindi nagmimina + + + &Report a bug + + Check git.hush.is for &updates @@ -451,11 +456,6 @@ &About About - - - &Report a bug on Github - - &Settings @@ -483,8 +483,8 @@ Website ng Hush - Check github.com for &updates - I-check ang github.com para sa mga update + Check git for &updates + I-check ang git para sa mga update @@ -1267,7 +1267,7 @@ Hindi magsisimula ang naka-embed na hushd dahil - walang naka-embedd na naipasa< may mali sa hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1276,7 +1276,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1285,34 +1285,34 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu May mali sa Authentication. Ang username / password na iyong nilagay ay hindi tinangap ng hushd. Subukang baguhin ito sa Edit->Settings na menu - + Your hushd is starting up. Please wait. Ang iyong hushd ay nagsisimula na. Mangyaring maghintay. - + This may take several hours, grab some popcorn Maaaring tumagal ito ng ilang oras, kumuha ka nalang ng popcorn - + Connection Error May Mali sa Koneksyon - + Transaction Error May Mali sa Transaksyon - + There was an error! : Mayroong Mali! : @@ -1896,8 +1896,8 @@ Would you like to visit the releases page? - Check github for updates at startup - I-check ang github para sa mga update tuwing pag-bukas + Check git for updates at startup + I-check ang git para sa mga update tuwing pag-bukas @@ -1940,8 +1940,8 @@ Would you like to visit the releases page? Kumonekta sa network ng TOR sa pamamagitan ng SOCKS proxy na tumatakbo sa 127.0.0.1:9050. Paalala lang na dapat mong i-install at patakbuhin ang serbisyo ng Tor sa labas ng app. - Connect to github on startup to check for updates - Kumonekta sa github simula pagbukas para i-check ang mga update + Connect to git on startup to check for updates + Kumonekta sa git simula pagbukas para i-check ang mga update diff --git a/res/silentdragon_fr.ts b/res/silentdragon_fr.ts index 0a1d4b3..526c8e8 100644 --- a/res/silentdragon_fr.ts +++ b/res/silentdragon_fr.ts @@ -245,11 +245,6 @@ TLS Support - - - &Report a bug on Github - - &Send Duke Feedback @@ -502,6 +497,11 @@ &About &À propos + + + &Report a bug + + &Settings @@ -517,7 +517,7 @@ &Faire un don - Check github.com for &updates + Check git for &updates Vérifier les mises à jour... @@ -1287,12 +1287,12 @@ If all else fails, please run hushd manually. MB à - + This may take several hours, grab some popcorn Cela peut prendre plusieurs heures. Prenez du pop-corn - + There was an error! : Il y avait une erreur! : @@ -1424,7 +1424,7 @@ Would you like to visit the releases page? erreur hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1433,7 +1433,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1442,23 +1442,23 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Authentification échouée. Le nom d'utilisateur / mot de passe que vous avez spécifié n'a pas été accepté par hushd. Essayez de le changer dans le menu Edition-> Préférences - + Your hushd is starting up. Please wait. Votre hushd est en cours de démarrage. Veuillez patienter. - + Connection Error Erreur de connection - + Transaction Error Erreur de transaction @@ -1769,7 +1769,7 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi Options - Check github for updates at startup + Check git for updates at startup Vérifiez les mises à jour sur Github au démarrage @@ -2043,8 +2043,8 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi - Connect to github on startup to check for updates - Connection à github au démarrage pour vérifier les mises à jour + Connect to git on startup to check for updates + Connection à git au démarrage pour vérifier les mises à jour diff --git a/res/silentdragon_hr.ts b/res/silentdragon_hr.ts index b208d3a..60bea52 100644 --- a/res/silentdragon_hr.ts +++ b/res/silentdragon_hr.ts @@ -256,6 +256,11 @@ You are currently not mining Trenutno ne rudarite + + + &Report a bug + + Check git.hush.is for &updates @@ -451,11 +456,6 @@ &About &O - - - &Report a bug on Github - - &Settings @@ -482,8 +482,8 @@ &Hush Web stranica - Check github.com for &updates - Provjeri na github.com &dopune + Check git for &updates + Provjeri na git &dopune @@ -1268,7 +1268,7 @@ Ne pokrećem integrirani hushd jer --no-embedded nije prilagođen hushd greška - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1277,7 +1277,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1286,34 +1286,34 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autorizacija neuspješna. Hushd nije prihvatio korisničko ime / lozinku koju ste unijeli. Pokušajte to promijeniti u Uredi->Postavke meniju - + Your hushd is starting up. Please wait. Hushd se pokreće. Molimo pričekajte. - + This may take several hours, grab some popcorn Ovo može potrajati nekoliko sati, donesite si kokice - + Connection Error Greška sa vezom - + Transaction Error Greška u transakciji - + There was an error! : Dogodila se greška! : @@ -1899,8 +1899,8 @@ Would you like to visit the releases page? - Check github for updates at startup - Prilikom pokretanja provjetite ažuriranja na githubu + Check git for updates at startup + Prilikom pokretanja provjetite ažuriranja na gitu @@ -1943,8 +1943,8 @@ Would you like to visit the releases page? Spojite se na Tor mrežu putem SOCKS proxy na 127.0.0.1:9050. Molim vas uzmite u obzir da ćete morati izvana instalirati Tor uslugu. - Connect to github on startup to check for updates - Prilikom pokretanja provjerite ažuriranja na githubu + Connect to git on startup to check for updates + Prilikom pokretanja provjerite ažuriranja na gitu diff --git a/res/silentdragon_id.ts b/res/silentdragon_id.ts index 18e05f4..96047d1 100644 --- a/res/silentdragon_id.ts +++ b/res/silentdragon_id.ts @@ -286,6 +286,11 @@ E&xit + + + &Report a bug + + Check git.hush.is for &updates @@ -455,11 +460,6 @@ &About &Tentang - - - &Report a bug on Github - - &Settings @@ -486,8 +486,8 @@ &Website Hush - Check github.com for &updates - Cek github.com untuk &Perbarui + Check git for &updates + Cek git untuk &Perbarui @@ -1266,48 +1266,48 @@ Tidak dapat memulai menanam hushd karena tidak ada penanaman yang diteruskanKesalahan Hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. Koneksi manual diminta, tetapi pengaturan tidak dikonfigurasi. Harap setel host / port dan pengguna / kata sandi di menu Edit- > Pengaturan - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. Tidak dapat terhubung ke pengaturan yang diatur dalam Hushd. Harap setel host / port dan pengguna / kata sandi di menu Edit- > Pengaturan. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Otentikasi gagal. Nama pengguna / kata sandi yang Anda tentukan tidak diterima oleh hushd. Coba ubah di menu Edit- > Pengaturan - + Your hushd is starting up. Please wait. Hushd telah memulai. Harap tunggu - + This may take several hours, grab some popcorn Inibmungkin memakan beberapa jam, ambil beberapa popcorn - + Connection Error Kesalahan Koneksi - + Transaction Error Kesalahan Transaksi - + There was an error! : Terjadi kesalahan! @@ -1891,8 +1891,8 @@ Would you like to visit the releases page? - Check github for updates at startup - Cek pembaruan github di memulai + Check git for updates at startup + Cek pembaruan git di memulai diff --git a/res/silentdragon_it.ts b/res/silentdragon_it.ts index ac74533..a04fddb 100644 --- a/res/silentdragon_it.ts +++ b/res/silentdragon_it.ts @@ -248,11 +248,6 @@ TLS Support - - - &Report a bug on Github - - &Send Duke Feedback @@ -504,6 +499,11 @@ &About &About + + + &Report a bug + + &Settings @@ -519,7 +519,7 @@ &Dona - Check github.com for &updates + Check git for &updates Controllo nuovi &aggiornamenti @@ -1266,12 +1266,12 @@ If all else fails, please run hushd manually. MB a - + This may take several hours, grab some popcorn Potrebbero essere necessarie alcune ore, prendi dei popcorn - + There was an error! : C'era un errore! : @@ -1403,7 +1403,7 @@ Would you like to visit the releases page? hushd errore - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1411,7 +1411,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1420,23 +1420,23 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autenticazione fallita. Il nome utente/password che hai specificato non sono stati accettati da hushd. Prova a cambiarlo nel menu Modifica-> Impostazioni - + Your hushd is starting up. Please wait. Il tuo hushd si sta avviando. Attendere prego. - + Connection Error Errore di Connessione - + Transaction Error Errore di transazione diff --git a/res/silentdragon_nl.ts b/res/silentdragon_nl.ts index 0dad13a..dd23610 100644 --- a/res/silentdragon_nl.ts +++ b/res/silentdragon_nl.ts @@ -213,6 +213,11 @@ Longest Chain Langste Keten + + + &Report a bug + + &Send Duke Feedback @@ -497,11 +502,6 @@ &About &Over - - - &Report a bug on Github - - &Settings @@ -517,8 +517,8 @@ &Doar - Check github.com for &updates - Check github.com voor &updates + Check git for &updates + Check git voor &updates @@ -1266,12 +1266,12 @@ Als al het andere faalt, voer hushd dan handmatig uit. MB om - + This may take several hours, grab some popcorn Dit kan enkele uren duren, pak wat popcorn - + There was an error! : Er was een error! : @@ -1401,7 +1401,7 @@ Wilt u de releasepagine bezoeken? Hushd fout - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1410,7 +1410,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1419,23 +1419,23 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Verificatie mislukt. De gebruikersnaam / wachtwoord dat u hebt opgegeven is niet geaccepteerd door hushd. Probeer het te veranderen in het menu Bewerken-> Instellingen - + Your hushd is starting up. Please wait. hushd is aan het opstarten. Even geduld AUB. - + Connection Error Connectie Fout - + Transaction Error Transactie Fout @@ -1822,8 +1822,8 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch - Check github for updates at startup - Check github voor updates bij opstarten + Check git for updates at startup + Check git voor updates bij opstarten @@ -2076,8 +2076,8 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch - Connect to github on startup to check for updates - Verbind met github tijdens het opstarten om te checken voor updates + Connect to git on startup to check for updates + Verbind met git tijdens het opstarten om te checken voor updates diff --git a/res/silentdragon_pt.ts b/res/silentdragon_pt.ts index 53cc81b..683271a 100644 --- a/res/silentdragon_pt.ts +++ b/res/silentdragon_pt.ts @@ -244,11 +244,6 @@ TLS Support - - - &Report a bug on Github - - &Send Duke Feedback @@ -498,6 +493,11 @@ &About &Sobre + + + &Report a bug + + &Settings @@ -513,8 +513,8 @@ &Doar - Check github.com for &updates - &Checar github.com por atualizações + Check git for &updates + &Checar git por atualizações @@ -1253,12 +1253,12 @@ Se tudo mais falhar, execute o hushd manualmente. MB a - + This may take several hours, grab some popcorn Isso pode levar várias horas, pegue um pouco de pipoca - + There was an error! : Havia um erro! : @@ -1388,7 +1388,7 @@ Would you like to visit the releases page? erro no hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1397,7 +1397,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1406,23 +1406,23 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autenticação falhou. O usuário/senha especificado não foi aceitado pelo hushd. Tente alterá-los em Editar->Preferências - + Your hushd is starting up. Please wait. Seu hushd está iniciando. Por favor aguarde. - + Connection Error Erro na Conexão - + Transaction Error Erro na transação diff --git a/res/silentdragon_ro.ts b/res/silentdragon_ro.ts index 0d8e6d9..818e5e4 100644 --- a/res/silentdragon_ro.ts +++ b/res/silentdragon_ro.ts @@ -200,6 +200,11 @@ Shielded Address (Private, Anonymous) Adresa Ecranata (Privata, Anonima) + + + &Report a bug + + Check git.hush.is for &updates @@ -455,11 +460,6 @@ &About &Despre - - - &Report a bug on Github - - &Settings @@ -486,8 +486,8 @@ Hush Website - Check github.com for &updates - Verifica github.com pentru &actualizari + Check git for &updates + Verifica git pentru &actualizari @@ -1265,7 +1265,7 @@ Hushd incorporat nu se porneste deoarece incorporarea nu a fost efectuata eroarea hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1273,7 +1273,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1281,34 +1281,34 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autentificare a esuat. Utilizator/parola specificata nu a fost acceptata de hushd. Incercati sa shimbati in Editare-> Meniu setari - + Your hushd is starting up. Please wait. Hushd se porneste. Asteptati - + This may take several hours, grab some popcorn Acesta poate dura citeva ore, gateste-ti popcorn - + Connection Error Eroare la Conexiune - + Transaction Error Eroarea de Tranzactie - + There was an error! : A avut loc eroarea @@ -1893,8 +1893,8 @@ Doriti sa vizitati pagina veriunii? - Check github for updates at startup - Verificati actualizarile la pornire pe github + Check git for updates at startup + Verificati actualizarile la pornire pe git @@ -1937,8 +1937,8 @@ Doriti sa vizitati pagina veriunii? Conectati la retea Tor prin SOCKS proxy functionind pe 127.0.0.1:9050. Rugam sa retineti ca va fi nevoie instalarea si executarea serviciului extern Tor. - Connect to github on startup to check for updates - Conectati github la pornire pentru verificarea actualizarilor + Connect to git on startup to check for updates + Conectati git la pornire pentru verificarea actualizarilor diff --git a/res/silentdragon_ru.ts b/res/silentdragon_ru.ts index dd20068..0b663ba 100644 --- a/res/silentdragon_ru.ts +++ b/res/silentdragon_ru.ts @@ -220,6 +220,11 @@ hushd hushd + + + &Report a bug + + Check git.hush.is for &updates @@ -488,11 +493,6 @@ &About &О кошельке - - - &Report a bug on Github - - &Settings @@ -519,8 +519,8 @@ &Сайт Hush - Check github.com for &updates - &Проверить github.com на обновления + Check git for &updates + &Проверить git на обновления @@ -1361,7 +1361,7 @@ Not starting embedded hushd because --no-embedded was passed ошибка hushd - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1370,22 +1370,22 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Аутентификация не удалась. username / password, которые вы указали, не были приняты hushd. Попробуйте изменить его в меню Редактировать-> Настройки - + Your hushd is starting up. Please wait. Ваш hushd запускается. Пожалуйста, подождите. - + This may take several hours, grab some popcorn - + There was an error! : @@ -1530,7 +1530,7 @@ Would you like to visit the releases page? не удалось. Пожалуйста, проверьте сайт справки для получения дополнительной информации - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1543,13 +1543,13 @@ Please set the host/port and user/password in the Edit->Settings menu.Это может занять несколько часов - + Connection Error Ошибка соединения - + Transaction Error ">Ошибка транзакции @@ -2024,8 +2024,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Опции - Check github for updates at startup - Проверьте github на наличие обновлений при запуске + Check git for updates at startup + Проверьте git на наличие обновлений при запуске @@ -2372,8 +2372,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Connect to github on startup to check for updates - Подключаться к github при запуске, чтобы проверить наличие обновлений + Connect to git on startup to check for updates + Подключаться к git при запуске, чтобы проверить наличие обновлений diff --git a/res/silentdragon_sr.ts b/res/silentdragon_sr.ts index 958afd6..6fb64ac 100644 --- a/res/silentdragon_sr.ts +++ b/res/silentdragon_sr.ts @@ -256,6 +256,11 @@ You are currently not mining Trenutno ne rudarite + + + &Report a bug + + Check git.hush.is for &updates @@ -451,11 +456,6 @@ &About &O - - - &Report a bug on Github - - &Settings @@ -482,8 +482,8 @@ &Hush Web stranica - Check github.com for &updates - Proveri na github.com &dopune + Check git for &updates + Proveri na git &dopune @@ -1268,7 +1268,7 @@ Ne pokrećem integrirani hushd jer --no-embedded nije prilagođen hushd greška - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1277,7 +1277,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1286,34 +1286,34 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autorizacija neuspešna. Hushd nije prihvatio korisničko ime / lozinku koju ste uneli. Pokušajte to promeniti u Uredi->Podešavanja meniju - + Your hushd is starting up. Please wait. Hushd se pokreće. Molimo pričekajte. - + This may take several hours, grab some popcorn Ovo može potrajati nekoliko sati, donesite si kokice - + Connection Error Greška sa vezom - + Transaction Error Greška u transakciji - + There was an error! : Dogodila se greška! : @@ -1899,8 +1899,8 @@ Would you like to visit the releases page? - Check github for updates at startup - Prilikom pokretanja provetite ažuriranja na githubu + Check git for updates at startup + Prilikom pokretanja provetite ažuriranja na gitu @@ -1943,8 +1943,8 @@ Would you like to visit the releases page? Spojite se na Tor mrežu putem SOCKS proxy na 127.0.0.1:9050. Molim vas uzmite u obzir da ćete morati izvana instalirati Tor uslugu. - Connect to github on startup to check for updates - Prilikom pokretanja provetite ažuriranja na githubu + Connect to git on startup to check for updates + Prilikom pokretanja provetite ažuriranja na gitu diff --git a/res/silentdragon_template.ts b/res/silentdragon_template.ts index 364faa1..a593740 100644 --- a/res/silentdragon_template.ts +++ b/res/silentdragon_template.ts @@ -434,7 +434,7 @@ - Check github.com for &updates + Check git for &updates @@ -1519,7 +1519,7 @@ Would you like to visit the releases page? - Check github for updates at startup + Check git for updates at startup @@ -1564,7 +1564,7 @@ Would you like to visit the releases page? - Connect to github on startup to check for updates + Connect to git on startup to check for updates diff --git a/res/silentdragon_tr.ts b/res/silentdragon_tr.ts index 9fb16ed..e24f04e 100644 --- a/res/silentdragon_tr.ts +++ b/res/silentdragon_tr.ts @@ -234,11 +234,6 @@ TLS Support - - - &Report a bug on Github - - &Send Duke Feedback @@ -514,6 +509,11 @@ &About Hakkında + + + &Report a bug + + &Settings @@ -529,8 +529,8 @@ Bağış Yap - Check github.com for &updates - Güncellemeler için github.com adresini kontrol edin + Check git for &updates + Güncellemeler için git adresini kontrol edin @@ -1254,7 +1254,7 @@ Hepsi başarısız olursa, lütfen hushd'i manuel olarak çalıştırın.MB saniyede - + There was an error! : Bir hata oluştu! : @@ -1388,7 +1388,7 @@ Yayınlanan sürümler sayfasını ziyaret etmek ister misiniz? hushd hatası - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1397,7 +1397,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1406,28 +1406,28 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Kimlik doğrulama başarısız oldu. Belirttiğiniz kullanıcı adı/şifre hushd tarafından kabul edilmedi. Düzenle-> Ayarlar menüsünde değiştirmeyi deneyin - + Your hushd is starting up. Please wait. hushd'niz başlıyor. Lütfen bekle. - + This may take several hours, grab some popcorn Bu birkaç saat sürebilir, biraz patlamış mısır kapın - + Connection Error Bağlantı Hatası - + Transaction Error İşlem Hatası @@ -1994,8 +1994,8 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. - Check github for updates at startup - Başlangıçta güncellemeler için github'u kontrol et + Check git for updates at startup + Başlangıçta güncellemeler için git'u kontrol et @@ -2008,8 +2008,8 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük.Tor ağına 127.0.0.1:9050'de çalışan SOCKS proxy üzerinden bağlanın. Lütfen Tor servisini harici olarak kurmanız ve çalıştırmanız gerektiğini lütfen unutmayın. - Connect to github on startup to check for updates - Güncellemeleri denetlemek için başlangıçta github'a bağlanır + Connect to git on startup to check for updates + Güncellemeleri denetlemek için başlangıçta git'a bağlanır diff --git a/res/silentdragon_uk.ts b/res/silentdragon_uk.ts index e91b246..b7b908f 100644 --- a/res/silentdragon_uk.ts +++ b/res/silentdragon_uk.ts @@ -220,6 +220,11 @@ hushd hushd + + + &Report a bug + + Check git.hush.is for &updates @@ -488,11 +493,6 @@ &About &Про гаманець - - - &Report a bug on Github - - &Settings @@ -519,8 +519,8 @@ &Сайт Hush - Check github.com for &updates - &Перевірити github.com на оновлення + Check git for &updates + &Перевірити git на оновлення @@ -1361,7 +1361,7 @@ Not starting embedded hushd because --no-embedded was passed помилка hushd - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1370,22 +1370,22 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Аутентифікація не вдалася. username / password, які ви вказали, не були прийняті hushd. Спробуйте змінити його в меню Редагувати-> Налаштування - + Your hushd is starting up. Please wait. Ваш hushd запускається. Будь ласка зачекайте. - + This may take several hours, grab some popcorn - + There was an error! : @@ -1530,7 +1530,7 @@ Would you like to visit the releases page? не вдалося. Будь ласка, перевірте сайт довідки для отримання додаткової інформації - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1543,13 +1543,13 @@ Please set the host/port and user/password in the Edit->Settings menu.Це може зайняти кілька годин - + Connection Error Помилка з'єднання - + Transaction Error Помилка транзакції @@ -2032,8 +2032,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Опції - Check github for updates at startup - Перевірити github на наявність оновлень при запуску + Check git for updates at startup + Перевірити git на наявність оновлень при запуску @@ -2380,8 +2380,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Connect to github on startup to check for updates - Підключатися до github при запуску, щоб перевірити наявність оновлень + Connect to git on startup to check for updates + Підключатися до git при запуску, щоб перевірити наявність оновлень diff --git a/res/silentdragon_zh.ts b/res/silentdragon_zh.ts index ec49d50..df80222 100644 --- a/res/silentdragon_zh.ts +++ b/res/silentdragon_zh.ts @@ -396,11 +396,6 @@ Connections 连接数 - - - &Report a bug on Github - - &Send Duke Feedback @@ -498,6 +493,11 @@ &About &关于 + + + &Report a bug + + &Settings @@ -513,8 +513,8 @@ &捐赠 - Check github.com for &updates - 检查github.com获取和&更新 + Check git for &updates + 检查git获取和&更新 @@ -1415,7 +1415,7 @@ Not starting embedded hushd because --no-embedded was passed hushd 出错 - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1424,7 +1424,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1433,22 +1433,22 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu 验证失败。 hushd不接受您指定的用户名/密码。 请在编辑 - >设置菜单中更改它 - + Your hushd is starting up. Please wait. 你的hushd正在启动。 请耐心等待。 - + This may take several hours, grab some popcorn - + There was an error! : @@ -1457,13 +1457,13 @@ Please set the host/port and user/password in the Edit->Settings menu.这可能需要几个小时 - + Connection Error 连接错误 - + Transaction Error 交易错误 @@ -2225,8 +2225,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - Check github for updates at startup - 启动时检查github更新 + Check git for updates at startup + 启动时检查git更新 @@ -2269,8 +2269,8 @@ You either have unconfirmed funds or the balance is too low for an automatic mig 通过运行在127.0.0.1:9050上的SOCKS代理连接到Tor网络。 请注意，您必须在外部安装和运行Tor服务。 - Connect to github on startup to check for updates - 在启动时连接到github以检查更新 + Connect to git on startup to check for updates + 在启动时连接到git以检查更新 diff --git a/src/3rdparty/sodium.h b/src/3rdparty/sodium.h index e7b1af4..f258b32 100644 --- a/src/3rdparty/sodium.h +++ b/src/3rdparty/sodium.h @@ -1,9 +1,10 @@ +// Copyright (c) 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef sodium_H #define sodium_H #include "sodium/version.h" - #include "sodium/core.h" #include "sodium/crypto_aead_aes256gcm.h" #include "sodium/crypto_aead_chacha20poly1305.h" diff --git a/src/addressbook.cpp b/src/addressbook.cpp index d5f9b55..e92ce4e 100644 --- a/src/addressbook.cpp +++ b/src/addressbook.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "addressbook.h" #include "ui_addressbook.h" #include "ui_mainwindow.h" diff --git a/src/addressbook.h b/src/addressbook.h index af64c07..294b1b3 100644 --- a/src/addressbook.h +++ b/src/addressbook.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef ADDRESSBOOK_H #define ADDRESSBOOK_H @@ -66,4 +68,4 @@ private: static AddressBook* instance; }; -#endif // ADDRESSBOOK_H \ No newline at end of file +#endif // ADDRESSBOOK_H diff --git a/src/addresscombo.cpp b/src/addresscombo.cpp index 9c50310..e38e5c8 100644 --- a/src/addresscombo.cpp +++ b/src/addresscombo.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "addresscombo.h" #include "addressbook.h" #include "settings.h" @@ -36,4 +38,4 @@ void AddressCombo::insertItem(int index, const QString& text, double bal) { QString txt = AddressBook::addLabelToAddress(text) % "(" % Settings::getDisplayFormat(bal) % ")"; QComboBox::insertItem(index, txt); -} \ No newline at end of file +} diff --git a/src/addresscombo.h b/src/addresscombo.h index 8088906..3475b32 100644 --- a/src/addresscombo.h +++ b/src/addresscombo.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef ADDRESSCOMBO_H #define ADDRESSCOMBO_H diff --git a/src/balancestablemodel.cpp b/src/balancestablemodel.cpp index 2be4190..b26bfaa 100644 --- a/src/balancestablemodel.cpp +++ b/src/balancestablemodel.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "balancestablemodel.h" #include "addressbook.h" #include "settings.h" diff --git a/src/balancestablemodel.h b/src/balancestablemodel.h index 3ad3550..d8c65e0 100644 --- a/src/balancestablemodel.h +++ b/src/balancestablemodel.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef BALANCESTABLEMODEL_H #define BALANCESTABLEMODEL_H @@ -31,4 +33,4 @@ private: bool loading = true; }; -#endif // BALANCESTABLEMODEL_H \ No newline at end of file +#endif // BALANCESTABLEMODEL_H diff --git a/src/connection.cpp b/src/connection.cpp index 3c4fafe..0051521 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -1,5 +1,5 @@ // Copyright 2019-2021 The Hush developers -// GPLv3 +// Released under the GPLv3 #include "connection.h" #include "mainwindow.h" #include "settings.h" @@ -82,11 +82,11 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { // We're going to attempt to connect to the one in the background one last time // and see if that works, else throw an error main->logger->write("Unknown problem while trying to start hushd!"); - QTimer::singleShot(2000, [=]() { doAutoConnect(/* don't attempt to start ezcashd */ false); }); + QTimer::singleShot(2000, [=]() { doAutoConnect(/* don't attempt to start ehushd */ false); }); } } } else { - // We tried to start ezcashd previously, and it didn't work. So, show the error. + // We tried to start ehushd previously, and it didn't work. So, show the error. main->logger->write("Couldn't start embedded hushd for unknown reason"); QString explanation; if (config->zcashDaemon) { @@ -98,7 +98,7 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { explanation = QString() % QObject::tr("Couldn't start the embedded hushd.\n\n" "Please try restarting.\n\nIf you previously started hushd with custom arguments, you might need to reset HUSH3.conf.\n\n" "If all else fails, please run hushd manually.") % - (ezcashd ? QObject::tr("The process returned") + ":\n\n" % ezcashd->errorString() : QString("")); + (ehushd ? QObject::tr("The process returned") + ":\n\n" % ehushd->errorString() : QString("")); } this->showError(explanation); @@ -328,8 +328,8 @@ bool ConnectionLoader::startEmbeddedZcashd() { // Static because it needs to survive even after this method returns. static QString processStdErrOutput; - if (ezcashd != nullptr) { - if (ezcashd->state() == QProcess::NotRunning) { + if (ehushd != nullptr) { + if (ehushd->state() == QProcess::NotRunning) { if (!processStdErrOutput.isEmpty()) { QMessageBox::critical(main, QObject::tr("hushd error"), "hushd said: " + processStdErrOutput, QMessageBox::Ok); @@ -357,23 +357,23 @@ bool ConnectionLoader::startEmbeddedZcashd() { main->logger->write("Found hushd at " + hushdProgram); } - ezcashd = std::shared_ptr(new QProcess(main)); - QObject::connect(ezcashd.get(), &QProcess::started, [=] () { + ehushd = std::shared_ptr(new QProcess(main)); + QObject::connect(ehushd.get(), &QProcess::started, [=] () { qDebug() << "Embedded hushd started via " << hushdProgram; }); - QObject::connect(ezcashd.get(), QOverload::of(&QProcess::finished), + QObject::connect(ehushd.get(), QOverload::of(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus exitStatus) { qDebug() << "hushd finished with code " << exitCode << "," << exitStatus; }); - QObject::connect(ezcashd.get(), &QProcess::errorOccurred, [&] (QProcess::ProcessError error) { + QObject::connect(ehushd.get(), &QProcess::errorOccurred, [&] (QProcess::ProcessError error) { qDebug() << "Couldn't start hushd at " << hushdProgram << ":" << error; }); - std::weak_ptr weak_obj(ezcashd); + std::weak_ptr weak_obj(ehushd); auto ptr_main(main); - QObject::connect(ezcashd.get(), &QProcess::readyReadStandardError, [weak_obj, ptr_main]() { + QObject::connect(ehushd.get(), &QProcess::readyReadStandardError, [weak_obj, ptr_main]() { auto output = weak_obj.lock()->readAllStandardError(); ptr_main->logger->write("hushd stderr:" + output); processStdErrOutput.append(output); @@ -386,18 +386,18 @@ bool ConnectionLoader::startEmbeddedZcashd() { // Finally, actually start the full node #ifdef Q_OS_LINUX qDebug() << "Starting on Linux: " + hushdProgram + " " + params; - ezcashd->start(hushdProgram, arguments); + ehushd->start(hushdProgram, arguments); #elif defined(Q_OS_DARWIN) qDebug() << "Starting on Darwin: " + hushdProgram + " " + params; - ezcashd->start(hushdProgram, arguments); + ehushd->start(hushdProgram, arguments); #elif defined(Q_OS_WIN64) qDebug() << "Starting on Win64: " + hushdProgram + " " + params; - ezcashd->setWorkingDirectory(appPath.absolutePath()); - ezcashd->start(hushdProgram, arguments); + ehushd->setWorkingDirectory(appPath.absolutePath()); + ehushd->start(hushdProgram, arguments); #else qDebug() << "Starting on Unknown OS(!): " + hushdProgram + " " + params; - ezcashd->setWorkingDirectory(appPath.absolutePath()); - ezcashd->start(hushdProgram, arguments); + ehushd->setWorkingDirectory(appPath.absolutePath()); + ehushd->start(hushdProgram, arguments); #endif // Q_OS_LINUX main->logger->write("Started via " + hushdProgram + " " + params); @@ -433,7 +433,7 @@ void ConnectionLoader::doManualConnect() { } void ConnectionLoader::doRPCSetConnection(Connection* conn) { - rpc->setEZcashd(ezcashd); + rpc->setEZcashd(ehushd); rpc->setConnection(conn); d->accept(); @@ -652,7 +652,7 @@ std::shared_ptr ConnectionLoader::autoDetectZcashConf() { auto zcashconf = new ConnectionConfig(); zcashconf->host = "127.0.0.1"; - zcashconf->connType = ConnectionType::DetectedConfExternalZcashD; + zcashconf->connType = ConnectionType::DetectedConfExternalHushD; zcashconf->usingZcashConf = true; zcashconf->zcashDir = QFileInfo(confLocation).absoluteDir().absolutePath(); zcashconf->zcashDaemon = false; diff --git a/src/connection.h b/src/connection.h index 5f5cd32..12eb239 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef CONNECTION_H #define CONNECTION_H @@ -8,9 +10,9 @@ class RPC; enum ConnectionType { - DetectedConfExternalZcashD = 1, + DetectedConfExternalHushD = 1, UISettingsZCashD, - InternalZcashD + InternalHushD }; struct ConnectionConfig { @@ -65,7 +67,7 @@ private: void doRPCSetConnection(Connection* conn); - std::shared_ptr ezcashd; + std::shared_ptr ehushd; QDialog* d; Ui_ConnectionDialog* connD; diff --git a/src/fillediconlabel.cpp b/src/fillediconlabel.cpp index 0982cab..6f06138 100644 --- a/src/fillediconlabel.cpp +++ b/src/fillediconlabel.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "fillediconlabel.h" FilledIconLabel::FilledIconLabel(QWidget* parent) : @@ -24,4 +26,4 @@ void FilledIconLabel::resizeEvent(QResizeEvent*) { painter.drawPixmap((sz.width() - scaled.width()) / 2, (sz.height() - scaled.height()) / 2, scaled); QLabel::setPixmap(p); -} \ No newline at end of file +} diff --git a/src/fillediconlabel.h b/src/fillediconlabel.h index d5de800..6211028 100644 --- a/src/fillediconlabel.h +++ b/src/fillediconlabel.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef FILLEDICONLABEL_H #define FILLEDICONLABEL_H @@ -18,4 +20,4 @@ private: }; -#endif // FILLEDICONLABEL_H \ No newline at end of file +#endif // FILLEDICONLABEL_H diff --git a/src/logger.cpp b/src/logger.cpp index 589b877..ca7d30a 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "logger.h" Logger::Logger(QObject *parent, QString fileName) : QObject(parent) { @@ -28,4 +30,4 @@ void Logger::write(const QString &value) { Logger::~Logger() { if (file != 0) file->close(); -} \ No newline at end of file +} diff --git a/src/logger.h b/src/logger.h index 495e1d4..1e7f13f 100644 --- a/src/logger.h +++ b/src/logger.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef LOGGER_H #define LOGGER_H @@ -20,4 +22,4 @@ public slots: void write(const QString &value); }; -#endif // LOGGER_H \ No newline at end of file +#endif // LOGGER_H diff --git a/src/main.cpp b/src/main.cpp index a1e83e7..084caae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,12 +1,10 @@ // Copyright 2019-2021 The Hush developers -// GPLv3 +// Released under the GPLv3 #include - #include "precompiled.h" #include "mainwindow.h" #include "rpc.h" #include "settings.h" - #include "version.h" class SignalHandler diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c29e26b..99badc5 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -334,7 +334,7 @@ void MainWindow::setupSettingsModal() { isUsingTor = !rpc->getConnection()->config->proxy.isEmpty(); } settings.chkTor->setChecked(isUsingTor); - if (rpc->getEZcashD() == nullptr) { + if (rpc->getEHushD() == nullptr) { settings.chkTor->setEnabled(false); settings.lblTor->setEnabled(false); QString tooltip = tr("Tor configuration is available only when running an embedded hushd."); @@ -358,7 +358,7 @@ void MainWindow::setupSettingsModal() { isUsingConsolidation = !rpc->getConnection()->config->consolidation.isEmpty() == true; } settings.chkConso->setChecked(isUsingConsolidation); - if (rpc->getEZcashD() == nullptr) { + if (rpc->getEHushD() == nullptr) { settings.chkConso->setEnabled(false); } @@ -369,7 +369,7 @@ void MainWindow::setupSettingsModal() { isUsingDeletetx = !rpc->getConnection()->config->deletetx.isEmpty() == true; } settings.chkDeletetx->setChecked(isUsingDeletetx); - if (rpc->getEZcashD() == nullptr) { + if (rpc->getEHushD() == nullptr) { settings.chkDeletetx->setEnabled(false); } @@ -380,7 +380,7 @@ void MainWindow::setupSettingsModal() { isUsingZindex = !rpc->getConnection()->config->zindex.isEmpty() == true; } settings.chkzindex->setChecked(isUsingZindex); - if (rpc->getEZcashD() == nullptr) { + if (rpc->getEHushD() == nullptr) { settings.chkzindex->setEnabled(false); } diff --git a/src/mainwindow.h b/src/mainwindow.h index 7ee90f8..0b033f4 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/src/memoedit.cpp b/src/memoedit.cpp index 79589e2..a32baac 100644 --- a/src/memoedit.cpp +++ b/src/memoedit.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "memoedit.h" MemoEdit::MemoEdit(QWidget* parent) : QPlainTextEdit(parent) { @@ -49,4 +51,4 @@ void MemoEdit::includeReplyTo(QString addr) { return; this->setPlainText(curText + "\n" + tr("Reply to") + ":\n" + addr); -} \ No newline at end of file +} diff --git a/src/memoedit.h b/src/memoedit.h index f1b2f5c..1db0510 100644 --- a/src/memoedit.h +++ b/src/memoedit.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef MEMOEDIT_H #define MEMOEDIT_H @@ -20,4 +22,4 @@ private: QPushButton* acceptButton = nullptr; }; -#endif // MEMOEDIT_H \ No newline at end of file +#endif // MEMOEDIT_H diff --git a/src/mobileappconnector.cpp b/src/mobileappconnector.cpp index 67f4486..b06590e 100644 --- a/src/mobileappconnector.cpp +++ b/src/mobileappconnector.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "mobileappconnector.h" #include "ui_mobileappconnector.h" diff --git a/src/mobileappconnector.h b/src/mobileappconnector.h index e740ae9..fb5efcc 100644 --- a/src/mobileappconnector.h +++ b/src/mobileappconnector.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef MOBILEAPPCONNECTOR_H #define MOBILEAPPCONNECTOR_H diff --git a/src/precompiled.h b/src/precompiled.h index 6e6cd35..dd9b6f2 100644 --- a/src/precompiled.h +++ b/src/precompiled.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #if defined __cplusplus /* Add C++ includes here */ diff --git a/src/qrcodelabel.cpp b/src/qrcodelabel.cpp index 97f34c0..2283785 100644 --- a/src/qrcodelabel.cpp +++ b/src/qrcodelabel.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "qrcodelabel.h" QRCodeLabel::QRCodeLabel(QWidget *parent) : @@ -54,4 +56,4 @@ QPixmap QRCodeLabel::scaledPixmap() const { void QRCodeLabel::setQrcodeString(QString stra) { str = stra; QLabel::setPixmap(scaledPixmap()); -} \ No newline at end of file +} diff --git a/src/qrcodelabel.h b/src/qrcodelabel.h index 461b238..af20559 100644 --- a/src/qrcodelabel.h +++ b/src/qrcodelabel.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef QRCODELABEL_H #define QRCODELABEL_H diff --git a/src/recurring.cpp b/src/recurring.cpp index 64affec..25d7c60 100644 --- a/src/recurring.cpp +++ b/src/recurring.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "recurring.h" #include "mainwindow.h" @@ -45,4 +47,4 @@ void Recurring::showEditDialog(QWidget* parent, MainWindow* main, Tx tx) { ui.txtDesc->setFocus(); d.exec(); -} \ No newline at end of file +} diff --git a/src/recurring.h b/src/recurring.h index 3f27115..340c33c 100644 --- a/src/recurring.h +++ b/src/recurring.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef RECURRING_H #define RECURRING_H @@ -33,4 +35,4 @@ public: static void showEditDialog(QWidget* parent, MainWindow* main, Tx tx); }; -#endif // RECURRING_H \ No newline at end of file +#endif // RECURRING_H diff --git a/src/requestdialog.cpp b/src/requestdialog.cpp index 8bba2ca..70a20f1 100644 --- a/src/requestdialog.cpp +++ b/src/requestdialog.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "requestdialog.h" #include "ui_requestdialog.h" #include "settings.h" diff --git a/src/requestdialog.h b/src/requestdialog.h index 6e53234..e81a393 100644 --- a/src/requestdialog.h +++ b/src/requestdialog.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef REQUESTDIALOG_H #define REQUESTDIALOG_H diff --git a/src/rpc.cpp b/src/rpc.cpp index 3096611..b65a9d4 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -69,9 +69,9 @@ RPC::~RPC() { } void RPC::setEZcashd(std::shared_ptr p) { - ezcashd = p; + ehushd = p; - if (ezcashd && ui->tabWidget->widget(4) == nullptr) { + if (ehushd && ui->tabWidget->widget(4) == nullptr) { ui->tabWidget->addTab(main->zcashdtab, "zcashd"); } } @@ -1212,7 +1212,7 @@ void RPC::refreshPrice() { void RPC::shutdownZcashd() { // Shutdown embedded hushd if it was started - if (ezcashd == nullptr || ezcashd->processId() == 0 || conn == nullptr) { + if (ehushd == nullptr || ehushd->processId() == 0 || conn == nullptr) { // No hushd running internally, just return return; } @@ -1251,8 +1251,8 @@ void RPC::shutdownZcashd() { QObject::connect(&waiter, &QTimer::timeout, [&] () { waitCount++; - if ((ezcashd->atEnd() && ezcashd->processId() == 0) || - ezcashd->state() == QProcess::NotRunning || + if ((ehushd->atEnd() && ehushd->processId() == 0) || + ehushd->state() == QProcess::NotRunning || waitCount > 30 || conn->config->zcashDaemon) { // If hushd is daemon, then we don't have to do anything else qDebug() << "Ended"; diff --git a/src/rpc.h b/src/rpc.h index e69004c..f420dd0 100644 --- a/src/rpc.h +++ b/src/rpc.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef RPCCLIENT_H #define RPCCLIENT_H @@ -37,7 +39,7 @@ public: void setConnection(Connection* c); void setEZcashd(std::shared_ptr p); - const QProcess* getEZcashD() { return ezcashd.get(); } + const QProcess* getEHushD() { return ehushd.get(); } void refresh(bool force = false); @@ -78,7 +80,7 @@ public: void shutdownZcashd(); void noConnection(); - bool isEmbedded() { return ezcashd != nullptr; } + bool isEmbedded() { return ehushd != nullptr; } QString getDefaultSaplingAddress(); QString getDefaultTAddress(); @@ -111,7 +113,7 @@ private: void getTAddresses (const std::function& cb); Connection* conn = nullptr; - std::shared_ptr ezcashd = nullptr; + std::shared_ptr ehushd = nullptr; QList* utxos = nullptr; QMap* allBalances = nullptr; diff --git a/src/scripts/make-binary-tarball.sh b/src/scripts/make-binary-tarball.sh index 2abc584..5dd5b36 100755 --- a/src/scripts/make-binary-tarball.sh +++ b/src/scripts/make-binary-tarball.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020 The Hush developers +# Copyright (c) 2019-2021 The Hush developers # Released under the GPLv3 APP_VERSION=$(cat src/version.h | cut -d\" -f2) diff --git a/src/scripts/make-only-deb.sh b/src/scripts/make-only-deb.sh index 21087eb..9cabc49 100755 --- a/src/scripts/make-only-deb.sh +++ b/src/scripts/make-only-deb.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020 The Hush developers +# Copyright (c) 2019-2021 The Hush developers # Released under the GPLv3 echo "Let There Be Debian Packages" diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh index 31d8dbc..f738999 100644 --- a/src/scripts/mkmacdmg.sh +++ b/src/scripts/mkmacdmg.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright (c) 2019-2021 The Hush developers +# Released under the GPLv3 # Accept the variables as command line arguments as well POSITIONAL=() diff --git a/src/scripts/signbinaries.sh b/src/scripts/signbinaries.sh index 284a900..447bb7e 100755 --- a/src/scripts/signbinaries.sh +++ b/src/scripts/signbinaries.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright (c) 2019-2021 The Hush developers +# Released under the GPLv3 # Accept the variables as command line arguments as well POSITIONAL=() diff --git a/src/sendtab.cpp b/src/sendtab.cpp index acde46c..1c6582d 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -1,4 +1,5 @@ -// Copyright 2019-2021 Hush developers +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "mainwindow.h" #include "ui_mainwindow.h" #include "addressbook.h" diff --git a/src/senttxstore.cpp b/src/senttxstore.cpp index a25f761..0ccb88e 100644 --- a/src/senttxstore.cpp +++ b/src/senttxstore.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "senttxstore.h" #include "settings.h" diff --git a/src/senttxstore.h b/src/senttxstore.h index a62fb67..8f9c5ab 100644 --- a/src/senttxstore.h +++ b/src/senttxstore.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef SENTTXSTORE_H #define SENTTXSTORE_H diff --git a/src/settings.h b/src/settings.h index 6d66ca1..5aba2e2 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,4 +1,5 @@ -// Copyright 2019 The Hush developers +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef SETTINGS_H #define SETTINGS_H diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp index e7e4f96..d139aae 100644 --- a/src/txtablemodel.cpp +++ b/src/txtablemodel.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "txtablemodel.h" #include "settings.h" #include "rpc.h" diff --git a/src/txtablemodel.h b/src/txtablemodel.h index 9c09a2c..0ef7262 100644 --- a/src/txtablemodel.h +++ b/src/txtablemodel.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef STRINGSTABLEMODEL_H #define STRINGSTABLEMODEL_H diff --git a/src/validateaddress.cpp b/src/validateaddress.cpp index d82e82e..a6b305f 100644 --- a/src/validateaddress.cpp +++ b/src/validateaddress.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "validateaddress.h" diff --git a/src/validateaddress.h b/src/validateaddress.h index 19db4cb..50032ef 100644 --- a/src/validateaddress.h +++ b/src/validateaddress.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef VALIDATEADDRESS_H #define VALIDATEADDRESS_H diff --git a/src/viewalladdresses.cpp b/src/viewalladdresses.cpp index 7b7af7d..58cb34a 100644 --- a/src/viewalladdresses.cpp +++ b/src/viewalladdresses.cpp @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "viewalladdresses.h" #include "settings.h" diff --git a/src/viewalladdresses.h b/src/viewalladdresses.h index 4e9e3d4..5d68e34 100644 --- a/src/viewalladdresses.h +++ b/src/viewalladdresses.h @@ -1,3 +1,5 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef VIEWALLADDRESSES_H #define VIEWALLADDRESSES_H @@ -21,4 +23,4 @@ private: RPC* rpc; }; -#endif \ No newline at end of file +#endif diff --git a/src/websockets.cpp b/src/websockets.cpp index 94f071d..743f5c5 100644 --- a/src/websockets.cpp +++ b/src/websockets.cpp @@ -1,4 +1,5 @@ -// Copyright 2019-2021 Hush developers +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #include "websockets.h" #include "rpc.h" #include "settings.h" diff --git a/src/websockets.h b/src/websockets.h index 1149a20..224d63c 100644 --- a/src/websockets.h +++ b/src/websockets.h @@ -1,12 +1,12 @@ +// Copyright 2019-2021 The Hush developers +// Released under the GPLv3 #ifndef WEBSOCKETS_H #define WEBSOCKETS_H #include "precompiled.h" - #include "mainwindow.h" #include "ui_mobileappconnector.h" - QT_FORWARD_DECLARE_CLASS(QWebSocketServer) QT_FORWARD_DECLARE_CLASS(QWebSocket) @@ -172,6 +172,4 @@ private: static AppDataModel* instance; }; - - #endif // WEBSOCKETS_H