diff options
| author | Tomo Ueda <[email protected]> | 2021-09-02 12:56:56 -0700 |
|---|---|---|
| committer | Tomo Ueda <[email protected]> | 2021-09-02 12:56:56 -0700 |
| commit | 42f6cc56c2909e9b04f4c549f9ebb1e5e0d78622 (patch) | |
| tree | 5ee83fd64a21f643e730182ed5dbe3eafab9f15a | |
| parent | really s/Doge/Dis/g this time (diff) | |
| download | discoin-42f6cc56c2909e9b04f4c549f9ebb1e5e0d78622.tar.xz discoin-42f6cc56c2909e9b04f4c549f9ebb1e5e0d78622.zip | |
s/DOGE/DIS/g
68 files changed, 210 insertions, 210 deletions
diff --git a/contrib/init/dogecoind.conf b/contrib/init/dogecoind.conf index 1007fe5fe..922f1ac83 100644 --- a/contrib/init/dogecoind.conf +++ b/contrib/init/dogecoind.conf @@ -3,14 +3,14 @@ description "Discoin Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env DOGECOIND_BIN="/usr/bin/discoind" -env DOGECOIND_USER="discoin" -env DOGECOIND_GROUP="discoin" -env DOGECOIND_PIDDIR="/var/run/discoind" +env DISCOIND_BIN="/usr/bin/discoind" +env DISCOIND_USER="discoin" +env DISCOIND_GROUP="discoin" +env DISCOIND_PIDDIR="/var/run/discoind" # upstart can't handle variables constructed with other variables -env DOGECOIND_PIDFILE="/var/run/discoind/discoind.pid" -env DOGECOIND_CONFIGFILE="/etc/discoin/discoin.conf" -env DOGECOIND_DATADIR="/var/lib/discoind" +env DISCOIND_PIDFILE="/var/run/discoind/discoind.pid" +env DISCOIND_CONFIGFILE="/etc/discoin/discoin.conf" +env DISCOIND_DATADIR="/var/lib/discoind" expect fork @@ -24,9 +24,9 @@ pre-start script # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. - if ! grep -qs '^rpcpassword=' "$DOGECOIND_CONFIGFILE" ; then + if ! grep -qs '^rpcpassword=' "$DISCOIND_CONFIGFILE" ; then echo "ERROR: You must set a secure rpcpassword to run discoind." - echo "The setting must appear in $DOGECOIND_CONFIGFILE" + echo "The setting must appear in $DISCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " echo "and must not be the same as the rpcuser setting." @@ -44,22 +44,22 @@ pre-start script exit 1 fi - mkdir -p "$DOGECOIND_PIDDIR" - chmod 0755 "$DOGECOIND_PIDDIR" - chown $DOGECOIND_USER:$DOGECOIND_GROUP "$DOGECOIND_PIDDIR" - chown $DOGECOIND_USER:$DOGECOIND_GROUP "$DOGECOIND_CONFIGFILE" - chmod 0660 "$DOGECOIND_CONFIGFILE" + mkdir -p "$DISCOIND_PIDDIR" + chmod 0755 "$DISCOIND_PIDDIR" + chown $DISCOIND_USER:$DISCOIND_GROUP "$DISCOIND_PIDDIR" + chown $DISCOIND_USER:$DISCOIND_GROUP "$DISCOIND_CONFIGFILE" + chmod 0660 "$DISCOIND_CONFIGFILE" end script exec start-stop-daemon \ --start \ - --pidfile "$DOGECOIND_PIDFILE" \ - --chuid $DOGECOIND_USER:$DOGECOIND_GROUP \ - --exec "$DOGECOIND_BIN" \ + --pidfile "$DISCOIND_PIDFILE" \ + --chuid $DISCOIND_USER:$DISCOIND_GROUP \ + --exec "$DISCOIND_BIN" \ -- \ - -pid="$DOGECOIND_PIDFILE" \ - -conf="$DOGECOIND_CONFIGFILE" \ - -datadir="$DOGECOIND_DATADIR" \ + -pid="$DISCOIND_PIDFILE" \ + -conf="$DISCOIND_CONFIGFILE" \ + -datadir="$DISCOIND_DATADIR" \ -disablewallet \ -daemon diff --git a/contrib/init/dogecoind.init b/contrib/init/dogecoind.init index 57cc74fc7..357e95e9e 100644 --- a/contrib/init/dogecoind.init +++ b/contrib/init/dogecoind.init @@ -19,14 +19,14 @@ fi RETVAL=0 prog=discoind -# you can override the lockfile via DOGECOIND_LOCKFILE in /etc/sysconfig/discoind -lockfile=${DOGECOIND_LOCKFILE-/var/lock/subsys/discoind} +# you can override the lockfile via DISCOIND_LOCKFILE in /etc/sysconfig/discoind +lockfile=${DISCOIND_LOCKFILE-/var/lock/subsys/discoind} -# discoind defaults to /usr/bin/discoind, override with DOGECOIND_BIN -discoind=${DOGECOIND_BIN-/usr/bin/discoind} +# discoind defaults to /usr/bin/discoind, override with DISCOIND_BIN +discoind=${DISCOIND_BIN-/usr/bin/discoind} -# discoind opts default to -disablewallet, override with DOGECOIND_OPTS -discoind_opts=${DOGECOIND_OPTS--disablewallet} +# discoind opts default to -disablewallet, override with DISCOIND_OPTS +discoind_opts=${DISCOIND_OPTS--disablewallet} start() { echo -n $"Starting $prog: " diff --git a/contrib/init/dogecoind.openrcconf b/contrib/init/dogecoind.openrcconf index 8c8178d63..c3e310cf9 100644 --- a/contrib/init/dogecoind.openrcconf +++ b/contrib/init/dogecoind.openrcconf @@ -1,33 +1,33 @@ # /etc/conf.d/discoind: config file for /etc/init.d/discoind # Config file location -#DOGECOIND_CONFIGFILE="/etc/discoin/discoin.conf" +#DISCOIND_CONFIGFILE="/etc/discoin/discoin.conf" -# What directory to write pidfile to? (created and owned by $DOGECOIND_USER) -#DOGECOIND_PIDDIR="/var/run/discoind" +# What directory to write pidfile to? (created and owned by $DISCOIND_USER) +#DISCOIND_PIDDIR="/var/run/discoind" # What filename to give the pidfile -#DOGECOIND_PIDFILE="${DOGECOIND_PIDDIR}/discoind.pid" +#DISCOIND_PIDFILE="${DISCOIND_PIDDIR}/discoind.pid" # Where to write discoind data (be mindful that the blockchain is large) -#DOGECOIND_DATADIR="/var/lib/discoind" +#DISCOIND_DATADIR="/var/lib/discoind" # User and group to own discoind process -#DOGECOIND_USER="discoin" -#DOGECOIND_GROUP="discoin" +#DISCOIND_USER="discoin" +#DISCOIND_GROUP="discoin" # Path to discoind executable -#DOGECOIND_BIN="/usr/bin/discoind" +#DISCOIND_BIN="/usr/bin/discoind" # Nice value to run discoind under -#DOGECOIND_NICE=0 +#DISCOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) -DOGECOIND_OPTS="-disablewallet" +DISCOIND_OPTS="-disablewallet" # The timeout in seconds OpenRC will wait for discoind to terminate # after a SIGTERM has been raised. # Note that this will be mapped as argument to start-stop-daemon's # '--retry' option, which means you can specify a retry schedule # here. For more information see man 8 start-stop-daemon. -DOGECOIND_SIGTERM_TIMEOUT=60 +DISCOIND_SIGTERM_TIMEOUT=60 diff --git a/doc/init.md b/doc/init.md index 87451bc2d..3705bfc35 100644 --- a/doc/init.md +++ b/doc/init.md @@ -104,7 +104,7 @@ use old versions of Upstart and do not supply the start-stop-daemon utility. Copy discoind.init to /etc/init.d/discoind. Test by running `service discoind start`. Using this script, you can adjust the path and flags to the discoind program by -setting the DOGECOIND and FLAGS environment variables in the file +setting the DISCOIND and FLAGS environment variables in the file /etc/sysconfig/discoind. You can also use the DAEMONOPTS environment variable here. 4e) Mac OS X diff --git a/doc/man/dogecoin-cli.1 b/doc/man/dogecoin-cli.1 index ab2f10183..431ca2f1a 100644 --- a/doc/man/dogecoin-cli.1 +++ b/doc/man/dogecoin-cli.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH DOGECOIN-CLI "1" "August 2021" "discoin-cli v1.14.4.0" "User Commands" +.TH DISCOIN-CLI "1" "August 2021" "discoin-cli v1.14.4.0" "User Commands" .SH NAME discoin-cli \- manual page for discoin-cli v1.14.4.0 .SH DESCRIPTION diff --git a/doc/man/dogecoin-qt.1 b/doc/man/dogecoin-qt.1 index c06f716d6..76423f19b 100644 --- a/doc/man/dogecoin-qt.1 +++ b/doc/man/dogecoin-qt.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH DOGECOIN-QT "1" "August 2021" "discoin-qt v1.14.4.0" "User Commands" +.TH DISCOIN-QT "1" "August 2021" "discoin-qt v1.14.4.0" "User Commands" .SH NAME discoin-qt \- manual page for discoin-qt v1.14.4.0 .SH DESCRIPTION @@ -284,17 +284,17 @@ Set key pool size to <n> (default: 100) .HP \fB\-fallbackfee=\fR<amt> .IP -A fee rate (in DOGE/kB) that will be used when fee estimation has +A fee rate (in DIS/kB) that will be used when fee estimation has insufficient data (default: 1.00) .HP \fB\-mintxfee=\fR<amt> .IP -Fees (in DOGE/kB) smaller than this are considered zero fee for +Fees (in DIS/kB) smaller than this are considered zero fee for transaction creation (default: 1.00) .HP \fB\-paytxfee=\fR<amt> .IP -Fee (in DOGE/kB) to add to transactions you send (default: 1.00) +Fee (in DIS/kB) to add to transactions you send (default: 1.00) .HP \fB\-rescan\fR .IP @@ -393,12 +393,12 @@ Prepend debug output with timestamp (default: 1) .HP \fB\-minrelaytxfee=\fR<amt> .IP -Fees (in DOGE/kB) smaller than this are considered zero fee for +Fees (in DIS/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.001) .HP \fB\-maxtxfee=\fR<amt> .IP -Maximum total fees (in DOGE) to use in a single wallet transaction or +Maximum total fees (in DIS) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: 400.00) .HP @@ -420,7 +420,7 @@ Node relay options: .HP \fB\-dustlimit=\fR<amt> .IP -Amount under which a transaction output is considered dust, in DOGE +Amount under which a transaction output is considered dust, in DIS (default: 1.00) .HP \fB\-bytespersigop\fR @@ -458,7 +458,7 @@ Set maximum size of high\-priority/low\-fee transactions in bytes .HP \fB\-blockmintxfee=\fR<amt> .IP -Set lowest fee rate (in DOGE/kB) for transactions to be included in +Set lowest fee rate (in DIS/kB) for transactions to be included in block creation. (default: 0.01) .PP RPC server options: diff --git a/doc/man/dogecoin-tx.1 b/doc/man/dogecoin-tx.1 index 771addfd0..4edf0cf33 100644 --- a/doc/man/dogecoin-tx.1 +++ b/doc/man/dogecoin-tx.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH DOGECOIN-TX "1" "August 2021" "discoin-tx v1.14.4.0" "User Commands" +.TH DISCOIN-TX "1" "August 2021" "discoin-tx v1.14.4.0" "User Commands" .SH NAME discoin-tx \- manual page for discoin-tx v1.14.4.0 .SH DESCRIPTION diff --git a/doc/man/dogecoind.1 b/doc/man/dogecoind.1 index 1404042c5..1cccf4bcb 100644 --- a/doc/man/dogecoind.1 +++ b/doc/man/dogecoind.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH DOGECOIND "1" "August 2021" "discoind v1.14.4.0" "User Commands" +.TH DISCOIND "1" "August 2021" "discoind v1.14.4.0" "User Commands" .SH NAME discoind \- manual page for discoind v1.14.4.0 .SH DESCRIPTION @@ -289,17 +289,17 @@ Set key pool size to <n> (default: 100) .HP \fB\-fallbackfee=\fR<amt> .IP -A fee rate (in DOGE/kB) that will be used when fee estimation has +A fee rate (in DIS/kB) that will be used when fee estimation has insufficient data (default: 1.00) .HP \fB\-mintxfee=\fR<amt> .IP -Fees (in DOGE/kB) smaller than this are considered zero fee for +Fees (in DIS/kB) smaller than this are considered zero fee for transaction creation (default: 1.00) .HP \fB\-paytxfee=\fR<amt> .IP -Fee (in DOGE/kB) to add to transactions you send (default: 1.00) +Fee (in DIS/kB) to add to transactions you send (default: 1.00) .HP \fB\-rescan\fR .IP @@ -398,12 +398,12 @@ Prepend debug output with timestamp (default: 1) .HP \fB\-minrelaytxfee=\fR<amt> .IP -Fees (in DOGE/kB) smaller than this are considered zero fee for +Fees (in DIS/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: 0.001) .HP \fB\-maxtxfee=\fR<amt> .IP -Maximum total fees (in DOGE) to use in a single wallet transaction or +Maximum total fees (in DIS) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: 400.00) .HP @@ -425,7 +425,7 @@ Node relay options: .HP \fB\-dustlimit=\fR<amt> .IP -Amount under which a transaction output is considered dust, in DOGE +Amount under which a transaction output is considered dust, in DIS (default: 1.00) .HP \fB\-bytespersigop\fR @@ -463,7 +463,7 @@ Set maximum size of high\-priority/low\-fee transactions in bytes .HP \fB\-blockmintxfee=\fR<amt> .IP -Set lowest fee rate (in DOGE/kB) for transactions to be included in +Set lowest fee rate (in DIS/kB) for transactions to be included in block creation. (default: 0.01) .PP RPC server options: diff --git a/doc/release-notes.md b/doc/release-notes.md index 4b04b2350..4a4be35a9 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -45,17 +45,17 @@ The main highlights for these enhancements are: deciding if a transaction can be accepted from another node and in applying fee-filter requests from peers, when relaying transactions. * The default setting shipped with discoin core for relay fee has been reduced - to 0.001 DOGE (was: 1 DOGE). This can be changed by operators using the + to 0.001 DIS (was: 1 DIS). This can be changed by operators using the `-mintxrelayfee=<amount>` option. * Spam management has been delegated to miners, where currently a default fee - of 0.01 DOGE has been set as a recommended default, to prevent spam on the + of 0.01 DIS has been set as a recommended default, to prevent spam on the blockchain. Miners can change this setting to their liking using the `-blockmintxfee` option. -* The relay dust limit has been reduced 100x to 0.01 DOGE and is now +* The relay dust limit has been reduced 100x to 0.01 DIS and is now configurable via the `-dustlimit` option. For this release, the recommended fees and dust limits, as implemented in the -wallet, remain at 1 DOGE per kilobyte, inclusive of the rounding up to the +wallet, remain at 1 DIS per kilobyte, inclusive of the rounding up to the nearest kilobyte, as miners and the relay network will upgrade gradually, requiring time for transactions with lower fees to be able to be relayed and mined. Not doing this would result in all transactions being rejected by old diff --git a/doc/release-notes/release-notes-1.14.3.md b/doc/release-notes/release-notes-1.14.3.md index e6e0d2bc4..d5e9c3d8e 100644 --- a/doc/release-notes/release-notes-1.14.3.md +++ b/doc/release-notes/release-notes-1.14.3.md @@ -67,10 +67,10 @@ Add size_on_disk, prune_target_size, automatic_pruning to getblockchaininfo Add query options to listunspent RPC call ----------------------------------------- -* Return unspents greater or equal than a specific amount in DOGE: minimumAmount (default = 0). -* Return unspents lower or equal than a specific amount in DOGE: maximumAmount (default=unlimited). +* Return unspents greater or equal than a specific amount in DIS: minimumAmount (default = 0). +* Return unspents lower or equal than a specific amount in DIS: maximumAmount (default=unlimited). * Return unspents with a total number lower or equal than a specific number: maximumCount (default=0=unlimited). -* Return unspents which total is greater or equal than a specific amount in DOGE: minimumSumAmount (default=unlimited). +* Return unspents which total is greater or equal than a specific amount in DIS: minimumSumAmount (default=unlimited). Minor changes ============= diff --git a/doc/tor.md b/doc/tor.md index 0ec28ccd7..1fb74d8af 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -1,4 +1,4 @@ -TOR SUPPORT IN DOGECOIN +TOR SUPPORT IN DISCOIN ======================= It is possible to run Discoin as a Tor hidden service, and connect to such services. diff --git a/qa/rpc-tests/bumpfee.py b/qa/rpc-tests/bumpfee.py index 593e661fa..18a336a31 100755 --- a/qa/rpc-tests/bumpfee.py +++ b/qa/rpc-tests/bumpfee.py @@ -45,7 +45,7 @@ class BumpFeeTest(BitcoinTestFramework): peer_node, rbf_node = self.nodes rbf_node_address = rbf_node.getnewaddress() - # fund rbf node with 25 outputs of 10 DOGE + # fund rbf node with 25 outputs of 10 DIS print("Mining blocks...") peer_node.generate(70) self.sync_all() diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py index 49f58bc2b..a24365d71 100755 --- a/qa/rpc-tests/fundrawtransaction.py +++ b/qa/rpc-tests/fundrawtransaction.py @@ -516,7 +516,7 @@ class RawTransactionsTest(BitcoinTestFramework): #fund a tx with ~20 small inputs inputs = [] - # Discoin: TX size rounding gives us a fee of 1 DOGE. 20 - 15 - 1 = 4 DOGE change + # Discoin: TX size rounding gives us a fee of 1 DIS. 20 - 15 - 1 = 4 DIS change outputs = {self.nodes[0].getnewaddress():15,self.nodes[0].getnewaddress():4} rawTx = self.nodes[1].createrawtransaction(inputs, outputs) fundedTx = self.nodes[1].fundrawtransaction(rawTx) diff --git a/qa/rpc-tests/getauxblock.py b/qa/rpc-tests/getauxblock.py index cb44383e8..2b4635fc1 100755 --- a/qa/rpc-tests/getauxblock.py +++ b/qa/rpc-tests/getauxblock.py @@ -115,7 +115,7 @@ class GetAuxBlockTest (BitcoinTestFramework): blk = self.nodes[1].getblock (auxblock['hash']) tx = self.nodes[1].getrawtransaction (blk['tx'][0], 1) coinbase = tx['vin'][0]['coinbase'] - assert_equal ("01%02x01" % auxblock['height'], coinbase[0 : 6]) # DOGE: We mine less blocks in these tests + assert_equal ("01%02x01" % auxblock['height'], coinbase[0 : 6]) # DIS: We mine less blocks in these tests if __name__ == '__main__': GetAuxBlockTest ().main () diff --git a/qa/rpc-tests/maxblocksinflight.py b/qa/rpc-tests/maxblocksinflight.py index 7bf7ed516..568502a6c 100755 --- a/qa/rpc-tests/maxblocksinflight.py +++ b/qa/rpc-tests/maxblocksinflight.py @@ -73,7 +73,7 @@ class TestManager(NodeConnCB): class MaxBlocksInFlightTest(BitcoinTestFramework): def add_options(self, parser): parser.add_option("--testbinary", dest="testbinary", - default=os.getenv("DOGECOIND", "discoind"), + default=os.getenv("DISCOIND", "discoind"), help="Binary to test max block requests behavior") def __init__(self): diff --git a/qa/rpc-tests/p2p-acceptblock.py b/qa/rpc-tests/p2p-acceptblock.py index c77fa522c..9113c9948 100755 --- a/qa/rpc-tests/p2p-acceptblock.py +++ b/qa/rpc-tests/p2p-acceptblock.py @@ -128,7 +128,7 @@ class TestNode(NodeConnCB): class AcceptBlockTest(BitcoinTestFramework): def add_options(self, parser): parser.add_option("--testbinary", dest="testbinary", - default=os.getenv("DOGECOIND", "discoind"), + default=os.getenv("DISCOIND", "discoind"), help="discoind binary to test") def __init__(self): diff --git a/qa/rpc-tests/paytxfee.py b/qa/rpc-tests/paytxfee.py index b58eb7680..4494bdd58 100644 --- a/qa/rpc-tests/paytxfee.py +++ b/qa/rpc-tests/paytxfee.py @@ -25,15 +25,15 @@ class PayTxFeeTest(BitcoinTestFramework): nodes.append(start_node(0, self.options.tmpdir, ["-debug", '-txindex'])) - # node 1 pays 0.1 DOGE on all txs due to implicit mintxfee = paytxfee + # node 1 pays 0.1 DIS on all txs due to implicit mintxfee = paytxfee nodes.append(start_node(1, self.options.tmpdir, ["-paytxfee=0.1", "-debug"])) - # node 2 will always pay 1 DOGE on all txs because of explicit mintxfee + # node 2 will always pay 1 DIS on all txs because of explicit mintxfee nodes.append(start_node(2, self.options.tmpdir, ["-mintxfee=1", "-paytxfee=0.1", "-debug"])) - # node 3 will always pay 0.1 DOGE on all txs despite explicit mintxfee of 0.01 + # node 3 will always pay 0.1 DIS on all txs despite explicit mintxfee of 0.01 nodes.append(start_node(3, self.options.tmpdir, ["-mintxfee=0.01", "-paytxfee=0.1", "-debug"])) diff --git a/qa/rpc-tests/replace-by-fee.py b/qa/rpc-tests/replace-by-fee.py index 475baa255..7a6e01f02 100755 --- a/qa/rpc-tests/replace-by-fee.py +++ b/qa/rpc-tests/replace-by-fee.py @@ -139,7 +139,7 @@ class ReplaceByFeeTest(BitcoinTestFramework): else: assert(False) - # Extra 5 DOGE fee + # Extra 5 DIS fee tx1b = CTransaction() tx1b.vin = [CTxIn(tx0_outpoint, nSequence=0)] tx1b.vout = [CTxOut(int(6*COIN), CScript([b'b']))] @@ -173,7 +173,7 @@ class ReplaceByFeeTest(BitcoinTestFramework): prevout = COutPoint(int(txid, 16), 0) # Whether the double-spend is allowed is evaluated by including all - # child fees - 400 DOGE - so this attempt is rejected. + # child fees - 400 DIS - so this attempt is rejected. dbl_tx = CTransaction() dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)] dbl_tx.vout = [CTxOut(initial_nValue - 300*COIN, CScript([1]))] @@ -251,7 +251,7 @@ class ReplaceByFeeTest(BitcoinTestFramework): else: assert(False) - # 1000 DOGE fee is enough + # 1000 DIS fee is enough dbl_tx = CTransaction() dbl_tx.vin = [CTxIn(tx0_outpoint, nSequence=0)] dbl_tx.vout = [CTxOut(initial_nValue - fee*n - 1000*COIN, CScript([1]))] diff --git a/qa/rpc-tests/rest.py b/qa/rpc-tests/rest.py index a4b93472f..25eb2366d 100755 --- a/qa/rpc-tests/rest.py +++ b/qa/rpc-tests/rest.py @@ -223,7 +223,7 @@ class RESTTest (BitcoinTestFramework): response_header = http_get_call(url.hostname, url.port, '/rest/headers/1/'+bb_hash+self.FORMAT_SEPARATOR+"bin", True) assert_equal(response_header.status, 200) headerLen = int(response_header.getheader('content-length')) - assert_equal(headerLen, 297) # DOGE: AuxPoW makes headers longer + assert_equal(headerLen, 297) # DIS: AuxPoW makes headers longer response_header_str = response_header.read() assert_equal(response_str[0:headerLen], response_header_str) diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 1487b849e..d717888a5 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -205,10 +205,10 @@ class ComparisonTestFramework(BitcoinTestFramework): def add_options(self, parser): parser.add_option("--testbinary", dest="testbinary", - default=os.getenv("DOGECOIND", "discoind"), + default=os.getenv("DISCOIND", "discoind"), help="discoind binary to test") parser.add_option("--refbinary", dest="refbinary", - default=os.getenv("DOGECOIND", "discoind"), + default=os.getenv("DISCOIND", "discoind"), help="discoind binary to use for reference nodes (if any)") def setup_network(self): diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py index 078aacca1..aa4f90fac 100644 --- a/qa/rpc-tests/test_framework/util.py +++ b/qa/rpc-tests/test_framework/util.py @@ -250,7 +250,7 @@ def initialize_chain(test_dir, num_nodes, cachedir): # Create cache directories, run bitcoinds: for i in range(MAX_NODES): datadir=initialize_datadir(cachedir, i) - args = [ os.getenv("DOGECOIND", "discoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ] + args = [ os.getenv("DISCOIND", "discoind"), "-server", "-keypool=1", "-datadir="+datadir, "-discover=0" ] if i > 0: args.append("-connect=127.0.0.1:"+str(p2p_port(0))) bitcoind_processes[i] = subprocess.Popen(args) @@ -336,7 +336,7 @@ def start_node(i, dirname, extra_args=None, rpchost=None, timewait=None, binary= """ datadir = os.path.join(dirname, "node"+str(i)) if binary is None: - binary = os.getenv("DOGECOIND", "discoind") + binary = os.getenv("DISCOIND", "discoind") args = [ binary, "-datadir="+datadir, "-server", "-keypool=1", "-discover=0", "-rest", "-mocktime="+str(get_mocktime()) ] if extra_args is not None: args.extend(extra_args) bitcoind_processes[i] = subprocess.Popen(args) diff --git a/qa/rpc-tests/txn_doublespend.py b/qa/rpc-tests/txn_doublespend.py index 46f8743e3..34845e877 100755 --- a/qa/rpc-tests/txn_doublespend.py +++ b/qa/rpc-tests/txn_doublespend.py @@ -26,7 +26,7 @@ class TxnMallTest(BitcoinTestFramework): return super(TxnMallTest, self).setup_network(True) def run_test(self): - # All nodes should start with 7,500,000 DOGE: + # All nodes should start with 7,500,000 DIS: starting_balance = 7500000 for i in range(4): assert_equal(self.nodes[i].getbalance(), starting_balance) @@ -47,7 +47,7 @@ class TxnMallTest(BitcoinTestFramework): # Coins are sent to node1_address node1_address = self.nodes[1].getnewaddress("from0") - # First: use raw transaction API to send 7440000 DOGE to node1_address, + # First: use raw transaction API to send 7440000 DIS to node1_address, # but don't broadcast: doublespend_fee = Decimal('-120') rawtx_input_0 = {} @@ -77,7 +77,7 @@ class TxnMallTest(BitcoinTestFramework): tx1 = self.nodes[0].gettransaction(txid1) tx2 = self.nodes[0].gettransaction(txid2) - # Node0's balance should be starting balance, plus 500,000 DOGE for another + # Node0's balance should be starting balance, plus 500,000 DIS for another # matured block, minus 7499960, minus 120000, and minus transaction fees: expected = starting_balance + fund_foo_tx["fee"] + fund_bar_tx["fee"] if self.options.mine_block: expected += 500000 @@ -119,7 +119,7 @@ class TxnMallTest(BitcoinTestFramework): assert_equal(tx1["confirmations"], -2) assert_equal(tx2["confirmations"], -2) - # Node0's total balance should be starting balance, plus 1000000 DOGE for + # Node0's total balance should be starting balance, plus 1000000 DIS for # two more matured blocks, minus 7440000 for the double-spend, plus fees (which are # negative): expected = starting_balance + 1000000 - 7440000 + fund_foo_tx["fee"] + fund_bar_tx["fee"] + doublespend_fee diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py index b65dec3e4..c9f937273 100755 --- a/qa/rpc-tests/wallet.py +++ b/qa/rpc-tests/wallet.py @@ -57,7 +57,7 @@ class WalletTest (BitcoinTestFramework): assert_equal(len(self.nodes[1].listunspent()), 1) assert_equal(len(self.nodes[2].listunspent()), 0) - # Send 210.000 DOGE from 0 to 2 using sendtoaddress call. + # Send 210.000 DIS from 0 to 2 using sendtoaddress call. self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 110000) self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 100000) @@ -114,7 +114,7 @@ class WalletTest (BitcoinTestFramework): assert_equal(self.nodes[2].getbalance(), 999994) assert_equal(self.nodes[2].getbalance("from1"), 999994-210000) - # Send 100000 DOGE normal + # Send 100000 DIS normal address = self.nodes[0].getnewaddress("test") fee_per_byte = Decimal('1') / 1000 self.nodes[2].settxfee(fee_per_byte * 1000) @@ -124,7 +124,7 @@ class WalletTest (BitcoinTestFramework): node_2_bal = self.check_fee_amount(self.nodes[2].getbalance(), Decimal('899994'), fee_per_byte, count_bytes(self.nodes[2].getrawtransaction(txid))) assert_equal(self.nodes[0].getbalance(), Decimal('100000')) - # Send 100000 DOGE with subtract fee from amount + # Send 100000 DIS with subtract fee from amount txid = self.nodes[2].sendtoaddress(address, 100000, "", "", True) self.nodes[2].generate(1) self.sync_all() @@ -132,7 +132,7 @@ class WalletTest (BitcoinTestFramework): assert_equal(self.nodes[2].getbalance(), node_2_bal) node_0_bal = self.check_fee_amount(self.nodes[0].getbalance(), Decimal('200000'), fee_per_byte, count_bytes(self.nodes[2].getrawtransaction(txid))) - # Sendmany 100000 DOGE + # Sendmany 100000 DIS txid = self.nodes[2].sendmany('from1', {address: 100000}, 0, "", []) self.nodes[2].generate(1) self.sync_all() diff --git a/src/Makefile.am b/src/Makefile.am index 5b2ddde15..f32989a77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,23 +24,23 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAG BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) -LIBDOGECOIN_SERVER=libdiscoin_server.a -LIBDOGECOIN_COMMON=libdiscoin_common.a -LIBDOGECOIN_CONSENSUS=libdiscoin_consensus.a -LIBDOGECOIN_CLI=libdiscoin_cli.a -LIBDOGECOIN_UTIL=libdiscoin_util.a -LIBDOGECOIN_CRYPTO=crypto/libdiscoin_crypto.a -LIBDOGECOINQT=qt/libdiscoinqt.a +LIBDISCOIN_SERVER=libdiscoin_server.a +LIBDISCOIN_COMMON=libdiscoin_common.a +LIBDISCOIN_CONSENSUS=libdiscoin_consensus.a +LIBDISCOIN_CLI=libdiscoin_cli.a +LIBDISCOIN_UTIL=libdiscoin_util.a +LIBDISCOIN_CRYPTO=crypto/libdiscoin_crypto.a +LIBDISCOINQT=qt/libdiscoinqt.a LIBSECP256K1=secp256k1/libsecp256k1.la if ENABLE_ZMQ -LIBDOGECOIN_ZMQ=libdiscoin_zmq.a +LIBDISCOIN_ZMQ=libdiscoin_zmq.a endif if BUILD_BITCOIN_LIBS -LIBDOGECOINCONSENSUS=libdiscoinconsensus.la +LIBDISCOINCONSENSUS=libdiscoinconsensus.la endif if ENABLE_WALLET -LIBDOGECOIN_WALLET=libdiscoin_wallet.a +LIBDISCOIN_WALLET=libdiscoin_wallet.a endif $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) @@ -49,16 +49,16 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) # Make is not made aware of per-object dependencies to avoid limiting building parallelization # But to build the less dependent modules first, we manually select their order here: EXTRA_LIBRARIES += \ - $(LIBDOGECOIN_CRYPTO) \ - $(LIBDOGECOIN_UTIL) \ - $(LIBDOGECOIN_COMMON) \ - $(LIBDOGECOIN_CONSENSUS) \ - $(LIBDOGECOIN_SERVER) \ - $(LIBDOGECOIN_CLI) \ - $(LIBDOGECOIN_WALLET) \ - $(LIBDOGECOIN_ZMQ) + $(LIBDISCOIN_CRYPTO) \ + $(LIBDISCOIN_UTIL) \ + $(LIBDISCOIN_COMMON) \ + $(LIBDISCOIN_CONSENSUS) \ + $(LIBDISCOIN_SERVER) \ + $(LIBDISCOIN_CLI) \ + $(LIBDISCOIN_WALLET) \ + $(LIBDISCOIN_ZMQ) -lib_LTLIBRARIES = $(LIBDOGECOINCONSENSUS) +lib_LTLIBRARIES = $(LIBDISCOINCONSENSUS) bin_PROGRAMS = noinst_PROGRAMS = @@ -380,14 +380,14 @@ discoind_SOURCES += bitcoind-res.rc endif discoind_LDADD = \ - $(LIBDOGECOIN_SERVER) \ - $(LIBDOGECOIN_COMMON) \ + $(LIBDISCOIN_SERVER) \ + $(LIBDISCOIN_COMMON) \ $(LIBUNIVALUE) \ - $(LIBDOGECOIN_UTIL) \ - $(LIBDOGECOIN_WALLET) \ - $(LIBDOGECOIN_ZMQ) \ - $(LIBDOGECOIN_CONSENSUS) \ - $(LIBDOGECOIN_CRYPTO) \ + $(LIBDISCOIN_UTIL) \ + $(LIBDISCOIN_WALLET) \ + $(LIBDISCOIN_ZMQ) \ + $(LIBDISCOIN_CONSENSUS) \ + $(LIBDISCOIN_CRYPTO) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ $(LIBSECP256K1) @@ -405,10 +405,10 @@ discoin_cli_SOURCES += bitcoin-cli-res.rc endif discoin_cli_LDADD = \ - $(LIBDOGECOIN_CLI) \ + $(LIBDISCOIN_CLI) \ $(LIBUNIVALUE) \ - $(LIBDOGECOIN_UTIL) \ - $(LIBDOGECOIN_CRYPTO) + $(LIBDISCOIN_UTIL) \ + $(LIBDISCOIN_CRYPTO) discoin_cli_LDADD += $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) # @@ -425,10 +425,10 @@ endif discoin_tx_LDADD = \ $(LIBUNIVALUE) \ - $(LIBDOGECOIN_COMMON) \ - $(LIBDOGECOIN_UTIL) \ - $(LIBDOGECOIN_CONSENSUS) \ - $(LIBDOGECOIN_CRYPTO) \ + $(LIBDISCOIN_COMMON) \ + $(LIBDISCOIN_UTIL) \ + $(LIBDISCOIN_CONSENSUS) \ + $(LIBDISCOIN_CRYPTO) \ $(LIBSECP256K1) discoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include index 7a2bf17ed..b0aaefb53 100644 --- a/src/Makefile.bench.include +++ b/src/Makefile.bench.include @@ -32,23 +32,23 @@ nodist_bench_bench_discoin_SOURCES = $(GENERATED_TEST_FILES) bench_bench_discoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/ bench_bench_discoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) bench_bench_discoin_LDADD = \ - $(LIBDOGECOIN_SERVER) \ - $(LIBDOGECOIN_COMMON) \ - $(LIBDOGECOIN_UTIL) \ - $(LIBDOGECOIN_CONSENSUS) \ - $(LIBDOGECOIN_CRYPTO) \ + $(LIBDISCOIN_SERVER) \ + $(LIBDISCOIN_COMMON) \ + $(LIBDISCOIN_UTIL) \ + $(LIBDISCOIN_CONSENSUS) \ + $(LIBDISCOIN_CRYPTO) \ $(LIBLEVELDB) \ $(LIBMEMENV) \ $(LIBSECP256K1) \ $(LIBUNIVALUE) if ENABLE_ZMQ -bench_bench_discoin_LDADD += $(LIBDOGECOIN_ZMQ) $(ZMQ_LIBS) +bench_bench_discoin_LDADD += $(LIBDISCOIN_ZMQ) $(ZMQ_LIBS) endif if ENABLE_WALLET bench_bench_discoin_SOURCES += bench/coin_selection.cpp -bench_bench_discoin_LDADD += $(LIBDOGECOIN_WALLET) $(LIBDOGECOIN_CRYPTO) +bench_bench_discoin_LDADD += $(LIBDISCOIN_WALLET) $(LIBDISCOIN_CRYPTO) endif bench_bench_discoin_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 6ff48fe22..0b0a2d7de 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -423,14 +423,14 @@ endif if TARGET_WINDOWS qt_discoin_qt_SOURCES += $(BITCOIN_RC) endif -qt_discoin_qt_LDADD = qt/libdiscoinqt.a $(LIBDOGECOIN_SERVER) +qt_discoin_qt_LDADD = qt/libdiscoinqt.a $(LIBDISCOIN_SERVER) if ENABLE_WALLET -qt_discoin_qt_LDADD += $(LIBDOGECOIN_WALLET) +qt_discoin_qt_LDADD += $(LIBDISCOIN_WALLET) endif if ENABLE_ZMQ -qt_discoin_qt_LDADD += $(LIBDOGECOIN_ZMQ) $(ZMQ_LIBS) +qt_discoin_qt_LDADD += $(LIBDISCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_discoin_qt_LDADD += $(LIBDOGECOIN_CLI) $(LIBDOGECOIN_COMMON) $(LIBDOGECOIN_UTIL) $(LIBDOGECOIN_CONSENSUS) $(LIBDOGECOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_discoin_qt_LDADD += $(LIBDISCOIN_CLI) $(LIBDISCOIN_COMMON) $(LIBDISCOIN_UTIL) $(LIBDISCOIN_CONSENSUS) $(LIBDISCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) qt_discoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) @@ -466,7 +466,7 @@ CLEAN_QT = $(nodist_qt_libdiscoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda CLEANFILES += $(CLEAN_QT) discoin_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libdiscoinqt_a_OBJECTS) $(qt_discoin_qt_OBJECTS) qt/discoin-qt$(EXEEXT) $(LIBDOGECOINQT) + rm -f $(CLEAN_QT) $(qt_libdiscoinqt_a_OBJECTS) $(qt_discoin_qt_OBJECTS) qt/discoin-qt$(EXEEXT) $(LIBDISCOINQT) discoin_qt : qt/discoin-qt$(EXEEXT) diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include index 948c80c24..d6dc7afa3 100644 --- a/src/Makefile.qttest.include +++ b/src/Makefile.qttest.include @@ -37,14 +37,14 @@ endif nodist_qt_test_test_discoin_qt_SOURCES = $(TEST_QT_MOC_CPP) -qt_test_test_discoin_qt_LDADD = $(LIBDOGECOINQT) $(LIBDOGECOIN_SERVER) +qt_test_test_discoin_qt_LDADD = $(LIBDISCOINQT) $(LIBDISCOIN_SERVER) if ENABLE_WALLET -qt_test_test_discoin_qt_LDADD += $(LIBDOGECOIN_WALLET) +qt_test_test_discoin_qt_LDADD += $(LIBDISCOIN_WALLET) endif if ENABLE_ZMQ -qt_test_test_discoin_qt_LDADD += $(LIBDOGECOIN_ZMQ) $(ZMQ_LIBS) +qt_test_test_discoin_qt_LDADD += $(LIBDISCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_test_test_discoin_qt_LDADD += $(LIBDOGECOIN_CLI) $(LIBDOGECOIN_COMMON) $(LIBDOGECOIN_UTIL) $(LIBDOGECOIN_CONSENSUS) $(LIBDOGECOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ +qt_test_test_discoin_qt_LDADD += $(LIBDISCOIN_CLI) $(LIBDISCOIN_COMMON) $(LIBDISCOIN_UTIL) $(LIBDISCOIN_CONSENSUS) $(LIBDISCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \ $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \ $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index f7e2fa9d5..c81444faa 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -152,14 +152,14 @@ endif test_test_discoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES) test_test_discoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS) -test_test_discoin_LDADD = $(LIBDOGECOIN_SERVER) $(LIBDOGECOIN_CLI) $(LIBDOGECOIN_COMMON) $(LIBDOGECOIN_UTIL) $(LIBDOGECOIN_CONSENSUS) $(LIBDOGECOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +test_test_discoin_LDADD = $(LIBDISCOIN_SERVER) $(LIBDISCOIN_CLI) $(LIBDISCOIN_COMMON) $(LIBDISCOIN_UTIL) $(LIBDISCOIN_CONSENSUS) $(LIBDISCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) test_test_discoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) if ENABLE_WALLET -test_test_discoin_LDADD += $(LIBDOGECOIN_WALLET) +test_test_discoin_LDADD += $(LIBDISCOIN_WALLET) endif -test_test_discoin_LDADD += $(LIBDOGECOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) +test_test_discoin_LDADD += $(LIBDISCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) test_test_discoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static if ENABLE_ZMQ @@ -175,11 +175,11 @@ test_test_discoin_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLA test_test_discoin_fuzzy_LDADD = \ $(LIBUNIVALUE) \ - $(LIBDOGECOIN_SERVER) \ - $(LIBDOGECOIN_COMMON) \ - $(LIBDOGECOIN_UTIL) \ - $(LIBDOGECOIN_CONSENSUS) \ - $(LIBDOGECOIN_CRYPTO) \ + $(LIBDISCOIN_SERVER) \ + $(LIBDISCOIN_COMMON) \ + $(LIBDISCOIN_UTIL) \ + $(LIBDISCOIN_CONSENSUS) \ + $(LIBDISCOIN_CRYPTO) \ $(LIBSECP256K1) test_test_discoin_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) diff --git a/src/amount.cpp b/src/amount.cpp index 6576a2708..d61b76e70 100644 --- a/src/amount.cpp +++ b/src/amount.cpp @@ -7,7 +7,7 @@ #include "tinyformat.h" -const std::string CURRENCY_UNIT = "DOGE"; +const std::string CURRENCY_UNIT = "DIS"; CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_) { diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index e2efd8091..38a52f268 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -197,7 +197,7 @@ public: return 3 * minRelayTxFee.GetFee(nSize); */ - // Discoin: Anything below 1 DOGE is always dust + // Discoin: Anything below 1 DIS is always dust return nDustLimit; } diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 042d95c8a..757da28fe 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -111,7 +111,7 @@ void AskPassphraseDialog::accept() break; } QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"), - tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"), + tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"), QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Cancel); if(retval == QMessageBox::Yes) diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 2b43458f7..f90b6f56a 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -44,11 +44,11 @@ QString BitcoinUnits::name(int unit) { switch(unit) { - case MBTC: return QString("MDOGE"); - case kBTC: return QString("kDOGE"); - case BTC: return QString("DOGE"); - case mBTC: return QString("mDOGE"); - case uBTC: return QString::fromUtf8("μDOGE"); + case MBTC: return QString("MDIS"); + case kBTC: return QString("kDIS"); + case BTC: return QString("DIS"); + case mBTC: return QString("mDIS"); + case uBTC: return QString::fromUtf8("μDIS"); default: return QString("???"); } } diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts index e2d7f5adc..b66ca92c3 100644 --- a/src/qt/locale/bitcoin_af.ts +++ b/src/qt/locale/bitcoin_af.ts @@ -168,8 +168,8 @@ <translation>Bevestig dat die beursie gekodifiseer is</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord <b>VERLOOR U AL U DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Waarskuwing: Indien u die beursie kodifiseer en u vergeet u wagwoord <b>VERLOOR U AL U DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 155daacbc..52652436c 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -168,8 +168,8 @@ <translation>تأكيد تشفير المحفظة</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>تحذير: إذا قمت بتشفير محفظتك وفقدت كلمة المرور الخاص بك, ستفقد كل عملات DOGECOINS الخاصة بك.</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>تحذير: إذا قمت بتشفير محفظتك وفقدت كلمة المرور الخاص بك, ستفقد كل عملات DISCOINS الخاصة بك.</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts index 156331b0b..997609591 100644 --- a/src/qt/locale/bitcoin_be_BY.ts +++ b/src/qt/locale/bitcoin_be_BY.ts @@ -168,7 +168,7 @@ <translation>Пацвердзіце шыфраванне гаманца</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>Увага: калі вы зашыфруеце свой гаманец і страціце парольную фразу, то <b>СТРАЦІЦЕ ЎСЕ СВАЕ БІТКОЙНЫ</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_bg.ts b/src/qt/locale/bitcoin_bg.ts index f38833ed5..1c027a874 100644 --- a/src/qt/locale/bitcoin_bg.ts +++ b/src/qt/locale/bitcoin_bg.ts @@ -168,7 +168,7 @@ <translation>Потвърдете на шифрирането на портфейла</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>ВНИМАНИЕ: Ако шифрирате вашият портфейл и изгубите паролата си, <b>ЩЕ ИЗГУБИТЕ ВСИЧКИТЕ СИ БИТКОИНИ</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 254debcb5..8cb04f721 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -168,8 +168,8 @@ <translation>Confirma l'encriptació del moneder</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/[email protected] b/src/qt/locale/[email protected] index a57ad13af..b6970d97e 100644 --- a/src/qt/locale/[email protected] +++ b/src/qt/locale/[email protected] @@ -168,8 +168,8 @@ <translation>Confirma l'encriptació del moneder</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index cf7311dce..21789ca1d 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -168,8 +168,8 @@ <translation>Confirma l'encriptació del moneder</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Avís: si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index a0b01f1d0..e4beac917 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -168,8 +168,8 @@ <translation>Potvrď zašifrování peněženky</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Upozornění: Pokud si zašifruješ peněženku a ztratíš či zapomeneš heslo, <b>PŘIJDEŠ O VŠECHNY DOGECOINY</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Upozornění: Pokud si zašifruješ peněženku a ztratíš či zapomeneš heslo, <b>PŘIJDEŠ O VŠECHNY DISCOINY</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 7d4ef4e7a..adeaba7be 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -168,8 +168,8 @@ <translation>Bekræft tegnebogskryptering</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Advarsel: Hvis du krypterer din tegnebog og mister din adgangskode, vil du <b>MISTE ALLE DINE DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Advarsel: Hvis du krypterer din tegnebog og mister din adgangskode, vil du <b>MISTE ALLE DINE DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index f3d9deebe..f96bdf338 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -168,7 +168,7 @@ <translation>Brieftaschen-Verschlüsselung bestätigen</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>Warnung: Wenn Sie Ihre Brieftasche verschlüsseln und Ihre Passphrase verlieren, werden Sie <b>alle Ihre Discoins verlieren</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 136f5944a..8892e7674 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -211,7 +211,7 @@ </message> <message> <location line="+1"/> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation type="unfinished"></translation> </message> <message> @@ -1764,7 +1764,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location line="+0"/> - <source>The paper wallet printing process has begun.<br/>Please wait for the wallets to print completely and verify that everything printed correctly.<br/>Check for misalignments, ink bleeding, smears, or anything else that could make the private keys unreadable.<br/>Now, enter the number of DOGE you wish to send to each wallet:</source> + <source>The paper wallet printing process has begun.<br/>Please wait for the wallets to print completely and verify that everything printed correctly.<br/>Check for misalignments, ink bleeding, smears, or anything else that could make the private keys unreadable.<br/>Now, enter the number of DIS you wish to send to each wallet:</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 2421c59f2..91d61e262 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -168,8 +168,8 @@ <translation>Confirmar cifrado del monedero</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Advertencia: Si cifra su monedero y pierde su contraseña<b>¡PERDERÁ TODOS SUS DOGECOINS!</b></translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Advertencia: Si cifra su monedero y pierde su contraseña<b>¡PERDERÁ TODOS SUS DISCOINS!</b></translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts index 5d8fce743..5da60c408 100644 --- a/src/qt/locale/bitcoin_es_ES.ts +++ b/src/qt/locale/bitcoin_es_ES.ts @@ -168,8 +168,8 @@ <translation>Confirmar encriptación del monedero</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Advertencia: Si encripta su monedero y pierde su frase clave <b>PERDERÁ TODOS SUS DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Advertencia: Si encripta su monedero y pierde su frase clave <b>PERDERÁ TODOS SUS DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 82f90fabc..24347cbe1 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -168,8 +168,8 @@ <translation>Kinnita rahakoti krüpteerimine.</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Hoiatus:Kui sa krüpteerid oma rahakoti ja kaotad salafraasi, siis sa<b>KAOTAD OMA DOGECOINID</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Hoiatus:Kui sa krüpteerid oma rahakoti ja kaotad salafraasi, siis sa<b>KAOTAD OMA DISCOINID</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index 372979ea0..1d55ae2c6 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -160,8 +160,8 @@ <translation>Berretsi zorroaren enkriptazioa</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Abisua: Zuk enkriptatzen baduzu zure diruzorroa eta zure pasahitza galtzen baduzu, <b>DOGECOIN GUZTIAK GALDUKO DITUZU</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Abisua: Zuk enkriptatzen baduzu zure diruzorroa eta zure pasahitza galtzen baduzu, <b>DISCOIN GUZTIAK GALDUKO DITUZU</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 6915eac29..1277bfacd 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -168,8 +168,8 @@ <translation>Confirmer le chiffrement du porte-monnaie</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Avertissement : si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS DOGECOINS</b> !</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Avertissement : si vous chiffrez votre porte-monnaie et perdez votre phrase de passe, vous <b>PERDREZ TOUS VOS DISCOINS</b> !</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index ced16a39f..b4adc39f3 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -168,8 +168,8 @@ <translation>Konfirmasi pengenkripsian dompet</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Peringatan: Jika kamu mengenkripsi dompet ini dan melupakan kata sandi anda, Kamu akan <b>KEHILANGAN SEMUA DOGECOIN ANDA</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Peringatan: Jika kamu mengenkripsi dompet ini dan melupakan kata sandi anda, Kamu akan <b>KEHILANGAN SEMUA DISCOIN ANDA</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> @@ -1382,8 +1382,8 @@ <translation>Muat Dompet Kertas</translation> </message> <message> - <source>The paper wallet printing process has begun.<br/>Please wait for the wallets to print completely and verify that everything printed correctly.<br/>Check for misalignments, ink bleeding, smears, or anything else that could make the private keys unreadable.<br/>Now, enter the number of DOGE you wish to send to each wallet:</source> - <translation>Proses pencetakan dompet kertas telah dimulai.<br/>Harap tunggu sampai dompet sepenuhnya telah dicetak dan pastikan semua bagian sudah tercetak dengan benar.<br/>Periksa juga barangkali ada ketidak sejajaran, tinta bercampur, bercak, atau apapun yang membuat kunci privat tidak terbaca.<br/>Sekarang, masukan berapa banyak DOGE yang mau dikirim kesetiap dompet:</translation> + <source>The paper wallet printing process has begun.<br/>Please wait for the wallets to print completely and verify that everything printed correctly.<br/>Check for misalignments, ink bleeding, smears, or anything else that could make the private keys unreadable.<br/>Now, enter the number of DIS you wish to send to each wallet:</source> + <translation>Proses pencetakan dompet kertas telah dimulai.<br/>Harap tunggu sampai dompet sepenuhnya telah dicetak dan pastikan semua bagian sudah tercetak dengan benar.<br/>Periksa juga barangkali ada ketidak sejajaran, tinta bercampur, bercak, atau apapun yang membuat kunci privat tidak terbaca.<br/>Sekarang, masukan berapa banyak DIS yang mau dikirim kesetiap dompet:</translation> </message> <message> <source>Paper wallet %1</source> diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index a297b3d31..ddb1a8c2f 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -168,7 +168,7 @@ <translation>Conferma la cifratura del portamonete</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>Attenzione: se si cifra il portamonete e si perde la passphrase <b>TUTTI I PROPRI Discoin ANDRANNO PERSI</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 1062fcf35..ccc27e11c 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -168,7 +168,7 @@ <translation>ウォレットの暗号化を確認する</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>警告: もしもあなたのウォレットを暗号化してパスフレーズを失ってしまったなら、<b>あなたの Discoin はすべて失われます</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 015a2a2f3..cffb487b0 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -168,7 +168,7 @@ <translation>지갑 암호화 확인</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>경고: 만약 암호화된 지갑의 비밀번호를 잃어버릴 경우, <b>모든 도지코인을 잃어버릴 수 있습니다</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 091902bc6..5fa0571a2 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -168,8 +168,8 @@ <translation>Bevestig versleuteling van de portemonnee</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u <b>AL UW DOGECOINS VERLIEZEN</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u <b>AL UW DISCOINS VERLIEZEN</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 5386da6d4..d074de35f 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -168,8 +168,8 @@ <translation>Potwierdź szyfrowanie portfela</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Uwaga: jeśli zaszyfrujesz swój portfel i zgubisz hasło <b>STRACISZ WSZYSTKIE SWOJE DOGECOINY</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Uwaga: jeśli zaszyfrujesz swój portfel i zgubisz hasło <b>STRACISZ WSZYSTKIE SWOJE DISCOINY</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 478b2705b..eeafeb7a8 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -168,8 +168,8 @@ <translation>Confirme a criptografia da carteira</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Aviso: Se você criptografar sua carteira e perder sua senha, você vai <b>PERDER TODOS OS SEUS DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Aviso: Se você criptografar sua carteira e perder sua senha, você vai <b>PERDER TODOS OS SEUS DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 6eb43b7fa..4aad0ef43 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -160,8 +160,8 @@ <translation>Confirmar encriptação da carteira</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>Aviso: se encriptar a sua carteira e perder a sua frase de segurnça, <b>PERDERÁ TODOS OS SEUS DOGECOINS</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>Aviso: se encriptar a sua carteira e perder a sua frase de segurnça, <b>PERDERÁ TODOS OS SEUS DISCOINS</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index ea2b779af..048e9496d 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -168,7 +168,7 @@ <translation>Подтвердите шифрование бумажника</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>Предупреждение: если вы зашифруете бумажник и потеряете пароль, вы <b>ПОТЕРЯЕТЕ ВСЕ ВАШИ БИТКОИНЫ</b>!</translation> </message> <message> diff --git a/src/qt/locale/[email protected] b/src/qt/locale/[email protected] index 836f45569..5baec1b78 100644 --- a/src/qt/locale/[email protected] +++ b/src/qt/locale/[email protected] @@ -100,7 +100,7 @@ <translation>Potvrdite šifrovanje novčanika</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>Upozorenje: Ako šifrujete svoj novčanik, i potom izgubite svoju pristupnu frazu <b>IZGUBIĆETE SVE SVOJE BITKOINE</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index 4ba6abcd6..7a6438a34 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -169,8 +169,8 @@ Var vänlig och försök igen.</translation> <translation>Bekräfta kryptering av plånbok</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> - <translation>VARNING: Om du krypterar din plånbok och glömmer ditt lösenord, kommer du att <b>FÖRLORA ALLA DINA DOGECOIN</b>!</translation> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> + <translation>VARNING: Om du krypterar din plånbok och glömmer ditt lösenord, kommer du att <b>FÖRLORA ALLA DINA DISCOIN</b>!</translation> </message> <message> <source>Are you sure you wish to encrypt your wallet?</source> diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index a0e31c5b3..b2c5fdc62 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -168,7 +168,7 @@ <translation>Cüzdan şifrelemesini onayla</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>Uyarı: Eğer cüzdanınızı şifreler ve parolanızı kaybederseniz <b>TÜM BİTCOİNLERİNİZİ KAYBEDECEKSİNİZ</b>!</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 676c3eede..ab7b0d514 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -168,7 +168,7 @@ <translation>确认钱包加密</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>警告: 如果把钱包加密后又忘记密码，你就会从此<b>失去其中所有的比特币了</b>！</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_zh_HK.ts b/src/qt/locale/bitcoin_zh_HK.ts index fb52a5d30..3cbd893a1 100644 --- a/src/qt/locale/bitcoin_zh_HK.ts +++ b/src/qt/locale/bitcoin_zh_HK.ts @@ -156,7 +156,7 @@ <translation>確認錢包加密</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>警告: 如果你將錢包加密後又忘記密碼，你就會<b>失去所有 Discoin 了</b>！</translation> </message> <message> diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index bdaf1c577..8ab0038f8 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -168,7 +168,7 @@ <translation>確認錢包加密</translation> </message> <message> - <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DOGECOINS</b>!</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR DISCOINS</b>!</source> <translation>警告: 如果把錢包加密後又忘記密碼，你就會從此<b>失去其中所有的 Discoin 了</b>！</translation> </message> <message> diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index c47a7d22b..bb3ca783d 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -74,7 +74,7 @@ void OptionsModel::Init(bool resetSettings) nDisplayUnit = settings.value("nDisplayUnit").toInt(); if (!settings.contains("strThirdPartyTxUrls")) - settings.setValue("strThirdPartyTxUrls", "https://dischain.info/tx/%s|https://chain.so/tx/DOGE/%s"); + settings.setValue("strThirdPartyTxUrls", "https://dischain.info/tx/%s|https://chain.so/tx/DIS/%s"); strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString(); if (!settings.contains("fCoinControlFeatures")) diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 73b895ab0..833176df6 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -399,7 +399,7 @@ void PaperWalletDialog::on_printButton_clicked() bool ok; // Ask for an amount to send to each paper wallet. It might be better to try to use the BitcoinAmountField, but this works fine. - double amountInput = QInputDialog::getDouble(this, tr("Load Paper Wallets"), tr("The paper wallet printing process has begun.<br/>Please wait for the wallets to print completely and verify that everything printed correctly.<br/>Check for misalignments, ink bleeding, smears, or anything else that could make the private keys unreadable.<br/>Now, enter the number of DOGE you wish to send to each wallet:"), 0, 0, 2147483647, 8, &ok); + double amountInput = QInputDialog::getDouble(this, tr("Load Paper Wallets"), tr("The paper wallet printing process has begun.<br/>Please wait for the wallets to print completely and verify that everything printed correctly.<br/>Check for misalignments, ink bleeding, smears, or anything else that could make the private keys unreadable.<br/>Now, enter the number of DIS you wish to send to each wallet:"), 0, 0, 2147483647, 8, &ok); if (!ok) { return; diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index e7ae35440..94bf3f26d 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -96,7 +96,7 @@ UniValue getpeerinfo(const JSONRPCRequest& request) " \"inbound\": true|false, (boolean) Inbound (true) or Outbound (false)\n" " \"addnode\": true|false, (boolean) Whether connection was due to addnode and is using an addnode slot\n" " \"startingheight\": n, (numeric) The starting height (block) of the peer\n" - " \"feefilter\": \"decimal\", (string) The value of the last feefilter set by this peer, in DOGE\n" + " \"feefilter\": \"decimal\", (string) The value of the last feefilter set by this peer, in DIS\n" " \"banscore\": n, (numeric) The ban score\n" " \"synced_headers\": n, (numeric) The last header we have in common with this peer\n" " \"synced_blocks\": n, (numeric) The last block we have in common with this peer\n" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 6055b56a0..069bee8dd 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2900,7 +2900,7 @@ UniValue bumpfee(const JSONRPCRequest& request) if (specifiedConfirmTarget) { nNewFee = CWallet::GetMinimumFee(*wtx.tx, maxNewTxSize, newConfirmTarget, mempool, CAmount(0)); } - // otherwise bump the fee by 1 DOGE. + // otherwise bump the fee by 1 DIS. else { nNewFee = nOldFee + walletIncrementalRelayFee.GetFeePerK(); } diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index a72e1ce09..24de59493 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -495,7 +495,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain240Setup) BOOST_AUTO_TEST_CASE(GetMinimumFee_test) { - uint64_t value = 1000 * COIN; // 1,000 DOGE + uint64_t value = 1000 * COIN; // 1,000 DIS CMutableTransaction tx; CTxMemPool pool(payTxFee); |