Skip to content

Commit 2ed38d1

Browse files
laanwjlaanwj
committed
Merge pull request #3408
22f0135 Rebrand to `Bitcoin Core` (Wladimir J. van der Laan)
2 parents 3d7c66d + 22f0135 commit 2ed38d1

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

‎doc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Copyright (c) 2009-2013 Bitcoin Developers
66

77
Setup
88
---------------------
9-
[Bitcoin-Qt](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](https://bitcointalk.org/index.php?topic=145386.0).
9+
[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](https://bitcointalk.org/index.php?topic=145386.0).
1010

1111
Running
1212
---------------------

‎doc/README_windows.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Setup
2020
-----
2121
Unpack the files into a directory and run bitcoin-qt.exe.
2222

23-
Bitcoin-Qt is the original Bitcoin client and it builds the backbone of the network.
23+
Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
2424
However, it downloads and stores the entire history of Bitcoin transactions;
2525
depending on the speed of your computer and network connection, the synchronization
2626
process can take anywhere from a few hours to a day or more.

‎src/bitcoind.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ bool AppInit(int argc, char* argv[])
7878
if (mapArgs.count("-?") || mapArgs.count("--help"))
7979
{
8080
// First part of help message is specific to bitcoind / RPC client
81-
std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
81+
std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" +
8282
_("Usage:") + "\n" +
8383
" bitcoind [options] " + _("Start Bitcoin server") + "\n" +
8484
_("Usage (deprecated, use bitcoin-cli):") + "\n" +

‎src/qt/bitcoin.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
162162
void DebugMessageHandler(QtMsgType type, const char *msg)
163163
{
164164
Q_UNUSED(type);
165-
LogPrint("qt", "Bitcoin-Qt: %s\n", msg);
165+
LogPrint("qt", "GUI: %s\n", msg);
166166
}
167167
#else
168168
void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg)
169169
{
170170
Q_UNUSED(type);
171171
Q_UNUSED(context);
172-
LogPrint("qt", "Bitcoin-Qt: %s\n", qPrintable(msg));
172+
LogPrint("qt", "GUI: %s\n", qPrintable(msg));
173173
}
174174
#endif
175175

@@ -364,7 +364,7 @@ int main(int argc, char *argv[])
364364
guiref = 0;
365365
delete walletModel;
366366
}
367-
// Shutdown the core and its threads, but don't exit Bitcoin-Qt here
367+
// Shutdown the core and its threads, but don't exit the GUI here
368368
threadGroup.interrupt_all();
369369
threadGroup.join_all();
370370
Shutdown();

‎src/qt/bitcoingui.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
7171

7272
if (!fIsTestnet)
7373
{
74-
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet"));
74+
setWindowTitle(tr("Bitcoin Core") + " - " + tr("Wallet"));
7575
#ifndef Q_OS_MAC
7676
QApplication::setWindowIcon(QIcon(":icons/bitcoin"));
7777
setWindowIcon(QIcon(":icons/bitcoin"));
@@ -81,7 +81,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
8181
}
8282
else
8383
{
84-
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet") + " " + tr("[testnet]"));
84+
setWindowTitle(tr("Bitcoin Core") + " - " + tr("Wallet") + " " + tr("[testnet]"));
8585
#ifndef Q_OS_MAC
8686
QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet"));
8787
setWindowIcon(QIcon(":icons/bitcoin_testnet"));
@@ -229,9 +229,9 @@ void BitcoinGUI::createActions(bool fIsTestnet)
229229
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
230230
quitAction->setMenuRole(QAction::QuitRole);
231231
if (!fIsTestnet)
232-
aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin"), this);
232+
aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin Core"), this);
233233
else
234-
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this);
234+
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin Core"), this);
235235
aboutAction->setStatusTip(tr("Show information about Bitcoin"));
236236
aboutAction->setMenuRole(QAction::AboutRole);
237237
#if QT_VERSION < 0x050000

‎src/qt/forms/aboutdialog.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>About Bitcoin</string>
14+
<string>About Bitcoin Core</string>
1515
</property>
1616
<layout class="QHBoxLayout" name="horizontalLayout_2">
1717
<item>
@@ -50,7 +50,7 @@
5050
<cursorShape>IBeamCursor</cursorShape>
5151
</property>
5252
<property name="text">
53-
<string>&lt;b&gt;Bitcoin&lt;/b&gt; version</string>
53+
<string>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</string>
5454
</property>
5555
<property name="textInteractionFlags">
5656
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -91,7 +91,7 @@
9191
<cursorShape>IBeamCursor</cursorShape>
9292
</property>
9393
<property name="text">
94-
<string notr="true">Copyright &amp;copy; 2009-YYYY The Bitcoin developers</string>
94+
<string notr="true">Copyright &amp;copy; 2009-YYYY The Bitcoin Core developers</string>
9595
</property>
9696
<property name="textFormat">
9797
<enum>Qt::RichText</enum>

‎src/qt/forms/intro.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<string notr="true">QLabel { font-style:italic; }</string>
2121
</property>
2222
<property name="text">
23-
<string>Welcome to Bitcoin-Qt.</string>
23+
<string>Welcome to Bitcoin Core.</string>
2424
</property>
2525
<property name="wordWrap">
2626
<bool>true</bool>
@@ -46,7 +46,7 @@
4646
<item>
4747
<widget class="QLabel" name="label_4">
4848
<property name="text">
49-
<string>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</string>
49+
<string>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</string>
5050
</property>
5151
<property name="wordWrap">
5252
<bool>true</bool>
@@ -56,7 +56,7 @@
5656
<item>
5757
<widget class="QLabel" name="sizeWarningLabel">
5858
<property name="text">
59-
<string>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
59+
<string>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
6060
</property>
6161
<property name="wordWrap">
6262
<bool>true</bool>

‎src/qt/forms/rpcconsole.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<item row="17" column="0">
349349
<widget class="QPushButton" name="showCLOptionsButton">
350350
<property name="toolTip">
351-
<string>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</string>
351+
<string>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</string>
352352
</property>
353353
<property name="text">
354354
<string>&amp;Show</string>

‎src/qt/guiutil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
594594
HelpMessageBox::HelpMessageBox(QWidget *parent) :
595595
QMessageBox(parent)
596596
{
597-
header = tr("Bitcoin-Qt") + " " + tr("version") + " " +
597+
header = tr("Bitcoin Core") + tr("version") + " " +
598598
QString::fromStdString(FormatFullVersion()) + "\n\n" +
599599
tr("Usage:") + "\n" +
600600
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";
@@ -607,7 +607,7 @@ HelpMessageBox::HelpMessageBox(QWidget *parent) :
607607
" -splash " + tr("Show splash screen on startup (default: 1)") + "\n" +
608608
" -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n";
609609

610-
setWindowTitle(tr("Bitcoin-Qt"));
610+
setWindowTitle(tr("Bitcoin Core"));
611611
setTextFormat(Qt::PlainText);
612612
// setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider.
613613
setText(header + QString(QChar(0x2003)).repeated(50));

‎src/qt/res/bitcoin-qt-res.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ BEGIN
2121
BLOCK "040904E4" // U.S. English - multilingual (hex)
2222
BEGIN
2323
VALUE "CompanyName", "Bitcoin"
24-
VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)"
24+
VALUE "FileDescription", "Bitcoin Core (OSS GUI client for Bitcoin)"
2525
VALUE "FileVersion", VER_FILEVERSION_STR
2626
VALUE "InternalName", "bitcoin-qt"
2727
VALUE "LegalCopyright", COPYRIGHT_STR
2828
VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
2929
VALUE "OriginalFilename", "bitcoin-qt.exe"
30-
VALUE "ProductName", "Bitcoin-Qt"
30+
VALUE "ProductName", "Bitcoin Core"
3131
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
3232
END
3333
END

0 commit comments

Comments
 (0)