Merge #844: Fix some Bitcoin mentions in Qt

5e3019570 Add parameter for chain name in initial download string (Philippe McLean)
f5aa08f53 Replace some Bitcoin mentions with Elements (Steven Roose)

Pull request description:

  Solves https://github.com/ElementsProject/elements/issues/667.

Tree-SHA512: fdee9fe38cfef9946bd2672f6f13317f5ebc6874b16bb87027e39130fe8d46e7cd04d6cb01ea1d1e203188be93ecdf8b027a81344f033a15e40c586cd485d140
This commit is contained in:
Steven Roose 2020-04-06 22:21:15 +01:00
commit 599f3c469d
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
35 changed files with 92 additions and 92 deletions

View file

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

View file

@ -129,8 +129,8 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
ui->lblExplanation1->setText(ui->lblExplanation1->text()
.arg(tr(PACKAGE_NAME))
.arg(m_blockchain_size)
.arg(2009)
.arg(tr("Bitcoin"))
.arg(2018)
.arg(tr("Liquid"))
);
ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME)));
@ -149,7 +149,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
}
requiredSpace += m_chain_state_size;
ui->sizeWarningLabel->setText(
tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " +
tr("%1 will download and store a copy of the %2 block chain.").arg(tr(PACKAGE_NAME)).arg(tr("Liquid")) + " " +
storageRequiresMsg.arg(requiredSpace) + " " +
tr("The wallet will also be stored in this directory.")
);

View file

@ -833,8 +833,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>
@ -3193,4 +3193,4 @@
<translation>خطأ</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,8 @@
<translation>Aproximadament %1 GB de dades s'emmagatzemaran 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>
@ -3556,4 +3556,4 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1
<translation>Error</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,7 +873,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 bločenky.</translation>
</message>
<message>
@ -3672,4 +3672,4 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa
<translation>Chyba</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,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>
@ -3664,4 +3664,4 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos
<translation>Fejl</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,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 heruntergeladen und als eine Kopie von dem Bitcoin Blockchain gespeichert.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 wird heruntergeladen und als eine Kopie von dem %2 Blockchain gespeichert.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3665,4 +3665,4 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio
<translation>Fehler</translation>
</message>
</context>
</TS>
</TS>

View file

@ -1111,7 +1111,7 @@
</message>
<message>
<location line="+8"/>
<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

@ -873,8 +873,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>
@ -3676,4 +3676,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>Error</translation>
</message>
</context>
</TS>
</TS>

View file

@ -872,8 +872,8 @@
<translation>Se almacenará aproximadamente %1 GB de datos 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>
@ -3675,4 +3675,4 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis
<translation>Error</translation>
</message>
</context>
</TS>
</TS>

View file

@ -844,8 +844,8 @@
<translation>Aproximadamente %1 GB de información será almacenado 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 del blockchain de Bitcoin.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 descargará y almacenará una copia del blockchain de %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3178,4 +3178,4 @@
<translation>Error</translation>
</message>
</context>
</TS>
</TS>

View file

@ -867,8 +867,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>
@ -3522,4 +3522,4 @@
<translation>Virhe</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,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>
@ -3664,4 +3664,4 @@ Note : Les frais étant calculés par octet, des frais de «100 satoshis par
<translation>Erreur</translation>
</message>
</context>
</TS>
</TS>

View file

@ -869,8 +869,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>
@ -3352,4 +3352,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

@ -872,8 +872,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>
@ -3663,4 +3663,4 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po k
<translation>Greška</translation>
</message>
</context>
</TS>
</TS>

View file

@ -840,8 +840,8 @@ Kérem a kulcsmondatban használjon &lt;b&gt; tíz vagy több véletlenszerű ka
<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>
@ -3119,4 +3119,4 @@ Kérem a kulcsmondatban használjon &lt;b&gt; tíz vagy több véletlenszerű ka
<translation>Hiba</translation>
</message>
</context>
</TS>
</TS>

View file

@ -869,8 +869,8 @@
<translation>%1 GB data akan disimpan di direktori ini.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 akan mengunduh dan menyimpan salinan Bitcoin block chain.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 akan mengunduh dan menyimpan salinan %2 block chain.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -2134,4 +2134,4 @@
<translation>Gagal</translation>
</message>
</context>
</TS>
</TS>

View file

@ -865,8 +865,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>
@ -3633,4 +3633,4 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di "
<translation>Errore</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,8 @@
<translation>%1GBのデータがこのディレクトリに保存されます</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1Bitcoinのブロックチェーンの複製をダウンロードし保存しま</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>
@ -3665,4 +3665,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

@ -873,8 +873,8 @@
<translation> %1GB의 .</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>
@ -3665,4 +3665,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

@ -847,8 +847,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>
@ -3526,4 +3526,4 @@
<translation>Feil</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,8 @@
<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>
@ -3676,4 +3676,4 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10
<translation>Fout</translation>
</message>
</context>
</TS>
</TS>

View file

@ -873,8 +873,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>
@ -3675,4 +3675,4 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
<translation>Błąd</translation>
</message>
</context>
</TS>
</TS>

View file

@ -869,8 +869,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>
@ -3669,4 +3669,4 @@ Diretório de blocos especificados "%s" não existe.</translation>
<translation>Erro</translation>
</message>
</context>
</TS>
</TS>

View file

@ -861,8 +861,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

@ -869,8 +869,8 @@
<translation>Aproximativ %1 GB de date vor fi stocate in acest director.</translation>
</message>
<message>
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
<translation>%1 va descarca si stoca o copie a blockchainului Bitcoin</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 va descarca si stoca o copie a blockchainului %2.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>

View file

@ -873,7 +873,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>
@ -3673,4 +3673,4 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 sato
<translation>Chyba</translation>
</message>
</context>
</TS>
</TS>

View file

@ -874,8 +874,8 @@ Var vänlig och 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 Bitcoin-blockkedjan.</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 %2-blockkedjan.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
@ -3677,4 +3677,4 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut f
<translation>Fel</translation>
</message>
</context>
</TS>
</TS>

View file

@ -861,8 +861,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>
@ -2120,4 +2120,4 @@
<translation>Feler</translation>
</message>
</context>
</TS>
</TS>

View file

@ -865,7 +865,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>
@ -3654,4 +3654,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

@ -843,8 +843,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>
@ -3434,4 +3434,4 @@
<translation>Lỗi</translation>
</message>
</context>
</TS>
</TS>

View file

@ -868,8 +868,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

@ -873,8 +873,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>
@ -3668,4 +3668,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

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

View file

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