Skip to content

Commit d5f4683

Browse files
luke-jrluke-jr
committed
Unify package name to as few places as possible without major changes
1 parent 348b281 commit d5f4683

29 files changed

+106
-58
lines changed

Diff for: ‎build-aux/m4/bitcoin_find_bdb48.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
3838
done
3939
if test "x$bdbpath" = "xX"; then
4040
AC_MSG_RESULT([no])
41-
AC_MSG_ERROR([libdb_cxx headers missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
41+
AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
4242
elif test "x$bdb48path" = "xX"; then
4343
BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
4444
AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
@@ -60,7 +60,7 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
6060
])
6161
done
6262
if test "x$BDB_LIBS" = "x"; then
63-
AC_MSG_ERROR([libdb_cxx missing, Bitcoin Core requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
63+
AC_MSG_ERROR([libdb_cxx missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
6464
fi
6565
AC_SUBST(BDB_LIBS)
6666
])

Diff for: ‎build-aux/m4/bitcoin_qt.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
220220
221221
222222
dnl enable qt support
223-
AC_MSG_CHECKING(whether to build Bitcoin Core GUI)
223+
AC_MSG_CHECKING(whether to build ]AC_PACKAGE_NAME[ GUI)
224224
BITCOIN_QT_CHECK([
225225
bitcoin_enable_qt=yes
226226
bitcoin_enable_qt_test=yes

Diff for: ‎libbitcoinconsensus.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
33
libdir=@libdir@
44
includedir=@includedir@
55

6-
Name: Bitcoin Core consensus library
6+
Name: @PACKAGE_NAME@ consensus library
77
Description: Library for the Bitcoin consensus protocol.
88
Version: @PACKAGE_VERSION@
99
Libs: -L${libdir} -lbitcoinconsensus

Diff for: ‎share/qt/Info.plist.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<string>APPL</string>
1818

1919
<key>CFBundleGetInfoString</key>
20-
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The Bitcoin Core developers</string>
20+
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ The @PACKAGE_NAME@ developers</string>
2121

2222
<key>CFBundleShortVersionString</key>
2323
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>

Diff for: ‎share/qt/extract_strings_qt.py

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def parse_po(text):
7070
#endif
7171
""")
7272
f.write('static const char UNUSED *bitcoin_strings[] = {\n')
73+
f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('PACKAGE_NAME'),))
7374
messages.sort(key=operator.itemgetter(0))
7475
for (msgid, msgstr) in messages:
7576
if msgid != EMPTY:

Diff for: ‎share/setup.nsi.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SetCompressor /SOLID lzma
66
# General Symbol Definitions
77
!define REGKEY "SOFTWARE\$(^Name)"
88
!define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
9-
!define COMPANY "Bitcoin Core project"
9+
!define COMPANY "@PACKAGE_NAME@ project"
1010
!define URL http://www.bitcoin.org/
1111

1212
# MUI Symbol Definitions
@@ -59,7 +59,7 @@ XPStyle on
5959
BrandingText " "
6060
ShowInstDetails show
6161
VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@
62-
VIAddVersionKey ProductName "Bitcoin Core"
62+
VIAddVersionKey ProductName "@PACKAGE_NAME@"
6363
VIAddVersionKey ProductVersion "${VERSION}"
6464
VIAddVersionKey CompanyName "${COMPANY}"
6565
VIAddVersionKey CompanyWebsite "${URL}"

Diff for: ‎src/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ clean-local:
448448

449449
.rc.o:
450450
@test -f $(WINDRES)
451-
$(AM_V_GEN) $(WINDRES) -DWINDRES_PREPROC -i $< -o $@
451+
## FIXME: How to get the appropriate modulename_CPPFLAGS in here?
452+
$(AM_V_GEN) $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) -DWINDRES_PREPROC -i $< -o $@
452453

453454
.mm.o:
454455
$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

Diff for: ‎src/Makefile.qt.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ SECONDARY: $(QT_QM)
382382

383383
qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES)
384384
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
385-
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) ../share/qt/extract_strings_qt.py $^
385+
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" ../share/qt/extract_strings_qt.py $^
386386

387387
translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
388388
@test -n $(LUPDATE) || echo "lupdate is required for updating translations"

Diff for: ‎src/bitcoin-cli-res.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BEGIN
1717
BLOCK "040904E4" // U.S. English - multilingual (hex)
1818
BEGIN
1919
VALUE "CompanyName", "Bitcoin"
20-
VALUE "FileDescription", "bitcoin-cli (JSON-RPC client for Bitcoin Core)"
20+
VALUE "FileDescription", "bitcoin-cli (JSON-RPC client for " PACKAGE_NAME ")"
2121
VALUE "FileVersion", VER_FILEVERSION_STR
2222
VALUE "InternalName", "bitcoin-cli"
2323
VALUE "LegalCopyright", COPYRIGHT_STR

Diff for: ‎src/bitcoin-cli.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6+
#if defined(HAVE_CONFIG_H)
7+
#include "config/bitcoin-config.h"
8+
#endif
9+
610
#include "chainparamsbase.h"
711
#include "clientversion.h"
812
#include "rpcclient.h"
@@ -68,10 +72,10 @@ static bool AppInitRPC(int argc, char* argv[])
6872
//
6973
ParseParameters(argc, argv);
7074
if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
71-
std::string strUsage = _("Bitcoin Core RPC client version") + " " + FormatFullVersion() + "\n";
75+
std::string strUsage = strprintf(_("%s RPC client version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n";
7276
if (!mapArgs.count("-version")) {
7377
strUsage += "\n" + _("Usage:") + "\n" +
74-
" bitcoin-cli [options] <command> [params] " + _("Send command to Bitcoin Core") + "\n" +
78+
" bitcoin-cli [options] <command> [params] " + strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" +
7579
" bitcoin-cli [options] help " + _("List commands") + "\n" +
7680
" bitcoin-cli [options] help <command> " + _("Get help for a command") + "\n";
7781

Diff for: ‎src/bitcoin-tx.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#if defined(HAVE_CONFIG_H)
6+
#include "config/bitcoin-config.h"
7+
#endif
8+
59
#include "base58.h"
610
#include "clientversion.h"
711
#include "coins.h"
@@ -47,7 +51,7 @@ static bool AppInitRawTx(int argc, char* argv[])
4751
if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help"))
4852
{
4953
// First part of help message is specific to this utility
50-
std::string strUsage = _("Bitcoin Core bitcoin-tx utility version") + " " + FormatFullVersion() + "\n\n" +
54+
std::string strUsage = strprintf(_("%s bitcoin-tx utility version"), _(PACKAGE_NAME)) + " " + FormatFullVersion() + "\n\n" +
5155
_("Usage:") + "\n" +
5256
" bitcoin-tx [options] <hex-tx> [commands] " + _("Update hex-encoded bitcoin transaction") + "\n" +
5357
" bitcoin-tx [options] -create [commands] " + _("Create hex-encoded bitcoin transaction") + "\n" +

Diff for: ‎src/bitcoind.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6+
#if defined(HAVE_CONFIG_H)
7+
#include "config/bitcoin-config.h"
8+
#endif
9+
610
#include "chainparams.h"
711
#include "clientversion.h"
812
#include "rpcserver.h"
@@ -74,7 +78,7 @@ bool AppInit(int argc, char* argv[])
7478
// Process help and version before taking care about datadir
7579
if (mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version"))
7680
{
77-
std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n";
81+
std::string strUsage = strprintf(_("%s Daemon"), _(PACKAGE_NAME)) + " " + _("version") + " " + FormatFullVersion() + "\n";
7882

7983
if (mapArgs.count("-version"))
8084
{
@@ -83,7 +87,7 @@ bool AppInit(int argc, char* argv[])
8387
else
8488
{
8589
strUsage += "\n" + _("Usage:") + "\n" +
86-
" bitcoind [options] " + _("Start Bitcoin Core Daemon") + "\n";
90+
" bitcoind [options] " + strprintf(_("Start %s Daemon"), _(PACKAGE_NAME)) + "\n";
8791

8892
strUsage += "\n" + HelpMessage(HMM_BITCOIND);
8993
}

Diff for: ‎src/clientversion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define DO_STRINGIZE(X) #X
3939

4040
//! Copyright string used in Windows .rc files
41-
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers"
41+
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The " PACKAGE_NAME " Developers"
4242

4343
/**
4444
* bitcoind-res.rc includes this file, but it cannot cope with real c++ code.

Diff for: ‎src/init.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ std::string HelpMessage(HelpMessageMode mode)
513513
std::string LicenseInfo()
514514
{
515515
// todo: remove urls from translations on next change
516-
return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
516+
return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The %s Developers"), COPYRIGHT_YEAR, _(PACKAGE_NAME))) + "\n" +
517517
"\n" +
518518
FormatParagraph(_("This is experimental software.")) + "\n" +
519519
"\n" +
@@ -997,7 +997,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
997997

998998
// Sanity check
999999
if (!InitSanityCheck())
1000-
return InitError(_("Initialization sanity check failed. Bitcoin Core is shutting down."));
1000+
return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), _(PACKAGE_NAME)));
10011001

10021002
std::string strDataDir = GetDataDir().string();
10031003
#ifdef ENABLE_WALLET
@@ -1013,9 +1013,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
10131013
try {
10141014
static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
10151015
if (!lock.try_lock())
1016-
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running."), strDataDir));
1016+
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), strDataDir, _(PACKAGE_NAME)));
10171017
} catch(const boost::interprocess::interprocess_exception& e) {
1018-
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin Core is probably already running.") + " %s.", strDataDir, e.what()));
1018+
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running.") + " %s.", strDataDir, _(PACKAGE_NAME), e.what()));
10191019
}
10201020

10211021
#ifndef WIN32
@@ -1423,10 +1423,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
14231423
" or address book entries might be missing or incorrect."));
14241424
}
14251425
else if (nLoadWalletRet == DB_TOO_NEW)
1426-
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin Core") << "\n";
1426+
strErrors << strprintf(_("Error loading wallet.dat: Wallet requires newer version of %s"), _(PACKAGE_NAME)) << "\n";
14271427
else if (nLoadWalletRet == DB_NEED_REWRITE)
14281428
{
1429-
strErrors << _("Wallet needed to be rewritten: restart Bitcoin Core to complete") << "\n";
1429+
strErrors << strprintf(_("Wallet needed to be rewritten: restart %s to complete"), _(PACKAGE_NAME)) << "\n";
14301430
LogPrintf("%s", strErrors.str());
14311431
return InitError(strErrors.str());
14321432
}

Diff for: ‎src/net.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,7 @@ bool BindListenPort(const CService &addrBind, string& strError, bool fWhiteliste
18491849
{
18501850
int nErr = WSAGetLastError();
18511851
if (nErr == WSAEADDRINUSE)
1852-
strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin Core is probably already running."), addrBind.ToString());
1852+
strError = strprintf(_("Unable to bind to %s on this computer. %s is probably already running."), addrBind.ToString(), _(PACKAGE_NAME));
18531853
else
18541854
strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %s)"), addrBind.ToString(), NetworkErrorString(nErr));
18551855
LogPrintf("%s\n", strError);

Diff for: ‎src/qt/askpassphrasedialog.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#if defined(HAVE_CONFIG_H)
6+
#include "config/bitcoin-config.h"
7+
#endif
8+
59
#include "askpassphrasedialog.h"
610
#include "ui_askpassphrasedialog.h"
711

@@ -119,9 +123,9 @@ void AskPassphraseDialog::accept()
119123
{
120124
QMessageBox::warning(this, tr("Wallet encrypted"),
121125
"<qt>" +
122-
tr("Bitcoin Core will close now to finish the encryption process. "
126+
tr("%1 will close now to finish the encryption process. "
123127
"Remember that encrypting your wallet cannot fully protect "
124-
"your bitcoins from being stolen by malware infecting your computer.") +
128+
"your bitcoins from being stolen by malware infecting your computer.").arg(tr(PACKAGE_NAME)) +
125129
"<br><br><b>" +
126130
tr("IMPORTANT: Any previous backups you have made of your wallet file "
127131
"should be replaced with the newly generated, encrypted wallet file. "

Diff for: ‎src/qt/bitcoin.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -578,14 +578,14 @@ int main(int argc, char *argv[])
578578
/// - Do not call GetDataDir(true) before this step finishes
579579
if (!boost::filesystem::is_directory(GetDataDir(false)))
580580
{
581-
QMessageBox::critical(0, QObject::tr("Bitcoin Core"),
581+
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
582582
QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"])));
583583
return 1;
584584
}
585585
try {
586586
ReadConfigFile(mapArgs, mapMultiArgs);
587587
} catch (const std::exception& e) {
588-
QMessageBox::critical(0, QObject::tr("Bitcoin Core"),
588+
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME),
589589
QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
590590
return false;
591591
}
@@ -600,7 +600,7 @@ int main(int argc, char *argv[])
600600
try {
601601
SelectParams(ChainNameFromCommandLine());
602602
} catch(std::exception &e) {
603-
QMessageBox::critical(0, QObject::tr("Bitcoin Core"), QObject::tr("Error: %1").arg(e.what()));
603+
QMessageBox::critical(0, QObject::tr(PACKAGE_NAME), QObject::tr("Error: %1").arg(e.what()));
604604
return 1;
605605
}
606606
#ifdef ENABLE_WALLET
@@ -658,7 +658,7 @@ int main(int argc, char *argv[])
658658
app.createWindow(networkStyle.data());
659659
app.requestInitialize();
660660
#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000
661-
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Bitcoin Core didn't yet exit safely..."), (HWND)app.getMainWinId());
661+
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely...").arg(QObject::tr(PACKAGE_NAME)), (HWND)app.getMainWinId());
662662
#endif
663663
app.exec();
664664
app.requestShutdown();

Diff for: ‎src/qt/bitcoingui.cpp

+10-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#if defined(HAVE_CONFIG_H)
6+
#include "config/bitcoin-config.h"
7+
#endif
8+
59
#include "bitcoingui.h"
610

711
#include "bitcoinunits.h"
@@ -105,7 +109,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *platformStyle, const NetworkStyle *n
105109
{
106110
GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
107111

108-
QString windowTitle = tr("Bitcoin Core") + " - ";
112+
QString windowTitle = tr(PACKAGE_NAME) + " - ";
109113
#ifdef ENABLE_WALLET
110114
/* if compiled with wallet support, -disablewallet can still disable the wallet */
111115
enableWallet = !GetBoolArg("-disablewallet", false);
@@ -303,14 +307,14 @@ void BitcoinGUI::createActions()
303307
quitAction->setStatusTip(tr("Quit application"));
304308
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
305309
quitAction->setMenuRole(QAction::QuitRole);
306-
aboutAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&About Bitcoin Core"), this);
307-
aboutAction->setStatusTip(tr("Show information about Bitcoin Core"));
310+
aboutAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&About %1").arg(tr(PACKAGE_NAME)), this);
311+
aboutAction->setStatusTip(tr("Show information about %1").arg(tr(PACKAGE_NAME)));
308312
aboutAction->setMenuRole(QAction::AboutRole);
309313
aboutQtAction = new QAction(platformStyle->TextColorIcon(":/icons/about_qt"), tr("About &Qt"), this);
310314
aboutQtAction->setStatusTip(tr("Show information about Qt"));
311315
aboutQtAction->setMenuRole(QAction::AboutQtRole);
312316
optionsAction = new QAction(platformStyle->TextColorIcon(":/icons/options"), tr("&Options..."), this);
313-
optionsAction->setStatusTip(tr("Modify configuration options for Bitcoin Core"));
317+
optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(tr(PACKAGE_NAME)));
314318
optionsAction->setMenuRole(QAction::PreferencesRole);
315319
toggleHideAction = new QAction(platformStyle->TextColorIcon(":/icons/about"), tr("&Show / Hide"), this);
316320
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
@@ -340,7 +344,7 @@ void BitcoinGUI::createActions()
340344

341345
showHelpMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/info"), tr("&Command-line options"), this);
342346
showHelpMessageAction->setMenuRole(QAction::NoRole);
343-
showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options"));
347+
showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(tr(PACKAGE_NAME)));
344348

345349
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
346350
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
@@ -518,7 +522,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle)
518522
{
519523
#ifndef Q_OS_MAC
520524
trayIcon = new QSystemTrayIcon(this);
521-
QString toolTip = tr("Bitcoin Core client") + " " + networkStyle->getTitleAddText();
525+
QString toolTip = tr("%1 client").arg(tr(PACKAGE_NAME)) + " " + networkStyle->getTitleAddText();
522526
trayIcon->setToolTip(toolTip);
523527
trayIcon->setIcon(networkStyle->getTrayAndWindowIcon());
524528
trayIcon->show();

Diff for: ‎src/qt/forms/debugwindow.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
<item>
416416
<widget class="QPushButton" name="openDebugLogfileButton">
417417
<property name="toolTip">
418-
<string>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</string>
418+
<string>Open the %1 debug log file from the current data directory. This can take a few seconds for large log files.</string>
419419
</property>
420420
<property name="text">
421421
<string>&amp;Open</string>

Diff for: ‎src/qt/forms/helpmessagedialog.ui

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<height>400</height>
1111
</rect>
1212
</property>
13-
<property name="windowTitle">
14-
<string notr="true">Bitcoin Core - Command-line options</string>
15-
</property>
1613
<layout class="QHBoxLayout" name="horizontalLayout_2">
1714
<property name="spacing">
1815
<number>0</number>

0 commit comments

Comments
 (0)