diff --git a/.gitignore b/.gitignore index 0cee466e..36661736 100644 --- a/.gitignore +++ b/.gitignore @@ -85,7 +85,7 @@ src/qt/test/moc*.cpp *.qm Makefile pivx-qt -PIVX-Qt.app +LUXX-Qt.app # Unit-tests Makefile.test diff --git a/configure.ac b/configure.ac index 06a63f4c..6af71a5c 100644 --- a/configure.ac +++ b/configure.ac @@ -19,9 +19,9 @@ BITCOIN_TX_NAME=lux-tx AC_CANONICAL_HOST -AH_TOP([#ifndef PIV_CONFIG_H]) -AH_TOP([#define PIV_CONFIG_H]) -AH_BOTTOM([#endif //PIV_CONFIG_H]) +AH_TOP([#ifndef LUX_CONFIG_H]) +AH_TOP([#define LUX_CONFIG_H]) +AH_BOTTOM([#endif //LUX_CONFIG_H]) dnl faketime breaks configure and is only needed for make. Disable it here. unset FAKETIME diff --git a/contrib/debian/examples/lux.conf b/contrib/debian/examples/lux.conf index 95f409a6..c4b92fcc 100755 --- a/contrib/debian/examples/lux.conf +++ b/contrib/debian/examples/lux.conf @@ -101,7 +101,7 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send PIVs. Transactions with fees +# Pay an optional transaction fee every time you send LUXs. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 diff --git a/contrib/debian/manpages/lux-qt.1 b/contrib/debian/manpages/lux-qt.1 index d721f63d..804b1d02 100755 --- a/contrib/debian/manpages/lux-qt.1 +++ b/contrib/debian/manpages/lux-qt.1 @@ -1,4 +1,4 @@ -.TH PIV-QT "1" "February 2017" "lux-qt 1" +.TH LUX-QT "1" "February 2017" "lux-qt 1" .SH NAME lux-qt \- peer-to-peer network based digital currency .SH DESCRIPTION diff --git a/contrib/debian/manpages/lux.conf.5 b/contrib/debian/manpages/lux.conf.5 index 386e225c..048ecbd4 100755 --- a/contrib/debian/manpages/lux.conf.5 +++ b/contrib/debian/manpages/lux.conf.5 @@ -1,4 +1,4 @@ -.TH PIV.CONF "5" "January 2011" "lux.conf 3.19" +.TH LUX.CONF "5" "January 2011" "lux.conf 3.19" .SH NAME lux.conf \- lux configuration file .SH SYNOPSIS @@ -59,16 +59,16 @@ Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES .SH MISCELLANEOUS OPTIONS .TP \fBgen=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable attempt to generate PIVs. +Enable or disable attempt to generate LUXs. .TP \fB4way=\fR[\fI'0'\fR|\fI'1'\fR] -Enable or disable use SSE instructions to try to generate PIVs faster. +Enable or disable use SSE instructions to try to generate LUXs faster. .TP \fBkeypool=\fR\fI'100'\fR Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions. .TP \fBpaytxfee=\fR\fI'0.00'\fR -Pay an optional transaction fee every time you send PIVs. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner. +Pay an optional transaction fee every time you send LUXs. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner. .TP \fBallowreceivebyip=\fR\fI'1'\fR Allow direct connections for the 'pay via IP address' feature. diff --git a/contrib/debian/manpages/luxd.1 b/contrib/debian/manpages/luxd.1 index a250fd0d..57b67446 100755 --- a/contrib/debian/manpages/luxd.1 +++ b/contrib/debian/manpages/luxd.1 @@ -1,4 +1,4 @@ -.TH PIVD "1" "February 2017" "luxd 2.1.4.1" +.TH LUXD "1" "February 2017" "luxd 2.1.4.1" .SH NAME Lux \- peer-to-peer network based digital currency .SH SYNOPSIS @@ -112,7 +112,7 @@ Returns the number of connections to other nodes. Returns the proof-of-work difficulty as a multiple of the minimum difficulty. .TP \fBgetgenerate\fR -Returns boolean true if server is trying to generate PIV, false otherwise. +Returns boolean true if server is trying to generate LUX, false otherwise. .TP \fBsetgenerate 'generate' ['genproclimit']\fR Generation is limited to ['genproclimit'] processors, \-1 is unlimited. @@ -183,7 +183,7 @@ Returns a list of the last ['count'] transactions for 'account' \- for all accou Moves funds between accounts. .TP \fBsendfrom* <'account'> <'luxaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR -Sends amount from account's balance to 'luxaddress'. This method will fail if there is less than amount PIV with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success. +Sends amount from account's balance to 'luxaddress'. This method will fail if there is less than amount LUX with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success. .TP \fBsendtoaddress 'luxaddress' 'amount' ['comment'] ['comment-to']\fR Sends amount from the server's available balance to 'luxaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success. diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index 84c0d8d3..2b1ba4fe 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend PIVs received on particular addresses, +# Use the raw transactions API to spend LUXs received on particular addresses, # and send any change back to that same address. # # Example usage: @@ -221,9 +221,9 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get PIVs from") + help="addresses to get LUXs from") parser.add_option("--to", dest="to", default=None, - help="address to get send PIVs to") + help="address to get send LUXs to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 0f61afcc..475edb4e 100755 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -118,7 +118,7 @@ to see it. **testnet mode** -Run with the -testnet option to run with "play PIVs (tPIV)" on the test network, if you +Run with the -testnet option to run with "play LUXs (tLUX)" on the test network, if you are testing multi-machine code that needs to operate across the internet. **DEBUG_LOCKORDER** diff --git a/doc/release-notes.md b/doc/release-notes.md index 8614db5e..8e24f3df 100755 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -40,10 +40,10 @@ frequently tested on them. Notable Changes =============== -Zerocoin (zPIV) Protocol +Zerocoin (zLUX) Protocol --------------------- -At long last, the zPIV release is here and the zerocoin protocol has been fully implemented! This allows users to send transactions with 100% fungible coins and absolutely zero history or link-ability to their previous owners. +At long last, the zLUX release is here and the zerocoin protocol has been fully implemented! This allows users to send transactions with 100% fungible coins and absolutely zero history or link-ability to their previous owners. Full and comprehensive details about the process and the use will be posted here during the days between Oct 6 and Oct 13. @@ -65,7 +65,7 @@ the code changes and accompanying discussion, both the pull request and git merge commit are mentioned. ### Broad Features -- #264 `15e84e5` zPIV is here! (Fuzzbawls Mrs-X Presstab Spock LUX) +- #264 `15e84e5` zLUX is here! (Fuzzbawls Mrs-X Presstab Spock LUX) ### P2P Protocol and Network Code - #242 `0ecd77f` [P2P] Improve TOR service connectivity (Fuzzbawls) diff --git a/doc/release-notes/release-notes-4.0.0.md b/doc/release-notes/release-notes-4.0.0.md index 83ef30b0..ec07f7e3 100755 --- a/doc/release-notes/release-notes-4.0.0.md +++ b/doc/release-notes/release-notes-4.0.0.md @@ -12,9 +12,9 @@ Please report bugs using the issue tracker at github: Recommended Update ============== -LUX Core v4.0.0 is a recommended, semi-mandatory update for all users. This release contains transaction creation bug fixes for zPIV spends, automint calculation adjustments, and other various updates/fixes. +LUX Core v4.0.0 is a recommended, semi-mandatory update for all users. This release contains transaction creation bug fixes for zLUX spends, automint calculation adjustments, and other various updates/fixes. -zPIV spending requires this update. +zLUX spending requires this update. How to Upgrade ============== @@ -45,21 +45,21 @@ Notable Changes Auto Wallet Backup --------------------- -In addition to the automatic wallet backup that is done at each start of the client, a new automatic backup function has been added that will, by default, create a backup of the wallet file during each zPIV mint operation (zPIV spends which re-mint their change are also included in this). This functionality is controlled by the `-backupzlux` command-line option, which defaults to `1` (enabled, auto-backup). +In addition to the automatic wallet backup that is done at each start of the client, a new automatic backup function has been added that will, by default, create a backup of the wallet file during each zLUX mint operation (zLUX spends which re-mint their change are also included in this). This functionality is controlled by the `-backupzlux` command-line option, which defaults to `1` (enabled, auto-backup). Users that wish to prevent this behavior (not recommended) can pass `-backupzlux=0` at the command-line when starting the client, or add `backupzlux=0` to their `lux.conf` file. -zPIV Automint Calculations +zLUX Automint Calculations --------------------- -A bug in the automint calculations was made apparent on mainnet when block times exceeded expectations, resulting in zPIV mint transactions that were in an unconfirmed state to still be treated as if they had never been minted. This caused automint to effectively mint more than what was intended. +A bug in the automint calculations was made apparent on mainnet when block times exceeded expectations, resulting in zLUX mint transactions that were in an unconfirmed state to still be treated as if they had never been minted. This caused automint to effectively mint more than what was intended. -zPIV Spending Fix +zLUX Spending Fix --------------------- -The size of zPIV spend transactions is knowingly larger than normal transactions, and while this was expected, a much stricter check against the scriptsig size is used for mainnet, causing the transactions to be rejected by the mempool, and thus not being packaged into any blocks. +The size of zLUX spend transactions is knowingly larger than normal transactions, and while this was expected, a much stricter check against the scriptsig size is used for mainnet, causing the transactions to be rejected by the mempool, and thus not being packaged into any blocks. -zPIV Transaction Recovery +zLUX Transaction Recovery --------------------- -Due to the aforementioned issue with zPIV spending, users may find that their attempted spends are now conflicted and zPIV balances are not represented as expected. "Recovery" of these transactions can be done using the following methods: +Due to the aforementioned issue with zLUX spending, users may find that their attempted spends are now conflicted and zLUX balances are not represented as expected. "Recovery" of these transactions can be done using the following methods: 1. GUI: diff --git a/src/activemasternode.h b/src/activemasternode.h index 5c10b694..5cb09a7d 100755 --- a/src/activemasternode.h +++ b/src/activemasternode.h @@ -33,7 +33,7 @@ class CActiveMasternode /// Register any Masternode bool Register(CTxIn vin, CService service, CKey key, CPubKey pubKey, CKey keyMasternode, CPubKey pubKeyMasternode, std::string& errorMessage); - /// Get 10000 PIV input that can be used for the Masternode + /// Get 10000 LUX input that can be used for the Masternode bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey, std::string strTxHash, std::string strOutputIndex); bool GetVinFromOutput(COutput out, CTxIn& vin, CPubKey& pubkey, CKey& secretKey); @@ -61,7 +61,7 @@ class CActiveMasternode /// Register remote Masternode bool Register(std::string strService, std::string strKey, std::string strTxHash, std::string strOutputIndex, std::string& errorMessage); - /// Get 10000 PIV input that can be used for the Masternode + /// Get 10000 LUX input that can be used for the Masternode bool GetMasterNodeVin(CTxIn& vin, CPubKey& pubkey, CKey& secretKey); vector SelectCoinsMasternode(); diff --git a/src/amount.cpp b/src/amount.cpp index 533e77e6..7cd3197e 100755 --- a/src/amount.cpp +++ b/src/amount.cpp @@ -27,5 +27,5 @@ CAmount CFeeRate::GetFee(size_t nSize) const std::string CFeeRate::ToString() const { - return strprintf("%d.%08d PIV/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN); + return strprintf("%d.%08d LUX/kB", nSatoshisPerK / COIN, nSatoshisPerK % COIN); } diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4e709c86..0a7bf3b9 100755 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers -// Copyright (c) 2015-2017 The PIVX developers +// Copyright (c) 2015-2017 The LUXX developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -109,15 +109,15 @@ class CMainParams : public CChainParams pchMessageStart[3] = 0x3l; vAlertPubKey = ParseHex("042d13c016ed91528241bcff222989769417eb10cdb679228c91e26e26900eb9fd053cd9f16a9a2894ad5ebbd551be1a4bd23bd55023679be17f0bd3a16e6fbeba"); nDefaultPort = 28666; - bnProofOfWorkLimit = ~uint256(0) >> 20; // PIVX starting difficulty is 1 / 2^12 + bnProofOfWorkLimit = ~uint256(0) >> 20; // LUXX starting difficulty is 1 / 2^12 nSubsidyHalvingInterval = 210000; nMaxReorganizationDepth = 100; nEnforceBlockUpgradeMajority = 750; nRejectBlockOutdatedMajority = 950; nToCheckBlockUpgradeMajority = 1000; nMinerThreads = 0; - nTargetTimespan = 1 * 60; // PIVX: 1 day - nTargetSpacing = 1 * 60; // PIVX: 1 minute + nTargetTimespan = 1 * 60; // LUXX: 1 day + nTargetSpacing = 1 * 60; // LUXX: 1 minute nMaturity = 100; nMasternodeCountDrift = 20; nMaxMoneyOut = 21000000 * COIN; @@ -239,8 +239,8 @@ class CTestNetParams : public CMainParams nRejectBlockOutdatedMajority = 75; nToCheckBlockUpgradeMajority = 100; nMinerThreads = 0; - nTargetTimespan = 1 * 60; // PIVX: 1 day - nTargetSpacing = 1 * 60; // PIVX: 1 minute + nTargetTimespan = 1 * 60; // LUXX: 1 day + nTargetSpacing = 1 * 60; // LUXX: 1 minute nLastPOWBlock = 200; nMaturity = 15; nMasternodeCountDrift = 4; diff --git a/src/config/lux-config.h b/src/config/lux-config.h index 1dc5843b..da4e3d47 100755 --- a/src/config/lux-config.h +++ b/src/config/lux-config.h @@ -1,9 +1,9 @@ /* src/config/lux-config.h. Generated from lux-config.h.in by configure. */ /* src/config/lux-config.h.in. Generated from configure.ac by autoheader. */ -#ifndef PIV_CONFIG_H +#ifndef LUX_CONFIG_H -#define PIV_CONFIG_H +#define LUX_CONFIG_H /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -340,4 +340,4 @@ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ -#endif //PIV_CONFIG_H +#endif //LUX_CONFIG_H diff --git a/src/config/lux-config.h.in b/src/config/lux-config.h.in index 3c577cb1..2f74edbe 100755 --- a/src/config/lux-config.h.in +++ b/src/config/lux-config.h.in @@ -1,8 +1,8 @@ /* src/config/lux-config.h.in. Generated from configure.ac by autoheader. */ -#ifndef PIV_CONFIG_H +#ifndef LUX_CONFIG_H -#define PIV_CONFIG_H +#define LUX_CONFIG_H /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -339,4 +339,4 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -#endif //PIV_CONFIG_H +#endif //LUX_CONFIG_H diff --git a/src/init.cpp b/src/init.cpp index c3a7531e..aaa1dbe7 100755 --- a/src/init.cpp +++ b/src/init.cpp @@ -333,7 +333,7 @@ std::string HelpMessage(HelpMessageMode mode) #endif strUsage += HelpMessageOpt("-reindex", _("Rebuild block chain index from current blk000??.dat files") + " " + _("on startup")); strUsage += HelpMessageOpt("-reindexaccumulators", _("Reindex the accumulator database") + " " + _("on startup")); - strUsage += HelpMessageOpt("-reindexmoneysupply", _("Reindex the PIV and zPIV money supply statistics") + " " + _("on startup")); + strUsage += HelpMessageOpt("-reindexmoneysupply", _("Reindex the LUX and zLUX money supply statistics") + " " + _("on startup")); strUsage += HelpMessageOpt("-resync", _("Delete blockchain folders and resync from scratch") + " " + _("on startup")); #if !defined(WIN32) strUsage += HelpMessageOpt("-sysperms", _("Create new files with system default permissions, instead of umask 077 (only effective with disabled wallet functionality)")); @@ -386,9 +386,9 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-disablewallet", _("Do not load the wallet and disable wallet RPC calls")); strUsage += HelpMessageOpt("-keypool=", strprintf(_("Set key pool size to (default: %u)"), 100)); if (GetBoolArg("-help-debug", false)) - strUsage += HelpMessageOpt("-mintxfee=", strprintf(_("Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"), + strUsage += HelpMessageOpt("-mintxfee=", strprintf(_("Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s)"), FormatMoney(CWallet::minTxFee.GetFeePerK()))); - strUsage += HelpMessageOpt("-paytxfee=", strprintf(_("Fee (in PIV/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK()))); + strUsage += HelpMessageOpt("-paytxfee=", strprintf(_("Fee (in LUX/kB) to add to transactions you send (default: %s)"), FormatMoney(payTxFee.GetFeePerK()))); strUsage += HelpMessageOpt("-rescan", _("Rescan the block chain for missing wallet transactions") + " " + _("on startup")); strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet.dat") + " " + _("on startup")); strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), 0)); @@ -450,7 +450,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-relaypriority", strprintf(_("Require high priority for relaying free or low-fee transactions (default:%u)"), 1)); strUsage += HelpMessageOpt("-maxsigcachesize=", strprintf(_("Limit size of signature cache to entries (default: %u)"), 50000)); } - strUsage += HelpMessageOpt("-minrelaytxfee=", strprintf(_("Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK()))); + strUsage += HelpMessageOpt("-minrelaytxfee=", strprintf(_("Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK()))); strUsage += HelpMessageOpt("-printtoconsole", strprintf(_("Send trace/debug info to console instead of debug.log file (default: %u)"), 0)); if (GetBoolArg("-help-debug", false)) { strUsage += HelpMessageOpt("-printpriority", strprintf(_("Log transaction priority and fee per kB when mining blocks (default: %u)"), 0)); @@ -487,7 +487,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-preferredDenom=", strprintf(_("Preferred Denomination for automatically minted Zerocoin (1/5/10/50/100/500/1000/5000), 0 for no preference. default: %u)"), 0)); strUsage += HelpMessageOpt("-backupzlux=", strprintf(_("Enable automatic wallet backups triggered after each zLux minting (0-1, default: %u)"), 1)); -// strUsage += " -anonymizeluxamount= " + strprintf(_("Keep N PIV anonymized (default: %u)"), 0) + "\n"; +// strUsage += " -anonymizeluxamount= " + strprintf(_("Keep N LUX anonymized (default: %u)"), 0) + "\n"; // strUsage += " -liquidityprovider= " + strprintf(_("Provide liquidity to Obfuscation by infrequently mixing coins on a continual basis (0-100, default: %u, 1=very frequent, high fees, 100=very infrequent, low fees)"), 0) + "\n"; strUsage += HelpMessageGroup(_("SwiftX options:")); @@ -1358,10 +1358,10 @@ bool AppInit2(boost::thread_group& threadGroup) // Recalculate money supply for blocks that are impacted by accounting issue after zerocoin activation if (GetBoolArg("-reindexmoneysupply", false)) { if (chainActive.Height() > Params().Zerocoin_StartHeight()) { - RecalculateZPIVMinted(); - RecalculateZPIVSpent(); + RecalculateZLUXMinted(); + RecalculateZLUXSpent(); } - RecalculatePIVSupply(1); + RecalculateLUXSupply(1); } // Force recalculation of accumulators. @@ -1743,8 +1743,8 @@ bool AppInit2(boost::thread_group& threadGroup) is convertable to another. For example: - 1PIV+1000 == (.1PIV+100)*10 - 10PIV+10000 == (1PIV+1000)*10 + 1LUX+1000 == (.1LUX+100)*10 + 10LUX+10000 == (1LUX+1000)*10 */ obfuScationDenominations.push_back((10000 * COIN) + 10000000); obfuScationDenominations.push_back((1000 * COIN) + 1000000); diff --git a/src/main.cpp b/src/main.cpp index e1f1f3ab..03fd4484 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -3067,7 +3067,7 @@ void ThreadScriptCheck() scriptcheckqueue.Thread(); } -void RecalculateZPIVMinted() +void RecalculateZLUXMinted() { CBlockIndex *pindex = chainActive[Params().Zerocoin_StartHeight()]; int nHeightEnd = chainActive.Height(); @@ -3094,14 +3094,14 @@ void RecalculateZPIVMinted() } } -void RecalculateZPIVSpent() +void RecalculateZLUXSpent() { CBlockIndex* pindex = chainActive[Params().Zerocoin_StartHeight()]; while (true) { if (pindex->nHeight % 1000 == 0) LogPrintf("%s : block %d...\n", __func__, pindex->nHeight); - //Rewrite zPIV supply + //Rewrite zLUX supply CBlock block; assert(ReadBlockFromDisk(block, pindex)); @@ -3110,13 +3110,13 @@ void RecalculateZPIVSpent() //Reset the supply to previous block pindex->mapZerocoinSupply = pindex->pprev->mapZerocoinSupply; - //Add mints to zPIV supply + //Add mints to zLUX supply for (auto denom : libzerocoin::zerocoinDenomList) { long nDenomAdded = count(pindex->vMintDenominationsInBlock.begin(), pindex->vMintDenominationsInBlock.end(), denom); pindex->mapZerocoinSupply.at(denom) += nDenomAdded; } - //Remove spends from zPIV supply + //Remove spends from zLUX supply for (auto denom : listDenomsSpent) pindex->mapZerocoinSupply.at(denom)--; @@ -3130,7 +3130,7 @@ void RecalculateZPIVSpent() } } -bool RecalculatePIVSupply(int nHeightStart) +bool RecalculateLUXSupply(int nHeightStart) { if (nHeightStart > chainActive.Height()) return false; @@ -3444,9 +3444,9 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin std::list listSpends = ZerocoinSpendListFromBlock(block, fFilterInvalid); if (pindex->nHeight == Params().Zerocoin_Block_RecalculateAccumulators() + 1) { - RecalculateZPIVMinted(); - RecalculateZPIVSpent(); - RecalculatePIVSupply(Params().Zerocoin_StartHeight()); + RecalculateZLUXMinted(); + RecalculateZLUXSpent(); + RecalculateLUXSupply(Params().Zerocoin_StartHeight()); } // Initialize zerocoin supply to the supply from previous block @@ -3676,7 +3676,7 @@ void static UpdateTip(CBlockIndex* pindexNew) { chainActive.SetTip(pindexNew); - // If turned on AutoZeromint will automatically convert PIV to zPIV + // If turned on AutoZeromint will automatically convert LUX to zLUX if (pwalletMain->isZeromintEnabled ()) pwalletMain->AutoZeromint (); diff --git a/src/main.h b/src/main.h index cc5336da..5b4ca419 100755 --- a/src/main.h +++ b/src/main.h @@ -371,9 +371,9 @@ bool IsTransactionInChain(uint256 txId, int& nHeightTx); bool IsBlockHashInChain(const uint256& hashBlock); void PopulateInvalidOutPointMap(); bool ValidOutPoint(const COutPoint out, int nHeight); -void RecalculateZPIVSpent(); -void RecalculateZPIVMinted(); -bool RecalculatePIVSupply(int nHeightStart); +void RecalculateZLUXSpent(); +void RecalculateZLUXMinted(); +bool RecalculateLUXSupply(int nHeightStart); bool ReindexAccumulators(list& listMissingCheckpoints, string& strError); diff --git a/src/masternode.cpp b/src/masternode.cpp index 1f85f46c..8b83908b 100755 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -602,7 +602,7 @@ bool CMasternodeBroadcast::CheckInputsAndAdd(int& nDoS) } // verify that sig time is legit in past - // should be at least not earlier than block when 1000 PIV tx got MASTERNODE_MIN_CONFIRMATIONS + // should be at least not earlier than block when 1000 LUX tx got MASTERNODE_MIN_CONFIRMATIONS uint256 hashBlock = 0; CTransaction tx2; GetTransaction(vin.prevout.hash, tx2, hashBlock, true); diff --git a/src/masternode.h b/src/masternode.h index b1f58d20..4bea2dec 100755 --- a/src/masternode.h +++ b/src/masternode.h @@ -100,7 +100,7 @@ class CMasternodePing }; // -// The Masternode Class. For managing the Obfuscation process. It contains the input of the 10000 PIV, signature to prove +// The Masternode Class. For managing the Obfuscation process. It contains the input of the 10000 LUX, signature to prove // it's the one who own that ip address and code for calculating the payment election. // class CMasternode diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 0594fdaf..c0fae5e5 100755 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -1011,7 +1011,7 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData GetTransaction(vin.prevout.hash, tx2, hashBlock, true); BlockMap::iterator mi = mapBlockIndex.find(hashBlock); if (mi != mapBlockIndex.end() && (*mi).second) { - CBlockIndex* pMNIndex = (*mi).second; // block for 10000 PIV tx -> 1 confirmation + CBlockIndex* pMNIndex = (*mi).second; // block for 10000 LUX tx -> 1 confirmation CBlockIndex* pConfIndex = chainActive[pMNIndex->nHeight + MASTERNODE_MIN_CONFIRMATIONS - 1]; // block where tx got MASTERNODE_MIN_CONFIRMATIONS if (pConfIndex->GetBlockTime() > sigTime) { LogPrint("masternode","mnb - Bad sigTime %d for Masternode %s (%i conf block is at %d)\n", diff --git a/src/obfuscation.cpp b/src/obfuscation.cpp index 271a6c24..49ecf943 100755 --- a/src/obfuscation.cpp +++ b/src/obfuscation.cpp @@ -37,7 +37,7 @@ map mapObfuscationBroadcastTxes; // Keep track of the active Masternode CActiveMasternode activeMasternode; -/* *** BEGIN OBFUSCATION MAGIC - PIV ********** +/* *** BEGIN OBFUSCATION MAGIC - LUX ********** Copyright (c) 2014-2015, Dash Developers eduffield - evan@dashpay.io udjinm6 - udjinm6@dashpay.io @@ -779,7 +779,7 @@ void CObfuscationPool::ChargeRandomFees() with using it to stop abuse. Otherwise it could serve as an attack vector and allow endless transaction that would bloat LUX and make it unusable. To stop these kinds of attacks 1 in 10 successful transactions are charged. This - adds up to a cost of 0.001 PIV per transaction on average. + adds up to a cost of 0.001 LUX per transaction on average. */ if (r <= 10) { LogPrintf("CObfuscationPool::ChargeRandomFees -- charging random fees. %u\n", i); @@ -1917,10 +1917,10 @@ void CObfuscationPool::GetDenominationsToString(int nDenom, std::string& strDeno { // Function returns as follows: // - // bit 0 - 100PIV+1 ( bit on if present ) - // bit 1 - 10PIV+1 - // bit 2 - 1PIV+1 - // bit 3 - .1PIV+1 + // bit 0 - 100LUX+1 ( bit on if present ) + // bit 1 - 10LUX+1 + // bit 2 - 1LUX+1 + // bit 3 - .1LUX+1 // bit 3 - non-denom @@ -1990,10 +1990,10 @@ int CObfuscationPool::GetDenominations(const std::vector& vout, bool fSi // Function returns as follows: // - // bit 0 - 100PIV+1 ( bit on if present ) - // bit 1 - 10PIV+1 - // bit 2 - 1PIV+1 - // bit 3 - .1PIV+1 + // bit 0 - 100LUX+1 ( bit on if present ) + // bit 1 - 10LUX+1 + // bit 2 - 1LUX+1 + // bit 3 - .1LUX+1 return denom; } diff --git a/src/obfuscation.h b/src/obfuscation.h index 51cc3e21..25a0d85e 100755 --- a/src/obfuscation.h +++ b/src/obfuscation.h @@ -247,7 +247,7 @@ class CObfuscationBroadcastTx class CObfuScationSigner { public: - /// Is the inputs associated with this public key? (and there is 10000 PIV - checking if valid masternode) + /// Is the inputs associated with this public key? (and there is 10000 LUX - checking if valid masternode) bool IsVinAssociatedWithPubkey(CTxIn& vin, CPubKey& pubkey); /// Set the private/public key values, returns true if successful bool GetKeysFromSecret(std::string strSecret, CKey& keyRet, CPubKey& pubkeyRet); diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index cd2e31a3..899fe061 100755 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -109,7 +109,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 LOSE ALL OF YOUR PIV!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), + tr("Warning: If you encrypt your wallet and lose your passphrase, you will LOSE ALL OF YOUR LUX!") + "

" + tr("Are you sure you wish to encrypt your wallet?"), QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel); if (retval == QMessageBox::Yes) { @@ -119,7 +119,7 @@ void AskPassphraseDialog::accept() "" + tr("LUX will close now to finish the encryption process. " "Remember that encrypting your wallet cannot fully protect " - "your PIVs from being stolen by malware infecting your computer.") + + "your LUXs from being stolen by malware infecting your computer.") + "

" + tr("IMPORTANT: Any previous backups you have made of your wallet file " "should be replaced with the newly generated, encrypted wallet file. " diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 505e3853..c1490704 100755 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -23,7 +23,7 @@ class AmountSpinBox : public QAbstractSpinBox public: explicit AmountSpinBox(QWidget* parent) : QAbstractSpinBox(parent), - currentUnit(BitcoinUnits::PIV), + currentUnit(BitcoinUnits::LUX), singleStep(100000) // satoshis { setAlignment(Qt::AlignRight); @@ -96,7 +96,7 @@ class AmountSpinBox : public QAbstractSpinBox const QFontMetrics fm(fontMetrics()); int h = lineEdit()->minimumSizeHint().height(); - int w = fm.width(BitcoinUnits::format(BitcoinUnits::PIV, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways)); + int w = fm.width(BitcoinUnits::format(BitcoinUnits::LUX, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways)); w += 2; // cursor blinking space QStyleOptionSpinBox opt; diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 3af4c511..11201a09 100755 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -332,7 +332,7 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle) tabGroup->addAction(historyAction); privacyAction = new QAction(QIcon(":/icons/privacy"), tr("&Privacy"), this); - privacyAction->setStatusTip(tr("Privacy Actions for zPIV")); + privacyAction->setStatusTip(tr("Privacy Actions for zLUX")); privacyAction->setToolTip(privacyAction->statusTip()); privacyAction->setCheckable(true); #ifdef Q_OS_MAC diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 5dc29b87..462ad32d 100755 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -19,18 +19,18 @@ BitcoinUnits::BitcoinUnits(QObject* parent) : QAbstractListModel(parent), QList BitcoinUnits::availableUnits() { QList unitlist; - unitlist.append(PIV); - unitlist.append(mPIV); - unitlist.append(uPIV); + unitlist.append(LUX); + unitlist.append(mLUX); + unitlist.append(uLUX); return unitlist; } bool BitcoinUnits::valid(int unit) { switch (unit) { - case PIV: - case mPIV: - case uPIV: + case LUX: + case mLUX: + case uLUX: return true; default: return false; @@ -40,11 +40,11 @@ bool BitcoinUnits::valid(int unit) QString BitcoinUnits::id(int unit) { switch (unit) { - case PIV: + case LUX: return QString("lux"); - case mPIV: + case mLUX: return QString("mlux"); - case uPIV: + case uLUX: return QString::fromUtf8("ulux"); default: return QString("???"); @@ -55,23 +55,23 @@ QString BitcoinUnits::name(int unit) { if (Params().NetworkID() == CBaseChainParams::MAIN) { switch (unit) { - case PIV: - return QString("PIV"); - case mPIV: - return QString("mPIV"); - case uPIV: - return QString::fromUtf8("μPIV"); + case LUX: + return QString("LUX"); + case mLUX: + return QString("mLUX"); + case uLUX: + return QString::fromUtf8("μLUX"); default: return QString("???"); } } else { switch (unit) { - case PIV: - return QString("tPIV"); - case mPIV: - return QString("mtPIV"); - case uPIV: - return QString::fromUtf8("μtPIV"); + case LUX: + return QString("tLUX"); + case mLUX: + return QString("mtLUX"); + case uLUX: + return QString::fromUtf8("μtLUX"); default: return QString("???"); } @@ -82,23 +82,23 @@ QString BitcoinUnits::description(int unit) { if (Params().NetworkID() == CBaseChainParams::MAIN) { switch (unit) { - case PIV: - return QString("PIV"); - case mPIV: - return QString("Milli-PIV (1 / 1" THIN_SP_UTF8 "000)"); - case uPIV: - return QString("Micro-PIV (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case LUX: + return QString("LUX"); + case mLUX: + return QString("Milli-LUX (1 / 1" THIN_SP_UTF8 "000)"); + case uLUX: + return QString("Micro-LUX (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } } else { switch (unit) { - case PIV: - return QString("TestPIVs"); - case mPIV: - return QString("Milli-TestPIV (1 / 1" THIN_SP_UTF8 "000)"); - case uPIV: - return QString("Micro-TestPIV (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case LUX: + return QString("TestLUXs"); + case mLUX: + return QString("Milli-TestLUX (1 / 1" THIN_SP_UTF8 "000)"); + case uLUX: + return QString("Micro-TestLUX (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } @@ -108,11 +108,11 @@ QString BitcoinUnits::description(int unit) qint64 BitcoinUnits::factor(int unit) { switch (unit) { - case PIV: + case LUX: return 100000000; - case mPIV: + case mLUX: return 100000; - case uPIV: + case uLUX: return 100; default: return 100000000; @@ -122,11 +122,11 @@ qint64 BitcoinUnits::factor(int unit) int BitcoinUnits::decimals(int unit) { switch (unit) { - case PIV: + case LUX: return 8; - case mPIV: + case mLUX: return 5; - case uPIV: + case uLUX: return 2; default: return 0; diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index 34d1b364..7872e8ce 100755 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -57,9 +57,9 @@ class BitcoinUnits : public QAbstractListModel @note Source: https://en.bitcoin.it/wiki/Units . Please add only sensible ones */ enum Unit { - PIV, - mPIV, - uPIV + LUX, + mLUX, + uLUX }; enum SeparatorStyle { diff --git a/src/qt/blockexplorer.cpp b/src/qt/blockexplorer.cpp index 7d21db0e..46fe3dda 100755 --- a/src/qt/blockexplorer.cpp +++ b/src/qt/blockexplorer.cpp @@ -44,7 +44,7 @@ static std::string ValueToString(CAmount nValue, bool AllowNegative = false) if (nValue < 0 && !AllowNegative) return "" + _("unknown") + ""; - QString Str = BitcoinUnits::formatWithUnit(BitcoinUnits::PIV, nValue); + QString Str = BitcoinUnits::formatWithUnit(BitcoinUnits::LUX, nValue); if (AllowNegative && nValue > 0) Str = '+' + Str; return std::string("") + Str.toUtf8().data() + ""; diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 233e328f..d1b46ef2 100755 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -653,7 +653,7 @@ void CoinControlDialog::updateLabels(WalletModel* model, QDialog* dialog) } // actually update labels - int nDisplayUnit = BitcoinUnits::PIV; + int nDisplayUnit = BitcoinUnits::LUX; if (model && model->getOptionsModel()) nDisplayUnit = model->getOptionsModel()->getDisplayUnit(); diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui index c3805ec8..1ba00821 100755 --- a/src/qt/forms/coincontroldialog.ui +++ b/src/qt/forms/coincontroldialog.ui @@ -132,7 +132,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -206,7 +206,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -286,7 +286,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -321,7 +321,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/forms/multisigdialog.ui b/src/qt/forms/multisigdialog.ui index fcb44659..13f5a114 100755 --- a/src/qt/forms/multisigdialog.ui +++ b/src/qt/forms/multisigdialog.ui @@ -443,7 +443,7 @@ Please be patient after clicking import. - Add destinations to send PIV to + Add destinations to send LUX to Add &Destination diff --git a/src/qt/forms/obfuscationconfig.ui b/src/qt/forms/obfuscationconfig.ui index 88a2d1fd..47322201 100755 --- a/src/qt/forms/obfuscationconfig.ui +++ b/src/qt/forms/obfuscationconfig.ui @@ -75,7 +75,7 @@ - Use 2 separate masternodes to mix funds up to 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX @@ -88,7 +88,7 @@ - Use 8 separate masternodes to mix funds up to 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX @@ -114,7 +114,7 @@ - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX @@ -127,7 +127,7 @@ - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX @@ -153,7 +153,7 @@ - 0.1 PIV per 10000 PIV you anonymize. + 0.1 LUX per 10000 LUX you anonymize. diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index be428863..4a08893d 100755 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -135,10 +135,10 @@ - Percentage of incoming PIV which get automatically converted to zPIV via Zerocoin Protocol (min: 10%) + Percentage of incoming LUX which get automatically converted to zLUX via Zerocoin Protocol (min: 10%) - Percentage of autominted zPIV + Percentage of autominted zLUX @@ -168,10 +168,10 @@ - Wait with automatic conversion to Zerocoin until enough PIV for this denomination is available + Wait with automatic conversion to Zerocoin until enough LUX for this denomination is available - Preferred Automint zPIV Denomination + Preferred Automint zLUX Denomination @@ -184,7 +184,7 @@ - Wait with automatic conversion to Zerocoin until enough PIV for this denomination is available + Wait with automatic conversion to Zerocoin until enough LUX for this denomination is available 9 diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 32184404..93ba4c4e 100755 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -60,7 +60,7 @@ - PIV Balances + LUX Balances @@ -118,7 +118,7 @@ Unconfirmed transactions to watch-only addresses - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -143,7 +143,7 @@ Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -168,7 +168,7 @@ Staked or masternode rewards in watch-only addresses that has not yet matured - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -226,7 +226,7 @@ Staked or masternode rewards that has not yet matured - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -271,7 +271,7 @@ Your current total balance - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -296,7 +296,7 @@ Current total balance in watch-only addresses - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -338,7 +338,7 @@ Your current spendable balance - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -363,7 +363,7 @@ Your current balance in watch-only addresses - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -963,7 +963,7 @@ Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -988,7 +988,7 @@ Total Balance, including unconfirmed and immature coins. - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1021,7 +1021,7 @@ - PIV: + LUX: @@ -1040,7 +1040,7 @@ Your current spendable balance - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1056,14 +1056,14 @@ - zPIV: + zLUX: - + - Current percentage of zPIV. + Current percentage of zLUX. If AutoMint is enabled this percentage will settle around the configured AutoMint percentage (default = 10%) @@ -1087,10 +1087,10 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - Locked PIV or Masternode collaterals. These are excluded from zPIV minting. + Locked LUX or Masternode collaterals. These are excluded from zLUX minting. - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1100,7 +1100,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - Locked PIV or Masternode collaterals. These are excluded from zPIV minting. + Locked LUX or Masternode collaterals. These are excluded from zLUX minting. Locked: @@ -1110,7 +1110,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - Unlocked PIVs. These can be used for zPIV minting. + Unlocked LUXs. These can be used for zLUX minting. Unlocked: @@ -1120,10 +1120,10 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - Unlocked PIVs. These can be used for zPIV minting. + Unlocked LUXs. These can be used for zLUX minting. - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1131,7 +1131,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - + 0 % @@ -1205,7 +1205,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin Mature: more than 20 confirmation and more than 3 mints of the same denomination after it was minted. -These zPIV are spendable. +These zLUX are spendable. Mature: @@ -1231,10 +1231,10 @@ These zPIV are spendable. IBeamCursor - All available zPIV, unconfirmed and immature zPIV included. + All available zLUX, unconfirmed and immature zLUX included. - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1266,7 +1266,7 @@ These zPIV are spendable. - All available zPIV, unconfirmed and immature zPIV included. + All available zLUX, unconfirmed and immature zLUX included. Total: @@ -1309,10 +1309,10 @@ These zPIV are spendable. Mature: more than 20 confirmation and more than 3 mints of the same denomination after it was minted. -These zPIV are spendable. +These zLUX are spendable. - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1343,7 +1343,7 @@ Immature: confirmed, but less than 3 mints of the same denomination after it was Immature: confirmed, but less than 3 mints of the same denomination after it was minted - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1387,7 +1387,7 @@ Immature: confirmed, but less than 3 mints of the same denomination after it was Immature: confirmed, but less than 3 mints of the same denomination after it was minted - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter diff --git a/src/qt/forms/privacydialog.ui b/src/qt/forms/privacydialog.ui index 01c7102e..5395fee0 100755 --- a/src/qt/forms/privacydialog.ui +++ b/src/qt/forms/privacydialog.ui @@ -31,7 +31,7 @@ - + 460 @@ -52,13 +52,13 @@ - PIV which were anonymized via Zerocin Protocol + LUX which were anonymized via Zerocin Protocol true - Zerocoin PIV (zPIV) + Zerocoin LUX (zLUX) Qt::AlignCenter @@ -74,7 +74,7 @@ - + 12 @@ -91,7 +91,7 @@ - + The displayed information may be out of date. Your wallet automatically synchronizes with the LUX network after a connection is established, but this process has not completed yet. @@ -137,7 +137,7 @@ - + 131 @@ -169,14 +169,14 @@ - + - zPIV + zLUX - + Available for minting are coins which are confirmed and not locked or Masternode collaterals. @@ -189,12 +189,12 @@ - + Enter an amount of Piv to convert to zLux - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -370,7 +370,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -542,7 +542,7 @@ - + 131 @@ -558,9 +558,9 @@ - + - Available (mature and spendable) zPIV for spending + Available (mature and spendable) zLUX for spending Available Balance: @@ -579,12 +579,12 @@ - Available (mature and spendable) zPIV for spending + Available (mature and spendable) zLUX for spending -zPIV are mature when they have more than 20 confirmations AND more than 2 mints of the same denomination after them were minted +zLUX are mature when they have more than 20 confirmations AND more than 2 mints of the same denomination after them were minted - 0 zPIV + 0 zLUX Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -784,15 +784,15 @@ zPIV are mature when they have more than 20 confirmations AND more than 2 mints Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - zPIVpayAmount + zLUXpayAmount - + - + 55 @@ -800,7 +800,7 @@ zPIV are mature when they have more than 20 confirmations AND more than 2 mints - zPIV + zLUX @@ -886,7 +886,7 @@ zPIV are mature when they have more than 20 confirmations AND more than 2 mints - + 12 @@ -960,7 +960,7 @@ zPIV are mature when they have more than 20 confirmations AND more than 2 mints - Total Balance including unconfirmed and immature zPIV + Total Balance including unconfirmed and immature zLUX Total Zerocoin Balance: @@ -998,10 +998,10 @@ zPIV are mature when they have more than 20 confirmations AND more than 2 mints - Total Balance including unconfirmed and immature zPIV + Total Balance including unconfirmed and immature zLUX - 0 zPIV + 0 zLUX Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -1576,7 +1576,7 @@ Immature: confirmed, but less than 2 mints of the same denomination after it was Qt::ActionsContextMenu - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -1650,7 +1650,7 @@ Immature: confirmed, but less than 2 mints of the same denomination after it was Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -1847,7 +1847,7 @@ Immature: confirmed, but less than 2 mints of the same denomination after it was Qt::ActionsContextMenu - 0.000 000 00 PIV + 0.000 000 00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index b03aeaa9..72edad0e 100755 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -324,7 +324,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -404,7 +404,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -484,7 +484,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -513,7 +513,7 @@ Qt::ActionsContextMenu - 0.00 PIV + 0.00 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -594,7 +594,7 @@ - 0 PIV + 0 LUX @@ -889,7 +889,7 @@ - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. per kilobyte @@ -905,7 +905,7 @@ - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. total at least @@ -1385,12 +1385,12 @@ 3 - + false - Anonymized PIV + Anonymized LUX @@ -1429,7 +1429,7 @@ IBeamCursor - 123.456 PIV + 123.456 LUX Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse diff --git a/src/qt/forms/tradingdialog.ui b/src/qt/forms/tradingdialog.ui index 0a92a0e7..1282e7cd 100755 --- a/src/qt/forms/tradingdialog.ui +++ b/src/qt/forms/tradingdialog.ui @@ -181,7 +181,7 @@ Asks - + 540 @@ -197,7 +197,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + 160 @@ -432,7 +432,7 @@ Buy - + 30 @@ -442,7 +442,7 @@ - Buy PIV + Buy LUX @@ -512,7 +512,7 @@ - PIV + LUX @@ -1704,10 +1704,10 @@ - PIV + LUX - + 310 @@ -1741,7 +1741,7 @@ - + 30 @@ -1751,7 +1751,7 @@ - Sell PIV + Sell LUX @@ -1777,12 +1777,12 @@ - PIV Available: + LUX Available: - + @@ -2213,7 +2213,7 @@ - + 75 @@ -2221,7 +2221,7 @@ - PIV + LUX @@ -2733,7 +2733,7 @@ TextLabel - + 150 @@ -2762,7 +2762,7 @@ - PIV Balance: + LUX Balance: @@ -2784,7 +2784,7 @@ BTC Balance: - + 150 @@ -2813,7 +2813,7 @@ - PIV Available: + LUX Available: @@ -2832,10 +2832,10 @@ - PIV Pending: + LUX Pending: - + 150 @@ -2928,7 +2928,7 @@ - Bittrex PIV Deposit Address: + Bittrex LUX Deposit Address: diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index aec31d2b..1d780b09 100755 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -161,7 +161,7 @@ bool parseBitcoinURI(const QUrl& uri, SendCoinsRecipient* out) fShouldReturnFalse = false; } else if (i->first == "amount") { if (!i->second.isEmpty()) { - if (!BitcoinUnits::parse(BitcoinUnits::PIV, i->second, &rv.amount)) { + if (!BitcoinUnits::parse(BitcoinUnits::LUX, i->second, &rv.amount)) { return false; } } @@ -196,7 +196,7 @@ QString formatBitcoinURI(const SendCoinsRecipient& info) int paramCount = 0; if (info.amount) { - ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::PIV, info.amount, false, BitcoinUnits::separatorNever)); + ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::LUX, info.amount, false, BitcoinUnits::separatorNever)); paramCount++; } diff --git a/src/qt/locale/lux_bg.ts b/src/qt/locale/lux_bg.ts index 332ba1bb..40a6d98e 100755 --- a/src/qt/locale/lux_bg.ts +++ b/src/qt/locale/lux_bg.ts @@ -168,7 +168,7 @@ Потвърдете криптирането на портфейла - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. LUX сега ще се затвори, за да довърши процеса на криптиране. Запомнете, че криптирането на вашия портфейл не може напълно да защити вашия LUX от това, да бъде откраднат от злонамерен софутуер, инфектирал вашия компютър. @@ -176,8 +176,8 @@ Сигурни ли сте, че искате да криптирате вашия портфейл? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - <b>Внимание: Ако криптирате вашия портфейл и загубите вашата парола, вие ще ЗАГУБИТЕ ВСИЧКИТЕ ВИ PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + <b>Внимание: Ако криптирате вашия портфейл и загубите вашата парола, вие ще ЗАГУБИТЕ ВСИЧКИТЕ ВИ LUX</b>! Wallet encrypted diff --git a/src/qt/locale/lux_ca.ts b/src/qt/locale/lux_ca.ts index e0173c89..8304a909 100755 --- a/src/qt/locale/lux_ca.ts +++ b/src/qt/locale/lux_ca.ts @@ -164,8 +164,8 @@ Estàs segur que vols encriptar el moneder? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Avís: Si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES PIVS</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Avís: Si encripteu el vostre moneder i perdeu la contrasenya, <b>PERDREU TOTS ELS VOSTRES LUXS</b>! Wallet encrypted diff --git a/src/qt/locale/lux_cs.ts b/src/qt/locale/lux_cs.ts index 359625ca..92bd5424 100755 --- a/src/qt/locale/lux_cs.ts +++ b/src/qt/locale/lux_cs.ts @@ -176,16 +176,16 @@ Potvrdit zašifrování peněženky - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX se teď zavře pro dokončení šifrovacího procesu. Prosím, vemte na vědomí, že zašifrování Vaší peněženky plně neochrání Vaše PIVy před krádží, pokud je Váš počítač infikován malwarem. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX se teď zavře pro dokončení šifrovacího procesu. Prosím, vemte na vědomí, že zašifrování Vaší peněženky plně neochrání Vaše LUXy před krádží, pokud je Váš počítač infikován malwarem. Are you sure you wish to encrypt your wallet? Opravdu chcete zašifrovat Vaši peněženku? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Varování: Pokud zašifrujete svou peněženku a ztratíte frázové heslo, tak <b>ZTRATÍTE VŠECHNY VAŠE PIVy</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Varování: Pokud zašifrujete svou peněženku a ztratíte frázové heslo, tak <b>ZTRATÍTE VŠECHNY VAŠE LUXy</b>! Wallet encrypted @@ -1438,24 +1438,24 @@ Prosím zkontrolujte adresu a zkuste to znovu. Vyberte úrpvěň ochrany soukromí - Use 2 separate masternodes to mix funds up to 10000 PIV - Použí 2 oddělené masternody k promíchání prostředků až do 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Použí 2 oddělené masternody k promíchání prostředků až do 10000 LUX Use 16 separate masternodes Použít 16 oddělených masternodů - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Tato možnost je nejrychleší a bude stát zhruba ~0.025 PIV pro anonymizaci 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Tato možnost je nejrychleší a bude stát zhruba ~0.025 LUX pro anonymizaci 10000 LUX This is the slowest and most secure option. Using maximum anonymity will cost Toto je nejpomalejší a nejvíce bezpečná volba. Použití maximalní anonymity bude stát - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV za 10000 PIV anonymizujete. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX za 10000 LUX anonymizujete. Obfuscation Configuration @@ -2057,8 +2057,8 @@ Prosím zkontrolujte adresu a zkuste to znovu. Změna: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: diff --git a/src/qt/locale/lux_da.ts b/src/qt/locale/lux_da.ts index 8ddf19c4..e3412bfd 100755 --- a/src/qt/locale/lux_da.ts +++ b/src/qt/locale/lux_da.ts @@ -176,7 +176,7 @@ Bekræft, og tegnebogen krypteres. - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. LUX vil lukke ned for at færdiggøre kryptograferingsprocesserne. Husk at kryptering alene ikke sikrer mod tyveri af mønterne fra malware eller virus på computeren. @@ -184,8 +184,8 @@ Er du sikker på, at du vil kryptere din tegnebog? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Advarsel! Hvis du krypterer din tegnebog og mister dit password vil du <b>MISTE ALLE DINE PIV</b>. Passworded kan ikke genskabes. + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Advarsel! Hvis du krypterer din tegnebog og mister dit password vil du <b>MISTE ALLE DINE LUX</b>. Passworded kan ikke genskabes. Wallet encrypted @@ -1508,32 +1508,32 @@ Kontroller adressen og prøv igen. Vælg tilsløringsniveau - Use 2 separate masternodes to mix funds up to 10000 PIV - Brug 2 separate masternoder for at tilsløre beløb op til 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Brug 2 separate masternoder for at tilsløre beløb op til 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV - Brug 8 separate masternoder for at tilsløre op til 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX + Brug 8 separate masternoder for at tilsløre op til 10000 LUX Use 16 separate masternodes Brug 16 separate masternoder - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Dette valg er det hurtigste og vil koste i omegnen af 0.025 PIV for at anonymiser 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Dette valg er det hurtigste og vil koste i omegnen af 0.025 LUX for at anonymiser 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - Dette valg er relativt hurtigt og vil koste i omegnen af 0.05 PIV for at anonymiser 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + Dette valg er relativt hurtigt og vil koste i omegnen af 0.05 LUX for at anonymiser 10000 LUX This is the slowest and most secure option. Using maximum anonymity will cost Denne mulighed er den langsomste og det mest sikre valg. Valg af maksimal tilsløring vil koste - 0.1 PIV per 10000 PIV you anonymize. - 0.1 pr 10000 PIV for at tilsløre. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 pr 10000 LUX for at tilsløre. Obfuscation Configuration @@ -2701,8 +2701,8 @@ https://www.transifex.com/216k155/216k155-translations UTXO størrelse: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: @@ -2745,12 +2745,12 @@ https://www.transifex.com/216k155/216k155-translations Bekræftelsestid - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Hvis den brugerfastsatte gebyrbetaling er sat til 1000 uPIVs og transaktionen kun fylder 250 bytes, så vil "pr. kilobyte" kun udbetale 250 uPIV i gebyr, <br /> mens "mindst" udbetaler 1000 uPIVs. For transaktioner større end en kilobyte betales i begge tilfælde i forhold til antallet af kilobytes + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Hvis den brugerfastsatte gebyrbetaling er sat til 1000 uLUXs og transaktionen kun fylder 250 bytes, så vil "pr. kilobyte" kun udbetale 250 uLUX i gebyr, <br /> mens "mindst" udbetaler 1000 uLUXs. For transaktioner større end en kilobyte betales i begge tilfælde i forhold til antallet af kilobytes - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Hvis den brugerfastsatte gebyrbetaling er sat til 1000 uPIVs og transaktionen kun fylder 250 bytes, så vil "pr. kilobyte" kun udbetale 250 uPIV i gebyr, <br /> mens "Total-mindst" udbetaler 1000 uPIVs. For transaktioner større end en kilobyte betales i begge tilfælde i forhold til antallet af kilobytes + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Hvis den brugerfastsatte gebyrbetaling er sat til 1000 uLUXs og transaktionen kun fylder 250 bytes, så vil "pr. kilobyte" kun udbetale 250 uLUX i gebyr, <br /> mens "Total-mindst" udbetaler 1000 uLUXs. For transaktioner større end en kilobyte betales i begge tilfælde i forhold til antallet af kilobytes Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for LUX transactions than the network can process. @@ -3721,8 +3721,8 @@ https://www.transifex.com/216k155/216k155-translations Send mønter - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. - SwiftTx understøtter ikke afsendelse af så store beløb endnu. Transaktioner er for tiden begrænsede til %1PIV. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. + SwiftTx understøtter ikke afsendelse af så store beløb endnu. Transaktioner er for tiden begrænsede til %1LUX. @@ -3859,12 +3859,12 @@ https://www.transifex.com/216k155/216k155-translations Udfør en kommando når den bedste blok ændres (%s in cmd erstattes med blok hashen) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) - Gebyrer (in PIV/kb) lavere end dette betragtes som et nul-gebyr for at videresende (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) + Gebyrer (in LUX/kb) lavere end dette betragtes som et nul-gebyr for at videresende (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Gebyrer (in PIV/kb) lavere end dette betragtes som et nul-gebyr for at oprette en transaktion (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Gebyrer (in LUX/kb) lavere end dette betragtes som et nul-gebyr for at oprette en transaktion (default: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -3995,12 +3995,12 @@ For eksempel: alertnotify=Echo %% | mail - s "LUX ALARM!" e-mail@administrator.d Det er ikke muligt at allokere tilstrækkeligt med tilsløret designeret indestående for at gennemføre denne transaktion. - Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV. - Det er ikke muligt at allokere tilstrækkeligt med tilsløret ikke-designeret indestående for at gennemføre denne transaktion, der ikke ækvivalerer 10000 PIV. + Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX. + Det er ikke muligt at allokere tilstrækkeligt med tilsløret ikke-designeret indestående for at gennemføre denne transaktion, der ikke ækvivalerer 10000 LUX. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. - Det var ikke muligt at allokere tilstrækkelige midler til denne transaktion som er forskellig fra 10000 PIV. + Unable to locate enough funds for this transaction that are not equal 10000 LUX. + Det var ikke muligt at allokere tilstrækkelige midler til denne transaktion som er forskellig fra 10000 LUX. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -4287,8 +4287,8 @@ For eksempel: alertnotify=Echo %% | mail - s "LUX ALARM!" e-mail@administrator.d Læsning af blokken mislykkedes - Fee (in PIV/kB) to add to transactions you send (default: %s) - Gebyr (i PIV/kB) som skal tilføjes transaktionen der sendes (default: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) + Gebyr (i LUX/kB) som skal tilføjes transaktionen der sendes (default: %s) Finalizing transaction. diff --git a/src/qt/locale/lux_de.ts b/src/qt/locale/lux_de.ts index 3698acae..a34ef798 100755 --- a/src/qt/locale/lux_de.ts +++ b/src/qt/locale/lux_de.ts @@ -176,16 +176,16 @@ Wallet-Verschlüsselung bestätigen - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - Die Anwendungs wird nun geschlossen um die Verschlüsselung abzuschließen. Bitte beachten Sie, dass auch Verschlüsselung nicht nicht vollständig vor Diebstahl ihrer PIVs durch Schadsoftware schützt, die ihren Computer befällt. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + Die Anwendungs wird nun geschlossen um die Verschlüsselung abzuschließen. Bitte beachten Sie, dass auch Verschlüsselung nicht nicht vollständig vor Diebstahl ihrer LUXs durch Schadsoftware schützt, die ihren Computer befällt. Are you sure you wish to encrypt your wallet? Sind Sie sich sicher, dass Sie ihre Wallet verschlüsseln möchten? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Warnung: Wenn Sie ihre Wallet verschlüsseln und Ihre Passphrase verlieren werden Sie <b>alle ihre PIVs verlieren</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Warnung: Wenn Sie ihre Wallet verschlüsseln und Ihre Passphrase verlieren werden Sie <b>alle ihre LUXs verlieren</b>! Wallet encrypted @@ -618,8 +618,8 @@ &Privatsphäre - Privacy Action for zPIV and Obfuscation - Privatsphäre Aktion für zPIV und Verschleierung + Privacy Action for zLUX and Obfuscation + Privatsphäre Aktion für zLUX und Verschleierung &Masternodes @@ -1539,32 +1539,32 @@ Bitte Adresse überprüfen und nochmals versuchen. Bitte den gewünschten Privatsphäre Level auswählen. - Use 2 separate masternodes to mix funds up to 10000 PIV - 2 separate Masternodes verwenden um bis zu 10000 PIV zu mixen + Use 2 separate masternodes to mix funds up to 10000 LUX + 2 separate Masternodes verwenden um bis zu 10000 LUX zu mixen - Use 8 separate masternodes to mix funds up to 10000 PIV - 8 separate Masternodes verwenden um bis zu 10000 PIV zu mixen + Use 8 separate masternodes to mix funds up to 10000 LUX + 8 separate Masternodes verwenden um bis zu 10000 LUX zu mixen Use 16 separate masternodes 16 separate Masternodes verwenden - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Diese Option ist die schnellst und kostet ungefähr ~0.025 PIV um 10000 PIV zu anonymisieren + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Diese Option ist die schnellst und kostet ungefähr ~0.025 LUX um 10000 LUX zu anonymisieren - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - Diese Option ist angemessen schnell und kostet ungefähr 0.05 PIV um 10000 PIV zu anonymisieren + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + Diese Option ist angemessen schnell und kostet ungefähr 0.05 LUX um 10000 LUX zu anonymisieren This is the slowest and most secure option. Using maximum anonymity will cost Diese Option ist die langsamste und sicherste Option. Die Verwendung maximaler Anonymisierung kostet - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV per 10000 PIV die anonymisiert werden. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX per 10000 LUX die anonymisiert werden. Obfuscation Configuration @@ -1707,20 +1707,20 @@ https://www.transifex.com/216k155/216k155-translations Port mit &UPnP mappen - Percentage of incoming PIV which get automatically converted to zPIV via Zerocoin Protocol (min: 10%) - Anteil des einkommenden PIV, welcher automatisch zu zPIV via Zerocoin Protokoll konvertiert wird (min: 10%) + Percentage of incoming LUX which get automatically converted to zLUX via Zerocoin Protocol (min: 10%) + Anteil des einkommenden LUX, welcher automatisch zu zLUX via Zerocoin Protokoll konvertiert wird (min: 10%) - Percentage of autominted zPIV - Prozentsatz der automatisierten zPIV + Percentage of autominted zLUX + Prozentsatz der automatisierten zLUX - Wait with automatic conversion to Zerocoin until enough PIV for this denomination is available - Warte mit automatischer Konvertierung zu Zerocoin, bis genügend PIV für diese Stückelung verfügbar ist + Wait with automatic conversion to Zerocoin until enough LUX for this denomination is available + Warte mit automatischer Konvertierung zu Zerocoin, bis genügend LUX für diese Stückelung verfügbar ist - Preferred Automint zPIV Denomination - Bevorzugte automatisierte zPIV Stückelung + Preferred Automint zLUX Denomination + Bevorzugte automatisierte zLUX Stückelung Connect to the LUX network through a SOCKS5 proxy. @@ -1854,8 +1854,8 @@ https://www.transifex.com/216k155/216k155-translations Formular - PIV Balances - PIV Bilanzen + LUX Balances + LUX Bilanzen Available: @@ -1922,12 +1922,12 @@ https://www.transifex.com/216k155/216k155-translations Kombinierte Bilanz (einschließlich unreifer Coins) - PIV: - PIV: + LUX: + LUX: - zPIV: - zPIV: + zLUX: + zLUX: 0 % @@ -2055,12 +2055,12 @@ https://www.transifex.com/216k155/216k155-translations PrivacyDialog - PIV which were anonymized via Zerocin Protocol - PIV, die über das Zerocin-Protokoll anonymisiert wurden + LUX which were anonymized via Zerocin Protocol + LUX, die über das Zerocin-Protokoll anonymisiert wurden - Zerocoin PIV (zPIV) - Zerocoin PIV (zPIV) + Zerocoin LUX (zLUX) + Zerocoin LUX (zLUX) Zerocoin Actions: @@ -2083,16 +2083,16 @@ https://www.transifex.com/216k155/216k155-translations 0 - zPIV - zPIV + zLUX + zLUX Available for Minting: Verfügbar für Prägung: - 0.000 000 00 PIV - 0.000 000 00 PIV + 0.000 000 00 LUX + 0.000 000 00 LUX Reset Zerocoin Wallet DB. Deletes transactions that did not make it into the blockchain. @@ -2151,8 +2151,8 @@ https://www.transifex.com/216k155/216k155-translations Verfügbare Bilanz: - 0 zPIV - 0 zPIV + 0 zLUX + 0 zLUX Security Level for Zerocoin Transactions. More is better, but needs more time and resources. @@ -2387,8 +2387,8 @@ https://www.transifex.com/216k155/216k155-translations Erfolgreich geprägt - zPIV in - zPIV in + zLUX in + zLUX in sec. Used denominations: @@ -2482,7 +2482,7 @@ Bitte haben Sie Geduld... zLux Spend #: - zPIV Ausgeben #: + zLUX Ausgeben #: denomination: @@ -3063,7 +3063,7 @@ Bitte haben Sie Geduld... SendCoinsDialog Send Coins - PIVs überweisen + LUXs überweisen Coin Control Features @@ -3134,8 +3134,8 @@ Bitte haben Sie Geduld... UTXO Größe: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: @@ -3186,12 +3186,12 @@ Bitte haben Sie Geduld... Coins automatisch ausgewählt - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Wenn die kundenspezifische Gebühr auf 1000 uPIVs eingestellt ist und die Transaktion nur 250 Bytes beträgt, dann zahlt man "pro Kilobyte" nur 250 uPIVs an Gebühr,<br />während man "mindestens" 1000 uPIVs bezahlt. Für Transaktionen, die größer sind als ein Kilobyte, bezahlen sie mit Kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Wenn die kundenspezifische Gebühr auf 1000 uLUXs eingestellt ist und die Transaktion nur 250 Bytes beträgt, dann zahlt man "pro Kilobyte" nur 250 uLUXs an Gebühr,<br />während man "mindestens" 1000 uLUXs bezahlt. Für Transaktionen, die größer sind als ein Kilobyte, bezahlen sie mit Kilobyte. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Wenn die kundenspezifische Gebühr auf 1000 uPIVs eingestellt ist und die Transaktion nur 250 Bytes beträgt, dann zahlt man "pro Kilobyte" nur 250 uPIVs an Gebühr,<br />während man "insgesamt mindestens" 1000 uPIVs bezahlt. Für Transaktionen, die größer sind als ein Kilobyte, bezahlen sie mit Kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Wenn die kundenspezifische Gebühr auf 1000 uLUXs eingestellt ist und die Transaktion nur 250 Bytes beträgt, dann zahlt man "pro Kilobyte" nur 250 uLUXs an Gebühr,<br />während man "insgesamt mindestens" 1000 uLUXs bezahlt. Für Transaktionen, die größer sind als ein Kilobyte, bezahlen sie mit Kilobyte. Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for LUX transactions than the network can process. @@ -3242,8 +3242,8 @@ Bitte haben Sie Geduld... Empfänge&r hinzufügen - Anonymized PIV - Anonymisierte PIV + Anonymized LUX + Anonymisierte LUX SwiftTX @@ -3817,7 +3817,7 @@ Bitte haben Sie Geduld... Generated coins must mature %1 blocks before they can be spent. When you generated this block, it was broadcast to the network to be added to the block chain. If it fails to get into the chain, its state will change to "not accepted" and it won't be spendable. This may occasionally happen if another node generates a block within a few seconds of yours. - Erzeugte PIVs müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine PIVs gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt. + Erzeugte LUXs müssen %1 Blöcke lang reifen, bevor sie ausgegeben werden können. Als Sie diesen Block erzeugten, wurde er an das Netzwerk übertragen, um ihn der Blockkette hinzuzufügen. Falls dies fehlschlägt wird der Status in "nicht angenommen" geändert und Sie werden keine LUXs gutgeschrieben bekommen. Das kann gelegentlich passieren, wenn ein anderer Knoten einen Block fast zeitgleich erzeugt. Debug information @@ -3963,23 +3963,23 @@ Bitte haben Sie Geduld... Converted Piv to zLux - Umgewandeltes PIV zu zPIV + Umgewandeltes LUX zu zLUX Spent zLux - Ausgeben zPIV + Ausgeben zLUX Received Piv from zLux - Empfangene PIV von zPIV + Empfangene LUX von zLUX Minted Change as zLux from zLux Spend - Geprägtes Wechselgeld als zPIV von zPIV Ausgabe + Geprägtes Wechselgeld als zLUX von zLUX Ausgabe Converted zLux to Piv - Umgewandeltes zPIV zu PIV + Umgewandeltes zLUX zu LUX watch-only @@ -3987,7 +3987,7 @@ Bitte haben Sie Geduld... zLux Accumulator - zPIV Speicher + zLUX Speicher (n/a) @@ -4098,7 +4098,7 @@ Bitte haben Sie Geduld... Received Piv from zLux - Empfangen PIV von zPIV + Empfangen LUX von zLUX Zerocoin Mint @@ -4110,7 +4110,7 @@ Bitte haben Sie Geduld... Zerocoin Spend, Change in zLux - Zerocoin Ausgabe, Wechselgeld in zPIV + Zerocoin Ausgabe, Wechselgeld in zLUX Zerocoin Spend to Self @@ -4231,11 +4231,11 @@ Bitte haben Sie Geduld... WalletModel Send Coins - PIVs überweisen + LUXs überweisen - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. - SwiftTX unterstützt das Versenden von Beträgen dieser Höhe noch nicht. Transaktionen sind zur Zeit auf maximal %1 PIV begrenzt. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. + SwiftTX unterstützt das Versenden von Beträgen dieser Höhe noch nicht. Transaktionen sind zur Zeit auf maximal %1 LUX begrenzt. @@ -4281,7 +4281,7 @@ Bitte haben Sie Geduld... ZPivControlDialog Select zLux to Spend - Auswahl zPIV als Ausgabe + Auswahl zLUX als Ausgabe Quantity @@ -4293,7 +4293,7 @@ Bitte haben Sie Geduld... zLux - zPIV + zLUX Select/Deselect All @@ -4379,12 +4379,12 @@ Bitte haben Sie Geduld... Befehl ausführen, wenn sich der beste Block ändert (%s in cmd wird durch Blockhash ersetzt) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) - Gebühren (in PIV/kB) kleiner als diese gelten als Null-Gebühr für die Weiterleitung (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) + Gebühren (in LUX/kB) kleiner als diese gelten als Null-Gebühr für die Weiterleitung (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Gebühren (in PIV/kB) kleiner als diese werden als Null-Gebühr für die Transaktionserstellung betrachtet (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Gebühren (in LUX/kB) kleiner als diese werden als Null-Gebühr für die Transaktionserstellung betrachtet (default: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) diff --git a/src/qt/locale/lux_en.ts b/src/qt/locale/lux_en.ts index 4414d1c7..11edc0b9 100755 --- a/src/qt/locale/lux_en.ts +++ b/src/qt/locale/lux_en.ts @@ -221,7 +221,7 @@ - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. @@ -231,7 +231,7 @@ - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! @@ -546,7 +546,7 @@ - Privacy Actions for zPIV + Privacy Actions for zLUX @@ -2078,7 +2078,7 @@ Please be patient after clicking import. - Add destinations to send PIV to + Add destinations to send LUX to @@ -2210,12 +2210,12 @@ p, li { white-space: pre-wrap; } - Use 2 separate masternodes to mix funds up to 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX @@ -2225,12 +2225,12 @@ p, li { white-space: pre-wrap; } - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX @@ -2240,7 +2240,7 @@ p, li { white-space: pre-wrap; } - 0.1 PIV per 10000 PIV you anonymize. + 0.1 LUX per 10000 LUX you anonymize. @@ -2419,23 +2419,23 @@ https://www.transifex.com/216k155/216k155-translations - Percentage of incoming PIV which get automatically converted to zPIV via Zerocoin Protocol (min: 10%) + Percentage of incoming LUX which get automatically converted to zLUX via Zerocoin Protocol (min: 10%) - Percentage of autominted zPIV + Percentage of autominted zLUX - Wait with automatic conversion to Zerocoin until enough PIV for this denomination is available + Wait with automatic conversion to Zerocoin until enough LUX for this denomination is available - Preferred Automint zPIV Denomination + Preferred Automint zLUX Denomination @@ -2605,7 +2605,7 @@ https://www.transifex.com/216k155/216k155-translations - PIV Balances + LUX Balances @@ -2706,17 +2706,17 @@ https://www.transifex.com/216k155/216k155-translations - PIV: + LUX: - zPIV: + zLUX: - Current percentage of zPIV. + Current percentage of zLUX. If AutoMint is enabled this percentage will settle around the configured AutoMint percentage (default = 10%) @@ -2729,7 +2729,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - Locked PIV or Masternode collaterals. These are excluded from zPIV minting. + Locked LUX or Masternode collaterals. These are excluded from zLUX minting. @@ -2738,7 +2738,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - 0.000 000 00 PIV + 0.000 000 00 LUX @@ -2749,7 +2749,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin - Unlocked PIVs. These can be used for zPIV minting. + Unlocked LUXs. These can be used for zLUX minting. @@ -2766,7 +2766,7 @@ If AutoMint is enabled this percentage will settle around the configured AutoMin Mature: more than 20 confirmation and more than 3 mints of the same denomination after it was minted. -These zPIV are spendable. +These zLUX are spendable. @@ -2777,7 +2777,7 @@ These zPIV are spendable. - All available zPIV, unconfirmed and immature zPIV included. + All available zLUX, unconfirmed and immature zLUX included. @@ -2807,7 +2807,7 @@ Immature: confirmed, but less than 3 mints of the same denomination after it was - Current percentage of zPIV. + Current percentage of zLUX. If AutoMint is enabled this percentage will settle around the configured AutoMint percentage (default = 10%). @@ -2973,12 +2973,12 @@ To enable AutoMint change 'enablezeromint=0' to 'enablezeromint=1 PrivacyDialog - PIV which were anonymized via Zerocin Protocol + LUX which were anonymized via Zerocin Protocol - Zerocoin PIV (zPIV) + Zerocoin LUX (zLUX) @@ -3014,7 +3014,7 @@ To enable AutoMint change 'enablezeromint=0' to 'enablezeromint=1 - zPIV + zLUX @@ -3029,7 +3029,7 @@ To enable AutoMint change 'enablezeromint=0' to 'enablezeromint=1 - 0.000 000 00 PIV + 0.000 000 00 LUX @@ -3104,7 +3104,7 @@ To enable AutoMint change 'enablezeromint=0' to 'enablezeromint=1 - Available (mature and spendable) zPIV for spending + Available (mature and spendable) zLUX for spending @@ -3114,15 +3114,15 @@ To enable AutoMint change 'enablezeromint=0' to 'enablezeromint=1 - Available (mature and spendable) zPIV for spending + Available (mature and spendable) zLUX for spending -zPIV are mature when they have more than 20 confirmations AND more than 2 mints of the same denomination after them were minted +zLUX are mature when they have more than 20 confirmations AND more than 2 mints of the same denomination after them were minted - 0 zPIV + 0 zLUX @@ -3213,7 +3213,7 @@ zPIV are mature when they have more than 20 confirmations AND more than 2 mints - Total Balance including unconfirmed and immature zPIV + Total Balance including unconfirmed and immature zLUX @@ -3424,13 +3424,13 @@ Immature: confirmed, but less than 2 mints of the same denomination after it was - zPIV is currently disabled due to maintenance. + zLUX is currently disabled due to maintenance. - zPIV is currently undergoing maintenance. + zLUX is currently undergoing maintenance. @@ -3455,7 +3455,7 @@ Immature: confirmed, but less than 2 mints of the same denomination after it was - zPIV in + zLUX in @@ -4451,7 +4451,7 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou - 0 PIV + 0 LUX @@ -4521,12 +4521,12 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. @@ -4592,7 +4592,7 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou - Anonymized PIV + Anonymized LUX @@ -5874,7 +5874,7 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou - SwiftX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. + SwiftX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. @@ -6064,12 +6064,12 @@ Either mint higher denominations (so fewer inputs are needed) or reduce the amou - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) @@ -6219,12 +6219,12 @@ for example: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com - Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV. + Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. + Unable to locate enough funds for this transaction that are not equal 10000 LUX. @@ -6634,7 +6634,7 @@ for example: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com - Fee (in PIV/kB) to add to transactions you send (default: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) diff --git a/src/qt/locale/lux_en_US.ts b/src/qt/locale/lux_en_US.ts index 6d9aeb8f..6159e13d 100755 --- a/src/qt/locale/lux_en_US.ts +++ b/src/qt/locale/lux_en_US.ts @@ -176,16 +176,16 @@ Confirm wallet encryption - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. Are you sure you wish to encrypt your wallet? Are you sure you wish to encrypt your wallet? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! Wallet encrypted @@ -1544,32 +1544,32 @@ Please check the address and try again. Please select a privacy level. - Use 2 separate masternodes to mix funds up to 10000 PIV - Use 2 separate masternodes to mix funds up to 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Use 2 separate masternodes to mix funds up to 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV - Use 8 separate masternodes to mix funds up to 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX + Use 8 separate masternodes to mix funds up to 10000 LUX Use 16 separate masternodes Use 16 separate masternodes - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX This is the slowest and most secure option. Using maximum anonymity will cost This is the slowest and most secure option. Using maximum anonymity will cost - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV per 10000 PIV you anonymize. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX per 10000 LUX you anonymize. Obfuscation Configuration @@ -1927,8 +1927,8 @@ https://www.transifex.com/216k155/216k155-translations Obfuscation Balance: - 0 PIV / 0 Rounds - 0 PIV / 0 Rounds + 0 LUX / 0 Rounds + 0 LUX / 0 Rounds Enabled/Disabled @@ -2792,8 +2792,8 @@ https://www.transifex.com/216k155/216k155-translations UTXO Size: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: @@ -2840,12 +2840,12 @@ https://www.transifex.com/216k155/216k155-translations Confirmation time: - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for LUX transactions than the network can process. @@ -3840,8 +3840,8 @@ https://www.transifex.com/216k155/216k155-translations Send Coins - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. @@ -3974,12 +3974,12 @@ https://www.transifex.com/216k155/216k155-translations Execute command when the best block changes (%s in cmd is replaced by block hash) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -4114,12 +4114,12 @@ for example: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com Unable to locate enough Obfuscation denominated funds for this transaction. - Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV. - Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV. + Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX. + Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. + Unable to locate enough funds for this transaction that are not equal 10000 LUX. + Unable to locate enough funds for this transaction that are not equal 10000 LUX. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -4406,8 +4406,8 @@ for example: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com Failed to read block - Fee (in PIV/kB) to add to transactions you send (default: %s) - Fee (in PIV/kB) to add to transactions you send (default: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) Finalizing transaction. @@ -4578,8 +4578,8 @@ for example: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com Enable staking functionality (0-1, default: %u) - Keep N PIV anonymized (default: %u) - Keep N PIV anonymized (default: %u) + Keep N LUX anonymized (default: %u) + Keep N LUX anonymized (default: %u) Keep at most <n> unconnectable transactions in memory (default: %u) diff --git a/src/qt/locale/lux_es.ts b/src/qt/locale/lux_es.ts index 7a0bd15a..743297fe 100755 --- a/src/qt/locale/lux_es.ts +++ b/src/qt/locale/lux_es.ts @@ -176,16 +176,16 @@ Confirme el cifrado del monedero - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX se cerrará para finalizar el proceso de cifrado. Recuerde que cifrar su monedero no garantiza que sus PIVs no sean robados mediante malware de su ordenador. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX se cerrará para finalizar el proceso de cifrado. Recuerde que cifrar su monedero no garantiza que sus LUXs no sean robados mediante malware de su ordenador. Are you sure you wish to encrypt your wallet? ¿Está seguro de que desea cifrar su monedero? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Atención: Si cifra su monedero y pierde su contraseña, perderá <b> TODOS SUS PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Atención: Si cifra su monedero y pierde su contraseña, perderá <b> TODOS SUS LUX</b>! Wallet encrypted @@ -618,8 +618,8 @@ &Privacidad - Privacy Action for zPIV and Obfuscation - Privacidad con zPIV y Ofuscación + Privacy Action for zLUX and Obfuscation + Privacidad con zLUX y Ofuscación &Masternodes @@ -1528,32 +1528,32 @@ Por favor compruebe la dirección e inténtelo de nuevo. Por favor selecciones un nivel de privacidad. - Use 2 separate masternodes to mix funds up to 10000 PIV - Use 2 nodos maestros diferentes para mezclar los fondos hasta los 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Use 2 nodos maestros diferentes para mezclar los fondos hasta los 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV - Use 8 nodos maestros diferentes para mezclar fondos hasta los 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX + Use 8 nodos maestros diferentes para mezclar fondos hasta los 10000 LUX Use 16 separate masternodes Use 16 nodos maestros diferentes - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Esta opción es la más rápida y costará alrededor de ~0.025 PIV para anonimizar 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Esta opción es la más rápida y costará alrededor de ~0.025 LUX para anonimizar 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - Esta opción es moderadamente rápida y costará cerca de 0.05 PIV para anonimizar 10000 PIV. + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + Esta opción es moderadamente rápida y costará cerca de 0.05 LUX para anonimizar 10000 LUX. This is the slowest and most secure option. Using maximum anonymity will cost Esta es la opción más lenta pero más segura. Usar el máximo anonimato costará - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV por 10000 PIV que anonimizas. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX por 10000 LUX que anonimizas. Obfuscation Configuration @@ -1696,16 +1696,16 @@ https://www.transifex.com/216k155/216k155-translations Mapear un puerto utilizando &UPnP - Percentage of incoming PIV which get automatically converted to zPIV via Zerocoin Protocol (min: 10%) - Porcentaje de PIVs entrantes que serán automáticamente convertidos a zPIV a través del Protocolo Zerocoin (mín: 10%) + Percentage of incoming LUX which get automatically converted to zLUX via Zerocoin Protocol (min: 10%) + Porcentaje de LUXs entrantes que serán automáticamente convertidos a zLUX a través del Protocolo Zerocoin (mín: 10%) - Percentage of autominted zPIV - Porcentaje de zPIV autogenerados + Percentage of autominted zLUX + Porcentaje de zLUX autogenerados - Wait with automatic conversion to Zerocoin until enough PIV for this denomination is available - Retrasar la conversión automática a Zerocoin hasta que hayan suficientes PIV disponibles para esta denominación + Wait with automatic conversion to Zerocoin until enough LUX for this denomination is available + Retrasar la conversión automática a Zerocoin hasta que hayan suficientes LUX disponibles para esta denominación Connect to the LUX network through a SOCKS5 proxy. @@ -1839,8 +1839,8 @@ https://www.transifex.com/216k155/216k155-translations Formulario - PIV Balances - Balances PIV + LUX Balances + Balances LUX Available: @@ -2741,8 +2741,8 @@ https://www.transifex.com/216k155/216k155-translations Tamaño de UTXO: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: @@ -2785,12 +2785,12 @@ https://www.transifex.com/216k155/216k155-translations Tiempo de confirmación: - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Si la comisión personalizada se fija en 1000 uPIVs y la transacción necesita sólo 250 bytes, entonces la opción "por kilobyte" sólo pagará 250 uPIVs de comisión,<br/>mientras "por lo menos" pagará 1000 uPIVs. Para transacciones que midan más de un kilobyte ambas pagan por kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Si la comisión personalizada se fija en 1000 uLUXs y la transacción necesita sólo 250 bytes, entonces la opción "por kilobyte" sólo pagará 250 uLUXs de comisión,<br/>mientras "por lo menos" pagará 1000 uLUXs. Para transacciones que midan más de un kilobyte ambas pagan por kilobyte. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Si la comisión personalizada se fija en 1000 uPIVs y la transacción necesita sólo 250 bytes, entonces la opción "por kilobyte" sólo pagará 250 uPIVs de comisión,<br/>mientras "por lo menos" pagará 1000 uPIVs. Para transacciones que midan más de un kilobyte ambas pagan por kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Si la comisión personalizada se fija en 1000 uLUXs y la transacción necesita sólo 250 bytes, entonces la opción "por kilobyte" sólo pagará 250 uLUXs de comisión,<br/>mientras "por lo menos" pagará 1000 uLUXs. Para transacciones que midan más de un kilobyte ambas pagan por kilobyte. Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for LUX transactions than the network can process. @@ -3761,8 +3761,8 @@ https://www.transifex.com/216k155/216k155-translations Enviar Monedas - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. - SwiftTX no soporta el envío de importes tan altos todavía. Las transacciones están actualmente limitadas a %1 PIV. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. + SwiftTX no soporta el envío de importes tan altos todavía. Las transacciones están actualmente limitadas a %1 LUX. @@ -3898,12 +3898,12 @@ https://www.transifex.com/216k155/216k155-translations Ejecutar comando cuando el mejor bloque cambie (%s en cmd es reemplazado por el block hash) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) - Comisiones (en PIV/Kb) menores a esta son consideradas gratuitas para la propagación de la transacción (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) + Comisiones (en LUX/Kb) menores a esta son consideradas gratuitas para la propagación de la transacción (default: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Comisiones (en PIV/Kb) menores a esta son consideradas gratuitas para la creación de la transacción (default: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Comisiones (en LUX/Kb) menores a esta son consideradas gratuitas para la creación de la transacción (default: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -4034,12 +4034,12 @@ por ejemplo: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com Imposible localizar suficientes fondos denominados de Ofuscación para esta transacción. - Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV. - Imposible localizar suficientes fondos no-denominados de Ofuscación para esta transacción que no es igual a 10000 PIV. + Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX. + Imposible localizar suficientes fondos no-denominados de Ofuscación para esta transacción que no es igual a 10000 LUX. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. - Imposible localizar fondos suficientes para esta transacción que no es igual a 10000 PIV. + Unable to locate enough funds for this transaction that are not equal 10000 LUX. + Imposible localizar fondos suficientes para esta transacción que no es igual a 10000 LUX. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -4326,8 +4326,8 @@ por ejemplo: alertnotify=echo %%s | mail -s "LUX Alert" admin@foo.com Falló al leer el bloque - Fee (in PIV/kB) to add to transactions you send (default: %s) - Comisión (en PIV/kB) para agregar a la transacción que envías (predeterminado: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) + Comisión (en LUX/kB) para agregar a la transacción que envías (predeterminado: %s) Finalizing transaction. diff --git a/src/qt/locale/lux_fi.ts b/src/qt/locale/lux_fi.ts index 70754d25..00b7259b 100755 --- a/src/qt/locale/lux_fi.ts +++ b/src/qt/locale/lux_fi.ts @@ -172,16 +172,16 @@ Vahvista lompakon salaus - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX sulkeutuu salausprosessin ajaksi. Muista, että lompakon salaus ei voi täysin suojella PIVien varkaudelta, jos tietokoneesi sisältää haittaohjelmia. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX sulkeutuu salausprosessin ajaksi. Muista, että lompakon salaus ei voi täysin suojella LUXien varkaudelta, jos tietokoneesi sisältää haittaohjelmia. Are you sure you wish to encrypt your wallet? Oletko varma että tahdot salata lompakkosi? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Varoitus: Jos salaat lompakkosi ja unohdat salausavaimesi, <b>menetät kaikki PIVisi</b> + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Varoitus: Jos salaat lompakkosi ja unohdat salausavaimesi, <b>menetät kaikki LUXisi</b> Wallet encrypted @@ -1135,11 +1135,11 @@ Please check the address and try again. Valitse yksityisyyden taso. - Use 2 separate masternodes to mix funds up to 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX Käytä 2 erillistä masternodea sekoittaaksesi enintään 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX Käytä 8 erillistä masternodea sekoittaaksesi enintään 10000 LUX @@ -1147,11 +1147,11 @@ Please check the address and try again. Käytä 16 erillistä masternodea - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Tämä vaihtoehto on nopein ja maksaa noin ~0.025 PIV anonymoidaksesi 10000 LUX + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Tämä vaihtoehto on nopein ja maksaa noin ~0.025 LUX anonymoidaksesi 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX Tämä vaihtoehto on suhteellisen nopea ja maksaa 0.05 LUX anonymoidaksesi 10000 LUX @@ -1159,7 +1159,7 @@ Please check the address and try again. Tämä on hitain ja turvallisin vaihtoehto. Täydesti anonymisoiminen ei maksa mitään. - 0.1 PIV per 10000 PIV you anonymize. + 0.1 LUX per 10000 LUX you anonymize. 0.1 per 10000 LUX, jotka anonymisoit. @@ -1898,8 +1898,8 @@ Please check the address and try again. Muutos: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Choose... diff --git a/src/qt/locale/lux_fr_FR.ts b/src/qt/locale/lux_fr_FR.ts index c9c7b35e..1fa130e5 100755 --- a/src/qt/locale/lux_fr_FR.ts +++ b/src/qt/locale/lux_fr_FR.ts @@ -152,16 +152,16 @@ Confirmer le cryptage du portefeuille - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX va maintenant se fermer pour finir le processus cryptage. Notez que le cryptage de votre portefeuille ne peut pas complètement protéger vos PIVs d'un vol par un malware ayant infecté votre ordinateur. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX va maintenant se fermer pour finir le processus cryptage. Notez que le cryptage de votre portefeuille ne peut pas complètement protéger vos LUXs d'un vol par un malware ayant infecté votre ordinateur. Are you sure you wish to encrypt your wallet? Êtes-vous sûr de vouloir crypter votre portefeuille? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Attention : si vous cryptez votre portefeuille et perdez votre phrase secrète, vous <b>PERDREZ TOUS VOS PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Attention : si vous cryptez votre portefeuille et perdez votre phrase secrète, vous <b>PERDREZ TOUS VOS LUX</b>! Wallet encrypted @@ -1038,32 +1038,32 @@ Veuillez vérifier l'adresse et réessayer. Veuillez sélectionner un niveau de confidentialité. - Use 2 separate masternodes to mix funds up to 10000 PIV - Utiliser 2 masternodes différentes pour mélanger les fonds jusqu'a 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Utiliser 2 masternodes différentes pour mélanger les fonds jusqu'a 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV - Utiliser 8 masternodes différentes pour mélanger les fonds jusqu'a 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX + Utiliser 8 masternodes différentes pour mélanger les fonds jusqu'a 10000 LUX Use 16 separate masternodes Utiliser 16 masternodes différentes - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Cette option est la plus rapide, et coutera ~0.025 PIV pour anonymiser 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Cette option est la plus rapide, et coutera ~0.025 LUX pour anonymiser 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - Cette option est moyennement rapide, et coutera 0.05 PIV pour anonymiser 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + Cette option est moyennement rapide, et coutera 0.05 LUX pour anonymiser 10000 LUX This is the slowest and most secure option. Using maximum anonymity will cost Il s'agit de l'option la plus lente est la plus sécurisé. Utiliser l'anonymat maximum coutera - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV par 10000 PIV vous anonymisez. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX par 10000 LUX vous anonymisez. @@ -1433,8 +1433,8 @@ Veuillez vérifier l'adresse et réessayer. Après commission - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: diff --git a/src/qt/locale/lux_it.ts b/src/qt/locale/lux_it.ts index abad5f88..892c7899 100755 --- a/src/qt/locale/lux_it.ts +++ b/src/qt/locale/lux_it.ts @@ -176,16 +176,16 @@ Conferma cifratura portafoglio - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX verrà ora chiuso per completare il processo di cifratura. Ricorda che crittografare il tuo portafoglio non protegge completamente i tuoi PIV dal furto da parte di software malevoli che potrebbero infettare il tuo computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX verrà ora chiuso per completare il processo di cifratura. Ricorda che crittografare il tuo portafoglio non protegge completamente i tuoi LUX dal furto da parte di software malevoli che potrebbero infettare il tuo computer. Are you sure you wish to encrypt your wallet? Confermi di voler crittografare il portafoglio? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Attenzione: Se crittografi il portafoglio e poi perdi la parola d'ordine, <b>PERDERAI TUTTI I TUOI PIV<7b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Attenzione: Se crittografi il portafoglio e poi perdi la parola d'ordine, <b>PERDERAI TUTTI I TUOI LUX<7b>! Wallet encrypted diff --git a/src/qt/locale/lux_ko_KR.ts b/src/qt/locale/lux_ko_KR.ts index f55d186e..8fc32688 100755 --- a/src/qt/locale/lux_ko_KR.ts +++ b/src/qt/locale/lux_ko_KR.ts @@ -176,16 +176,16 @@ 지갑 암호화 확인 - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX는 이제 암호화 프로세스를 마치기 위해 닫힐것입니다. 지갑을 암호화하더라도 맬웨어로 인한 PIVs 의 도난당하는 것을 완벽하게 보호 할 수는 없습니다. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX는 이제 암호화 프로세스를 마치기 위해 닫힐것입니다. 지갑을 암호화하더라도 맬웨어로 인한 LUXs 의 도난당하는 것을 완벽하게 보호 할 수는 없습니다. Are you sure you wish to encrypt your wallet? 지갑을 암호화 하시겠습니까? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - 경고: 지갑 암호화 후 암호를 분실하게 되면 <b>모든 PIV를 잃게 됩니다</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + 경고: 지갑 암호화 후 암호를 분실하게 되면 <b>모든 LUX를 잃게 됩니다</b>! Wallet encrypted @@ -1508,32 +1508,32 @@ Please check the address and try again. 익명화 레벨을 선택해주세요. - Use 2 separate masternodes to mix funds up to 10000 PIV - 2개의 개별 마스터노드를 이용하여 최대 10000 PIV 를 섞을 수 있습니다. + Use 2 separate masternodes to mix funds up to 10000 LUX + 2개의 개별 마스터노드를 이용하여 최대 10000 LUX 를 섞을 수 있습니다. - Use 8 separate masternodes to mix funds up to 10000 PIV - 8개의 개별 마스터노드를 이용하여 최대 10000 PIV 를 섞을 수 있습니다. + Use 8 separate masternodes to mix funds up to 10000 LUX + 8개의 개별 마스터노드를 이용하여 최대 10000 LUX 를 섞을 수 있습니다. Use 16 separate masternodes 16개의 개별 마스터노드를 사용 - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - 이 옵션은 가장 빠르게 전송되며 10000 PIV 익명화에 약 ~0.025 PIV의 비용이 들어갑니다. + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + 이 옵션은 가장 빠르게 전송되며 10000 LUX 익명화에 약 ~0.025 LUX의 비용이 들어갑니다. - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - 이 옵션은 중간 정도의 속도로 전송되며 10000 PIV 익명화에 약 0.05 PIV의 비용이 들어갑니다. + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + 이 옵션은 중간 정도의 속도로 전송되며 10000 LUX 익명화에 약 0.05 LUX의 비용이 들어갑니다. This is the slowest and most secure option. Using maximum anonymity will cost 이것은 가장 느리고 안전한 옵션입니다. 최고 익명성을 사용하면 비용이 발생합니다. - 0.1 PIV per 10000 PIV you anonymize. - 10000 PIV 익명화에 0.1 PIV 가 듭니다. + 0.1 LUX per 10000 LUX you anonymize. + 10000 LUX 익명화에 0.1 LUX 가 듭니다. Obfuscation Configuration @@ -2706,8 +2706,8 @@ https://www.transifex.com/216k155/216k155-translations UTXO 크기: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: @@ -2750,12 +2750,12 @@ https://www.transifex.com/216k155/216k155-translations 승인 시간: - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - 트랜잭션이 250바이트 인 경우 사용자 지정 수수료가 1000 uPIVs로 설정되고,<br />1000 uPIVs 안에는 최소 "킬로바이트당" 250 uPIVs 만 지불합니다. 1 킬로바이트보다 큰 트랜잭션의 경우 모두 킬로바이트 단위로 지불합니다. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + 트랜잭션이 250바이트 인 경우 사용자 지정 수수료가 1000 uLUXs로 설정되고,<br />1000 uLUXs 안에는 최소 "킬로바이트당" 250 uLUXs 만 지불합니다. 1 킬로바이트보다 큰 트랜잭션의 경우 모두 킬로바이트 단위로 지불합니다. - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "total at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - 트랜잭션이 250바이트 인 경우 사용자 지정 수수료가 1000 uPIVs로 설정되고,<br />1000 uPIVs 안에는 전체에서 최소 "킬로바이트당" 250 uPIVs 만 지불합니다. 1 킬로바이트보다 큰 트랜잭션의 경우 모두 킬로바이트 단위로 지불합니다. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "total at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + 트랜잭션이 250바이트 인 경우 사용자 지정 수수료가 1000 uLUXs로 설정되고,<br />1000 uLUXs 안에는 전체에서 최소 "킬로바이트당" 250 uLUXs 만 지불합니다. 1 킬로바이트보다 큰 트랜잭션의 경우 모두 킬로바이트 단위로 지불합니다. Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for LUX transactions than the network can process. @@ -3731,8 +3731,8 @@ https://www.transifex.com/216k155/216k155-translations 코인 전송 - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. - SwiftTX는 아직 높은 값을 전송하는 것을 지원하지 않습니다. 트랜잭션은 현재 %1 PIV로 제한됩니다. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. + SwiftTX는 아직 높은 값을 전송하는 것을 지원하지 않습니다. 트랜잭션은 현재 %1 LUX로 제한됩니다. @@ -3868,12 +3868,12 @@ https://www.transifex.com/216k155/216k155-translations 최고 블록이 변경될 경우 명령을 실행하십시오 (명령 내 %s 는 블록 해시로 대체 되었습니다) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) - 이것보다 작은 수수료 (PIV/Kb)는 중계 수수료가 없는 것으로 간주됩니다 (기본값: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) + 이것보다 작은 수수료 (LUX/Kb)는 중계 수수료가 없는 것으로 간주됩니다 (기본값: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - 이것보다 작은 수수료 (PIV/Kb)는 트랜잭션 생성 수수료가 없는 것으로 간주됩니다 (기본값: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + 이것보다 작은 수수료 (LUX/Kb)는 트랜잭션 생성 수수료가 없는 것으로 간주됩니다 (기본값: %s) Flush database activity from memory pool to disk log every <n> megabytes (default: %u) @@ -4004,12 +4004,12 @@ rpcpassword=%s 이 트랜잭션를 위해 난독화 표기된 충분한 금액을 찾을 수 없습니다. - Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV. - 이 트랜잭션를 위해 난독화 표기가 안된 충분한 금액을 찾을 수 없습니다. 10000 PIV과 일치하지 않음. + Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX. + 이 트랜잭션를 위해 난독화 표기가 안된 충분한 금액을 찾을 수 없습니다. 10000 LUX과 일치하지 않음. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. - 트랜잭션에 대한 충분한 금액을 찾을 수 없습니다. 10000 PIV와 같지 않음 + Unable to locate enough funds for this transaction that are not equal 10000 LUX. + 트랜잭션에 대한 충분한 금액을 찾을 수 없습니다. 10000 LUX와 같지 않음 Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -4296,8 +4296,8 @@ rpcpassword=%s 블록을 받아오는데 실패했습니다. - Fee (in PIV/kB) to add to transactions you send (default: %s) - 당신이 보내는 트랜잭션에 추가 할 수수료 (PIV/kB) (기본값: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) + 당신이 보내는 트랜잭션에 추가 할 수수료 (LUX/kB) (기본값: %s) Finalizing transaction. diff --git a/src/qt/locale/lux_nl.ts b/src/qt/locale/lux_nl.ts index 3ce9bc7a..e05a379e 100755 --- a/src/qt/locale/lux_nl.ts +++ b/src/qt/locale/lux_nl.ts @@ -172,16 +172,16 @@ Bevestig versleuteling van de portemonnee - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw PIVs stelen. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX zal nu afsluiten om het versleutelingsproces te voltooien. Onthoud dat het versleutelen van uw portemonnee u niet volledig kan beschermen: Malware kan uw computer infecteren en uw LUXs stelen. Are you sure you wish to encrypt your wallet? Weet u zeker dat u uw portemonnee wilt versleutelen? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u <b>AL UW PIV VERLIEZEN</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Waarschuwing: Als u uw portemonnee versleutelt en uw wachtwoord vergeet, zult u <b>AL UW LUX VERLIEZEN</b>! Wallet encrypted @@ -1508,8 +1508,8 @@ MultiSend: %1 0 - zPIV - zPIV + zLUX + zLUX Reset @@ -2029,8 +2029,8 @@ MultiSend: %1 Wijzig: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: diff --git a/src/qt/locale/lux_pl.ts b/src/qt/locale/lux_pl.ts index 33a301da..39ab11a8 100755 --- a/src/qt/locale/lux_pl.ts +++ b/src/qt/locale/lux_pl.ts @@ -148,8 +148,8 @@ Czy na pewno chcesz zakodować portfel? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Ostrzeżenie: Jeżeli zakodujesz portfel i stracisz do niego hasło , UTRACISZ WSZYSTKIE PIV! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Ostrzeżenie: Jeżeli zakodujesz portfel i stracisz do niego hasło , UTRACISZ WSZYSTKIE LUX! Wallet encrypted diff --git a/src/qt/locale/lux_pt.ts b/src/qt/locale/lux_pt.ts index a7d6de25..5e47aabf 100755 --- a/src/qt/locale/lux_pt.ts +++ b/src/qt/locale/lux_pt.ts @@ -176,16 +176,16 @@ Confirmar encriptação da carteira - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX encerrará para terminar o processo de encriptação. Lembre-se que encriptar sua carteira não protege completamente suas PIVs contra roubo por malware infectando seu computador. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX encerrará para terminar o processo de encriptação. Lembre-se que encriptar sua carteira não protege completamente suas LUXs contra roubo por malware infectando seu computador. Are you sure you wish to encrypt your wallet? Tem certeza que deseja encriptar sua carteira? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Atenção: Se você encriptar sua carteira e perder a senha, você <B>PERDERÁ TODA SUA PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Atenção: Se você encriptar sua carteira e perder a senha, você <B>PERDERÁ TODA SUA LUX</b>! Wallet encrypted diff --git a/src/qt/locale/lux_pt_BR.ts b/src/qt/locale/lux_pt_BR.ts index 5a5570e9..22b7cfb0 100755 --- a/src/qt/locale/lux_pt_BR.ts +++ b/src/qt/locale/lux_pt_BR.ts @@ -172,16 +172,16 @@ Confirmar criptografia de carteira - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX vai fechar agora para finalizar o processo de criptografia. Lembre-se que encriptar sua carteira não pode proteger totalmente suas PIVs de serem roubadas por malwares infectando seu computador. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX vai fechar agora para finalizar o processo de criptografia. Lembre-se que encriptar sua carteira não pode proteger totalmente suas LUXs de serem roubadas por malwares infectando seu computador. Are you sure you wish to encrypt your wallet? Você tem certeza que deseja criptografar sua carteira? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Aviso: se você criptografar sua carteira e perder sua senha você <b>PERDERÁ TODAS AS SUAS PIV<b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Aviso: se você criptografar sua carteira e perder sua senha você <b>PERDERÁ TODAS AS SUAS LUX<b>! Wallet encrypted @@ -1452,32 +1452,32 @@ Favor verificar o endereço e tente novamente. Favor selecionar o nível de privacidade. - Use 2 separate masternodes to mix funds up to 10000 PIV - Use 2 masternodes separados para embaralhar fundos até 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Use 2 masternodes separados para embaralhar fundos até 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV - Use 8 masternodes separados para embaralhar fundos até 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX + Use 8 masternodes separados para embaralhar fundos até 10000 LUX Use 16 separate masternodes Use 16 masternodes separados - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Está opção é a mais rápida e vai custar em torno de ~0.025 PIV para anonimizar 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Está opção é a mais rápida e vai custar em torno de ~0.025 LUX para anonimizar 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - Está opção moderamente rápida e vai custar em torno de ~0.05 PIV para anonimizar 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + Está opção moderamente rápida e vai custar em torno de ~0.05 LUX para anonimizar 10000 LUX This is the slowest and most secure option. Using maximum anonymity will cost Esta é a opção mais lenta e mais segura. Usando a anonimização máxima vai custar - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV por 10000 PIV que deixar anônima. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX por 10000 LUX que deixar anônima. Obfuscation Configuration @@ -2429,8 +2429,8 @@ https://www.transifex.com/216k155/216k155-translations Tamanho UTXO: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: @@ -2469,8 +2469,8 @@ https://www.transifex.com/216k155/216k155-translations Tempo de confirmação: - If the custom fee is set to 1000 uPIVs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uPIVs in fee,<br />while "at least" pays 1000 uPIVs. For transactions bigger than a kilobyte both pay by kilobyte. - Se a taxa padrão estiver definida para 1000 uPIVs e a transação for somente de 250 bytes, então "por kilobyte" pagará somente 250 uPIVs em taxa,<br /> pagará pelo menos 1000 uPIVs. Para transações maiores que um kilobyte ambas pagam por kilobyte. + If the custom fee is set to 1000 uLUXs and the transaction is only 250 bytes, then "per kilobyte" only pays 250 uLUXs in fee,<br />while "at least" pays 1000 uLUXs. For transactions bigger than a kilobyte both pay by kilobyte. + Se a taxa padrão estiver definida para 1000 uLUXs e a transação for somente de 250 bytes, então "por kilobyte" pagará somente 250 uLUXs em taxa,<br /> pagará pelo menos 1000 uLUXs. Para transações maiores que um kilobyte ambas pagam por kilobyte. Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks.<br />But be aware that this can end up in a never confirming transaction once there is more demand for LUX transactions than the network can process. @@ -3361,8 +3361,8 @@ https://www.transifex.com/216k155/216k155-translations Enviar Moedas - SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV. - SwiftTX ainda não suporta o envio de valores altos assim. As transações atualmente são limitadas a %1 PIV. + SwiftTX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX. + SwiftTX ainda não suporta o envio de valores altos assim. As transações atualmente são limitadas a %1 LUX. @@ -3434,12 +3434,12 @@ https://www.transifex.com/216k155/216k155-translations Executar o comando quando uma transação da carteira mudar (%s no cmd será substituído pela TxID) - Fees (in PIV/Kb) smaller than this are considered zero fee for relaying (default: %s) - Taxas (em PIV/Kb) menores que isso serão consideradas taxa zero para propagação (padrão: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for relaying (default: %s) + Taxas (em LUX/Kb) menores que isso serão consideradas taxa zero para propagação (padrão: %s) - Fees (in PIV/Kb) smaller than this are considered zero fee for transaction creation (default: %s) - Taxas (em PIV/Kb) menores que isso serão consideradas taxa zero para a criação da transação (padrão: %s) + Fees (in LUX/Kb) smaller than this are considered zero fee for transaction creation (default: %s) + Taxas (em LUX/Kb) menores que isso serão consideradas taxa zero para a criação da transação (padrão: %s) In this mode -genproclimit controls how many blocks are generated immediately. @@ -3462,8 +3462,8 @@ https://www.transifex.com/216k155/216k155-translations SwiftTX requer inputs com pelo menos 6 confirmações, você precisar aguardar alguns minutos e tentar novamente. - Unable to locate enough funds for this transaction that are not equal 10000 PIV. - Incapaz de localizar fundos para esta transação que não são iguais a 10000 PIV. + Unable to locate enough funds for this transaction that are not equal 10000 LUX. + Incapaz de localizar fundos para esta transação que não são iguais a 10000 LUX. Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: %s) @@ -3650,8 +3650,8 @@ https://www.transifex.com/216k155/216k155-translations Falhou em ler o bloco - Fee (in PIV/kB) to add to transactions you send (default: %s) - Taxa (em PIV/kB) a adicionar em transações que você enviar (padrão: %s) + Fee (in LUX/kB) to add to transactions you send (default: %s) + Taxa (em LUX/kB) a adicionar em transações que você enviar (padrão: %s) Finalizing transaction. diff --git a/src/qt/locale/lux_ru.ts b/src/qt/locale/lux_ru.ts index a42fef6b..8c94e3da 100755 --- a/src/qt/locale/lux_ru.ts +++ b/src/qt/locale/lux_ru.ts @@ -172,7 +172,7 @@ Подтверждение шифрования кошелька - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. LUX сейчас закроется, чтобы завершить процесс шифрования. Помните, что шифрование вашего кошелька не может полностью защитить ваши LUX от кражи с использованием вредоносного ПО. @@ -180,8 +180,8 @@ Вы действительно хотите зашифровать свой кошелек? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Внимание: если вы зашифруете свой кошелёк и потеряете от него пароль, то вы <b>ПОТЕРЯЕТЕ ВСЕ СВОИ PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Внимание: если вы зашифруете свой кошелёк и потеряете от него пароль, то вы <b>ПОТЕРЯЕТЕ ВСЕ СВОИ LUX</b>! Wallet encrypted @@ -1504,32 +1504,32 @@ Please check the address and try again. Выберите уровень конфиденциальности. - Use 2 separate masternodes to mix funds up to 10000 PIV - Используйте 2 разные мастерноды для смешивания средств до 10000 PIV + Use 2 separate masternodes to mix funds up to 10000 LUX + Используйте 2 разные мастерноды для смешивания средств до 10000 LUX - Use 8 separate masternodes to mix funds up to 10000 PIV - Используйте 8 разных мастернод для смешивания средств до 10000 PIV + Use 8 separate masternodes to mix funds up to 10000 LUX + Используйте 8 разных мастернод для смешивания средств до 10000 LUX Use 16 separate masternodes Используйте 16 разных мастернод - This option is the quickest and will cost about ~0.025 PIV to anonymize 10000 PIV - Этот вариант является самым быстрым и будет стоить порядка ~0.025 PIV для анонимизации 10000 PIV + This option is the quickest and will cost about ~0.025 LUX to anonymize 10000 LUX + Этот вариант является самым быстрым и будет стоить порядка ~0.025 LUX для анонимизации 10000 LUX - This option is moderately fast and will cost about 0.05 PIV to anonymize 10000 PIV - Это средний по скорости вариант и он будет стоить около 0.05 PIV для анонимизации 10000 PIV + This option is moderately fast and will cost about 0.05 LUX to anonymize 10000 LUX + Это средний по скорости вариант и он будет стоить около 0.05 LUX для анонимизации 10000 LUX This is the slowest and most secure option. Using maximum anonymity will cost Это самый медленный и безопасный вариант. Максимальная анонимность стоит - 0.1 PIV per 10000 PIV you anonymize. - 0.1 PIV за 10000 PIV которые вы собираетесь анонимизировать. + 0.1 LUX per 10000 LUX you anonymize. + 0.1 LUX за 10000 LUX которые вы собираетесь анонимизировать. Obfuscation Configuration @@ -2570,8 +2570,8 @@ https://www.transifex.com/216k155/216k155-translations Изменить: - 0 PIV - 0 PIV + 0 LUX + 0 LUX Transaction Fee: diff --git a/src/qt/locale/lux_sk.ts b/src/qt/locale/lux_sk.ts index d60194aa..9b0260f1 100755 --- a/src/qt/locale/lux_sk.ts +++ b/src/qt/locale/lux_sk.ts @@ -176,16 +176,16 @@ Potvrďte šifrovanie peňaženky - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX sa teraz ukončí, aby dokončil proces šifrovania. Nezabudnite, že šifrovanie peňaženky nemôže úplne ochrániť vaše PIV pred odcudzením škodlivým softvérom, ktorý infikuje váš počítač. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX sa teraz ukončí, aby dokončil proces šifrovania. Nezabudnite, že šifrovanie peňaženky nemôže úplne ochrániť vaše LUX pred odcudzením škodlivým softvérom, ktorý infikuje váš počítač. Are you sure you wish to encrypt your wallet? Naozaj chcete zašifrovať svoju peňaženku? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Upozornenie: Ak zašifrujete svoju peňaženku a stratíte svoju prístupovú frázu, <b> PRÍDETE O VŠETKY PIV </ b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Upozornenie: Ak zašifrujete svoju peňaženku a stratíte svoju prístupovú frázu, <b> PRÍDETE O VŠETKY LUX </ b>! Wallet encrypted diff --git a/src/qt/locale/lux_sv.ts b/src/qt/locale/lux_sv.ts index eb14083e..28151f05 100755 --- a/src/qt/locale/lux_sv.ts +++ b/src/qt/locale/lux_sv.ts @@ -160,16 +160,16 @@ Bekräfta plånboks krypering - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX kommer att stängas ner nu för att färdigställa kryperingsprocessen. Kom ihåg att kryptering av din plånbok inte kan säkerställa dina PIVs från att bli stulna av skadeprogram som infekterat din dator. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX kommer att stängas ner nu för att färdigställa kryperingsprocessen. Kom ihåg att kryptering av din plånbok inte kan säkerställa dina LUXs från att bli stulna av skadeprogram som infekterat din dator. Are you sure you wish to encrypt your wallet? Är du säker på att du vill kryptera din plånbok? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Varning: om du krypterar din plånbok och tappar bort din lösenfras kommer du <b> FÖRLORA ALLA DINA PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Varning: om du krypterar din plånbok och tappar bort din lösenfras kommer du <b> FÖRLORA ALLA DINA LUX</b>! Wallet encrypted diff --git a/src/qt/locale/lux_tr.ts b/src/qt/locale/lux_tr.ts index 1f039a3c..4ab5e0aa 100755 --- a/src/qt/locale/lux_tr.ts +++ b/src/qt/locale/lux_tr.ts @@ -176,15 +176,15 @@ cüzdan şifrelemesini onayla - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX şifreleme işlemini tamamlamak için şimdi kapanacaktır. Cüzdanınızı şifrelemenin, PIV'lerinizi bilgisayarınıza bulaşan kötücül yazılımlar tarafından çalınmasına tamamen engelleyemediğini unutmayın + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX şifreleme işlemini tamamlamak için şimdi kapanacaktır. Cüzdanınızı şifrelemenin, LUX'lerinizi bilgisayarınıza bulaşan kötücül yazılımlar tarafından çalınmasına tamamen engelleyemediğini unutmayın Are you sure you wish to encrypt your wallet? Cüzdanınızı şifrelemek istediğinizden emin misiniz? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! Dikkat! Eğer cüzdanınızı şifrelerseniz ve şifrenizi unutursanız <b>Tüm Pıvlerinizi kaybedersiniz</b>! diff --git a/src/qt/locale/lux_uk.ts b/src/qt/locale/lux_uk.ts index e5d1172b..8d880d3a 100755 --- a/src/qt/locale/lux_uk.ts +++ b/src/qt/locale/lux_uk.ts @@ -176,16 +176,16 @@ Підтвердження шифрування гаманця - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX зараз закриється, щоб завершити процес шифрування. Пам'ятайте, що шифрування гаманця не може повністю захистити ваші PIV'и від крадіжки зловмисним програмним забезпеченням, що заражає ваш комп'ютер. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX зараз закриється, щоб завершити процес шифрування. Пам'ятайте, що шифрування гаманця не може повністю захистити ваші LUX'и від крадіжки зловмисним програмним забезпеченням, що заражає ваш комп'ютер. Are you sure you wish to encrypt your wallet? Ви впевнені, що хочете зашифрувати Ваш гаманець? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - Попередження: Якщо після шифрування гаманця Ви <b>загубите кодове слово, то ви втратите всі Ваші PIV'и</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + Попередження: Якщо після шифрування гаманця Ви <b>загубите кодове слово, то ви втратите всі Ваші LUX'и</b>! Wallet encrypted diff --git a/src/qt/locale/lux_zh_CN.ts b/src/qt/locale/lux_zh_CN.ts index c0d26f7e..09babd61 100755 --- a/src/qt/locale/lux_zh_CN.ts +++ b/src/qt/locale/lux_zh_CN.ts @@ -176,16 +176,16 @@ 确认钱包加密 - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX将关闭以完成加密过程。但是，仅仅加密您的钱包是不够的，因为它并不能阻止恶意软件从您的电脑里面偷取PIVs。 + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX将关闭以完成加密过程。但是，仅仅加密您的钱包是不够的，因为它并不能阻止恶意软件从您的电脑里面偷取LUXs。 Are you sure you wish to encrypt your wallet? 您确定加密您的钱包吗？ - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - 注意：请妥善保管好你的密码，因为在加密后，没有密码将无法打开钱包。这将会让您<b>损失钱包中所有的PIV</b>！ + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + 注意：请妥善保管好你的密码，因为在加密后，没有密码将无法打开钱包。这将会让您<b>损失钱包中所有的LUX</b>！ Wallet encrypted diff --git a/src/qt/locale/lux_zh_TW.ts b/src/qt/locale/lux_zh_TW.ts index 4bf4aa3e..cf85469d 100755 --- a/src/qt/locale/lux_zh_TW.ts +++ b/src/qt/locale/lux_zh_TW.ts @@ -164,16 +164,16 @@ 錢包確認加密 - LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your PIVs from being stolen by malware infecting your computer. - LUX 現在會關閉程式來處理加密流程, 請注意, 僅僅是加密你的錢包並不能完全保護你的 PIV 幣被可疑軟體或病毒偷走的風險. + LUX will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your LUXs from being stolen by malware infecting your computer. + LUX 現在會關閉程式來處理加密流程, 請注意, 僅僅是加密你的錢包並不能完全保護你的 LUX 幣被可疑軟體或病毒偷走的風險. Are you sure you wish to encrypt your wallet? 確定要加密你的錢包? - Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR PIV</b>! - 請注意: 如果你加密了你的錢包但是卻忘記你設定的密碼, <b>你將會失去錢包裡的錢(PIV)</b>! + Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR LUX</b>! + 請注意: 如果你加密了你的錢包但是卻忘記你設定的密碼, <b>你將會失去錢包裡的錢(LUX)</b>! Wallet encrypted diff --git a/src/qt/luxstrings.cpp b/src/qt/luxstrings.cpp index 78d61f3a..1350e772 100755 --- a/src/qt/luxstrings.cpp +++ b/src/qt/luxstrings.cpp @@ -89,10 +89,10 @@ QT_TRANSLATE_NOOP("lux-core", "" "Execute command when the best block changes (%s in cmd is replaced by block " "hash)"), QT_TRANSLATE_NOOP("lux-core", "" -"Fees (in PIV/Kb) smaller than this are considered zero fee for relaying " +"Fees (in LUX/Kb) smaller than this are considered zero fee for relaying " "(default: %s)"), QT_TRANSLATE_NOOP("lux-core", "" -"Fees (in PIV/Kb) smaller than this are considered zero fee for transaction " +"Fees (in LUX/Kb) smaller than this are considered zero fee for transaction " "creation (default: %s)"), QT_TRANSLATE_NOOP("lux-core", "" "Flush database activity from memory pool to disk log every megabytes " @@ -187,10 +187,10 @@ QT_TRANSLATE_NOOP("lux-core", "" "Unable to locate enough Obfuscation denominated funds for this transaction."), QT_TRANSLATE_NOOP("lux-core", "" "Unable to locate enough Obfuscation non-denominated funds for this " -"transaction that are not equal 10000 PIV."), +"transaction that are not equal 10000 LUX."), QT_TRANSLATE_NOOP("lux-core", "" "Unable to locate enough funds for this transaction that are not equal 10000 " -"PIV."), +"LUX."), QT_TRANSLATE_NOOP("lux-core", "" "Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: " "%s)"), @@ -304,7 +304,7 @@ QT_TRANSLATE_NOOP("lux-core", "Failed to listen on any port. Use -listen=0 if yo QT_TRANSLATE_NOOP("lux-core", "Failed to read block index"), QT_TRANSLATE_NOOP("lux-core", "Failed to read block"), QT_TRANSLATE_NOOP("lux-core", "Failed to write block index"), -QT_TRANSLATE_NOOP("lux-core", "Fee (in PIV/kB) to add to transactions you send (default: %s)"), +QT_TRANSLATE_NOOP("lux-core", "Fee (in LUX/kB) to add to transactions you send (default: %s)"), QT_TRANSLATE_NOOP("lux-core", "Finalizing transaction."), QT_TRANSLATE_NOOP("lux-core", "Force safe mode (default: %u)"), QT_TRANSLATE_NOOP("lux-core", "Found enough users, signing ( waiting %s )"), diff --git a/src/qt/multisigdialog.cpp b/src/qt/multisigdialog.cpp index 4ba48b7c..e198fc36 100755 --- a/src/qt/multisigdialog.cpp +++ b/src/qt/multisigdialog.cpp @@ -367,7 +367,7 @@ bool MultisigDialog::createMultisigTransaction(vector vUserIn, vector vUserIn, vectorlabelBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, balance - immatureBalance, false, BitcoinUnits::separatorAlways)); ui->labelzBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, zerocoinBalance, false, BitcoinUnits::separatorAlways)); ui->labelUnconfirmed->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, unconfirmedBalance, false, BitcoinUnits::separatorAlways)); @@ -201,7 +201,7 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed ui->labelWatchImmature->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchImmatureBalance, false, BitcoinUnits::separatorAlways)); ui->labelWatchTotal->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, watchOnlyBalance + watchUnconfBalance + watchImmatureBalance, false, BitcoinUnits::separatorAlways)); - // zPIV labels + // zLUX labels QString szPercentage = ""; QString sPercentage = ""; CAmount nLockedBalance = 0; @@ -222,11 +222,11 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed ui->labelzBalanceMature->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, matureZerocoinBalance, false, BitcoinUnits::separatorAlways)); ui->labelTotalz->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, nTotalBalance + zerocoinBalance, false, BitcoinUnits::separatorAlways)); ui->labelUnLockedBalance->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, nUnlockedBalance, false, BitcoinUnits::separatorAlways)); - ui->labelPIVPercent->setText(sPercentage); - ui->labelzPIVPercent->setText(szPercentage); + ui->labelLUXPercent->setText(sPercentage); + ui->labelzLUXPercent->setText(szPercentage); // Adjust bubble-help according to AutoMint settings - QString automintHelp = tr("Current percentage of zPIV.\nIf AutoMint is enabled this percentage will settle around the configured AutoMint percentage (default = 10%).\n"); + QString automintHelp = tr("Current percentage of zLUX.\nIf AutoMint is enabled this percentage will settle around the configured AutoMint percentage (default = 10%).\n"); bool fEnableZeromint = GetBoolArg("-enablezeromint", true); int nZeromintPercentage = GetArg("-zeromintpercentage", 10); if (fEnableZeromint) { @@ -236,7 +236,7 @@ void OverviewPage::setBalance(const CAmount& balance, const CAmount& unconfirmed else { automintHelp += tr("AutoMint is currently disabled.\nTo enable AutoMint change 'enablezeromint=0' to 'enablezeromint=1' in lux.conf"); } - ui->labelzPIVPercent->setToolTip(automintHelp); + ui->labelzLUXPercent->setToolTip(automintHelp); // only show immature (newly mined) balance if it's non-zero, so as not to complicate things // for the non-mining users @@ -315,7 +315,7 @@ void OverviewPage::setWalletModel(WalletModel* model) connect(model, SIGNAL(notifyWatchonlyChanged(bool)), this, SLOT(updateWatchOnlyLabels(bool))); } - // update the display unit, to not use the default ("PIV") + // update the display unit, to not use the default ("LUX") updateDisplayUnit(); } diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h index 233ac322..265c8ea9 100755 --- a/src/qt/overviewpage.h +++ b/src/qt/overviewpage.h @@ -59,7 +59,7 @@ public slots: CAmount currentWatchUnconfBalance; CAmount currentWatchImmatureBalance; int nDisplayUnit; - void getPercentage(CAmount nTotalBalance, CAmount nZerocoinBalance, QString& sPIVPercentage, QString& szPIVPercentage); + void getPercentage(CAmount nTotalBalance, CAmount nZerocoinBalance, QString& sLUXPercentage, QString& szLUXPercentage); TxViewDelegate* txdelegate; TransactionFilterProxy* filter; diff --git a/src/qt/privacydialog.cpp b/src/qt/privacydialog.cpp index 7648ef8e..0c80b1c3 100755 --- a/src/qt/privacydialog.cpp +++ b/src/qt/privacydialog.cpp @@ -30,14 +30,14 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent), nDisplayUnit = 0; // just make sure it's not unitialized ui->setupUi(this); - // "Spending 999999 zPIV ought to be enough for anybody." - Bill Gates, 2017 - ui->zPIVpayAmount->setValidator( new QDoubleValidator(0.0, 21000000.0, 20, this) ); + // "Spending 999999 zLUX ought to be enough for anybody." - Bill Gates, 2017 + ui->zLUXpayAmount->setValidator( new QDoubleValidator(0.0, 21000000.0, 20, this) ); ui->labelMintAmountValue->setValidator( new QIntValidator(0, 999999, this) ); // Default texts for (mini-) coincontrol ui->labelCoinControlQuantity->setText (tr("Coins automatically selected")); ui->labelCoinControlAmount->setText (tr("Coins automatically selected")); - ui->labelzPIVSyncStatus->setText("(" + tr("out of sync") + ")"); + ui->labelzLUXSyncStatus->setText("(" + tr("out of sync") + ")"); // Sunken frame for minting messages ui->TEMintStatus->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); @@ -94,11 +94,11 @@ PrivacyDialog::PrivacyDialog(QWidget* parent) : QDialog(parent), //temporary disable for maintenance if(GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE)) { - ui->pushButtonMintzPIV->setEnabled(false); - ui->pushButtonMintzPIV->setToolTip(tr("zPIV is currently disabled due to maintenance.")); + ui->pushButtonMintzLUX->setEnabled(false); + ui->pushButtonMintzLUX->setToolTip(tr("zLUX is currently disabled due to maintenance.")); - ui->pushButtonSpendzPIV->setEnabled(false); - ui->pushButtonSpendzPIV->setToolTip(tr("zPIV is currently disabled due to maintenance.")); + ui->pushButtonSpendzLUX->setEnabled(false); + ui->pushButtonSpendzLUX->setToolTip(tr("zLUX is currently disabled due to maintenance.")); } } @@ -137,18 +137,18 @@ void PrivacyDialog::on_addressBookButton_clicked() dlg.setModel(walletModel->getAddressTableModel()); if (dlg.exec()) { ui->payTo->setText(dlg.getReturnValue()); - ui->zPIVpayAmount->setFocus(); + ui->zLUXpayAmount->setFocus(); } } -void PrivacyDialog::on_pushButtonMintzPIV_clicked() +void PrivacyDialog::on_pushButtonMintzLUX_clicked() { if (!walletModel || !walletModel->getOptionsModel()) return; if(GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE)) { QMessageBox::information(this, tr("Mint Zerocoin"), - tr("zPIV is currently undergoing maintenance."), QMessageBox::Ok, + tr("zLUX is currently undergoing maintenance."), QMessageBox::Ok, QMessageBox::Ok); return; } @@ -176,7 +176,7 @@ void PrivacyDialog::on_pushButtonMintzPIV_clicked() return; } - ui->TEMintStatus->setPlainText(tr("Minting ") + ui->labelMintAmountValue->text() + " zPIV..."); + ui->TEMintStatus->setPlainText(tr("Minting ") + ui->labelMintAmountValue->text() + " zLUX..."); ui->TEMintStatus->repaint (); int64_t nTime = GetTimeMillis(); @@ -194,7 +194,7 @@ void PrivacyDialog::on_pushButtonMintzPIV_clicked() double fDuration = (double)(GetTimeMillis() - nTime)/1000.0; // Minting successfully finished. Show some stats for entertainment. - QString strStatsHeader = tr("Successfully minted ") + ui->labelMintAmountValue->text() + tr(" zPIV in ") + + QString strStatsHeader = tr("Successfully minted ") + ui->labelMintAmountValue->text() + tr(" zLUX in ") + QString::number(fDuration) + tr(" sec. Used denominations:\n"); // Clear amount to avoid double spending when accidentally clicking twice @@ -253,7 +253,7 @@ void PrivacyDialog::on_pushButtonSpentReset_clicked() return; } -void PrivacyDialog::on_pushButtonSpendzPIV_clicked() +void PrivacyDialog::on_pushButtonSpendzLUX_clicked() { if (!walletModel || !walletModel->getOptionsModel() || !pwalletMain) @@ -261,7 +261,7 @@ void PrivacyDialog::on_pushButtonSpendzPIV_clicked() if(GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE)) { QMessageBox::information(this, tr("Mint Zerocoin"), - tr("zPIV is currently undergoing maintenance."), QMessageBox::Ok, QMessageBox::Ok); + tr("zLUX is currently undergoing maintenance."), QMessageBox::Ok, QMessageBox::Ok); return; } @@ -273,12 +273,12 @@ void PrivacyDialog::on_pushButtonSpendzPIV_clicked() // Unlock wallet was cancelled return; } - // Wallet is unlocked now, sedn zPIV - sendzPIV(); + // Wallet is unlocked now, sedn zLUX + sendzLUX(); return; } - // Wallet already unlocked or not encrypted at all, send zPIV - sendzPIV(); + // Wallet already unlocked or not encrypted at all, send zLUX + sendzLUX(); } void PrivacyDialog::on_pushButtonZPivControl_clicked() @@ -299,7 +299,7 @@ static inline int64_t roundint64(double d) return (int64_t)(d > 0 ? d + 0.5 : d - 0.5); } -void PrivacyDialog::sendzPIV() +void PrivacyDialog::sendzLUX() { QSettings settings; @@ -317,24 +317,24 @@ void PrivacyDialog::sendzPIV() } // Double is allowed now - double dAmount = ui->zPIVpayAmount->text().toDouble(); + double dAmount = ui->zLUXpayAmount->text().toDouble(); CAmount nAmount = roundint64(dAmount* COIN); // Check amount validity if (!MoneyRange(nAmount) || nAmount <= 0.0) { QMessageBox::warning(this, tr("Spend Zerocoin"), tr("Invalid Send Amount"), QMessageBox::Ok, QMessageBox::Ok); - ui->zPIVpayAmount->setFocus(); + ui->zLUXpayAmount->setFocus(); return; } - // Convert change to zPIV + // Convert change to zLUX bool fMintChange = ui->checkBoxMintChange->isChecked(); // Persist minimize change setting fMinimizeChange = ui->checkBoxMinimizeChange->isChecked(); settings.setValue("fMinimizeChange", fMinimizeChange); - // Warn for additional fees if amount is not an integer and change as zPIV is requested + // Warn for additional fees if amount is not an integer and change as zLUX is requested bool fWholeNumber = floor(dAmount) == dAmount; double dzFee = 0.0; @@ -343,7 +343,7 @@ void PrivacyDialog::sendzPIV() if(!fWholeNumber && fMintChange){ QString strFeeWarning = "You've entered an amount with fractional digits and want the change to be converted to Zerocoin.

"; - strFeeWarning += QString::number(dzFee, 'f', 8) + " PIV will be added to the standard transaction fees!
"; + strFeeWarning += QString::number(dzFee, 'f', 8) + " LUX will be added to the standard transaction fees!
"; QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm additional Fees"), strFeeWarning, QMessageBox::Yes | QMessageBox::Cancel, @@ -351,7 +351,7 @@ void PrivacyDialog::sendzPIV() if (retval != QMessageBox::Yes) { // Sending canceled - ui->zPIVpayAmount->setFocus(); + ui->zLUXpayAmount->setFocus(); return; } } @@ -370,7 +370,7 @@ void PrivacyDialog::sendzPIV() // General info QString strQuestionString = tr("Are you sure you want to send?

"); - QString strAmount = "" + QString::number(dAmount, 'f', 8) + " zPIV"; + QString strAmount = "" + QString::number(dAmount, 'f', 8) + " zLUX"; QString strAddress = tr(" to address ") + QString::fromStdString(address.ToString()) + strAddressLabel + "
"; if(ui->payTo->text().isEmpty()){ @@ -402,7 +402,7 @@ void PrivacyDialog::sendzPIV() vMintsSelected = ZPivControlDialog::GetSelectedMints(); } - // Spend zPIV + // Spend zLUX CWalletTx wtxNew; CZerocoinSpendReceipt receipt; bool fSuccess = false; @@ -418,7 +418,7 @@ void PrivacyDialog::sendzPIV() // Display errors during spend if (!fSuccess) { int nNeededSpends = receipt.GetNeededSpends(); // Number of spends we would need for this transaction - const int nMaxSpends = Params().Zerocoin_MaxSpendsPerTransaction(); // Maximum possible spends for one zPIV transaction + const int nMaxSpends = Params().Zerocoin_MaxSpendsPerTransaction(); // Maximum possible spends for one zLUX transaction if (nNeededSpends > nMaxSpends) { QString strStatusMessage = tr("Too much inputs (") + QString::number(nNeededSpends, 10) + tr(") needed. \nMaximum allowed: ") + QString::number(nMaxSpends, 10); strStatusMessage += tr("\nEither mint higher denominations (so fewer inputs are needed) or reduce the amount to spend."); @@ -429,7 +429,7 @@ void PrivacyDialog::sendzPIV() QMessageBox::warning(this, tr("Spend Zerocoin"), receipt.GetStatusMessage().c_str(), QMessageBox::Ok, QMessageBox::Ok); ui->TEMintStatus->setPlainText(tr("Spend Zerocoin failed with status = ") +QString::number(receipt.GetStatus(), 10) + "\n" + "Message: " + QString::fromStdString(receipt.GetStatusMessage())); } - ui->zPIVpayAmount->setFocus(); + ui->zLUXpayAmount->setFocus(); ui->TEMintStatus->repaint(); return; } @@ -472,7 +472,7 @@ void PrivacyDialog::sendzPIV() strReturn += strStats; // Clear amount to avoid double spending when accidentally clicking twice - ui->zPIVpayAmount->setText ("0"); + ui->zLUXpayAmount->setText ("0"); ui->TEMintStatus->setPlainText(strReturn); ui->TEMintStatus->repaint(); @@ -614,7 +614,7 @@ void PrivacyDialog::setBalance(const CAmount& balance, const CAmount& unconfirme strDenomStats = strUnconfirmed + QString::number(mapDenomBalances.at(denom)) + " x " + QString::number(nCoins) + " = " + - QString::number(nSumPerCoin) + " zPIV "; + QString::number(nSumPerCoin) + " zLUX "; switch (nCoins) { case libzerocoin::CoinDenomination::ZQ_ONE: @@ -652,9 +652,9 @@ void PrivacyDialog::setBalance(const CAmount& balance, const CAmount& unconfirme nLockedBalance = walletModel->getLockedBalance(); } - ui->labelzAvailableAmount->setText(QString::number(zerocoinBalance/COIN) + QString(" zPIV ")); - ui->labelzAvailableAmount_2->setText(QString::number(matureZerocoinBalance/COIN) + QString(" zPIV ")); - ui->labelzPIVAmountValue->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, balance - immatureBalance - nLockedBalance, false, BitcoinUnits::separatorAlways)); + ui->labelzAvailableAmount->setText(QString::number(zerocoinBalance/COIN) + QString(" zLUX ")); + ui->labelzAvailableAmount_2->setText(QString::number(matureZerocoinBalance/COIN) + QString(" zLUX ")); + ui->labelzLUXAmountValue->setText(BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, balance - immatureBalance - nLockedBalance, false, BitcoinUnits::separatorAlways)); } void PrivacyDialog::updateDisplayUnit() @@ -670,7 +670,7 @@ void PrivacyDialog::updateDisplayUnit() void PrivacyDialog::showOutOfSyncWarning(bool fShow) { - ui->labelzPIVSyncStatus->setVisible(fShow); + ui->labelzLUXSyncStatus->setVisible(fShow); } void PrivacyDialog::keyPressEvent(QKeyEvent* event) diff --git a/src/qt/privacydialog.h b/src/qt/privacydialog.h index 3af62248..53a39a25 100755 --- a/src/qt/privacydialog.h +++ b/src/qt/privacydialog.h @@ -76,7 +76,7 @@ public slots: int nDisplayUnit; bool updateLabel(const QString& address); - void sendzPIV(); + void sendzLUX(); private slots: void on_payTo_textChanged(const QString& address); @@ -96,10 +96,10 @@ private slots: // void coinControlClipboardLowOutput(); // void coinControlClipboardChange(); - void on_pushButtonMintzPIV_clicked(); + void on_pushButtonMintzLUX_clicked(); void on_pushButtonMintReset_clicked(); void on_pushButtonSpentReset_clicked(); - void on_pushButtonSpendzPIV_clicked(); + void on_pushButtonSpendzLUX_clicked(); void on_pushButtonZPivControl_clicked(); void on_pasteButton_clicked(); void updateDisplayUnit(); diff --git a/src/qt/res/css/default.css b/src/qt/res/css/default.css index ff27e2fb..3a124873 100755 --- a/src/qt/res/css/default.css +++ b/src/qt/res/css/default.css @@ -694,13 +694,13 @@ QWidget#PrivacyDialog QLabel { border:0px solid #000; } -QWidget#PrivacyDialog QLabel#zPIVLabel { +QWidget#PrivacyDialog QLabel#zLUXLabel { font-size:14px; color:#ffffff; background-color:#5B4C7C; } -QWidget#PrivacyDialog QLabel#oPIVLabel { +QWidget#PrivacyDialog QLabel#oLUXLabel { font-size:14px; color:#ffffff; background-color:#5B4C7C; @@ -877,7 +877,7 @@ font-weight:normal; min-height:30px; } -QWidget .QFrame#frame .QLabel#label_5 { /* PIV Balances Label */ +QWidget .QFrame#frame .QLabel#label_5 { /* LUX Balances Label */ qproperty-alignment: 'AlignVCenter | AlignLeft'; min-width:160px; background-color:transparent; @@ -1014,7 +1014,7 @@ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceText { /* Available zPIV Label */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceText { /* Available zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1026,7 +1026,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_4 .QLabel#labelzBalance { /* Available zPIV Balance */ +QWidget .QFrame#frame_4 .QLabel#labelzBalance { /* Available zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; @@ -1034,7 +1034,7 @@ color:#5B4C7C; margin-left:0px; } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceUnconfirmedText { /* Unconfirmed zPIV Label */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceUnconfirmedText { /* Unconfirmed zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1046,7 +1046,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceUnconfirmed { /* Unconfirmed zPIV Balance */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceUnconfirmed { /* Unconfirmed zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; @@ -1054,7 +1054,7 @@ color:#5B4C7C; margin-left:0px; } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceMatureText { /* Mature zPIV Label */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceMatureText { /* Mature zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1066,7 +1066,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceMature { /* Mature zPIV Balance */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceMature { /* Mature zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; @@ -1074,7 +1074,7 @@ color:#5B4C7C; margin-left:0px; } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceImmatureText { /* Immature zPIV Label */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceImmatureText { /* Immature zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1086,7 +1086,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_4 .QLabel#labelzBalanceImmature { /* Immature zPIV Balance */ +QWidget .QFrame#frame_4 .QLabel#labelzBalanceImmature { /* Immature zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; @@ -1105,7 +1105,7 @@ margin-right:5px; padding-right:5px; } -QWidget .QFrame#frame_3 .QLabel#labelBalanceTextz { /* Available PIV Label */ +QWidget .QFrame#frame_3 .QLabel#labelBalanceTextz { /* Available LUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1117,7 +1117,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_3 .QLabel#labelBalancez { /* Available PIV Balance */ +QWidget .QFrame#frame_3 .QLabel#labelBalancez { /* Available LUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; @@ -1125,7 +1125,7 @@ color:#5B4C7C; margin-left:0px; } -QWidget .QFrame#frame_3 .QLabel#labelzBalanceTextz { /* Available zPIV Label */ +QWidget .QFrame#frame_3 .QLabel#labelzBalanceTextz { /* Available zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1137,7 +1137,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_3 .QLabel#labelzBalancez { /* Available zPIV Balance */ +QWidget .QFrame#frame_3 .QLabel#labelzBalancez { /* Available zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:bold; @@ -1145,7 +1145,7 @@ color:#5B4C7C; margin-left:0px; } -QWidget .QFrame#frame_3 .QLabel#labelLockedBalanceText { /* Available zPIV Label */ +QWidget .QFrame#frame_3 .QLabel#labelLockedBalanceText { /* Available zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1157,7 +1157,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_3 .QLabel#labelLockedBalance { /* Available zPIV Balance */ +QWidget .QFrame#frame_3 .QLabel#labelLockedBalance { /* Available zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:normal; @@ -1165,7 +1165,7 @@ color:#5B4C7C; margin-left:0px; } -QWidget .QFrame#frame_3 .QLabel#labelUnLockedBalanceText { /* Available zPIV Label */ +QWidget .QFrame#frame_3 .QLabel#labelUnLockedBalanceText { /* Available zLUX Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; background-color:#5B4C7C; @@ -1177,7 +1177,7 @@ font-size:14px; /* min-height:35px; */ } -QWidget .QFrame#frame_3 .QLabel#labelUnLockedBalance { /* Available zPIV Balance */ +QWidget .QFrame#frame_3 .QLabel#labelUnLockedBalance { /* Available zLUX Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:12px; font-weight:normal; diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 9e362bcd..223ca864 100755 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -134,7 +134,7 @@ SendCoinsDialog::SendCoinsDialog(QWidget* parent) : QDialog(parent), ui->customFee->setValue(settings.value("nTransactionFee").toLongLong()); ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool()); ui->checkBoxFreeTx->setChecked(settings.value("fSendFreeTransactions").toBool()); - ui->checkzPIV->hide(); + ui->checkzLUX->hide(); minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool()); } diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 9d098739..766d3edb 100755 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -314,7 +314,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact if (recipients[0].useSwiftTX && total > GetSporkValue(SPORK_5_MAX_VALUE) * COIN) { - emit message(tr("Send Coins"), tr("SwiftX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), + emit message(tr("Send Coins"), tr("SwiftX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } @@ -323,7 +323,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact transaction.setTransactionFee(nFeeRequired); if (recipients[0].useSwiftTX && newTx->GetValueOut() > GetSporkValue(SPORK_5_MAX_VALUE) * COIN) { - emit message(tr("Send Coins"), tr("SwiftX doesn't support sending values that high yet. Transactions are currently limited to %1 PIV.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), + emit message(tr("Send Coins"), tr("SwiftX doesn't support sending values that high yet. Transactions are currently limited to %1 LUX.").arg(GetSporkValue(SPORK_5_MAX_VALUE)), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; } diff --git a/src/qt/walletview.h b/src/qt/walletview.h index 1c18747e..84688c06 100755 --- a/src/qt/walletview.h +++ b/src/qt/walletview.h @@ -129,7 +129,7 @@ public slots: /** Show progress dialog e.g. for rescan */ void showProgress(const QString& title, int nProgress); - /** Update selected PIV amount from transactionview */ + /** Update selected LUX amount from transactionview */ void trxAmount(QString amount); signals: diff --git a/src/qt/zpivcontroldialog.h b/src/qt/zpivcontroldialog.h index 8387106c..a82e88cb 100755 --- a/src/qt/zpivcontroldialog.h +++ b/src/qt/zpivcontroldialog.h @@ -2,8 +2,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef ZPIVCONTROLDIALOG_H -#define ZPIVCONTROLDIALOG_H +#ifndef ZLUXCONTROLDIALOG_H +#define ZLUXCONTROLDIALOG_H #include #include @@ -52,4 +52,4 @@ private slots: void ButtonAllClicked(); }; -#endif // ZPIVCONTROLDIALOG_H +#endif // ZLUXCONTROLDIALOG_H diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 62af14d3..0c30bcfc 100755 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -95,7 +95,7 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDe zpivObj.push_back(Pair(to_string(denom), ValueFromAmount(blockindex->mapZerocoinSupply.at(denom) * (denom*COIN)))); } zpivObj.emplace_back(Pair("total", ValueFromAmount(blockindex->GetZerocoinSupply()))); - result.emplace_back(Pair("zPIVsupply", zpivObj)); + result.emplace_back(Pair("zLUXsupply", zpivObj)); return result; } @@ -278,17 +278,17 @@ Value getblock(const Array& params, bool fHelp) " \"previousblockhash\" : \"hash\", (string) The hash of the previous block\n" " \"nextblockhash\" : \"hash\" (string) The hash of the next block\n" " \"moneysupply\" : \"supply\" (numeric) The money supply when this block was added to the blockchain\n" - " \"zPIVsupply\" :\n" + " \"zLUXsupply\" :\n" " {\n" - " \"1\" : n, (numeric) supply of 1 zPIV denomination\n" - " \"5\" : n, (numeric) supply of 5 zPIV denomination\n" - " \"10\" : n, (numeric) supply of 10 zPIV denomination\n" - " \"50\" : n, (numeric) supply of 50 zPIV denomination\n" - " \"100\" : n, (numeric) supply of 100 zPIV denomination\n" - " \"500\" : n, (numeric) supply of 500 zPIV denomination\n" - " \"1000\" : n, (numeric) supply of 1000 zPIV denomination\n" - " \"5000\" : n, (numeric) supply of 5000 zPIV denomination\n" - " \"total\" : n, (numeric) The total supply of all zPIV denominations\n" + " \"1\" : n, (numeric) supply of 1 zLUX denomination\n" + " \"5\" : n, (numeric) supply of 5 zLUX denomination\n" + " \"10\" : n, (numeric) supply of 10 zLUX denomination\n" + " \"50\" : n, (numeric) supply of 50 zLUX denomination\n" + " \"100\" : n, (numeric) supply of 100 zLUX denomination\n" + " \"500\" : n, (numeric) supply of 500 zLUX denomination\n" + " \"1000\" : n, (numeric) supply of 1000 zLUX denomination\n" + " \"5000\" : n, (numeric) supply of 5000 zLUX denomination\n" + " \"total\" : n, (numeric) The total supply of all zLUX denominations\n" " }\n" "}\n" "\nResult (for verbose=false):\n" diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index e7940fc1..6ac9bc3b 100755 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -65,17 +65,17 @@ Value getinfo(const Array& params, bool fHelp) " \"difficulty\": xxxxxx, (numeric) the current difficulty\n" " \"testnet\": true|false, (boolean) if the server is using testnet or not\n" " \"moneysupply\" : \"supply\" (numeric) The money supply when this block was added to the blockchain\n" - " \"zPIVsupply\" :\n" + " \"zLUXsupply\" :\n" " {\n" - " \"1\" : n, (numeric) supply of 1 zPIV denomination\n" - " \"5\" : n, (numeric) supply of 5 zPIV denomination\n" - " \"10\" : n, (numeric) supply of 10 zPIV denomination\n" - " \"50\" : n, (numeric) supply of 50 zPIV denomination\n" - " \"100\" : n, (numeric) supply of 100 zPIV denomination\n" - " \"500\" : n, (numeric) supply of 500 zPIV denomination\n" - " \"1000\" : n, (numeric) supply of 1000 zPIV denomination\n" - " \"5000\" : n, (numeric) supply of 5000 zPIV denomination\n" - " \"total\" : n, (numeric) The total supply of all zPIV denominations\n" + " \"1\" : n, (numeric) supply of 1 zLUX denomination\n" + " \"5\" : n, (numeric) supply of 5 zLUX denomination\n" + " \"10\" : n, (numeric) supply of 10 zLUX denomination\n" + " \"50\" : n, (numeric) supply of 50 zLUX denomination\n" + " \"100\" : n, (numeric) supply of 100 zLUX denomination\n" + " \"500\" : n, (numeric) supply of 500 zLUX denomination\n" + " \"1000\" : n, (numeric) supply of 1000 zLUX denomination\n" + " \"5000\" : n, (numeric) supply of 5000 zLUX denomination\n" + " \"total\" : n, (numeric) The total supply of all zLUX denominations\n" " }\n" " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" @@ -113,7 +113,7 @@ Value getinfo(const Array& params, bool fHelp) zpivObj.push_back(Pair(to_string(denom), ValueFromAmount(chainActive.Tip()->mapZerocoinSupply.at(denom) * (denom*COIN)))); } zpivObj.emplace_back(Pair("total", ValueFromAmount(chainActive.Tip()->GetZerocoinSupply()))); - obj.emplace_back(Pair("zPIVsupply", zpivObj)); + obj.emplace_back(Pair("zLUXsupply", zpivObj)); #ifdef ENABLE_WALLET if (pwalletMain) { diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index be648e10..0d27b59a 100755 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1600,7 +1600,7 @@ Value walletpassphrase(const Array& params, bool fHelp) throw runtime_error( "walletpassphrase \"passphrase\" timeout ( anonymizeonly )\n" "\nStores the wallet decryption key in memory for 'timeout' seconds.\n" - "This is needed prior to performing transactions related to private keys such as sending PIVs\n" + "This is needed prior to performing transactions related to private keys such as sending LUXs\n" "\nArguments:\n" "1. \"passphrase\" (string, required) The wallet passphrase\n" "2. timeout (numeric, required) The time to keep the decryption key in seconds.\n" @@ -1737,7 +1737,7 @@ Value encryptwallet(const Array& params, bool fHelp) "\nExamples:\n" "\nEncrypt you wallet\n" + HelpExampleCli("encryptwallet", "\"my pass phrase\"") + - "\nNow set the passphrase to use the wallet, such as for signing or sending PIVs\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + + "\nNow set the passphrase to use the wallet, such as for signing or sending LUXs\n" + HelpExampleCli("walletpassphrase", "\"my pass phrase\"") + "\nNow we can so something like sign\n" + HelpExampleCli("signmessage", "\"luxaddress\" \"test message\"") + "\nNow lock the wallet again by removing the passphrase\n" + HelpExampleCli("walletlock", "") + "\nAs a json rpc call\n" + HelpExampleRpc("encryptwallet", "\"my pass phrase\"")); @@ -1775,7 +1775,7 @@ Value lockunspent(const Array& params, bool fHelp) "lockunspent unlock [{\"txid\":\"txid\",\"vout\":n},...]\n" "\nUpdates list of temporarily unspendable outputs.\n" "Temporarily lock (unlock=false) or unlock (unlock=true) specified transaction outputs.\n" - "A locked transaction output will not be chosen by automatic coin selection, when spending PIVs.\n" + "A locked transaction output will not be chosen by automatic coin selection, when spending LUXs.\n" "Locks are stored in memory only. Nodes start with zero locked outputs, and the locked output list\n" "is always cleared (by virtue of process exit) when a node stops or fails.\n" "Also see the listunspent call\n" @@ -1887,7 +1887,7 @@ Value settxfee(const Array& params, bool fHelp) "settxfee amount\n" "\nSet the transaction fee per kB.\n" "\nArguments:\n" - "1. amount (numeric, required) The transaction fee in PIV/kB rounded to the nearest 0.00000001\n" + "1. amount (numeric, required) The transaction fee in LUX/kB rounded to the nearest 0.00000001\n" "\nResult\n" "true|false (boolean) Returns true if successful\n" "\nExamples:\n" + @@ -1911,7 +1911,7 @@ Value getwalletinfo(const Array& params, bool fHelp) "\nResult:\n" "{\n" " \"walletversion\": xxxxx, (numeric) the wallet version\n" - " \"balance\": xxxxxxx, (numeric) the total PIV balance of the wallet\n" + " \"balance\": xxxxxxx, (numeric) the total LUX balance of the wallet\n" " \"txcount\": xxxxxxx, (numeric) the total number of transactions in the wallet\n" " \"keypoololdest\": xxxxxx, (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n" " \"keypoolsize\": xxxx, (numeric) how many new keys are pre-generated\n" @@ -2267,7 +2267,7 @@ Value multisend(const Array& params, bool fHelp) string strAddress = params[0].get_str(); CBitcoinAddress address(strAddress); if (!address.IsValid()) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid PIV address"); + throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid LUX address"); if (boost::lexical_cast(params[1].get_str()) < 0) throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected valid percentage"); if (pwalletMain->IsLocked()) @@ -2406,7 +2406,7 @@ Value mintzerocoin(const Array& params, bool fHelp) int64_t nTime = GetTimeMillis(); if(GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE)) - throw JSONRPCError(RPC_WALLET_ERROR, "zPIV is currently disabled due to maintenance."); + throw JSONRPCError(RPC_WALLET_ERROR, "zLUX is currently disabled due to maintenance."); if (pwalletMain->IsLocked()) throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please enter the wallet passphrase with walletpassphrase first."); @@ -2440,9 +2440,9 @@ Value spendzerocoin(const Array& params, bool fHelp) if (fHelp || params.size() > 5 || params.size() < 4) throw runtime_error( "spendzerocoin
\n" - "Overview: Convert zPIV (zerocoins) into PIV. \n" + "Overview: Convert zLUX (zerocoins) into LUX. \n" "amount: amount to spend\n" - "mintchange: if there is left over PIV (change), the wallet can convert it automatically back to zerocoins [true]\n" + "mintchange: if there is left over LUX (change), the wallet can convert it automatically back to zerocoins [true]\n" "minimizechange: try to minimize the returning change [false]\n" "security level: the amount of checkpoints to add to the accumulator. A checkpoint contains 10 blocks worth of zerocoinmints." "The more checkpoints that are added, the more untraceable the transaction will be. Use [100] to add the maximum amount" @@ -2452,14 +2452,14 @@ Value spendzerocoin(const Array& params, bool fHelp) + HelpRequiringPassphrase()); if(GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE)) - throw JSONRPCError(RPC_WALLET_ERROR, "zPIV is currently disabled due to maintenance."); + throw JSONRPCError(RPC_WALLET_ERROR, "zLUX is currently disabled due to maintenance."); int64_t nTimeStart = GetTimeMillis(); if (pwalletMain->IsLocked()) throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please enter the wallet passphrase with walletpassphrase first."); CAmount nAmount = AmountFromValue(params[0]); // Spending amount - bool fMintChange = params[1].get_bool(); // Mint change to zPIV + bool fMintChange = params[1].get_bool(); // Mint change to zLUX bool fMinimizeChange = params[2].get_bool(); // Minimize change int nSecurityLevel = params[3].get_int(); // Security level diff --git a/src/spork.h b/src/spork.h index 60e79f1b..f21d5c89 100755 --- a/src/spork.h +++ b/src/spork.h @@ -45,7 +45,7 @@ using namespace boost; #define SPORK_2_SWIFTTX_DEFAULT 978307200 //2001-1-1 #define SPORK_3_SWIFTTX_BLOCK_FILTERING_DEFAULT 1424217600 //2015-2-18 -#define SPORK_5_MAX_VALUE_DEFAULT 1000 //1000 PIV +#define SPORK_5_MAX_VALUE_DEFAULT 1000 //1000 LUX #define SPORK_7_MASTERNODE_SCANNING_DEFAULT 978307200 //2001-1-1 #define SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT 4070908800 //OFF #define SPORK_9_MASTERNODE_BUDGET_ENFORCEMENT_DEFAULT 4070908800 //OFF diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 1cffb836..47952ec4 100755 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -17,7 +17,7 @@ BOOST_AUTO_TEST_CASE(subsidy_limit_test) { CAmount nSum = 0; for (int nHeight = 0; nHeight < 1; nHeight += 1) { - /* premine in block 1 (60,001 PIV) */ + /* premine in block 1 (60,001 LUX) */ CAmount nSubsidy = GetBlockValue(nHeight); BOOST_CHECK(nSubsidy <= 60001 * COIN); nSum += nSubsidy; diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp index ae6359b7..85b5f37e 100755 --- a/src/test/torcontrol_tests.cpp +++ b/src/test/torcontrol_tests.cpp @@ -21,8 +21,8 @@ BOOST_AUTO_TEST_CASE(util_SplitTorReplyLine) { // Data we should receive during normal usage CheckSplitTorReplyLine( - "PROTOCOLINFO PIVERSION", - "PROTOCOLINFO", "PIVERSION"); + "PROTOCOLINFO LUXERSION", + "PROTOCOLINFO", "LUXERSION"); CheckSplitTorReplyLine( "AUTH METHODS=COOKIE,SAFECOOKIE COOKIEFILE=\"/home/x/.tor/control_auth_cookie\"", "AUTH", "METHODS=COOKIE,SAFECOOKIE COOKIEFILE=\"/home/x/.tor/control_auth_cookie\""); diff --git a/src/test/zerocoin_transactions_tests.cpp b/src/test/zerocoin_transactions_tests.cpp index 8239c04d..a12907ab 100755 --- a/src/test/zerocoin_transactions_tests.cpp +++ b/src/test/zerocoin_transactions_tests.cpp @@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(zerocoin_spend_test) CZerocoinSpendReceipt receipt; cWallet.SpendZerocoin(nAmount, nSecurityLevel, *wtx, receipt, vMints, fMintChange, fMinimizeChange); - BOOST_CHECK_MESSAGE(receipt.GetStatus() == ZPIV_TRX_FUNDS_PROBLEMS, "Failed Invalid Amount Check"); + BOOST_CHECK_MESSAGE(receipt.GetStatus() == ZLUX_TRX_FUNDS_PROBLEMS, "Failed Invalid Amount Check"); nAmount = 1; CZerocoinSpendReceipt receipt2; @@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(zerocoin_spend_test) // if using "wallet.dat", instead of "unlocked.dat" need this /// BOOST_CHECK_MESSAGE(vString == "Error: Wallet locked, unable to create transaction!"," Locked Wallet Check Failed"); - BOOST_CHECK_MESSAGE(receipt2.GetStatus() == ZPIV_TRX_FUNDS_PROBLEMS, "Failed Invalid Amount Check"); + BOOST_CHECK_MESSAGE(receipt2.GetStatus() == ZLUX_TRX_FUNDS_PROBLEMS, "Failed Invalid Amount Check"); } diff --git a/src/wallet.cpp b/src/wallet.cpp index a067412d..c78e5f6e 100755 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1941,13 +1941,13 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, set= nTargetValue); } - //if we're doing only denominated, we need to round up to the nearest .1 PIV + //if we're doing only denominated, we need to round up to the nearest .1 LUX if (coin_type == ONLY_DENOMINATED) { // Make outputs by looping through denominations, from large to small BOOST_FOREACH (CAmount v, obfuScationDenominations) { BOOST_FOREACH (const COutput& out, vCoins) { if (out.tx->vout[out.i].nValue == v //make sure it's the denom we're looking for - && nValueRet + out.tx->vout[out.i].nValue < nTargetValue + (0.1 * COIN) + 100 //round the amount up to .1 PIV over + && nValueRet + out.tx->vout[out.i].nValue < nTargetValue + (0.1 * COIN) + 100 //round the amount up to .1 LUX over ) { CTxIn vin = CTxIn(out.tx->GetHash(), out.i); int rounds = GetInputObfuscationRounds(vin); @@ -2009,12 +2009,12 @@ bool CWallet::SelectCoinsByDenominations(int nDenom, CAmount nValueMin, CAmount // Function returns as follows: // - // bit 0 - 10000 PIV+1 ( bit on if present ) - // bit 1 - 1000 PIV+1 - // bit 2 - 100 PIV+1 - // bit 3 - 10 PIV+1 - // bit 4 - 1 PIV+1 - // bit 5 - .1 PIV+1 + // bit 0 - 10000 LUX+1 ( bit on if present ) + // bit 1 - 1000 LUX+1 + // bit 2 - 100 LUX+1 + // bit 3 - 10 LUX+1 + // bit 4 - 1 LUX+1 + // bit 5 - .1 LUX+1 CTxIn vin = CTxIn(out.tx->GetHash(), out.i); @@ -2373,9 +2373,9 @@ bool CWallet::CreateTransaction(const vector >& vecSend, if (coin_type == ALL_COINS) { strFailReason = _("Insufficient funds."); } else if (coin_type == ONLY_NOT10000IFMN) { - strFailReason = _("Unable to locate enough funds for this transaction that are not equal 10000 PIV."); + strFailReason = _("Unable to locate enough funds for this transaction that are not equal 10000 LUX."); } else if (coin_type == ONLY_NONDENOMINATED_NOT10000IFMN) { - strFailReason = _("Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 PIV."); + strFailReason = _("Unable to locate enough Obfuscation non-denominated funds for this transaction that are not equal 10000 LUX."); } else { strFailReason = _("Unable to locate enough Obfuscation denominated funds for this transaction."); strFailReason += " " + _("Obfuscation uses exact denominated amounts to send funds, you might simply need to anonymize some more coins."); @@ -3552,32 +3552,32 @@ void CWallet::AutoZeromint() CAmount nMintAmount = 0; CAmount nToMintAmount = 0; - // zPIV are integers > 0, so we can't mint 10% of 9 PIV + // zLUX are integers > 0, so we can't mint 10% of 9 LUX if (nBalance < 10){ - LogPrint("zero", "CWallet::AutoZeromint(): available balance (%ld) too small for minting zPIV\n", nBalance); + LogPrint("zero", "CWallet::AutoZeromint(): available balance (%ld) too small for minting zLUX\n", nBalance); return; } - // Percentage of zPIV we already have + // Percentage of zLUX we already have double dPercentage = 100 * (double)nZerocoinBalance / (double)(nZerocoinBalance + nBalance); // Check if minting is actually needed if(dPercentage >= nZeromintPercentage){ - LogPrint("zero", "CWallet::AutoZeromint() @block %ld: percentage of existing zPIV (%lf%%) already >= configured percentage (%d%%). No minting needed...\n", + LogPrint("zero", "CWallet::AutoZeromint() @block %ld: percentage of existing zLUX (%lf%%) already >= configured percentage (%d%%). No minting needed...\n", chainActive.Tip()->nHeight, dPercentage, nZeromintPercentage); return; } - // zPIV amount needed for the target percentage + // zLUX amount needed for the target percentage nToMintAmount = ((nZerocoinBalance + nBalance) * nZeromintPercentage / 100); - // zPIV amount missing from target (must be minted) + // zLUX amount missing from target (must be minted) nToMintAmount = (nToMintAmount - nZerocoinBalance) / COIN; - // Use the biggest denomination smaller than the needed zPIV We'll only mint exact denomination to make minting faster. + // Use the biggest denomination smaller than the needed zLUX We'll only mint exact denomination to make minting faster. // Exception: for big amounts use 6666 (6666 = 1*5000 + 1*1000 + 1*500 + 1*100 + 1*50 + 1*10 + 1*5 + 1) to create all // possible denominations to avoid having 5000 denominations only. - // If a preferred denomination is used (means nPreferredDenom != 0) do nothing until we have enough PIV to mint this denomination + // If a preferred denomination is used (means nPreferredDenom != 0) do nothing until we have enough LUX to mint this denomination if (nPreferredDenom > 0){ if (nToMintAmount >= nPreferredDenom) @@ -3621,7 +3621,7 @@ void CWallet::AutoZeromint() nZerocoinBalance = GetZerocoinBalance(false); nBalance = GetUnlockedCoins(); dPercentage = 100 * (double)nZerocoinBalance / (double)(nZerocoinBalance + nBalance); - LogPrintf("CWallet::AutoZeromint() @ block %ld: successfully minted %ld zPIV. Current percentage of zPIV: %lf%%\n", + LogPrintf("CWallet::AutoZeromint() @ block %ld: successfully minted %ld zLUX. Current percentage of zLUX: %lf%%\n", chainActive.Tip()->nHeight, nMintAmount, dPercentage); // Re-adjust startup time to delay next Automint for 5 minutes nStartupTime = GetAdjustedTime(); @@ -4065,14 +4065,14 @@ bool CWallet::CreateZerocoinMintTransaction(const CAmount nValue, CMutableTransa bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, const uint256& hashTxOut, CTxIn& newTxIn, CZerocoinSpendReceipt& receipt) { // Default error status if not changed below - receipt.SetStatus(_("Transaction Mint Started"), ZPIV_TXMINT_GENERAL); + receipt.SetStatus(_("Transaction Mint Started"), ZLUX_TXMINT_GENERAL); libzerocoin::CoinDenomination denomination = zerocoinSelected.GetDenomination(); // 2. Get pubcoin from the private coin libzerocoin::PublicCoin pubCoinSelected(Params().Zerocoin_Params(), zerocoinSelected.GetValue(), denomination); LogPrintf("%s : pubCoinSelected:\n denom=%d\n value%s\n", __func__, denomination, pubCoinSelected.getValue().GetHex()); if (!pubCoinSelected.validate()) { - receipt.SetStatus(_("The selected mint coin is an invalid coin"), ZPIV_INVALID_COIN); + receipt.SetStatus(_("The selected mint coin is an invalid coin"), ZLUX_INVALID_COIN); return false; } @@ -4082,7 +4082,7 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con string strFailReason = ""; int nMintsAdded = 0; if (!GenerateAccumulatorWitness(pubCoinSelected, accumulator, witness, nSecurityLevel, nMintsAdded, strFailReason)) { - receipt.SetStatus(_("Try to spend with a higher security level to include more coins"), ZPIV_FAILED_ACCUMULATOR_INITIALIZATION); + receipt.SetStatus(_("Try to spend with a higher security level to include more coins"), ZLUX_FAILED_ACCUMULATOR_INITIALIZATION); LogPrintf("%s : %s \n", __func__, receipt.GetStatusMessage()); return false; } @@ -4098,7 +4098,7 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con libzerocoin::CoinSpend spend(Params().Zerocoin_Params(), privateCoin, accumulator, nChecksum, witness, hashTxOut); if (!spend.Verify(accumulator)) { - receipt.SetStatus(_("The new spend coin transaction did not verify"), ZPIV_INVALID_WITNESS); + receipt.SetStatus(_("The new spend coin transaction did not verify"), ZLUX_INVALID_WITNESS); return false; } @@ -4122,13 +4122,13 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con serializedCoinSpendChecking << spend; } catch (...) { - receipt.SetStatus(_("Failed to deserialize"), ZPIV_BAD_SERIALIZATION); + receipt.SetStatus(_("Failed to deserialize"), ZLUX_BAD_SERIALIZATION); return false; } libzerocoin::CoinSpend newSpendChecking(Params().Zerocoin_Params(), serializedCoinSpendChecking); if (!newSpendChecking.Verify(accumulator)) { - receipt.SetStatus(_("The transaction did not verify"), ZPIV_BAD_SERIALIZATION); + receipt.SetStatus(_("The transaction did not verify"), ZLUX_BAD_SERIALIZATION); return false; } @@ -4141,7 +4141,7 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con LogPrintf("%s failed to write zerocoinmint\n", __func__); pwalletMain->NotifyZerocoinChanged(pwalletMain, zerocoinSelected.GetValue().GetHex(), "Used", CT_UPDATED); - receipt.SetStatus(_("The coin spend has been used"), ZPIV_SPENT_USED_ZPIV); + receipt.SetStatus(_("The coin spend has been used"), ZLUX_SPENT_USED_ZLUX); return false; } } @@ -4152,11 +4152,11 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con receipt.AddSpend(zcSpend); } catch (const std::exception&) { - receipt.SetStatus(_("CoinSpend: Accumulator witness does not verify"), ZPIV_INVALID_WITNESS); + receipt.SetStatus(_("CoinSpend: Accumulator witness does not verify"), ZLUX_INVALID_WITNESS); return false; } - receipt.SetStatus(_("Spend Valid"), ZPIV_SPEND_OKAY); // Everything okay + receipt.SetStatus(_("Spend Valid"), ZLUX_SPEND_OKAY); // Everything okay return true; } @@ -4164,7 +4164,7 @@ bool CWallet::MintToTxIn(CZerocoinMint zerocoinSelected, int nSecurityLevel, con bool CWallet::CreateZerocoinSpendTransaction(CAmount nValue, int nSecurityLevel, CWalletTx& wtxNew, CReserveKey& reserveKey, CZerocoinSpendReceipt& receipt, vector& vSelectedMints, vector& vNewMints, bool fMintChange, bool fMinimizeChange, CBitcoinAddress* address) { // Check available funds - int nStatus = ZPIV_TRX_FUNDS_PROBLEMS; + int nStatus = ZLUX_TRX_FUNDS_PROBLEMS; if (nValue > GetZerocoinBalance(true)) { receipt.SetStatus(_("You don't have enough Zerocoins in your wallet"), nStatus); return false; @@ -4176,7 +4176,7 @@ bool CWallet::CreateZerocoinSpendTransaction(CAmount nValue, int nSecurityLevel, } // Create transaction - nStatus = ZPIV_TRX_CREATE; + nStatus = ZLUX_TRX_CREATE; // If not already given pre-selected mints, then select mints from the wallet CWalletDB walletdb(pwalletMain->strWalletFile); @@ -4184,7 +4184,7 @@ bool CWallet::CreateZerocoinSpendTransaction(CAmount nValue, int nSecurityLevel, CAmount nValueSelected = 0; int nCoinsReturned = 0; // Number of coins returned in change from function below (for debug) int nNeededSpends = 0; // Number of spends which would be needed if selection failed - const int nMaxSpends = Params().Zerocoin_MaxSpendsPerTransaction(); // Maximum possible spends for one zPIV transaction + const int nMaxSpends = Params().Zerocoin_MaxSpendsPerTransaction(); // Maximum possible spends for one zLUX transaction if (vSelectedMints.empty()) { listMints = walletdb.ListMintedCoins(true, true, true); // need to find mints to spend if(listMints.empty()) { @@ -4260,7 +4260,7 @@ bool CWallet::CreateZerocoinSpendTransaction(CAmount nValue, int nSecurityLevel, } // Create change if needed - nStatus = ZPIV_TRX_CHANGE; + nStatus = ZLUX_TRX_CHANGE; CMutableTransaction txNew; wtxNew.BindWallet(this); @@ -4329,7 +4329,7 @@ bool CWallet::CreateZerocoinSpendTransaction(CAmount nValue, int nSecurityLevel, // Limit size unsigned int nBytes = ::GetSerializeSize(txNew, SER_NETWORK, PROTOCOL_VERSION); if (nBytes >= MAX_ZEROCOIN_TX_SIZE) { - receipt.SetStatus(_("In rare cases, a spend with 7 coins exceeds our maximum allowable transaction size, please retry spend using 6 or less coins"), ZPIV_TX_TOO_LARGE); + receipt.SetStatus(_("In rare cases, a spend with 7 coins exceeds our maximum allowable transaction size, please retry spend using 6 or less coins"), ZLUX_TX_TOO_LARGE); return false; } @@ -4351,7 +4351,7 @@ bool CWallet::CreateZerocoinSpendTransaction(CAmount nValue, int nSecurityLevel, } } - receipt.SetStatus(_("Transaction Created"), ZPIV_SPEND_OKAY); // Everything okay + receipt.SetStatus(_("Transaction Created"), ZLUX_SPEND_OKAY); // Everything okay return true; } @@ -4555,10 +4555,10 @@ string CWallet::MintZerocoin(CAmount nValue, CWalletTx& wtxNew, vector& vMintsSelected, bool fMintChange, bool fMinimizeChange, CBitcoinAddress* addressTo) { // Default: assume something goes wrong. Depending on the problem this gets more specific below - int nStatus = ZPIV_SPEND_ERROR; + int nStatus = ZLUX_SPEND_ERROR; if (IsLocked()) { - receipt.SetStatus("Error: Wallet locked, unable to create transaction!", ZPIV_WALLET_LOCKED); + receipt.SetStatus("Error: Wallet locked, unable to create transaction!", ZLUX_WALLET_LOCKED); return false; } @@ -4574,7 +4574,7 @@ bool CWallet::SpendZerocoin(CAmount nAmount, int nSecurityLevel, CWalletTx& wtxN CWalletDB walletdb(pwalletMain->strWalletFile); if (!CommitTransaction(wtxNew, reserveKey)) { LogPrintf("%s: failed to commit\n", __func__); - nStatus = ZPIV_COMMIT_FAILED; + nStatus = ZLUX_COMMIT_FAILED; //reset all mints for (CZerocoinMint mint : vMintsSelected) { @@ -4586,7 +4586,7 @@ bool CWallet::SpendZerocoin(CAmount nAmount, int nSecurityLevel, CWalletTx& wtxN //erase spends for (CZerocoinSpend spend : receipt.GetSpends()) { if (!walletdb.EraseZerocoinSpendSerialEntry(spend.GetSerial())) { - receipt.SetStatus("Error: It cannot delete coin serial number in wallet", ZPIV_ERASE_SPENDS_FAILED); + receipt.SetStatus("Error: It cannot delete coin serial number in wallet", ZLUX_ERASE_SPENDS_FAILED); } //Remove from public zerocoinDB @@ -4596,7 +4596,7 @@ bool CWallet::SpendZerocoin(CAmount nAmount, int nSecurityLevel, CWalletTx& wtxN // erase new mints for (auto& mint : vNewMints) { if (!walletdb.EraseZerocoinMint(mint)) { - receipt.SetStatus("Error: Unable to cannot delete zerocoin mint in wallet", ZPIV_ERASE_NEW_MINTS_FAILED); + receipt.SetStatus("Error: Unable to cannot delete zerocoin mint in wallet", ZLUX_ERASE_NEW_MINTS_FAILED); } } @@ -4629,7 +4629,7 @@ bool CWallet::SpendZerocoin(CAmount nAmount, int nSecurityLevel, CWalletTx& wtxN walletdb.WriteZerocoinMint(mint); } - receipt.SetStatus("Spend Successful", ZPIV_SPEND_OKAY); // When we reach this point spending zPIV was successful + receipt.SetStatus("Spend Successful", ZLUX_SPEND_OKAY); // When we reach this point spending zLUX was successful return true; } diff --git a/src/wallet.h b/src/wallet.h index beb511bd..eb17fa6f 100755 --- a/src/wallet.h +++ b/src/wallet.h @@ -80,29 +80,29 @@ enum AvailableCoinsType { ALL_COINS = 1, ONLY_DENOMINATED = 2, ONLY_NOT10000IFMN = 3, - ONLY_NONDENOMINATED_NOT10000IFMN = 4, // ONLY_NONDENOMINATED and not 10000 PIV at the same time + ONLY_NONDENOMINATED_NOT10000IFMN = 4, // ONLY_NONDENOMINATED and not 10000 LUX at the same time ONLY_10000 = 5, // find masternode outputs including locked ones (use with caution) STAKABLE_COINS = 6 // UTXO's that are valid for staking }; -// Possible states for zPIV send +// Possible states for zLUX send enum ZerocoinSpendStatus { - ZPIV_SPEND_OKAY = 0, // No error - ZPIV_SPEND_ERROR = 1, // Unspecified class of errors, more details are (hopefully) in the returning text - ZPIV_WALLET_LOCKED = 2, // Wallet was locked - ZPIV_COMMIT_FAILED = 3, // Commit failed, reset status - ZPIV_ERASE_SPENDS_FAILED = 4, // Erasing spends during reset failed - ZPIV_ERASE_NEW_MINTS_FAILED = 5, // Erasing new mints during reset failed - ZPIV_TRX_FUNDS_PROBLEMS = 6, // Everything related to available funds - ZPIV_TRX_CREATE = 7, // Everything related to create the transaction - ZPIV_TRX_CHANGE = 8, // Everything related to transaction change - ZPIV_TXMINT_GENERAL = 9, // General errors in MintToTxIn - ZPIV_INVALID_COIN = 10, // Selected mint coin is not valid - ZPIV_FAILED_ACCUMULATOR_INITIALIZATION = 11, // Failed to initialize witness - ZPIV_INVALID_WITNESS = 12, // Spend coin transaction did not verify - ZPIV_BAD_SERIALIZATION = 13, // Transaction verification failed - ZPIV_SPENT_USED_ZPIV = 14, // Coin has already been spend - ZPIV_TX_TOO_LARGE = 15 // The transaction is larger than the max tx size + ZLUX_SPEND_OKAY = 0, // No error + ZLUX_SPEND_ERROR = 1, // Unspecified class of errors, more details are (hopefully) in the returning text + ZLUX_WALLET_LOCKED = 2, // Wallet was locked + ZLUX_COMMIT_FAILED = 3, // Commit failed, reset status + ZLUX_ERASE_SPENDS_FAILED = 4, // Erasing spends during reset failed + ZLUX_ERASE_NEW_MINTS_FAILED = 5, // Erasing new mints during reset failed + ZLUX_TRX_FUNDS_PROBLEMS = 6, // Everything related to available funds + ZLUX_TRX_CREATE = 7, // Everything related to create the transaction + ZLUX_TRX_CHANGE = 8, // Everything related to transaction change + ZLUX_TXMINT_GENERAL = 9, // General errors in MintToTxIn + ZLUX_INVALID_COIN = 10, // Selected mint coin is not valid + ZLUX_FAILED_ACCUMULATOR_INITIALIZATION = 11, // Failed to initialize witness + ZLUX_INVALID_WITNESS = 12, // Spend coin transaction did not verify + ZLUX_BAD_SERIALIZATION = 13, // Transaction verification failed + ZLUX_SPENT_USED_ZLUX = 14, // Coin has already been spend + ZLUX_TX_TOO_LARGE = 15 // The transaction is larger than the max tx size }; struct CompactTallyItem {