Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-08-04 05:54:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge qt_ambig_uri_refs

Browse Source
This commit is contained in:
Luke Dashjr 2024-06-21 19:28:12 +00:00
commit a1c1504ab8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/bitcoin.cpp
View File

@ -565,10 +565,10 @@ int GuiMain(int argc, char* argv[])
}
#endif
if (payment_server_token_seen && arg.startsWith("-")) {
InitError(Untranslated(strprintf("Options ('%s') cannot follow a BIP-21 payment URI", argv[i])));
InitError(Untranslated(strprintf("Options ('%s') cannot follow a payment URI", argv[i])));
QMessageBox::critical(nullptr, PACKAGE_NAME,
// message cannot be translated because translations have not been initialized
QString::fromStdString("Options ('%1') cannot follow a BIP-21 payment URI").arg(QString::fromStdString(argv[i])));
QString::fromStdString("Options ('%1') cannot follow a payment URI").arg(QString::fromStdString(argv[i])));
return EXIT_FAILURE;
}
if (invalid_token) {

2
src/qt/utilitydialog.cpp
View File

@ -59,7 +59,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
} else {
setWindowTitle(tr("Command-line options"));
QString header = "Usage: bitcoin-qt [command-line options] [URI]\n\n"
"Optional URI is a Bitcoin address in BIP21 URI format.\n";
"Optional URI is a Bitcoin address in URI format.\n";
QTextCursor cursor(ui->helpMessage->document());
cursor.insertText(version);
cursor.insertBlock();