aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-12-17 07:29:44 +0100
committerWladimir J. van der Laan <[email protected]>2013-12-17 07:29:53 +0100
commit8f5fd9449738e95d8c9dc27e9ddb9b7305b24564 (patch)
treed3417cdb58e4347de8930b01cd5f15fa8cf06f86
parentMerge pull request #3430 from ldenman/patch-1 (diff)
parentsome more small re-branding changes (Bitcoin Core) (diff)
downloaddiscoin-8f5fd9449738e95d8c9dc27e9ddb9b7305b24564.tar.xz
discoin-8f5fd9449738e95d8c9dc27e9ddb9b7305b24564.zip
Merge pull request #3434
46469d0 some more small re-branding changes (Bitcoin Core) (Philip Kaufmann)
-rw-r--r--src/init.cpp4
-rw-r--r--src/qt/forms/rpcconsole.ui2
-rw-r--r--src/qt/guiutil.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 40dd2d04c..f577a6e05 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -858,8 +858,8 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
}
}
- // as LoadBlockIndex can take several minutes, it's possible the user
- // requested to kill bitcoin-qt during the last operation. If so, exit.
+ // As LoadBlockIndex can take several minutes, it's possible the user
+ // requested to kill the GUI during the last operation. If so, exit.
// As the program has not fully started yet, Shutdown() is possibly overkill.
if (fRequestShutdown)
{
diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui
index 36c0b881c..83e51b275 100644
--- a/src/qt/forms/rpcconsole.ui
+++ b/src/qt/forms/rpcconsole.ui
@@ -36,7 +36,7 @@
</font>
</property>
<property name="text">
- <string>Bitcoin Core</string>
+ <string>General</string>
</property>
</widget>
</item>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 309d08d07..b87498402 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -594,7 +594,7 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
HelpMessageBox::HelpMessageBox(QWidget *parent) :
QMessageBox(parent)
{
- header = tr("Bitcoin Core") + tr("version") + " " +
+ header = tr("Bitcoin Core") + " " + tr("version") + " " +
QString::fromStdString(FormatFullVersion()) + "\n\n" +
tr("Usage:") + "\n" +
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";