Merge branch show-version-in-help-2 of https://github.com/dooglus/bitcoin

diff --combined init.cpp
index 92a428d,1522fcc..04bdd68
--- 1/init.cpp
--- 2/init.cpp
+++ b/init.cpp
@@@ -158,8 -158,9 +158,9 @@@ bool AppInit2(int argc, char* argv[]
  
      if (mapArgs.count("-?") || mapArgs.count("--help"))
      {
+         string beta = VERSION_IS_BETA ? _(" beta") : "";
          string strUsage = string() +
-           "bitcoin version " + FormatVersion(VERSION).c_str() + " beta\n" +
+           _("Bitcoin version") + " " + FormatVersion(VERSION) + pszSubVer + beta + "\n\n" +
            _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" +
              "  bitcoin [options]                   \t  " + "\n" +
              "  bitcoin [options] <command> [params]\t  " + _("Send command to -server or bitcoind\n") +
@@@ -190,7 -191,7 +191,7 @@@
  #ifdef USE_SSL
          strUsage += string() +
              _("\nSSL options: (see the Bitcoin Wiki for SSL setup instructions)\n") +
 -            "  -rpcssl=1                              \t  " + _("Use OpenSSL (https) for JSON-RPC connections\n") +
 +            "  -rpcssl                                \t  " + _("Use OpenSSL (https) for JSON-RPC connections\n") +
              "  -rpcsslcertificatechainfile=<file.cert>\t  " + _("Server certificate file (default: server.cert)\n") +
              "  -rpcsslprivatekeyfile=<file.pem>       \t  " + _("Server private key (default: server.pem)\n") +
              "  -rpcsslciphers=<ciphers>               \t  " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n");
@@@ -228,7 -229,7 +229,7 @@@
      if (!fDebug && !pszSetDataDir[0])
          ShrinkDebugFile();
      printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
-     printf("Bitcoin version %s%s beta\n", FormatVersion(VERSION).c_str(), pszSubVer);
+     printf("Bitcoin version %s%s%s\n", FormatVersion(VERSION).c_str(), pszSubVer, VERSION_IS_BETA ? _(" beta") : "");
  #ifdef GUI
      printf("OS version %s\n", ((string)wxGetOsDescription()).c_str());
      printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str());