Skip to content

Commit bbe2655

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#26142: Use PACKAGE_NAME in messages rather than hardcoding "Bitcoin Core"
b147322 Use `PACKAGE_NAME` in messages rather than hardcoding "Bitcoin Core" (Hennadii Stepanov) Pull request description: Usually, we do not hardcode "Bitcoin Core" in the user-faced messages. See: - bitcoin/bitcoin#18646 - bitcoin/bitcoin#19282 Also grammar has been improved -- singular instead of plural. ACKs for top commit: jarolrod: ACK b147322 Tree-SHA512: b135c18703dfdd7b63d4cb27d1ac48f6a9dbf69382142ae381f33bf561cbf57477a11d1c73263aa834f705206d7dd5716df2523d38ed0d4cfec8babc38bb017a
2 parents c102a55 + b147322 commit bbe2655

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
17101710

17111711
const auto BadPortWarning = [](const char* prefix, uint16_t port) {
17121712
return strprintf(_("%s request to listen on port %u. This port is considered \"bad\" and "
1713-
"thus it is unlikely that any Bitcoin Core peers connect to it. See "
1713+
"thus it is unlikely that any peer will connect to it. See "
17141714
"doc/p2p-bad-ports.md for details and a full list."),
17151715
prefix,
17161716
port);

src/qt/forms/optionsdialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
<item>
287287
<widget class="QLineEdit" name="externalSignerPath">
288288
<property name="toolTip">
289-
<string>Full path to a Bitcoin Core compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</string>
289+
<string>Full path to a %1 compatible script (e.g. C:\Downloads\hwi.exe or /Users/you/Downloads/hwi.py). Beware: malware can steal your coins!</string>
290290
</property>
291291
</widget>
292292
</item>

src/qt/optionsdialog.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
9191
ui->thirdPartyTxUrls->setVisible(false);
9292
}
9393

94-
#ifndef ENABLE_EXTERNAL_SIGNER
94+
#ifdef ENABLE_EXTERNAL_SIGNER
95+
ui->externalSignerPath->setToolTip(ui->externalSignerPath->toolTip().arg(PACKAGE_NAME));
96+
#else
9597
//: "External signing" means using devices such as hardware wallets.
9698
ui->externalSignerPath->setToolTip(tr("Compiled without external signing support (required for external signing)"));
9799
ui->externalSignerPath->setEnabled(false);

0 commit comments

Comments
 (0)