Merge 599f3c469d into merged_master (Elements PR #844)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:12 +00:00
commit 389f392232
34 changed files with 87 additions and 87 deletions

View file

@ -358,7 +358,7 @@ void BitcoinApplication::shutdownResult()
void BitcoinApplication::handleRunawayException(const QString &message)
{
QMessageBox::critical(nullptr, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message);
QMessageBox::critical(nullptr, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Elements can no longer continue safely and will quit.") + QString("\n\n") + message);
::exit(EXIT_FAILURE);
}

View file

@ -139,7 +139,7 @@ Intro::Intro(QWidget *parent, int64_t blockchain_size_gb, int64_t chain_state_si
.arg(PACKAGE_NAME)
.arg(m_blockchain_size_gb)
.arg(2009)
.arg(tr("Bitcoin"))
.arg(tr("Liquid"))
);
ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(PACKAGE_NAME));

View file

@ -896,8 +896,8 @@
<translation>سيتم تخزين %1 جيجابايت تقريباً من البيانات في هذا الدليل.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>سيقوم %1 بتنزيل نسخة من سلسلة كتل بتكوين وتخزينها.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3125,4 +3125,4 @@
<translation>إنتهاء التحميل</translation>
</message>
</context>
</TS>
</TS>

View file

@ -891,8 +891,8 @@
<translation>Aproximadament %1GB de dades seran emmagetzamades en aquest directori.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 descarregarà i emmagatzemarà una còpia de la cadena de blocs Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 descarregarà i emmagatzemarà una còpia de la cadena de blocs %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3399,4 +3399,4 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1
<translation>Ha acabat la càrrega</translation>
</message>
</context>
</TS>
</TS>

View file

@ -915,7 +915,7 @@
<translation>Bude proto potřebovat do tohoto adresáře uložit přibližně %1 GB dat.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 bude stahovat kopii blockchainu.</translation>
</message>
<message>
@ -3565,4 +3565,4 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa
<translation>Načítání dokončeno</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation>Omtrent %1 GB data vil blive gemt i denne mappe.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 vil downloade og gemme en kopi af Bitcoin-blokkæden.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 vil downloade og gemme en kopi af %2-blokkæden.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3801,4 +3801,4 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos
<translation>Indlæsning gennemført</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation>Etwa %1 GB Daten werden in diesem Verzeichnis gespeichert.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 wird eine Kopie der Bitcoin-Blockchain herunterladen und speichern.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 wird eine Kopie der %2-Blockchain herunterladen und speichern.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3811,4 +3811,4 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
<translation>Laden abgeschlossen</translation>
</message>
</context>
</TS>
</TS>

View file

@ -1236,7 +1236,7 @@
</message>
<message>
<location line="+4"/>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation type="unfinished"></translation>
</message>
<message>

View file

@ -987,8 +987,8 @@
<translation>Approximately %1 GB of data will be stored in this directory.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 will download and store a copy of the Bitcoin block chain.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 will download and store a copy of the %2 block chain.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3809,4 +3809,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>Done loading</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation>Aproximadamente %1 GB de datos se almacenarán en este directorio.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 descargará y almacenará una copia de la cadena de bloques de Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 descargará y almacenará una copia de la cadena de bloques de %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3729,4 +3729,4 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis
<translation>Se terminó de cargar</translation>
</message>
</context>
</TS>
</TS>

View file

@ -836,8 +836,8 @@ Exportar los datos en la pestaña actual a un archivo</translation>
<translation>Aproximadamente %1 GB de datos se almacenarán en este directorio.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 descargará y almacenará una copia de la cadena de bloques de Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 descargará y almacenará una copia de la cadena de bloques de %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3102,4 +3102,4 @@ Exportar los datos en la pestaña actual a un archivo</translation>
<translation>Listo Cargando</translation>
</message>
</context>
</TS>
</TS>

View file

@ -967,8 +967,8 @@
<translation>Noin %1 GB tietoa varastoidaan tähän hakemistoon.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 lataa ja tallentaa kopion Bitcoinin lohkoketjusta.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 lataa ja tallentaa kopion %2in lohkoketjusta.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3601,4 +3601,4 @@ Huom: Koska siirtomaksu lasketaan tavujen mukaan, niin määrittelemällä 500 t
<translation>Lataus on valmis</translation>
</message>
</context>
</TS>
</TS>

View file

@ -867,8 +867,8 @@
<translation>Humigit-kumulang na %1 GB na data ay maiimbak sa direktoryong ito.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 ay mag-do-download at magiimbak ng kopya ng Bitcoin blockchain.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 ay mag-do-download at magiimbak ng kopya ng %2 blockchain.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3497,4 +3497,4 @@ Tandaan: Dahil ang bayad ay kinakalkula sa bawat-byte na batayan, ang bayad ng
<translation>Tapos na ang pag-lo-load</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation>Approximativement %1 Go de données seront stockés dans ce répertoire.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 téléchargera et stockera une copie de la chaîne de blocs Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 téléchargera et stockera une copie de la chaîne de blocs %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3809,4 +3809,4 @@ Note : Les frais étant calculés par octet, des frais de «100 satoshis par
<translation>Chargement terminé</translation>
</message>
</context>
</TS>
</TS>

View file

@ -883,8 +883,8 @@
<translation>מידע בנפח של כ-%1 ג׳יגה-בייט יאוחסן בתיקייה זו.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 תוריד ותאחסן עותק של שרשרת הבלוקים של ביטקוין.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3534,4 +3534,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>טעינה הושלמה</translation>
</message>
</context>
</TS>
</TS>

View file

@ -974,8 +974,8 @@
<translation>Otprilike %1 GB podataka bit će spremljeno u ovoj mapi.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 preuzet će i pohraniti kopiju Bitcoinovog lanca blokova.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 preuzet će i pohraniti kopiju %2ovog lanca blokova.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3704,4 +3704,4 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k
<translation>Učitavanje gotovo</translation>
</message>
</context>
</TS>
</TS>

View file

@ -954,8 +954,8 @@
<translation>Hozzávetőlegesen %1 GB adatot fogunk ebben a könyvtárban tárolni.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 le fog töltődni és a Bitcoin blokk lánc egy másolatát fogja tárolni.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 le fog töltődni és a %2 blokk lánc egy másolatát fogja tárolni.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3406,4 +3406,4 @@
<translation>Betöltés befejezve.</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation>Verranno salvati circa %1 GB di dati in questa cartella.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 scaricherà e salverà una copia della block chain di Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 scaricherà e salverà una copia della block chain di %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3810,4 +3810,4 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di "
<translation>Caricamento completato</translation>
</message>
</context>
</TS>
</TS>

View file

@ -984,8 +984,8 @@
<translation>%1 GBのデータがこのディレクトリに保存されます</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 Bitcoin </translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 %2 </translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3758,4 +3758,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation></translation>
</message>
</context>
</TS>
</TS>

View file

@ -875,8 +875,8 @@
<translation>Omtrent %1GB data vil bli lagret i denne mappen.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 vil laste ned og lagre en kopi av Bitcoin blokkjeden.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 vil laste ned og lagre en kopi av %2 blokkjeden.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3405,4 +3405,4 @@
<translation>Ferdig med lasting</translation>
</message>
</context>
</TS>
</TS>

View file

@ -988,8 +988,8 @@ Dit is ideaal voor alleen-lezen portommonees.</translation>
<translation>Gemiddeld %1 GB aan data zal worden opgeslagen in deze map.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 zal een kopie van de blokketen van Bitcoin downloaden en opslaan.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 zal een kopie van de blokketen van %2 downloaden en opslaan.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3810,4 +3810,4 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10
<translation>Klaar met laden</translation>
</message>
</context>
</TS>
</TS>

View file

@ -975,8 +975,8 @@
<translation>Około %1 GB danych zostanie zapisane w tym katalogu.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 pobierze i zapisze lokalnie kopię łańcucha bloków Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 pobierze i zapisze lokalnie kopię łańcucha bloków %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3696,4 +3696,4 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
<translation>Wczytywanie zakończone</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation>Aproximadamente %1 GB de dados irão ser guardados nesta pasta.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 irá descarregar e armazenar uma cópia da cadeia de blocos da Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 irá descarregar e armazenar uma cópia da cadeia de blocos da %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>

View file

@ -987,8 +987,8 @@
<translation>Aproximadamente %1 GB de dados serão armazenados neste diretório.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 irá baixar e armazenar uma cópia da block chain do Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 irá baixar e armazenar uma cópia da block chain do %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3810,4 +3810,4 @@ Diretório de blocos especificados "%s" não existe.</translation>
<translation>Carregamento terminado!</translation>
</message>
</context>
</TS>
</TS>

View file

@ -975,7 +975,7 @@
<translation>Približne %1 GB dát bude uložených v tejto zložke.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 bude sťahovať kopiu reťazca blokov.</translation>
</message>
<message>
@ -3694,4 +3694,4 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 sato
<translation>Dokončené načítavanie</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,7 +987,7 @@
<translation>Približno %1 GB podatkov bo shranjenih v tem direktoriju.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 bo prenesel in shranil kopijo verige blokov.</translation>
</message>
<message>
@ -3809,4 +3809,4 @@ Opomba: Ker se provizija izračuna na bajt, bi provizija "100 satoshijev na kB"
<translation>Nalaganje končano</translation>
</message>
</context>
</TS>
</TS>

View file

@ -948,8 +948,8 @@ Försök igen.</translation>
<translation>Ungefär %1 GB data kommer att lagras i den här katalogen.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 kommer att ladda ner och lagra en kopia av Bitcoins blockkedja.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 kommer att ladda ner och lagra en kopia av %2s blockkedja.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3618,4 +3618,4 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f
<translation>Inläsning klar</translation>
</message>
</context>
</TS>
</TS>

View file

@ -827,8 +827,8 @@
<translation>Kole %1 GB datōw ôstanie spamiyntane w tym katalogu.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 sebiere i spamiyntŏ kopijõ kety blokōw Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 sebiere i spamiyntŏ kopijõ kety blokōw %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -1991,4 +1991,4 @@
<translation>Wgrŏwanie zakōńczōne</translation>
</message>
</context>
</TS>
</TS>

View file

@ -983,7 +983,7 @@
<translation>Близько %1 Гб даних буде збережено в цьому каталозі.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 буде завантажувати та зберігати копію ланцюжка блоків біткінів.</translation>
</message>
<message>
@ -3800,4 +3800,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>Завантаження завершено</translation>
</message>
</context>
</TS>
</TS>

View file

@ -883,8 +883,8 @@
<translation>Gần đúng %1 GB of data sẽ đưc lưu giữ trong danh mục này.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 sẽ download lưu trữ một bản copy của Bitcoin block chain.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 sẽ download lưu trữ một bản copy của %2 block chain.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3557,4 +3557,4 @@ Lưu ý: Vì phí được tính trên cơ sở mỗi byte, nên phí "100 satos
<translation>Done loading</translation>
</message>
</context>
</TS>
</TS>

View file

@ -987,8 +987,8 @@
<translation> %1 GB </translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 </translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>

View file

@ -887,8 +887,8 @@
<translation> %1 GB </translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 Bitcoin </translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 %2 </translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3577,4 +3577,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation></translation>
</message>
</context>
</TS>
</TS>

View file

@ -47,7 +47,7 @@ const QString BITCOIN_IPC_PREFIX("bitcoin:");
//
static QString ipcServerName()
{
QString name("BitcoinQt");
QString name("ElementsQt");
// Append a simple hash of the datadir
// Note that GetDataDir(true) returns a different path
@ -249,7 +249,7 @@ void PaymentServer::handleURIOrFile(const QString& s)
}
else
Q_EMIT message(tr("URI handling"),
tr("URI cannot be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters."),
tr("URI cannot be parsed! This can be caused by an invalid address or malformed URI parameters."),
CClientUIInterface::ICON_WARNING);
return;

View file

@ -845,7 +845,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
}
else if (!IsValidDestination(dest)) // Invalid address
{
ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Bitcoin address"));
ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid address"));
}
else // Valid address
{