Browse Source

Merge pull request #3434

46469d0 some more small re-branding changes (Bitcoin Core) (Philip Kaufmann)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
8f5fd94497
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 4
      src/init.cpp
  2. 2
      src/qt/forms/rpcconsole.ui
  3. 2
      src/qt/guiutil.cpp

4
src/init.cpp

@ -858,8 +858,8 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) @@ -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)
{

2
src/qt/forms/rpcconsole.ui

@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
</font>
</property>
<property name="text">
<string>Bitcoin Core</string>
<string>General</string>
</property>
</widget>
</item>

2
src/qt/guiutil.cpp

@ -594,7 +594,7 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize, @@ -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";

Loading…
Cancel
Save