Skip to content

Commit

Permalink
Merged in release_prep (pull request dashpay#84)
Browse files Browse the repository at this point in the history
5.0 release prep
  • Loading branch information
MitchellCash committed Jul 6, 2020
2 parents dc5969c + ddf4748 commit fb06a42
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 105 deletions.
11 changes: 6 additions & 5 deletions doc/man/ion-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ION-CLI "1" "March 2020" "ion-cli v5.0.01.0" "User Commands"
.TH ION-CLI "1" "July 2020" "ion-cli v5.0.99.0" "User Commands"
.SH NAME
ion-cli \- manual page for ion-cli v5.0.01.0
ion-cli \- manual page for ion-cli v5.0.99.0
.SH DESCRIPTION
Ion Core RPC client version v5.0.01.0
Ion Core RPC client version v5.0.99.0
.SS "Usage:"
.TP
ion\-cli [options] <command> [params]
Expand Down Expand Up @@ -79,10 +79,11 @@ Read extra arguments from standard input, one per line until EOF/Ctrl\-D
\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)
filename in iond directory, required if iond/\-Qt runs with
multiple wallets)
.SH COPYRIGHT
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

Expand Down
76 changes: 27 additions & 49 deletions doc/man/ion-qt.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ION-QT "1" "March 2020" "ion-qt v5.0.01.0" "User Commands"
.TH ION-QT "1" "July 2020" "ion-qt v5.0.99.0" "User Commands"
.SH NAME
ion-qt \- manual page for ion-qt v5.0.01.0
ion-qt \- manual page for ion-qt v5.0.99.0
.SH DESCRIPTION
Ion Core version v5.0.01.0 (64\-bit)
Ion Core version v5.0.99.0 (64\-bit)
Usage:
.IP
ion\-qt [command\-line options]
Expand Down Expand Up @@ -32,14 +32,18 @@ block hash)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70,
1599d484cfd57e3dc0ef8a2e8bc428c6b12ed8f8f73d6f5afd6c405c100f9a15,
testnet:
0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843)
.HP
\fB\-conf=\fR<file>
.IP
Specify configuration file (default: ioncoin.conf)
.HP
\fB\-daemon\fR
.IP
Run in the background as a daemon and accept commands
.HP
\fB\-datadir=\fR<dir>
.IP
Specify data directory
Expand Down Expand Up @@ -69,14 +73,18 @@ Do not keep transactions in the mempool longer than <n> hours (default:
.IP
Whether to save the mempool on shutdown and load on restart (default: 1)
.HP
\fB\-syncmempool\fR
.IP
Sync mempool from other nodes on start (default: 1)
.HP
\fB\-blockreconstructionextratxn=\fR<n>
.IP
Extra transactions to keep in memory for compact block reconstructions
(default: 100)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
Expand Down Expand Up @@ -403,10 +411,6 @@ KeePassHttp id for the established association
.IP
Name to construct url for KeePass entry that stores the wallet
passphrase
.HP
\fB\-windowtitle=\fR<name>
.IP
Wallet window title
.PP
ZeroMQ notification options:
.HP
Expand Down Expand Up @@ -475,6 +479,15 @@ Exclude debugging information for a category. Can be used in conjunction
with \fB\-debug\fR=\fI\,1\/\fR to output debug logs for all categories except one
or more specified categories.
.HP
\fB\-gen\fR
.IP
Generate coins (default: 0)
.HP
\fB\-genproclimit=\fR<n>
.IP
Set the number of threads for coin generation if enabled (\fB\-1\fR = all
cores, default: 1)
.HP
\fB\-help\-debug\fR
.IP
Show all debugging options (usage: \fB\-\-help\fR \fB\-help\-debug\fR)
Expand Down Expand Up @@ -533,47 +546,10 @@ you.
.PP
Masternode options:
.HP
\fB\-masternode\fR
.IP
Enable the client to act as a masternode (0\-1, default: 0)
.HP
\fB\-masternodeblsprivkey=\fR<hex>
.IP
Set the masternode BLS private key
.PP
PrivateSend options:
.HP
\fB\-enableprivatesend\fR
.IP
Enable use of PrivateSend for funds stored in this wallet (0\-1, default:
0)
.HP
\fB\-privatesendautostart\fR
.IP
Start PrivateSend automatically (0\-1, default: 0)
.HP
\fB\-privatesendmultisession\fR
.IP
Enable multiple PrivateSend mixing sessions per block, experimental
(0\-1, default: 0)
.HP
\fB\-privatesendsessions=\fR<n>
.IP
Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
.HP
\fB\-privatesendrounds=\fR<n>
.IP
Use N separate masternodes for each denominated input to mix funds
(2\-16, default: 4)
.HP
\fB\-privatesendamount=\fR<n>
.IP
Keep N ION mixed (2\-38600000, default: 1000)
.HP
\fB\-privatesenddenoms=\fR<n>
.IP
Create up to N inputs of each denominated amount (10\-100000, default:
300)
Set the masternode BLS private key and enable the client to act as a
masternode
.PP
InstantSend options:
.HP
Expand All @@ -595,7 +571,7 @@ Relay and mine data carrier transactions (default: 1)
\fB\-datacarriersize\fR
.IP
Maximum size of data in data carrier transactions we relay and mine
(default: 83)
(default: 184)
.HP
\fB\-minrelaytxfee=\fR<amt>
.IP
Expand Down Expand Up @@ -721,6 +697,8 @@ Show splash screen on startup (default: 1)
Reset all settings changed in the GUI
.SH COPYRIGHT
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

Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
Expand Down
8 changes: 5 additions & 3 deletions doc/man/ion-tx.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ION-TX "1" "March 2020" "ion-tx v5.0.01.0" "User Commands"
.TH ION-TX "1" "July 2020" "ion-tx v5.0.99.0" "User Commands"
.SH NAME
ion-tx \- manual page for ion-tx v5.0.01.0
ion-tx \- manual page for ion-tx v5.0.99.0
.SH DESCRIPTION
Ion Core ion\-tx utility version v5.0.01.0
Ion Core ion\-tx utility version v5.0.99.0
.SS "Usage:"
.TP
ion\-tx [options] <hex\-tx> [commands]
Expand Down Expand Up @@ -109,6 +109,8 @@ set=NAME:JSON\-STRING
Set register NAME to given JSON\-STRING
.SH COPYRIGHT
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

Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
Expand Down
68 changes: 23 additions & 45 deletions doc/man/iond.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH IOND "1" "March 2020" "iond v5.0.01.0" "User Commands"
.TH IOND "1" "July 2020" "iond v5.0.99.0" "User Commands"
.SH NAME
iond \- manual page for iond v5.0.01.0
iond \- manual page for iond v5.0.99.0
.SH DESCRIPTION
Ion Core Daemon version v5.0.01.0
Ion Core Daemon version v5.0.99.0
.SS "Usage:"
.TP
iond [options]
Expand Down Expand Up @@ -33,7 +33,7 @@ block hash)
If this block is in the chain assume that it and its ancestors are valid
and potentially skip their script verification (0 to verify all,
default:
000000000000001e09926bcf5fa4513d23e870a34f74e38200db99eb3f5b7a70,
1599d484cfd57e3dc0ef8a2e8bc428c6b12ed8f8f73d6f5afd6c405c100f9a15,
testnet:
0000000005ae4db9746d6cad8e0ccebdef1e05afec9c40809f31457fdaf7d843)
.HP
Expand Down Expand Up @@ -74,14 +74,18 @@ Do not keep transactions in the mempool longer than <n> hours (default:
.IP
Whether to save the mempool on shutdown and load on restart (default: 1)
.HP
\fB\-syncmempool\fR
.IP
Sync mempool from other nodes on start (default: 1)
.HP
\fB\-blockreconstructionextratxn=\fR<n>
.IP
Extra transactions to keep in memory for compact block reconstructions
(default: 100)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-2\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
Expand Down Expand Up @@ -476,6 +480,15 @@ Exclude debugging information for a category. Can be used in conjunction
with \fB\-debug\fR=\fI\,1\/\fR to output debug logs for all categories except one
or more specified categories.
.HP
\fB\-gen\fR
.IP
Generate coins (default: 0)
.HP
\fB\-genproclimit=\fR<n>
.IP
Set the number of threads for coin generation if enabled (\fB\-1\fR = all
cores, default: 1)
.HP
\fB\-help\-debug\fR
.IP
Show all debugging options (usage: \fB\-\-help\fR \fB\-help\-debug\fR)
Expand Down Expand Up @@ -534,47 +547,10 @@ you.
.PP
Masternode options:
.HP
\fB\-masternode\fR
.IP
Enable the client to act as a masternode (0\-1, default: 0)
.HP
\fB\-masternodeblsprivkey=\fR<hex>
.IP
Set the masternode BLS private key
.PP
PrivateSend options:
.HP
\fB\-enableprivatesend\fR
.IP
Enable use of PrivateSend for funds stored in this wallet (0\-1, default:
0)
.HP
\fB\-privatesendautostart\fR
.IP
Start PrivateSend automatically (0\-1, default: 0)
.HP
\fB\-privatesendmultisession\fR
.IP
Enable multiple PrivateSend mixing sessions per block, experimental
(0\-1, default: 0)
.HP
\fB\-privatesendsessions=\fR<n>
.IP
Use N separate masternodes in parallel to mix funds (1\-10, default: 4)
.HP
\fB\-privatesendrounds=\fR<n>
.IP
Use N separate masternodes for each denominated input to mix funds
(2\-16, default: 4)
.HP
\fB\-privatesendamount=\fR<n>
.IP
Keep N ION mixed (2\-38600000, default: 1000)
.HP
\fB\-privatesenddenoms=\fR<n>
.IP
Create up to N inputs of each denominated amount (10\-100000, default:
300)
Set the masternode BLS private key and enable the client to act as a
masternode
.PP
InstantSend options:
.HP
Expand All @@ -596,7 +572,7 @@ Relay and mine data carrier transactions (default: 1)
\fB\-datacarriersize\fR
.IP
Maximum size of data in data carrier transactions we relay and mine
(default: 83)
(default: 184)
.HP
\fB\-minrelaytxfee=\fR<amt>
.IP
Expand Down Expand Up @@ -696,6 +672,8 @@ Keep the specified amount available for spending at all times (default:
0)
.SH COPYRIGHT
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

Please contribute if you find Ion Core useful. Visit <https://ionomy.com> for
Expand Down
6 changes: 4 additions & 2 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ EXTRA_LIBRARIES += qt/libionqt.a
QT_TS = \
qt/locale/ion_ar.ts \
qt/locale/ion_bg.ts \
qt/locale/ion_ca.ts \
qt/locale/ion_cs.ts \
qt/locale/ion_da.ts \
qt/locale/ion_de.ts \
qt/locale/ion_en.ts \
qt/locale/ion_eo.ts \
qt/locale/ion_es.ts \
qt/locale/ion_hi_IN.ts \
qt/locale/ion_hr.ts \
qt/locale/ion_fi.ts \
qt/locale/ion_fr.ts \
qt/locale/ion_hi_IN.ts \
qt/locale/ion_hr.ts \
qt/locale/ion_it.ts \
qt/locale/ion_ja.ts \
qt/locale/ion_ko.ts \
Expand All @@ -32,6 +33,7 @@ QT_TS = \
qt/locale/ion_ro.ts \
qt/locale/ion_ru.ts \
qt/locale/ion_sk.ts \
qt/locale/ion_sv.ts \
qt/locale/ion_th.ts \
qt/locale/ion_tr.ts \
qt/locale/ion_uk.ts \
Expand Down
4 changes: 3 additions & 1 deletion src/qt/ion_locale.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
<qresource prefix="/translations">
<file alias="ar">locale/ion_ar.qm</file>
<file alias="bg">locale/ion_bg.qm</file>
<file alias="ca">locale/ion_ca.qm</file>
<file alias="cs">locale/ion_cs.qm</file>
<file alias="da">locale/ion_da.qm</file>
<file alias="de">locale/ion_de.qm</file>
<file alias="en">locale/ion_en.qm</file>
<file alias="eo">locale/ion_eo.qm</file>
<file alias="es">locale/ion_es.qm</file>
<file alias="fi">locale/ion_fi.qm</file>
<file alias="hr">locale/ion_hr.qm</file>
<file alias="fr">locale/ion_fr.qm</file>
<file alias="hi_IN">locale/ion_hi_IN.qm</file>
<file alias="hr">locale/ion_hr.qm</file>
<file alias="it">locale/ion_it.qm</file>
<file alias="ja">locale/ion_ja.qm</file>
<file alias="ko">locale/ion_ko.qm</file>
Expand All @@ -23,6 +24,7 @@
<file alias="ro">locale/ion_ro.qm</file>
<file alias="ru">locale/ion_ru.qm</file>
<file alias="sk">locale/ion_sk.qm</file>
<file alias="sv">locale/ion_sv.qm</file>
<file alias="th">locale/ion_th.qm</file>
<file alias="tr">locale/ion_tr.qm</file>
<file alias="uk">locale/ion_uk.qm</file>
Expand Down

0 comments on commit fb06a42

Please sign in to comment.