Merged in update-translation-strings-for-splash-copyrights (pull requ…

…est dashpay#62)

Update translation strings for splash copyrights

build_msvc/ion_config.h

@@ -22,12 +22,33 @@
 /* Copyright holder(s) before %s replacement */
 #define COPYRIGHT_HOLDERS "The %s developers"
 
+/* Copyright holder(s) before %b replacement */
+#define BITCOIN_COPYRIGHT_HOLDERS "The %b developers"
+
+/* Copyright holder(s) before %d replacement */
+#define DASH_COPYRIGHT_HOLDERS "The %d developers"
+
+/* Copyright holder(s) before %p replacement */
+#define PIVX_COPYRIGHT_HOLDERS "The %p developers"
+
 /* Copyright holder(s) */
 #define COPYRIGHT_HOLDERS_FINAL "The Ion Core developers"
+#define BITCOIN_COPYRIGHT_HOLDERS_FINAL "The Bitcoin Core developers"
+#define DASH_COPYRIGHT_HOLDERS_FINAL "The Dash Core developers"
+#define PIVX_COPYRIGHT_HOLDERS_FINAL "The PIVX Core developers"
 
 /* Replacement for %s in copyright holders string */
 #define COPYRIGHT_HOLDERS_SUBSTITUTION "Ion Core"
 
+/* Replacement for %b in copyright holders string */
+#define BITCOIN_COPYRIGHT_HOLDERS_SUBSTITUTION "Bitcoin Core"
+
+/* Replacement for %d in copyright holders string */
+#define DASH_COPYRIGHT_HOLDERS_SUBSTITUTION "Dash Core"
+
+/* Replacement for %p in copyright holders string */
+#define PIVX_COPYRIGHT_HOLDERS_SUBSTITUTION "PIVX Core"
+
 /* Copyright year */
 #define COPYRIGHT_YEAR 2020
 

configure.ac

@@ -8,6 +8,12 @@ define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2020)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Ion Core]])
+define(_BITCOIN_COPYRIGHT_HOLDERS,[The %b developers])
+define(_BITCOIN_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
+define(_DASH_COPYRIGHT_HOLDERS,[The %d developers])
+define(_DASH_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])
+define(_PIVX_COPYRIGHT_HOLDERS,[The %p developers])
+define(_PIVX_COPYRIGHT_HOLDERS_SUBSTITUTION,[[PIVX Core]])
 AC_INIT([Ion Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://bitbucket.org/ioncoin/ion/issues],[ioncore],[https://ionomy.com/])
 AC_CONFIG_SRCDIR([src/validation.cpp])
 AC_CONFIG_HEADERS([src/config/ion-config.h])

debian/manpages/ion-cli.1

@@ -1,19 +1,17 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ION-CLI "1" "April 2019" "ion-cli v3.2.99.0" "User Commands"
+.TH ION-CLI "1" "April 2020" "ion-cli v5.0.99.0" "User Commands"
 .SH NAME
-ion-cli \- manual page for ion-cli v3.2.99.0
+ion-cli \- manual page for ion-cli v5.0.99.0
 .SH DESCRIPTION
-Ion Core RPC client version v3.2.99.0
+Ion Core RPC client version v5.0.99.0\-dirty
 .SS "Usage:"
 .TP
 ion\-cli [options] <command> [params]
 Send command to Ion Core
-.TP
-ion\-cli [options] help
-List commands
-.TP
-ion\-cli [options] help <command>
-Get help for a command
+.IP
+ion\-cli [options] \fB\-named\fR <command> [name=value] ... Send command to Ion Core (with named arguments)
+ion\-cli [options] help                List commands
+ion\-cli [options] help <command>      Get help for a command
 .SH OPTIONS
 .HP
 \-?
@@ -27,16 +25,26 @@ Specify configuration file (default: ioncoin.conf)
 \fB\-datadir=\fR<dir>
 .IP
 Specify data directory
+.PP
+Chain selection options:
 .HP
 \fB\-testnet\fR
 .IP
-Use the test network
+Use the test chain
+.HP
+\fB\-devnet=\fR<name>
+.IP
+Use devnet chain with provided name
 .HP
 \fB\-regtest\fR
 .IP
 Enter regression test mode, which uses a special chain in which blocks
-can be solved instantly. This is intended for regression testing tools
-and app development.
+can be solved instantly. This is intended for regression testing
+tools and app development.
+.HP
+\fB\-named\fR
+.IP
+Pass named instead of positional arguments (default: false)
 .HP
 \fB\-rpcconnect=\fR<ip>
 .IP
@@ -60,21 +68,33 @@ Password for JSON\-RPC connections
 .HP
 \fB\-rpcclienttimeout=\fR<n>
 .IP
-Timeout during HTTP requests (default: 900)
+Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
+900)
+.HP
+\fB\-stdin\fR
+.IP
+Read extra arguments from standard input, one per line until EOF/Ctrl\-D
+(recommended for sensitive information such as passphrases)
+.HP
+\fB\-rpcwallet=\fR<walletname>
+.IP
+Send RPC for non\-default wallet on RPC server (argument is wallet
+filename in iond directory, required if iond/\-Qt runs with
+multiple wallets)
 .SH COPYRIGHT
-Copyright (C) 2009-2019 The Bitcoin Core Developers
+Copyright (C) 2018-2020 The Ion Core developers
+Copyright (C) 2015-2020 The PIVX Core developers
+Copyright (C) 2014-2020 The Dash Core developers
+Copyright (C) 2009-2020 The Bitcoin Core developers
 
-Copyright (C) 2014-2019 The Dash Core Developers
-
-Copyright (C) 2015-2019 The PIVX Core Developers
-
-Copyright (C) 2018-2019 The Dash Core Developers
+Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
+further information about the software.
+The source code is available from <https://bitbucket.org/ioncoin/ion>.
 
 This is experimental software.
-
 Distributed under the MIT software license, see the accompanying file COPYING
-or <http://www.opensource.org/licenses/mit-license.php>.
+or <https://opensource.org/licenses/MIT>
 
 This product includes software developed by the OpenSSL Project for use in the
-OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
+Eric Young and UPnP software written by Thomas Bernard.