From 6986c779f03f5e25b37904ea2d34b50d8a45e2fb Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 27 Jul 2012 08:17:57 +0200 Subject: [PATCH] update HelpMessage() - place "-?" option at first - re-work description and "\n" usage for Gavins new block creation options to better match current description syntax - ensure no "\n" is in translated strings, which is better for Transifex --- src/init.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 35230095a..5fbe9d5d6 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -216,6 +216,7 @@ bool static Bind(const CService &addr, bool fError = true) { std::string HelpMessage() { string strUsage = _("Options:") + "\n" + + " -? " + _("This help message") + "\n" + " -conf= " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + " -pid= " + _("Specify pid file (default: bitcoind.pid)") + "\n" + " -gen " + _("Generate coins") + "\n" + @@ -279,15 +280,13 @@ std::string HelpMessage() " -checkblocks= " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" + " -checklevel= " + _("How thorough the block verification is (0-6, default: 1)") + "\n" + " -loadblock= " + _("Imports blocks from external blk000?.dat file") + "\n" + - _("\nBlock creation options:\n") + - " -blockminsize= " + _("Minimum size, in bytes (default: 0)\n") + - " -blockmaxsize= " + _("Maximum size, in bytes (default: 250000)\n") + - " -blockprioritysize= " + _("Maximum bytes of high-priority/low-fee transactions (default: 27000)\n") + - " -? " + _("This help message") + "\n"; + "\n" + _("Block creation options:") + "\n" + + " -blockminsize= " + _("Set minimum block size in bytes (default: 0)") + "\n" + + " -blockmaxsize= " + _("Set maximum block size in bytes (default: 250000)") + "\n" + + " -blockprioritysize= " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n" + - strUsage += string() + - _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" + + "\n" + _("SSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" + " -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" + " -rpcsslcertificatechainfile= " + _("Server certificate file (default: server.cert)") + "\n" + " -rpcsslprivatekeyfile= " + _("Server private key (default: server.pem)") + "\n" +