From 43421af2e4714f8d1fee711d16a07a9c1eea8c75 Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 13 Dec 2011 06:46:37 +0100 Subject: [PATCH] move \\n outside _() in --help --- src/init.cpp | 92 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index dd8bdf559..471757a73 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -173,69 +173,69 @@ bool AppInit2(int argc, char* argv[]) _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" + _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" + " bitcoind [options] \t " + "\n" + - " bitcoind [options] [params]\t " + _("Send command to -server or bitcoind\n") + - " bitcoind [options] help \t\t " + _("List commands\n") + - " bitcoind [options] help \t\t " + _("Get help for a command\n") + - _("Options:\n") + - " -conf= \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") + - " -pid= \t\t " + _("Specify pid file (default: bitcoind.pid)\n") + - " -gen \t\t " + _("Generate coins\n") + - " -gen=0 \t\t " + _("Don't generate coins\n") + - " -min \t\t " + _("Start minimized\n") + - " -datadir= \t\t " + _("Specify data directory\n") + - " -timeout= \t " + _("Specify connection timeout (in milliseconds)\n") + - " -proxy= \t " + _("Connect through socks4 proxy\n") + - " -dns \t " + _("Allow DNS lookups for addnode and connect\n") + - " -port= \t\t " + _("Listen for connections on (default: 8333 or testnet: 18333)\n") + - " -maxconnections=\t " + _("Maintain at most connections to peers (default: 125)\n") + - " -addnode= \t " + _("Add a node to connect to\n") + - " -connect= \t\t " + _("Connect only to the specified node\n") + - " -nolisten \t " + _("Don't accept connections from outside\n") + - " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS\n") + - " -banscore= \t " + _("Threshold for disconnecting misbehaving peers (default: 100)\n") + - " -bantime= \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)\n") + - " -maxreceivebuffer=\t " + _("Maximum per-connection receive buffer, *1000 bytes (default: 10000)\n") + - " -maxsendbuffer=\t " + _("Maximum per-connection send buffer, *1000 bytes (default: 10000)\n") + + " bitcoind [options] [params]\t " + _("Send command to -server or bitcoind") + "\n" + + " bitcoind [options] help \t\t " + _("List commands") + "\n" + + " bitcoind [options] help \t\t " + _("Get help for a command") + "\n" + + _("Options:") + "\n" + + " -conf= \t\t " + _("Specify configuration file (default: bitcoin.conf)") + "\n" + + " -pid= \t\t " + _("Specify pid file (default: bitcoind.pid)") + "\n" + + " -gen \t\t " + _("Generate coins") + "\n" + + " -gen=0 \t\t " + _("Don't generate coins") + "\n" + + " -min \t\t " + _("Start minimized") + "\n" + + " -datadir= \t\t " + _("Specify data directory") + "\n" + + " -timeout= \t " + _("Specify connection timeout (in milliseconds)") + "\n" + + " -proxy= \t " + _("Connect through socks4 proxy") + "\n" + + " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" + + " -port= \t\t " + _("Listen for connections on (default: 8333 or testnet: 18333)") + "\n" + + " -maxconnections=\t " + _("Maintain at most connections to peers (default: 125)") + "\n" + + " -addnode= \t " + _("Add a node to connect to") + "\n" + + " -connect= \t\t " + _("Connect only to the specified node") + "\n" + + " -nolisten \t " + _("Don't accept connections from outside") + "\n" + + " -nodnsseed \t " + _("Don't bootstrap list of peers using DNS") + "\n" + + " -banscore= \t " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + + " -bantime= \t " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + + " -maxreceivebuffer=\t " + _("Maximum per-connection receive buffer, *1000 bytes (default: 10000)") + "\n" + + " -maxsendbuffer=\t " + _("Maximum per-connection send buffer, *1000 bytes (default: 10000)") + "\n" + #ifdef USE_UPNP #if USE_UPNP - " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port\n") + + " -noupnp \t " + _("Don't attempt to use UPnP to map the listening port") + "\n" + #else - " -upnp \t " + _("Attempt to use UPnP to map the listening port\n") + + " -upnp \t " + _("Attempt to use UPnP to map the listening port") + "\n" + #endif #endif - " -paytxfee= \t " + _("Fee per KB to add to transactions you send\n") + + " -paytxfee= \t " + _("Fee per KB to add to transactions you send") + "\n" + #ifdef GUI - " -server \t\t " + _("Accept command line and JSON-RPC commands\n") + + " -server \t\t " + _("Accept command line and JSON-RPC commands") + "\n" + #endif #ifndef WIN32 - " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") + + " -daemon \t\t " + _("Run in the background as a daemon and accept commands") + "\n" + #endif - " -testnet \t\t " + _("Use the test network\n") + - " -debug \t\t " + _("Output extra debugging information\n") + - " -logtimestamps \t " + _("Prepend debug output with timestamp\n") + - " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file\n") + + " -testnet \t\t " + _("Use the test network") + "\n" + + " -debug \t\t " + _("Output extra debugging information") + "\n" + + " -logtimestamps \t " + _("Prepend debug output with timestamp") + "\n" + + " -printtoconsole \t " + _("Send trace/debug info to console instead of debug.log file") + "\n" + #ifdef WIN32 - " -printtodebugger \t " + _("Send trace/debug info to debugger\n") + + " -printtodebugger \t " + _("Send trace/debug info to debugger") + "\n" + #endif - " -rpcuser= \t " + _("Username for JSON-RPC connections\n") + - " -rpcpassword=\t " + _("Password for JSON-RPC connections\n") + - " -rpcport= \t\t " + _("Listen for JSON-RPC connections on (default: 8332)\n") + - " -rpcallowip= \t\t " + _("Allow JSON-RPC connections from specified IP address\n") + - " -rpcconnect= \t " + _("Send commands to node running on (default: 127.0.0.1)\n") + - " -keypool= \t " + _("Set key pool size to (default: 100)\n") + - " -rescan \t " + _("Rescan the block chain for missing wallet transactions\n"); + " -rpcuser= \t " + _("Username for JSON-RPC connections") + "\n" + + " -rpcpassword=\t " + _("Password for JSON-RPC connections") + "\n" + + " -rpcport= \t\t " + _("Listen for JSON-RPC connections on (default: 8332)") + "\n" + + " -rpcallowip= \t\t " + _("Allow JSON-RPC connections from specified IP address") + "\n" + + " -rpcconnect= \t " + _("Send commands to node running on (default: 127.0.0.1)") + "\n" + + " -keypool= \t " + _("Set key pool size to (default: 100)") + "\n" + + " -rescan \t " + _("Rescan the block chain for missing wallet transactions") + "\n"; #ifdef USE_SSL strUsage += string() + - _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") + - " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections\n") + - " -rpcsslcertificatechainfile=\t " + _("Server certificate file (default: server.cert)\n") + - " -rpcsslprivatekeyfile= \t " + _("Server private key (default: server.pem)\n") + - " -rpcsslciphers= \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"); + _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)") + "\n" + + " -rpcssl \t " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" + + " -rpcsslcertificatechainfile=\t " + _("Server certificate file (default: server.cert)") + "\n" + + " -rpcsslprivatekeyfile= \t " + _("Server private key (default: server.pem)") + "\n" + + " -rpcsslciphers= \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)") + "\n"; #endif strUsage += string() + - " -? \t\t " + _("This help message\n"); + " -? \t\t " + _("This help message") + "\n"; // Remove tabs strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end());