Skip to content

Commit

Permalink
Merge #848: [0.18 backport] Replace some Bitcoin mentions with Elements
Browse files Browse the repository at this point in the history
96b90d0 Add parameter for chain name in initial download string (Philippe McLean)
a531e6a Replace some Bitcoin mentions with Elements (Steven Roose)

Pull request description:

  Backport of #844.

Tree-SHA512: 61441d3dc913f80cb01c1816ecb41dde0bbb278cc1c9da47e17a8c1606aa1c2608b5aea5facc0a80eb198e1d61b91a3e773aa255bfa0e5cbd13cba58a8c1cdf0
  • Loading branch information
stevenroose committed Apr 6, 2020
2 parents 0f91d8e + 96b90d0 commit 17092fc
Show file tree
Hide file tree
Showing 35 changed files with 92 additions and 92 deletions.
2 changes: 1 addition & 1 deletion src/qt/bitcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
6 changes: 3 additions & 3 deletions src/qt/intro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)));

Expand All @@ -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.")
);
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -881,8 +881,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>
Expand Down Expand Up @@ -3212,4 +3212,4 @@
<translation>خطأ</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -853,8 +853,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>
Expand Down Expand Up @@ -3451,4 +3451,4 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1
<translation>Error</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,8 @@
<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>
<translation>%1 bude stahovat kopii blockchainu.</translation>
<source>%1 will download and store a copy of the %2 block chain.</source>
<translation>%1 bude stahovat kopii bločenky.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
Expand Down Expand Up @@ -3725,4 +3725,4 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa
<translation>Chyba</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>
Expand Down Expand Up @@ -3717,4 +3717,4 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satos
<translation>Fejl</translation>
</message>
</context>
</TS>
</TS>
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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 heruntergeladen und als eine Kopie von dem %2 Blockchain gespeichert.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,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>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_en_GB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>
Expand Down Expand Up @@ -3729,4 +3729,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>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -912,8 +912,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>
Expand Down Expand Up @@ -3724,4 +3724,4 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis
<translation>Error</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_es_CL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,8 +829,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>
Expand Down Expand Up @@ -3114,4 +3114,4 @@
<translation>Error</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -877,8 +877,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>
Expand Down Expand Up @@ -3535,4 +3535,4 @@
<translation>Virhe</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>
Expand Down Expand Up @@ -3717,4 +3717,4 @@ Note : Les frais étant calculés par octet, des frais de « 100 satoshis par
<translation>Erreur</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -853,8 +853,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>
Expand Down Expand Up @@ -3311,4 +3311,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>שגיאה</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_hr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,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>
Expand Down Expand Up @@ -3582,4 +3582,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>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_hu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,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>
Expand Down Expand Up @@ -3082,4 +3082,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>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_id_ID.ts
Original file line number Diff line number Diff line change
Expand Up @@ -885,8 +885,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>
Expand Down Expand Up @@ -2165,4 +2165,4 @@
<translation>Gagal</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>
Expand Down Expand Up @@ -3710,4 +3710,4 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di "
<translation>Errore</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>
Expand Down Expand Up @@ -3713,4 +3713,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>エラー</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_ko_KR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>%1은 %2 블록 체인의 사본을 다운로드하여 저장합니다.</translation>
</message>
<message>
<source>The wallet will also be stored in this directory.</source>
Expand Down Expand Up @@ -3725,4 +3725,4 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis p
<translation>오류</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_nb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -897,8 +897,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>
Expand Down Expand Up @@ -3581,4 +3581,4 @@
<translation>Feil</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,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>
Expand Down Expand Up @@ -3729,4 +3729,4 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10
<translation>Fout</translation>
</message>
</context>
</TS>
</TS>
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -889,8 +889,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>
Expand Down Expand Up @@ -3640,4 +3640,4 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw
<translation>Błąd</translation>
</message>
</context>
</TS>
</TS>
Loading

0 comments on commit 17092fc

Please sign in to comment.