Merge pull request #3434
46469d0
some more small re-branding changes (Bitcoin Core) (Philip Kaufmann)
This commit is contained in:
commit
8f5fd94497
3 changed files with 4 additions and 4 deletions
|
@ -858,8 +858,8 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// as LoadBlockIndex can take several minutes, it's possible the user
|
// As LoadBlockIndex can take several minutes, it's possible the user
|
||||||
// requested to kill bitcoin-qt during the last operation. If so, exit.
|
// requested to kill the GUI during the last operation. If so, exit.
|
||||||
// As the program has not fully started yet, Shutdown() is possibly overkill.
|
// As the program has not fully started yet, Shutdown() is possibly overkill.
|
||||||
if (fRequestShutdown)
|
if (fRequestShutdown)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Bitcoin Core</string>
|
<string>General</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -594,7 +594,7 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
|
||||||
HelpMessageBox::HelpMessageBox(QWidget *parent) :
|
HelpMessageBox::HelpMessageBox(QWidget *parent) :
|
||||||
QMessageBox(parent)
|
QMessageBox(parent)
|
||||||
{
|
{
|
||||||
header = tr("Bitcoin Core") + tr("version") + " " +
|
header = tr("Bitcoin Core") + " " + tr("version") + " " +
|
||||||
QString::fromStdString(FormatFullVersion()) + "\n\n" +
|
QString::fromStdString(FormatFullVersion()) + "\n\n" +
|
||||||
tr("Usage:") + "\n" +
|
tr("Usage:") + "\n" +
|
||||||
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";
|
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";
|
||||||
|
|
Loading…
Reference in a new issue