Skip to content

Commit

Permalink
Decorify transaltions and part of the GUI
Browse files Browse the repository at this point in the history
Summary: These are remains that slept throught the cracks.

Test Plan:
  make check

Reviewers: schancel, Mengerian, #bitcoin_abc

Reviewed By: schancel, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D697
  • Loading branch information
deadalnix committed Nov 16, 2017
1 parent 5e74d11 commit f396e42
Show file tree
Hide file tree
Showing 91 changed files with 582 additions and 584 deletions.
2 changes: 1 addition & 1 deletion src/clientversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/**
* Name of client reported in the 'version' message. Report the same name
* for both bitcoind and bitcoin-core, to make it harder for attackers to
* for both bitcoind and bitcoin-abc, to make it harder for attackers to
* target servers or GUI users specifically.
*/
const std::string CLIENT_NAME("Bitcoin ABC");
Expand Down
9 changes: 4 additions & 5 deletions src/protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,16 @@ enum ServiceFlags : uint64_t {
// Nothing
NODE_NONE = 0,
// NODE_NETWORK means that the node is capable of serving the block chain.
// It is currently set by all Bitcoin Core nodes, and is unset by SPV
// clients or other peers that just want network services but don't provide
// them.
// It is currently set by all Bitcoin ABC nodes, and is unset by SPV clients
// or other peers that just want network services but don't provide them.
NODE_NETWORK = (1 << 0),
// NODE_GETUTXO means the node is capable of responding to the getutxo
// protocol request. Bitcoin Core does not support this but a patch set
// protocol request. Bitcoin ABC does not support this but a patch set
// called Bitcoin XT does. See BIP 64 for details on how this is
// implemented.
NODE_GETUTXO = (1 << 1),
// NODE_BLOOM means the node is capable and willing to handle bloom-filtered
// connections. Bitcoin Core nodes used to support this by default, without
// connections. Bitcoin ABC nodes used to support this by default, without
// advertising this bit, but no longer do as of protocol version 70011 (=
// NO_BLOOM_VERSION)
NODE_BLOOM = (1 << 2),
Expand Down
19 changes: 10 additions & 9 deletions src/qt/bitcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static void InitMessage(const std::string &message) {
* Translate string to current locale using Qt.
*/
static std::string Translate(const char *psz) {
return QCoreApplication::translate("bitcoin-core", psz).toStdString();
return QCoreApplication::translate("bitcoin-abc", psz).toStdString();
}

static QString GetLangTerritory() {
Expand Down Expand Up @@ -174,13 +174,14 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext &context,
}
#endif

/** Class encapsulating Bitcoin Core startup and shutdown.
/**
* Class encapsulating Bitcoin ABC startup and shutdown.
* Allows running startup and shutdown in a different thread from the UI thread.
*/
class BitcoinCore : public QObject {
class BitcoinABC : public QObject {
Q_OBJECT
public:
explicit BitcoinCore();
explicit BitcoinABC();

public Q_SLOTS:
void initialize(Config *config);
Expand Down Expand Up @@ -262,14 +263,14 @@ public Q_SLOTS:

#include "bitcoin.moc"

BitcoinCore::BitcoinCore() : QObject() {}
BitcoinABC::BitcoinABC() : QObject() {}

void BitcoinCore::handleRunawayException(const std::exception *e) {
void BitcoinABC::handleRunawayException(const std::exception *e) {
PrintExceptionContinue(e, "Runaway exception");
Q_EMIT runawayException(QString::fromStdString(GetWarnings("gui")));
}

void BitcoinCore::initialize(Config *cfg) {
void BitcoinABC::initialize(Config *cfg) {
Config &config(*cfg);
try {
qDebug() << __func__ << ": Running AppInit2 in thread";
Expand Down Expand Up @@ -297,7 +298,7 @@ void BitcoinCore::initialize(Config *cfg) {
}
}

void BitcoinCore::shutdown() {
void BitcoinABC::shutdown() {
try {
qDebug() << __func__ << ": Running Shutdown in thread";
Interrupt(threadGroup);
Expand Down Expand Up @@ -386,7 +387,7 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle) {
void BitcoinApplication::startThread() {
if (coreThread) return;
coreThread = new QThread(this);
BitcoinCore *executor = new BitcoinCore();
BitcoinABC *executor = new BitcoinABC();
executor->moveToThread(coreThread);

/* communication to and from thread */
Expand Down
680 changes: 339 additions & 341 deletions src/qt/bitcoinstrings.cpp

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/qt/locale/bitcoin_af.ts
Original file line number Diff line number Diff line change
Expand Up @@ -906,10 +906,10 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Kern</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>Information</source>
Expand Down Expand Up @@ -948,4 +948,4 @@
<translation>Fout</translation>
</message>
</context>
</TS>
</TS>
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_af_ZA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Opsies:</translation>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>خيارات: </translation>
Expand All @@ -1932,7 +1932,7 @@
<translation>حدد مجلد المعلومات</translation>
</message>
<message>
<source>Bitcoin Core</source>
<source>Bitcoin ABC</source>
<translation>جوهر البيت كوين</translation>
</message>
<message>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_be_BY.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Опцыі:</translation>
Expand All @@ -1258,8 +1258,8 @@
<translation>Запусціць у фоне як дэман і прымаць каманды</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>Do you want to rebuild the block database now?</source>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2328,7 +2328,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Опции:</translation>
Expand All @@ -2346,7 +2346,7 @@
<translation>Въведете Ваш публичен адрес</translation>
</message>
<message>
<source>Bitcoin Core</source>
<source>Bitcoin ABC</source>
<translation>Биткойн ядро</translation>
</message>
<message>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_bg_BG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Bitcoin Core</source>
<source>Bitcoin ABC</source>
<translation>Биткойн ядро</translation>
</message>
</context>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2784,7 +2784,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Opcions:</translation>
Expand Down Expand Up @@ -2842,8 +2842,8 @@
<translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Opcions:</translation>
Expand Down Expand Up @@ -2558,8 +2558,8 @@
<translation>Executa en segon pla com a programa dimoni i accepta ordes</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_ca_ES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2784,7 +2784,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Opcions:</translation>
Expand Down Expand Up @@ -2842,8 +2842,8 @@
<translation>No s'ha pogut iniciar el servidor HTTP. Vegeu debug.log per a més detalls.</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2988,7 +2988,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Možnosti:</translation>
Expand Down Expand Up @@ -3058,8 +3058,8 @@
<translation>Nemohu spustit HTTP server. Detaily viz v debug.log.</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>The %s developers</source>
Expand Down
8 changes: 4 additions & 4 deletions src/qt/locale/bitcoin_cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,14 @@
<name>WalletView</name>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Opsiynau:</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Craidd Bitcoin</translation>
<source>Bitcoin ABC</source>
<translation>ABC Bitcoin</translation>
</message>
<message>
<source>Information</source>
Expand All @@ -500,4 +500,4 @@
<translation>Gwall</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 @@ -2988,7 +2988,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Indstillinger:</translation>
Expand Down Expand Up @@ -3058,8 +3058,8 @@
<translation>Kunne ikke starte HTTP-server. Se fejlretningslog for detaljer.</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>The %s developers</source>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2984,7 +2984,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Optionen:</translation>
Expand Down Expand Up @@ -3054,8 +3054,8 @@
<translation>Kann HTTP Server nicht starten. Siehe debug log für Details.</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>The %s developers</source>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/locale/bitcoin_el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<name>WalletView</name>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Insufficient funds</source>
<translation>Κεφάλαια μη επαρκή</translation>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_el_GR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@
<name>WalletView</name>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<source>Options:</source>
<translation>Επιλογές:</translation>
Expand All @@ -1443,8 +1443,8 @@
<translation>Εκτέλεση στο παρασκήνιο κι αποδοχή εντολών</translation>
</message>
<message>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation>Bitcoin ABC</translation>
</message>
<message>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
Expand Down
6 changes: 3 additions & 3 deletions src/qt/locale/bitcoin_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3865,7 +3865,7 @@
</message>
</context>
<context>
<name>bitcoin-core</name>
<name>bitcoin-abc</name>
<message>
<location filename="../bitcoinstrings.cpp" line="+318"/>
<source>Options:</source>
Expand Down Expand Up @@ -3953,8 +3953,8 @@
</message>
<message>
<location line="-360"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
<source>Bitcoin ABC</source>
<translation type="unfinished">Bitcoin ABC</translation>
</message>
<message>
<location line="+1"/>
Expand Down
Loading

0 comments on commit f396e42

Please sign in to comment.