diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -118,20 +118,18 @@ gArgs.ParseParameters(argc, argv); if (argc < 2 || HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { std::string strUsage = - strprintf(_("%s RPC client version"), _(PACKAGE_NAME)) + " " + - FormatFullVersion() + "\n"; + PACKAGE_NAME " RPC client version " + FormatFullVersion() + "\n"; if (!gArgs.IsArgSet("-version")) { - strUsage += - "\n" + _("Usage:") + "\n" + - " bitcoin-cli [options] [params] " + - strprintf(_("Send command to %s"), _(PACKAGE_NAME)) + "\n" + - " bitcoin-cli [options] -named [name=value] ... " + - strprintf(_("Send command to %s (with named arguments)"), - _(PACKAGE_NAME)) + - "\n" + " bitcoin-cli [options] help " + - _("List commands") + "\n" + - " bitcoin-cli [options] help " + - _("Get help for a command") + "\n"; + strUsage += "\n" + "Usage: bitcoin-cli [options] [params] " + "Send command to " PACKAGE_NAME "\n" + "or: bitcoin-cli [options] -named " + "[name=value]... Send command to " PACKAGE_NAME + " (with named arguments)\n" + "or: bitcoin-cli [options] help " + "List commands\n" + "or: bitcoin-cli [options] help Get " + "help for a command\n"; strUsage += "\n" + HelpMessageCli(); } diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -56,12 +56,13 @@ if (argc < 2 || HelpRequested(gArgs)) { // First part of help message is specific to this utility std::string strUsage = - strprintf(_("%s bitcoin-tx utility version"), _(PACKAGE_NAME)) + - " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\n" + - " bitcoin-tx [options] [commands] " + - _("Update hex-encoded bitcoin transaction") + "\n" + - " bitcoin-tx [options] -create [commands] " + - _("Create hex-encoded bitcoin transaction") + "\n" + "\n"; + PACKAGE_NAME " bitcoin-tx utility version " + FormatFullVersion() + + "\n\n" + + "Usage: bitcoin-tx [options] [commands] Update " + "hex-encoded bitcoin transaction\n" + + "or: bitcoin-tx [options] -create [commands] Create " + "hex-encoded bitcoin transaction\n" + + "\n"; fprintf(stdout, "%s", strUsage.c_str()); diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -74,16 +74,14 @@ // Process help and version before taking care about datadir if (HelpRequested(gArgs) || gArgs.IsArgSet("-version")) { - std::string strUsage = strprintf(_("%s Daemon"), _(PACKAGE_NAME)) + - " " + _("version") + " " + FormatFullVersion() + - "\n"; + std::string strUsage = + PACKAGE_NAME " Daemon version " + FormatFullVersion() + "\n"; if (gArgs.IsArgSet("-version")) { strUsage += FormatParagraph(LicenseInfo()); } else { - strUsage += "\n" + _("Usage:") + "\n" + - " bitcoind [options] " + - strprintf(_("Start %s Daemon"), _(PACKAGE_NAME)) + "\n"; + strUsage += "\nUsage: bitcoind [options] " + "Start " PACKAGE_NAME " Daemon\n"; strUsage += "\n" + HelpMessage(HelpMessageMode::BITCOIND); } diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -69,9 +69,8 @@ ui->helpMessage->setVisible(false); } else { setWindowTitle(tr("Command-line options")); - QString header = tr("Usage:") + "\n" + " bitcoin-qt [" + - tr("command-line options") + "] " + - "\n"; + QString header = + "Usage: bitcoin-qt [command-line options] \n"; QTextCursor cursor(ui->helpMessage->document()); cursor.insertText(version); cursor.insertBlock(); @@ -117,7 +116,7 @@ BitcoinGUI::DEFAULT_UIPLATFORM)); } QString coreOptions = QString::fromStdString(strUsage); - text = version + "\n" + header + "\n" + coreOptions; + text = version + "\n\n" + header + "\n" + coreOptions; QTextTableFormat tf; tf.setBorderStyle(QTextFrameFormat::BorderStyle_None);