Skip to content

Commit 599f3c4

Browse files
committed
Merge #844: Fix some Bitcoin mentions in Qt
5e30195 Add parameter for chain name in initial download string (Philippe McLean) f5aa08f Replace some Bitcoin mentions with Elements (Steven Roose) Pull request description: Solves #667. Tree-SHA512: fdee9fe38cfef9946bd2672f6f13317f5ebc6874b16bb87027e39130fe8d46e7cd04d6cb01ea1d1e203188be93ecdf8b027a81344f033a15e40c586cd485d140
2 parents 51f62dc + 5e30195 commit 599f3c4

35 files changed

+92
-92
lines changed

src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ void BitcoinApplication::shutdownResult()
390390

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

src/qt/intro.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
129129
ui->lblExplanation1->setText(ui->lblExplanation1->text()
130130
.arg(tr(PACKAGE_NAME))
131131
.arg(m_blockchain_size)
132-
.arg(2009)
133-
.arg(tr("Bitcoin"))
132+
.arg(2018)
133+
.arg(tr("Liquid"))
134134
);
135135
ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME)));
136136

@@ -149,7 +149,7 @@ Intro::Intro(QWidget *parent, uint64_t blockchain_size, uint64_t chain_state_siz
149149
}
150150
requiredSpace += m_chain_state_size;
151151
ui->sizeWarningLabel->setText(
152-
tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " +
152+
tr("%1 will download and store a copy of the %2 block chain.").arg(tr(PACKAGE_NAME)).arg(tr("Liquid")) + " " +
153153
storageRequiresMsg.arg(requiredSpace) + " " +
154154
tr("The wallet will also be stored in this directory.")
155155
);

src/qt/locale/bitcoin_ar.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,8 @@
833833
<translation>سيتم تخزين %1 جيجابايت تقريباً من البيانات في هذا الدليل.</translation>
834834
</message>
835835
<message>
836-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
837-
<translation>سيقوم %1 بتنزيل نسخة من سلسلة كتل بتكوين وتخزينها.</translation>
836+
<source>%1 will download and store a copy of the %2 block chain.</source>
837+
<translation type="unfinished"></translation>
838838
</message>
839839
<message>
840840
<source>The wallet will also be stored in this directory.</source>
@@ -3193,4 +3193,4 @@
31933193
<translation>خطأ</translation>
31943194
</message>
31953195
</context>
3196-
</TS>
3196+
</TS>

src/qt/locale/bitcoin_ca.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@
873873
<translation>Aproximadament %1 GB de dades s'emmagatzemaran en aquest directori.</translation>
874874
</message>
875875
<message>
876-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
877-
<translation>%1 descarregarà i emmagatzemarà una còpia de la cadena de blocs Bitcoin.</translation>
876+
<source>%1 will download and store a copy of the %2 block chain.</source>
877+
<translation>%1 descarregarà i emmagatzemarà una còpia de la cadena de blocs %2.</translation>
878878
</message>
879879
<message>
880880
<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
35563556
<translation>Error</translation>
35573557
</message>
35583558
</context>
3559-
</TS>
3559+
</TS>

src/qt/locale/bitcoin_cs.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@
873873
<translation>Bude proto potřebovat do tohoto adresáře uložit přibližně %1 GB dat.</translation>
874874
</message>
875875
<message>
876-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
876+
<source>%1 will download and store a copy of the %2 block chain.</source>
877877
<translation>%1 bude stahovat kopii bločenky.</translation>
878878
</message>
879879
<message>
@@ -3672,4 +3672,4 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 sa
36723672
<translation>Chyba</translation>
36733673
</message>
36743674
</context>
3675-
</TS>
3675+
</TS>

src/qt/locale/bitcoin_da.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@
873873
<translation>Omtrent %1 GB data vil blive gemt i denne mappe.</translation>
874874
</message>
875875
<message>
876-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
877-
<translation>%1 vil downloade og gemme en kopi af Bitcoin-blokkæden.</translation>
876+
<source>%1 will download and store a copy of the %2 block chain.</source>
877+
<translation>%1 vil downloade og gemme en kopi af %2-blokkæden.</translation>
878878
</message>
879879
<message>
880880
<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
36643664
<translation>Fejl</translation>
36653665
</message>
36663666
</context>
3667-
</TS>
3667+
</TS>

src/qt/locale/bitcoin_de.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@
873873
<translation>Etwa %1 GB Daten werden in diesem Verzeichnis gespeichert.</translation>
874874
</message>
875875
<message>
876-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
877-
<translation>%1 wird heruntergeladen und als eine Kopie von dem Bitcoin Blockchain gespeichert.</translation>
876+
<source>%1 will download and store a copy of the %2 block chain.</source>
877+
<translation>%1 wird heruntergeladen und als eine Kopie von dem %2 Blockchain gespeichert.</translation>
878878
</message>
879879
<message>
880880
<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
36653665
<translation>Fehler</translation>
36663666
</message>
36673667
</context>
3668-
</TS>
3668+
</TS>

src/qt/locale/bitcoin_en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@
11111111
</message>
11121112
<message>
11131113
<location line="+8"/>
1114-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
1114+
<source>%1 will download and store a copy of the %2 block chain.</source>
11151115
<translation type="unfinished"></translation>
11161116
</message>
11171117
<message>

src/qt/locale/bitcoin_en_GB.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@
873873
<translation>Approximately %1 GB of data will be stored in this directory.</translation>
874874
</message>
875875
<message>
876-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
877-
<translation>%1 will download and store a copy of the Bitcoin block chain.</translation>
876+
<source>%1 will download and store a copy of the %2 block chain.</source>
877+
<translation>%1 will download and store a copy of the %2 block chain.</translation>
878878
</message>
879879
<message>
880880
<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
36763676
<translation>Error</translation>
36773677
</message>
36783678
</context>
3679-
</TS>
3679+
</TS>

src/qt/locale/bitcoin_es.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -872,8 +872,8 @@
872872
<translation>Se almacenará aproximadamente %1 GB de datos en este directorio.</translation>
873873
</message>
874874
<message>
875-
<source>%1 will download and store a copy of the Bitcoin block chain.</source>
876-
<translation>%1 descargará y almacenará una copia de la cadena de bloques de Bitcoin.</translation>
875+
<source>%1 will download and store a copy of the %2 block chain.</source>
876+
<translation>%1 descargará y almacenará una copia de la cadena de bloques de %2.</translation>
877877
</message>
878878
<message>
879879
<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
36753675
<translation>Error</translation>
36763676
</message>
36773677
</context>
3678-
</TS>
3678+
</TS>

0 commit comments

Comments
 (0)