diff --git a/src/Makefile.am b/src/Makefile.am index 1661d39..308cb6e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -205,8 +205,8 @@ BITCOIN_CORE_H = \ util/time.h \ validation.h \ validationinterface.h \ - versioneximiat.h \ - versioneximiatinfo.h \ + versionbits.h \ + versionbitsinfo.h \ walletinitinterface.h \ wallet/coincontrol.h \ wallet/crypter.h \ @@ -284,7 +284,7 @@ libbitcoin_server_a_SOURCES = \ ui_interface.cpp \ validation.cpp \ validationinterface.cpp \ - versioneximiat.cpp \ + versionbits.cpp \ $(BITCOIN_CORE_H) if !ENABLE_WALLET @@ -438,7 +438,7 @@ libbitcoin_common_a_SOURCES = \ script/ismine.cpp \ script/sign.cpp \ script/standard.cpp \ - versioneximiatinfo.cpp \ + versionbitsinfo.cpp \ warnings.cpp \ $(BITCOIN_CORE_H) diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 3edff4f..619c9c9 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -128,7 +128,7 @@ BITCOIN_TESTS =\ test/uint256_tests.cpp \ test/util_tests.cpp \ test/validation_block_tests.cpp \ - test/versioneximiat_tests.cpp + test/versionbits_tests.cpp if ENABLE_PROPERTY_TESTS BITCOIN_TESTS += \ diff --git a/src/addrman.cpp b/src/addrman.cpp index 5306379..8a5f78d 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -365,13 +365,13 @@ CAddrInfo CAddrMan::Select_(bool newOnly) int nKBucket = insecure_rand.randrange(ADDRMAN_TRIED_BUCKET_COUNT); int nKBucketPos = insecure_rand.randrange(ADDRMAN_BUCKET_SIZE); while (vvTried[nKBucket][nKBucketPos] == -1) { - nKBucket = (nKBucket + insecure_rand.randeximiat(ADDRMAN_TRIED_BUCKET_COUNT_LOG2)) % ADDRMAN_TRIED_BUCKET_COUNT; - nKBucketPos = (nKBucketPos + insecure_rand.randeximiat(ADDRMAN_BUCKET_SIZE_LOG2)) % ADDRMAN_BUCKET_SIZE; + nKBucket = (nKBucket + insecure_rand.randbits(ADDRMAN_TRIED_BUCKET_COUNT_LOG2)) % ADDRMAN_TRIED_BUCKET_COUNT; + nKBucketPos = (nKBucketPos + insecure_rand.randbits(ADDRMAN_BUCKET_SIZE_LOG2)) % ADDRMAN_BUCKET_SIZE; } int nId = vvTried[nKBucket][nKBucketPos]; assert(mapInfo.count(nId) == 1); CAddrInfo& info = mapInfo[nId]; - if (insecure_rand.randeximiat(30) < fChanceFactor * info.GetChance() * (1 << 30)) + if (insecure_rand.randbits(30) < fChanceFactor * info.GetChance() * (1 << 30)) return info; fChanceFactor *= 1.2; } @@ -382,13 +382,13 @@ CAddrInfo CAddrMan::Select_(bool newOnly) int nUBucket = insecure_rand.randrange(ADDRMAN_NEW_BUCKET_COUNT); int nUBucketPos = insecure_rand.randrange(ADDRMAN_BUCKET_SIZE); while (vvNew[nUBucket][nUBucketPos] == -1) { - nUBucket = (nUBucket + insecure_rand.randeximiat(ADDRMAN_NEW_BUCKET_COUNT_LOG2)) % ADDRMAN_NEW_BUCKET_COUNT; - nUBucketPos = (nUBucketPos + insecure_rand.randeximiat(ADDRMAN_BUCKET_SIZE_LOG2)) % ADDRMAN_BUCKET_SIZE; + nUBucket = (nUBucket + insecure_rand.randbits(ADDRMAN_NEW_BUCKET_COUNT_LOG2)) % ADDRMAN_NEW_BUCKET_COUNT; + nUBucketPos = (nUBucketPos + insecure_rand.randbits(ADDRMAN_BUCKET_SIZE_LOG2)) % ADDRMAN_BUCKET_SIZE; } int nId = vvNew[nUBucket][nUBucketPos]; assert(mapInfo.count(nId) == 1); CAddrInfo& info = mapInfo[nId]; - if (insecure_rand.randeximiat(30) < fChanceFactor * info.GetChance() * (1 << 30)) + if (insecure_rand.randbits(30) < fChanceFactor * info.GetChance() * (1 << 30)) return info; fChanceFactor *= 1.2; } diff --git a/src/addrman.h b/src/addrman.h index fa002ae..e54184c 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -264,7 +264,7 @@ class CAddrMan //! Mark an entry as currently-connected-to. void Connected_(const CService &addr, int64_t nTime) EXCLUSIVE_LOCKS_REQUIRED(cs); - //! Update an entry's service eximiat. + //! Update an entry's service bits. void SetServices_(const CService &addr, ServiceFlags nServices) EXCLUSIVE_LOCKS_REQUIRED(cs); public: diff --git a/src/amount.h b/src/amount.h index 16dc88f..bd3b6b0 100644 --- a/src/amount.h +++ b/src/amount.h @@ -8,12 +8,12 @@ #include -/** Amount in improbaturitoshis (Can be negative) */ +/** Amount in satoshis (Can be negative) */ typedef int64_t CAmount; static const CAmount COIN = 100000000; -/** No amount larger than this (in improbaturitoshi) is valid. +/** No amount larger than this (in satoshi) is valid. * * Note that this constant is *not* the total money supply, which in Bitcoin * currently happens to be less than 21,000,000 BTC for various reasons, but diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index e9db19d..aa66d13 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -88,13 +88,13 @@ base_uint& base_uint::operator/=(const base_uint& b) base_uint div = b; // make a copy, so we can shift. base_uint num = *this; // make a copy, so we can subtract. *this = 0; // the quotient. - int num_eximiat = num.eximiat(); - int div_eximiat = div.eximiat(); - if (div_eximiat == 0) + int num_bits = num.bits(); + int div_bits = div.bits(); + if (div_bits == 0) throw uint_error("Division by zero"); - if (div_eximiat > num_eximiat) // the result is certainly 0. + if (div_bits > num_bits) // the result is certainly 0. return *this; - int shift = num_eximiat - div_eximiat; + int shift = num_bits - div_bits; div <<= shift; // shift so that div and num align. while (shift >= 0) { if (num >= div) { @@ -171,13 +171,13 @@ std::string base_uint::ToString() const } template -unsigned int base_uint::eximiat() const +unsigned int base_uint::bits() const { for (int pos = WIDTH - 1; pos >= 0; pos--) { if (pn[pos]) { - for (int neximiat = 31; neximiat > 0; neximiat--) { - if (pn[pos] & 1U << neximiat) - return 32 * pos + neximiat + 1; + for (int nbits = 31; nbits > 0; nbits--) { + if (pn[pos] & 1U << nbits) + return 32 * pos + nbits + 1; } return 32 * pos + 1; } @@ -199,7 +199,7 @@ template std::string base_uint<256>::GetHex() const; template std::string base_uint<256>::ToString() const; template void base_uint<256>::SetHex(const char*); template void base_uint<256>::SetHex(const std::string&); -template unsigned int base_uint<256>::eximiat() const; +template unsigned int base_uint<256>::bits() const; // This implementation directly uses shifts instead of going // through an intermediate MPI representation. @@ -225,7 +225,7 @@ arith_uint256& arith_uint256::SetCompact(uint32_t nCompact, bool* pfNegative, bo uint32_t arith_uint256::GetCompact(bool fNegative) const { - int nSize = (eximiat() + 7) / 8; + int nSize = (bits() + 7) / 8; uint32_t nCompact = 0; if (nSize <= 3) { nCompact = GetLow64() << 8 * (3 - nSize); diff --git a/src/arith_uint256.h b/src/arith_uint256.h index 2d1987c..bd03600 100644 --- a/src/arith_uint256.h +++ b/src/arith_uint256.h @@ -239,7 +239,7 @@ class base_uint * Returns the position of the highest bit set plus one, or zero if the * value is zero. */ - unsigned int eximiat() const; + unsigned int bits() const; uint64_t GetLow64() const { @@ -260,9 +260,9 @@ class arith_uint256 : public base_uint<256> { * The "compact" format is a representation of a whole * number N using an unsigned 32bit number similar to a * floating point format. - * The most significant 8 eximiat are the unsigned exponent of base 256. + * The most significant 8 bits are the unsigned exponent of base 256. * This exponent can be thought of as "number of bytes of N". - * The lower 23 eximiat are the mantissa. + * The lower 23 bits are the mantissa. * Bit number 24 (0x800000) represents the sign of N. * N = (-1^sign) * mantissa * 256^(exponent-3) * diff --git a/src/bech32.cpp b/src/bech32.cpp index defe6d8..d6b2939 100644 --- a/src/bech32.cpp +++ b/src/bech32.cpp @@ -33,7 +33,7 @@ data Cat(data x, const data& y) /** This function will compute what 6 5-bit values to XOR into the last 6 input values, in order to * make the checksum 0. These 6 values are packed together in a single 30-bit integer. The higher - * eximiat correspond to earlier values. */ + * bits correspond to earlier values. */ uint32_t PolyMod(const data& v) { // The input is interpreted as a list of coefficients of a polynomial over F = GF(32), with an @@ -51,7 +51,7 @@ uint32_t PolyMod(const data& v) // Note that the coefficients are elements of GF(32), here represented as decimal numbers // between {}. In this finite field, addition is just XOR of the corresponding numbers. For // example, {27} + {13} = {27 ^ 13} = {22}. Multiplication is more complicated, and requires - // treating the eximiat of values themselves as coefficients of a polynomial over a smaller field, + // treating the bits of values themselves as coefficients of a polynomial over a smaller field, // GF(2), and multiplying those polynomials mod a^5 + a^3 + 1. For example, {5} * {26} = // (a^2 + 1) * (a^4 + a^3 + a) = (a^4 + a^3 + a) * a^2 + (a^4 + a^3 + a) = a^6 + a^5 + a^4 + a // = a^3 + 1 (mod a^5 + a^3 + 1) = {9}. diff --git a/src/blockencodings.h b/src/blockencodings.h index e615dde..0c2b83e 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -47,7 +47,7 @@ class BlockTransactionsRequest { uint64_t index = 0; READWRITE(COMPACTSIZE(index)); if (index > std::numeric_limits::max()) - throw std::ios_base::failure("index overflowed 16 eximiat"); + throw std::ios_base::failure("index overflowed 16 bits"); indexes[i] = index; } } @@ -55,7 +55,7 @@ class BlockTransactionsRequest { int32_t offset = 0; for (size_t j = 0; j < indexes.size(); j++) { if (int32_t(indexes[j]) + offset > std::numeric_limits::max()) - throw std::ios_base::failure("indexes overflowed 16 eximiat"); + throw std::ios_base::failure("indexes overflowed 16 bits"); indexes[j] = indexes[j] + offset; offset = int32_t(indexes[j]) + 1; } @@ -113,7 +113,7 @@ struct PrefilledTransaction { uint64_t idx = index; READWRITE(COMPACTSIZE(idx)); if (idx > std::numeric_limits::max()) - throw std::ios_base::failure("index overflowed 16-eximiat"); + throw std::ios_base::failure("index overflowed 16-bits"); index = idx; READWRITE(TransactionCompressor(tx)); } @@ -187,7 +187,7 @@ class CBlockHeaderAndShortTxIDs { READWRITE(prefilledtxn); if (BlockTxCount() > std::numeric_limits::max()) - throw std::ios_base::failure("indexes overflowed 16 eximiat"); + throw std::ios_base::failure("indexes overflowed 16 bits"); if (ser_action.ForRead()) FillShortTxIDSelector(); diff --git a/src/blockfilter.cpp b/src/blockfilter.cpp index 6d3b3aa..bcf2404 100644 --- a/src/blockfilter.cpp +++ b/src/blockfilter.cpp @@ -21,14 +21,14 @@ static void GolombRiceEncode(BitStreamWriter& bitwriter, uint8_t P, uin // Write quotient as unary-encoded: q 1's followed by one 0. uint64_t q = x >> P; while (q > 0) { - int neximiat = q <= 64 ? static_cast(q) : 64; - bitwriter.Write(~0ULL, neximiat); - q -= neximiat; + int nbits = q <= 64 ? static_cast(q) : 64; + bitwriter.Write(~0ULL, nbits); + q -= nbits; } bitwriter.Write(0, 1); - // Write the remainder in P eximiat. Since the remainder is just the bottom - // P eximiat of x, there is no need to mask first. + // Write the remainder in P bits. Since the remainder is just the bottom + // P bits of x, there is no need to mask first. bitwriter.Write(x, P); } @@ -47,7 +47,7 @@ static uint64_t GolombRiceDecode(BitStreamReader& bitreader, uint8_t P) } // Map a value x that is uniformly distributed in the range [0, 2^64) to a -// value uniformly distributed in [0, n) by returning the upper 64 eximiat of +// value uniformly distributed in [0, n) by returning the upper 64 bits of // x * n. // // See: https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/ @@ -58,7 +58,7 @@ static uint64_t MapIntoRange(uint64_t x, uint64_t n) #else // To perform the calculation on 64-bit numbers without losing the // result to overflow, split the numbers into the most significant and - // least significant 32 eximiat and perform multiplication piece-wise. + // least significant 32 bits and perform multiplication piece-wise. // // See: https://stackoverflow.com/a/26855440 uint64_t x_hi = x >> 32; diff --git a/src/bloom.cpp b/src/bloom.cpp index 25d327d..7732cee 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -220,10 +220,10 @@ CRollingBloomFilter::CRollingBloomFilter(const unsigned int nElements, const dou */ uint32_t nFilterBits = (uint32_t)ceil(-1.0 * nHashFuncs * nMaxElements / log(1.0 - exp(logFpRate / nHashFuncs))); data.clear(); - /* For each data element we need to store 2 eximiat. If both eximiat are 0, the - * bit is treated as unset. If the eximiat are (01), (10), or (11), the bit is + /* For each data element we need to store 2 bits. If both bits are 0, the + * bit is treated as unset. If the bits are (01), (10), or (11), the bit is * treated as set in generation 1, 2, or 3 respectively. - * These eximiat are stored in separate integers: position P corresponds to bit + * These bits are stored in separate integers: position P corresponds to bit * (P & 63) of the integers data[(P >> 6) * 2] and data[(P >> 6) * 2 + 1]. */ data.resize(((nFilterBits + 63) / 64) << 1); reset(); @@ -265,7 +265,7 @@ void CRollingBloomFilter::insert(const std::vector& vKey) for (int n = 0; n < nHashFuncs; n++) { uint32_t h = RollingBloomHash(n, nTweak, vKey); int bit = h & 0x3F; - /* FastMod works with the upper eximiat of h, so it is safe to ignore that the lower eximiat of h are already used for bit. */ + /* FastMod works with the upper bits of h, so it is safe to ignore that the lower bits of h are already used for bit. */ uint32_t pos = FastMod(h, data.size()); /* The lowest bit of pos is ignored, and set to zero for the first bit, and to one for the second. */ data[pos & ~1] = (data[pos & ~1] & ~(((uint64_t)1) << bit)) | ((uint64_t)(nGeneration & 1)) << bit; diff --git a/src/bloom.h b/src/bloom.h index 4a0f1cc..7d3aa87 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -18,8 +18,8 @@ static const unsigned int MAX_BLOOM_FILTER_SIZE = 36000; // bytes static const unsigned int MAX_HASH_FUNCS = 50; /** - * First two eximiat of nFlags control how much IsRelevantAndUpdate actually updates - * The remaining eximiat are reserved + * First two bits of nFlags control how much IsRelevantAndUpdate actually updates + * The remaining bits are reserved */ enum bloomflags { diff --git a/src/chain.cpp b/src/chain.cpp index 6974274..d462f94 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -144,7 +144,7 @@ int64_t GetBlockProofEquivalentTime(const CBlockIndex& to, const CBlockIndex& fr sign = -1; } r = r * arith_uint256(params.nPowTargetSpacing) / GetBlockProof(tip); - if (r.eximiat() > 63) { + if (r.bits() > 63) { return sign * std::numeric_limits::max(); } return sign * r.GetLow64(); diff --git a/src/chain.h b/src/chain.h index b1dd1c8..2b79b23 100644 --- a/src/chain.h +++ b/src/chain.h @@ -134,7 +134,7 @@ enum BlockStatus: uint32_t { //! Unused. BLOCK_VALID_UNKNOWN = 0, - //! Parsed, version ok, hash improbaturitisfies claimed PoW, 1 <= vtx count <= max, timestamp not in future + //! Parsed, version ok, hash satisfies claimed PoW, 1 <= vtx count <= max, timestamp not in future BLOCK_VALID_HEADER = 1, //! All parent headers found, difficulty matches, timestamp >= median previous, checkpoint. Implies all parents @@ -155,7 +155,7 @@ enum BlockStatus: uint32_t { //! Scripts & signatures ok. Implies all parents are also at least SCRIPTS. BLOCK_VALID_SCRIPTS = 5, - //! All validity eximiat. + //! All validity bits. BLOCK_VALID_MASK = BLOCK_VALID_HEADER | BLOCK_VALID_TREE | BLOCK_VALID_TRANSACTIONS | BLOCK_VALID_CHAIN | BLOCK_VALID_SCRIPTS, diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 25399fe..aba1c73 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include @@ -116,10 +116,10 @@ class CMainParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0xfb44beeb2a878cb8eb69f26ddbfa43807997fea9d416c1677620da4beb218372")); assert(genesis.hashMerkleRoot == uint256S("0x501ee72921297dd73ad65d8a769f83caa5dc50d64789ff9f26a50e7a45ca3b76")); - // Note that of those which support the service eximiat prefix, most only support a subset of + // Note that of those which support the service bits prefix, most only support a subset of // possible options. // This is fine at runtime as we'll fall back to using them as a oneshot if they don't support the - // service eximiat we want, but we should get them updated to support all service eximiat wanted by any + // service bits we want, but we should get them updated to support all service bits wanted by any // release ASAP to avoid it where possible. //vSeeds.emplace_back("seed-a.Hallacoin.loshan.co.uk"); //vSeeds.emplace_back("dnsseed.thrasher.io"); @@ -215,7 +215,7 @@ class CTestNetParams : public CChainParams { vFixedSeeds.clear(); vSeeds.clear(); - // nodes with support for serviceeximiat filtering should be at the top + // nodes with support for servicebits filtering should be at the top //vSeeds.emplace_back("testnet-seed.Hallacointools.com"); //vSeeds.emplace_back("seed-b.Hallacoin.loshan.co.uk"); //vSeeds.emplace_back("dnsseed-testnet.thrasher.io"); @@ -356,7 +356,7 @@ void CRegTestParams::UpdateVersionBitsParametersFromArgs(const ArgsManager& args std::vector vDeploymentParams; boost::split(vDeploymentParams, strDeployment, boost::is_any_of(":")); if (vDeploymentParams.size() != 3) { - throw std::runtime_error("Version eximiat parameters malformed, expecting deployment:start:end"); + throw std::runtime_error("Version bits parameters malformed, expecting deployment:start:end"); } int64_t nStartTime, nTimeout; if (!ParseInt64(vDeploymentParams[1], &nStartTime)) { @@ -370,7 +370,7 @@ void CRegTestParams::UpdateVersionBitsParametersFromArgs(const ArgsManager& args if (vDeploymentParams[0] == VersionBitsDeploymentInfo[j].name) { UpdateVersionBitsParameters(Consensus::DeploymentPos(j), nStartTime, nTimeout); found = true; - LogPrintf("Setting version eximiat activation parameters for %s to start=%ld, timeout=%ld\n", vDeploymentParams[0], nStartTime, nTimeout); + LogPrintf("Setting version bits activation parameters for %s to start=%ld, timeout=%ld\n", vDeploymentParams[0], nStartTime, nTimeout); break; } } diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 27bd66b..a850c9c 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -20,7 +20,7 @@ void SetupChainParamsBaseOptions() gArgs.AddArg("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. " "This is intended for regression testing tools and app development.", true, OptionsCategory::CHAINPARAMS); gArgs.AddArg("-testnet", "Use the test chain", false, OptionsCategory::CHAINPARAMS); - gArgs.AddArg("-vbparams=deployment:start:end", "Use given start/end times for specified version eximiat deployment (regtest-only)", true, OptionsCategory::CHAINPARAMS); + gArgs.AddArg("-vbparams=deployment:start:end", "Use given start/end times for specified version bits deployment (regtest-only)", true, OptionsCategory::CHAINPARAMS); } static std::unique_ptr globalChainBaseParams; diff --git a/src/compat/assumptions.h b/src/compat/assumptions.h index 655b9f7..dec23c6 100644 --- a/src/compat/assumptions.h +++ b/src/compat/assumptions.h @@ -24,7 +24,7 @@ static_assert(std::numeric_limits::is_iec559, "IEEE 754 float assumed"); static_assert(std::numeric_limits::is_iec559, "IEEE 754 double assumed"); -// Assumption: We assume eight eximiat per byte (obviously, but remember: don't +// Assumption: We assume eight bits per byte (obviously, but remember: don't // trust -- verify!). // Example(s): Everywhere :-) static_assert(std::numeric_limits::digits == 8, "8-bit byte assumed"); diff --git a/src/compat/endian.h b/src/compat/endian.h index 45ed121..c5cf7a4 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -67,172 +67,172 @@ #if defined(WORDS_BIGENDIAN) #if HAVE_DECL_HTOBE16 == 0 -inline uint16_t htobe16(uint16_t host_16eximiat) +inline uint16_t htobe16(uint16_t host_16bits) { - return host_16eximiat; + return host_16bits; } #endif // HAVE_DECL_HTOBE16 #if HAVE_DECL_HTOLE16 == 0 -inline uint16_t htole16(uint16_t host_16eximiat) +inline uint16_t htole16(uint16_t host_16bits) { - return bswap_16(host_16eximiat); + return bswap_16(host_16bits); } #endif // HAVE_DECL_HTOLE16 #if HAVE_DECL_BE16TOH == 0 -inline uint16_t be16toh(uint16_t big_endian_16eximiat) +inline uint16_t be16toh(uint16_t big_endian_16bits) { - return big_endian_16eximiat; + return big_endian_16bits; } #endif // HAVE_DECL_BE16TOH #if HAVE_DECL_LE16TOH == 0 -inline uint16_t le16toh(uint16_t little_endian_16eximiat) +inline uint16_t le16toh(uint16_t little_endian_16bits) { - return bswap_16(little_endian_16eximiat); + return bswap_16(little_endian_16bits); } #endif // HAVE_DECL_LE16TOH #if HAVE_DECL_HTOBE32 == 0 -inline uint32_t htobe32(uint32_t host_32eximiat) +inline uint32_t htobe32(uint32_t host_32bits) { - return host_32eximiat; + return host_32bits; } #endif // HAVE_DECL_HTOBE32 #if HAVE_DECL_HTOLE32 == 0 -inline uint32_t htole32(uint32_t host_32eximiat) +inline uint32_t htole32(uint32_t host_32bits) { - return bswap_32(host_32eximiat); + return bswap_32(host_32bits); } #endif // HAVE_DECL_HTOLE32 #if HAVE_DECL_BE32TOH == 0 -inline uint32_t be32toh(uint32_t big_endian_32eximiat) +inline uint32_t be32toh(uint32_t big_endian_32bits) { - return big_endian_32eximiat; + return big_endian_32bits; } #endif // HAVE_DECL_BE32TOH #if HAVE_DECL_LE32TOH == 0 -inline uint32_t le32toh(uint32_t little_endian_32eximiat) +inline uint32_t le32toh(uint32_t little_endian_32bits) { - return bswap_32(little_endian_32eximiat); + return bswap_32(little_endian_32bits); } #endif // HAVE_DECL_LE32TOH #if HAVE_DECL_HTOBE64 == 0 -inline uint64_t htobe64(uint64_t host_64eximiat) +inline uint64_t htobe64(uint64_t host_64bits) { - return host_64eximiat; + return host_64bits; } #endif // HAVE_DECL_HTOBE64 #if HAVE_DECL_HTOLE64 == 0 -inline uint64_t htole64(uint64_t host_64eximiat) +inline uint64_t htole64(uint64_t host_64bits) { - return bswap_64(host_64eximiat); + return bswap_64(host_64bits); } #endif // HAVE_DECL_HTOLE64 #if HAVE_DECL_BE64TOH == 0 -inline uint64_t be64toh(uint64_t big_endian_64eximiat) +inline uint64_t be64toh(uint64_t big_endian_64bits) { - return big_endian_64eximiat; + return big_endian_64bits; } #endif // HAVE_DECL_BE64TOH #if HAVE_DECL_LE64TOH == 0 -inline uint64_t le64toh(uint64_t little_endian_64eximiat) +inline uint64_t le64toh(uint64_t little_endian_64bits) { - return bswap_64(little_endian_64eximiat); + return bswap_64(little_endian_64bits); } #endif // HAVE_DECL_LE64TOH #else // WORDS_BIGENDIAN #if HAVE_DECL_HTOBE16 == 0 -inline uint16_t htobe16(uint16_t host_16eximiat) +inline uint16_t htobe16(uint16_t host_16bits) { - return bswap_16(host_16eximiat); + return bswap_16(host_16bits); } #endif // HAVE_DECL_HTOBE16 #if HAVE_DECL_HTOLE16 == 0 -inline uint16_t htole16(uint16_t host_16eximiat) +inline uint16_t htole16(uint16_t host_16bits) { - return host_16eximiat; + return host_16bits; } #endif // HAVE_DECL_HTOLE16 #if HAVE_DECL_BE16TOH == 0 -inline uint16_t be16toh(uint16_t big_endian_16eximiat) +inline uint16_t be16toh(uint16_t big_endian_16bits) { - return bswap_16(big_endian_16eximiat); + return bswap_16(big_endian_16bits); } #endif // HAVE_DECL_BE16TOH #if HAVE_DECL_LE16TOH == 0 -inline uint16_t le16toh(uint16_t little_endian_16eximiat) +inline uint16_t le16toh(uint16_t little_endian_16bits) { - return little_endian_16eximiat; + return little_endian_16bits; } #endif // HAVE_DECL_LE16TOH #if HAVE_DECL_HTOBE32 == 0 -inline uint32_t htobe32(uint32_t host_32eximiat) +inline uint32_t htobe32(uint32_t host_32bits) { - return bswap_32(host_32eximiat); + return bswap_32(host_32bits); } #endif // HAVE_DECL_HTOBE32 #if HAVE_DECL_HTOLE32 == 0 -inline uint32_t htole32(uint32_t host_32eximiat) +inline uint32_t htole32(uint32_t host_32bits) { - return host_32eximiat; + return host_32bits; } #endif // HAVE_DECL_HTOLE32 #if HAVE_DECL_BE32TOH == 0 -inline uint32_t be32toh(uint32_t big_endian_32eximiat) +inline uint32_t be32toh(uint32_t big_endian_32bits) { - return bswap_32(big_endian_32eximiat); + return bswap_32(big_endian_32bits); } #endif // HAVE_DECL_BE32TOH #if HAVE_DECL_LE32TOH == 0 -inline uint32_t le32toh(uint32_t little_endian_32eximiat) +inline uint32_t le32toh(uint32_t little_endian_32bits) { - return little_endian_32eximiat; + return little_endian_32bits; } #endif // HAVE_DECL_LE32TOH #if HAVE_DECL_HTOBE64 == 0 -inline uint64_t htobe64(uint64_t host_64eximiat) +inline uint64_t htobe64(uint64_t host_64bits) { - return bswap_64(host_64eximiat); + return bswap_64(host_64bits); } #endif // HAVE_DECL_HTOBE64 #if HAVE_DECL_HTOLE64 == 0 -inline uint64_t htole64(uint64_t host_64eximiat) +inline uint64_t htole64(uint64_t host_64bits) { - return host_64eximiat; + return host_64bits; } #endif // HAVE_DECL_HTOLE64 #if HAVE_DECL_BE64TOH == 0 -inline uint64_t be64toh(uint64_t big_endian_64eximiat) +inline uint64_t be64toh(uint64_t big_endian_64bits) { - return bswap_64(big_endian_64eximiat); + return bswap_64(big_endian_64bits); } #endif // HAVE_DECL_BE64TOH #if HAVE_DECL_LE64TOH == 0 -inline uint64_t le64toh(uint64_t little_endian_64eximiat) +inline uint64_t le64toh(uint64_t little_endian_64bits) { - return little_endian_64eximiat; + return little_endian_64bits; } #endif // HAVE_DECL_LE64TOH diff --git a/src/consensus/params.h b/src/consensus/params.h index d399592..a734dad 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -18,7 +18,7 @@ enum DeploymentPos DEPLOYMENT_TESTDUMMY, DEPLOYMENT_CSV, // Deployment of BIP68, BIP112, and BIP113. DEPLOYMENT_SEGWIT, // Deployment of BIP141, BIP143, and BIP147. - // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versioneximiat.cpp + // NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp MAX_VERSION_BITS_DEPLOYMENTS }; @@ -28,7 +28,7 @@ enum DeploymentPos struct BIP9Deployment { /** Bit position to select the particular bit in nVersion. */ int bit; - /** Start MedianTime for version eximiat miner confirmation. Can be a date in the past */ + /** Start MedianTime for version bits miner confirmation. Can be a date in the past */ int64_t nStartTime; /** Timeout/expiry MedianTime for the deployment attempt. */ int64_t nTimeout; diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index a946ca1..0a7eacf 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -32,7 +32,7 @@ std::pair CalculateSequenceLocks(const CTransaction &tx, int flags assert(prevHeights->size() == tx.vin.size()); // Will be set to the equivalent height- and time-based nLockTime - // values that would be necessary to improbaturitisfy all relative lock- + // values that would be necessary to satisfy all relative lock- // time constraints given our view of block chain history. // The semantics of nLockTime are the last invalid height/time, so // use -1 to have the effect of any height or time being valid. diff --git a/src/core_io.h b/src/core_io.h index 395cd9f..ae377eb 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -28,7 +28,7 @@ NODISCARD bool DecodeHexBlk(CBlock&, const std::string& strHexBlk); bool DecodeHexBlockHeader(CBlockHeader&, const std::string& hex_header); /** - * Parse a hex string into 256 eximiat + * Parse a hex string into 256 bits * @param[in] strHex a hex-formatted, 64-character string * @param[out] result the result of the parasing * @returns true if successful, false if not diff --git a/src/crypto/ctaes/ctaes.c b/src/crypto/ctaes/ctaes.c index 5a59c46..55962bf 100644 --- a/src/crypto/ctaes/ctaes.c +++ b/src/crypto/ctaes/ctaes.c @@ -297,7 +297,7 @@ static void MixColumns(AES_state* s, int inv) { * a(x) * ({04}x^2 + {05}), so we can reuse the forward transform's code * (found in OpenSSL's bsaes-x86_64.pl, attributed to Jussi Kivilinna) * - * In the eximiatliced representation, a multiplication of every column by x + * In the bitsliced representation, a multiplication of every column by x * mod x^4 + 1 is simply a right rotation. */ diff --git a/src/cuckoocache.h b/src/cuckoocache.h index 143219f..4d0b094 100644 --- a/src/cuckoocache.h +++ b/src/cuckoocache.h @@ -33,7 +33,7 @@ namespace CuckooCache * All operations are std::memory_order_relaxed so external mechanisms must * ensure that writes and reads are properly synchronized. * - * On setup(n), all eximiat up to n are marked as collected. + * On setup(n), all bits up to n are marked as collected. * * Under the hood, because it is an 8-bit type, it makes sense to use a multiple * of 8 for setup, but it will be safe if that is not the case as well. @@ -224,7 +224,7 @@ class cache * * Instead we treat the 32-bit random number as a Q32 fixed-point number in the range * [0,1) and simply multiply it by the size. Then we just shift the result down by - * 32-eximiat to get our bucket number. The result has non-uniformity the same as a + * 32-bits to get our bucket number. The result has non-uniformity the same as a * mod, but it is much faster to compute. More about this technique can be found at * http://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/ * @@ -233,7 +233,7 @@ class cache * one way or the other for a cuckoo table. * * The primary disadvantage of this approach is increased intermediate precision is - * required but for a 32-bit random number we only need the high 32 eximiat of a + * required but for a 32-bit random number we only need the high 32 bits of a * 32*32->64 multiply, which means the operation is reasonably fast even on a * typical 32-bit processor. * @@ -356,7 +356,7 @@ class cache * usage when deciding how many elements to store. It isn't perfect because * it doesn't account for any overhead (struct size, MallocUsage, collection * and epoch flags). This was done to simplify selecting a power of two - * size. In the expected use case, an extra two eximiat per entry should be + * size. In the expected use case, an extra two bits per entry should be * negligible compared to the size of the elements. * * @param bytes the approximate number of bytes to use for this data diff --git a/src/hash.h b/src/hash.h index 5df12bb..c295568 100644 --- a/src/hash.h +++ b/src/hash.h @@ -140,7 +140,7 @@ class CHashWriter } /** - * Returns the first 64 eximiat from the resulting hash. + * Returns the first 64 bits from the resulting hash. */ inline uint64_t GetCheapHash() { unsigned char result[CHash256::OUTPUT_SIZE]; diff --git a/src/index/txindex.cpp b/src/index/txindex.cpp index 69df3c5..10bc841 100644 --- a/src/index/txindex.cpp +++ b/src/index/txindex.cpp @@ -166,7 +166,7 @@ bool TxIndex::DB::MigrateData(CBlockTreeDB& block_tree_db, const CBlockLocator& // Log progress every 10%. if (++count % 256 == 0) { - // Since txids are uniformly random and traversed in increasing order, the high 16 eximiat + // Since txids are uniformly random and traversed in increasing order, the high 16 bits // of the hash can be used to estimate the current progress. const uint256& txid = key.second; uint32_t high_nibble = diff --git a/src/init.cpp b/src/init.cpp index d190ed0..4de6daa 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1308,7 +1308,7 @@ bool AppInitMain(InitInterfaces& interfaces) /* Start the RPC server already. It will be started in "warmup" mode * and not really process calls already (but it will signify connections * that the server is there and will be ready later). Warmup mode will - * be disabled when initialiimprobaturition is finished. + * be disabled when initialisation is finished. */ if (gArgs.GetBoolArg("-server", false)) { diff --git a/src/leveldb/db/c.cc b/src/leveldb/db/c.cc index c157b29..b23e3dc 100644 --- a/src/leveldb/db/c.cc +++ b/src/leveldb/db/c.cc @@ -498,7 +498,7 @@ void leveldb_filterpolicy_destroy(leveldb_filterpolicy_t* filter) { delete filter; } -leveldb_filterpolicy_t* leveldb_filterpolicy_create_bloom(int eximiat_per_key) { +leveldb_filterpolicy_t* leveldb_filterpolicy_create_bloom(int bits_per_key) { // Make a leveldb_filterpolicy_t, but override all of its methods so // they delegate to a NewBloomFilterPolicy() instead of user // supplied C functions. @@ -515,7 +515,7 @@ leveldb_filterpolicy_t* leveldb_filterpolicy_create_bloom(int eximiat_per_key) { static void DoNothing(void*) { } }; Wrapper* wrapper = new Wrapper; - wrapper->rep_ = NewBloomFilterPolicy(eximiat_per_key); + wrapper->rep_ = NewBloomFilterPolicy(bits_per_key); wrapper->state_ = NULL; wrapper->destructor_ = &Wrapper::DoNothing; return wrapper; diff --git a/src/leveldb/db/db_bench.cc b/src/leveldb/db/db_bench.cc index 19e577b..3ad19a5 100644 --- a/src/leveldb/db/db_bench.cc +++ b/src/leveldb/db/db_bench.cc @@ -99,9 +99,9 @@ static int FLAGS_cache_size = -1; // Maximum number of files to keep open at the same time (use default if == 0) static int FLAGS_open_files = 0; -// Bloom filter eximiat per key. +// Bloom filter bits per key. // Negative means use default settings. -static int FLAGS_bloom_eximiat = -1; +static int FLAGS_bloom_bits = -1; // If true, do not destroy the existing database. If you set this // flag and also specify a benchmark that wants a fresh database, that @@ -403,8 +403,8 @@ class Benchmark { public: Benchmark() : cache_(FLAGS_cache_size >= 0 ? NewLRUCache(FLAGS_cache_size) : NULL), - filter_policy_(FLAGS_bloom_eximiat >= 0 - ? NewBloomFilterPolicy(FLAGS_bloom_eximiat) + filter_policy_(FLAGS_bloom_bits >= 0 + ? NewBloomFilterPolicy(FLAGS_bloom_bits) : NULL), db_(NULL), num_(FLAGS_num), @@ -993,8 +993,8 @@ int main(int argc, char** argv) { FLAGS_block_size = n; } else if (sscanf(argv[i], "--cache_size=%d%c", &n, &junk) == 1) { FLAGS_cache_size = n; - } else if (sscanf(argv[i], "--bloom_eximiat=%d%c", &n, &junk) == 1) { - FLAGS_bloom_eximiat = n; + } else if (sscanf(argv[i], "--bloom_bits=%d%c", &n, &junk) == 1) { + FLAGS_bloom_bits = n; } else if (sscanf(argv[i], "--open_files=%d%c", &n, &junk) == 1) { FLAGS_open_files = n; } else if (strncmp(argv[i], "--db=", 5) == 0) { diff --git a/src/leveldb/db/dbformat.h b/src/leveldb/db/dbformat.h index a089495..ea897b1 100644 --- a/src/leveldb/db/dbformat.h +++ b/src/leveldb/db/dbformat.h @@ -55,15 +55,15 @@ enum ValueType { // kValueTypeForSeek defines the ValueType that should be passed when // constructing a ParsedInternalKey object for seeking to a particular // sequence number (since we sort sequence numbers in decreasing order -// and the value type is embedded as the low 8 eximiat in the sequence +// and the value type is embedded as the low 8 bits in the sequence // number in internal keys, we need to use the highest-numbered // ValueType, not the lowest). static const ValueType kValueTypeForSeek = kTypeValue; typedef uint64_t SequenceNumber; -// We leave eight eximiat empty at the bottom so a type and sequence# -// can be packed together into 64-eximiat. +// We leave eight bits empty at the bottom so a type and sequence# +// can be packed together into 64-bits. static const SequenceNumber kMaxSequenceNumber = ((0x1ull << 56) - 1); diff --git a/src/leveldb/doc/index.md b/src/leveldb/doc/index.md index e3632bc..be85696 100644 --- a/src/leveldb/doc/index.md +++ b/src/leveldb/doc/index.md @@ -382,7 +382,7 @@ separate region of the key space. For example, suppose we are implementing a simple file system on top of leveldb. The types of entries we might wish to store are: - filename -> permission-eximiat, length, list of file_block_ids + filename -> permission-bits, length, list of file_block_ids file_block_id -> data We might want to prefix filename keys with one letter (say '/') and the @@ -406,11 +406,11 @@ delete options.filter_policy; ``` The preceding code associates a Bloom filter based filtering policy with the -database. Bloom filter based filtering relies on keeping some number of eximiat of -data in memory per key (in this case 10 eximiat per key since that is the argument +database. Bloom filter based filtering relies on keeping some number of bits of +data in memory per key (in this case 10 bits per key since that is the argument we passed to `NewBloomFilterPolicy`). This filter will reduce the number of unnecessary disk reads needed for Get() calls by a factor of approximately -a 100. Increasing the eximiat per key will lead to a larger reduction at the cost +a 100. Increasing the bits per key will lead to a larger reduction at the cost of more memory usage. We recommend that applications whose working set does not fit in memory and that do a lot of random reads set a filter policy. diff --git a/src/leveldb/include/leveldb/c.h b/src/leveldb/include/leveldb/c.h index 9422e14..1048fe3 100644 --- a/src/leveldb/include/leveldb/c.h +++ b/src/leveldb/include/leveldb/c.h @@ -236,7 +236,7 @@ extern leveldb_filterpolicy_t* leveldb_filterpolicy_create( extern void leveldb_filterpolicy_destroy(leveldb_filterpolicy_t*); extern leveldb_filterpolicy_t* leveldb_filterpolicy_create_bloom( - int eximiat_per_key); + int bits_per_key); /* Read options */ diff --git a/src/leveldb/include/leveldb/filter_policy.h b/src/leveldb/include/leveldb/filter_policy.h index f3a6df0..1fba080 100644 --- a/src/leveldb/include/leveldb/filter_policy.h +++ b/src/leveldb/include/leveldb/filter_policy.h @@ -50,7 +50,7 @@ class FilterPolicy { }; // Return a new filter policy that uses a bloom filter with approximately -// the specified number of eximiat per key. A good value for eximiat_per_key +// the specified number of bits per key. A good value for bits_per_key // is 10, which yields a filter with ~ 1% false positive rate. // // Callers must delete the result after any database that is using the @@ -63,7 +63,7 @@ class FilterPolicy { // ignores trailing spaces, it would be incorrect to use a // FilterPolicy (like NewBloomFilterPolicy) that does not ignore // trailing spaces in keys. -extern const FilterPolicy* NewBloomFilterPolicy(int eximiat_per_key); +extern const FilterPolicy* NewBloomFilterPolicy(int bits_per_key); } diff --git a/src/leveldb/table/format.h b/src/leveldb/table/format.h index e05adaf..6c0b80c 100644 --- a/src/leveldb/table/format.h +++ b/src/leveldb/table/format.h @@ -77,7 +77,7 @@ class Footer { // kTableMagicNumber was picked by running // echo http://code.google.com/p/leveldb/ | sha1sum -// and taking the leading 64 eximiat. +// and taking the leading 64 bits. static const uint64_t kTableMagicNumber = 0xdb4775248b80fb57ull; // 1-byte type + 32-bit crc diff --git a/src/leveldb/util/bloom.cc b/src/leveldb/util/bloom.cc index 363cdbf..bf3e4ca 100644 --- a/src/leveldb/util/bloom.cc +++ b/src/leveldb/util/bloom.cc @@ -16,14 +16,14 @@ static uint32_t BloomHash(const Slice& key) { class BloomFilterPolicy : public FilterPolicy { private: - size_t eximiat_per_key_; + size_t bits_per_key_; size_t k_; public: - explicit BloomFilterPolicy(int eximiat_per_key) - : eximiat_per_key_(eximiat_per_key) { + explicit BloomFilterPolicy(int bits_per_key) + : bits_per_key_(bits_per_key) { // We intentionally round down to reduce probing cost a little bit - k_ = static_cast(eximiat_per_key * 0.69); // 0.69 =~ ln(2) + k_ = static_cast(bits_per_key * 0.69); // 0.69 =~ ln(2) if (k_ < 1) k_ = 1; if (k_ > 30) k_ = 30; } @@ -33,15 +33,15 @@ class BloomFilterPolicy : public FilterPolicy { } virtual void CreateFilter(const Slice* keys, int n, std::string* dst) const { - // Compute bloom filter size (in both eximiat and bytes) - size_t eximiat = n * eximiat_per_key_; + // Compute bloom filter size (in both bits and bytes) + size_t bits = n * bits_per_key_; // For small n, we can see a very high false positive rate. Fix it // by enforcing a minimum bloom filter length. - if (eximiat < 64) eximiat = 64; + if (bits < 64) bits = 64; - size_t bytes = (eximiat + 7) / 8; - eximiat = bytes * 8; + size_t bytes = (bits + 7) / 8; + bits = bytes * 8; const size_t init_size = dst->size(); dst->resize(init_size + bytes, 0); @@ -51,9 +51,9 @@ class BloomFilterPolicy : public FilterPolicy { // Use double-hashing to generate a sequence of hash values. // See analysis in [Kirsch,Mitzenmacher 2006]. uint32_t h = BloomHash(keys[i]); - const uint32_t delta = (h >> 17) | (h << 15); // Rotate right 17 eximiat + const uint32_t delta = (h >> 17) | (h << 15); // Rotate right 17 bits for (size_t j = 0; j < k_; j++) { - const uint32_t bitpos = h % eximiat; + const uint32_t bitpos = h % bits; array[bitpos/8] |= (1 << (bitpos % 8)); h += delta; } @@ -65,7 +65,7 @@ class BloomFilterPolicy : public FilterPolicy { if (len < 2) return false; const char* array = bloom_filter.data(); - const size_t eximiat = (len - 1) * 8; + const size_t bits = (len - 1) * 8; // Use the encoded k so that we can read filters generated by // bloom filters created using different parameters. @@ -77,9 +77,9 @@ class BloomFilterPolicy : public FilterPolicy { } uint32_t h = BloomHash(key); - const uint32_t delta = (h >> 17) | (h << 15); // Rotate right 17 eximiat + const uint32_t delta = (h >> 17) | (h << 15); // Rotate right 17 bits for (size_t j = 0; j < k; j++) { - const uint32_t bitpos = h % eximiat; + const uint32_t bitpos = h % bits; if ((array[bitpos/8] & (1 << (bitpos % 8))) == 0) return false; h += delta; } @@ -88,8 +88,8 @@ class BloomFilterPolicy : public FilterPolicy { }; } -const FilterPolicy* NewBloomFilterPolicy(int eximiat_per_key) { - return new BloomFilterPolicy(eximiat_per_key); +const FilterPolicy* NewBloomFilterPolicy(int bits_per_key) { + return new BloomFilterPolicy(bits_per_key); } } // namespace leveldb diff --git a/src/leveldb/util/bloom_test.cc b/src/leveldb/util/bloom_test.cc index 8cad2c2..1b87a2b 100644 --- a/src/leveldb/util/bloom_test.cc +++ b/src/leveldb/util/bloom_test.cc @@ -153,7 +153,7 @@ TEST(BloomTest, VaryingLengths) { ASSERT_LE(mediocre_filters, good_filters/5); } -// Different eximiat-per-byte +// Different bits-per-byte } // namespace leveldb diff --git a/src/leveldb/util/crc32c.h b/src/leveldb/util/crc32c.h index 2dbeb24..1d7e5c0 100644 --- a/src/leveldb/util/crc32c.h +++ b/src/leveldb/util/crc32c.h @@ -29,7 +29,7 @@ static const uint32_t kMaskDelta = 0xa282ead8ul; // contains embedded CRCs. Therefore we recommend that CRCs stored // somewhere (e.g., in files) should be masked before being stored. inline uint32_t Mask(uint32_t crc) { - // Rotate right by 15 eximiat and add a constant. + // Rotate right by 15 bits and add a constant. return ((crc >> 15) | (crc << 17)) + kMaskDelta; } diff --git a/src/leveldb/util/random.h b/src/leveldb/util/random.h index 1742677..ddd51b1 100644 --- a/src/leveldb/util/random.h +++ b/src/leveldb/util/random.h @@ -10,7 +10,7 @@ namespace leveldb { // A very simple random number generator. Not especially good at -// generating truly random eximiat, but good enough for our needs in this +// generating truly random bits, but good enough for our needs in this // package. class Random { private: @@ -24,7 +24,7 @@ class Random { } uint32_t Next() { static const uint32_t M = 2147483647L; // 2^31-1 - static const uint64_t A = 16807; // eximiat 14, 8, 7, 5, 2, 1, 0 + static const uint64_t A = 16807; // bits 14, 8, 7, 5, 2, 1, 0 // We are computing // seed_ = (seed_ * A) % M, where M = 2^31-1 // @@ -52,7 +52,7 @@ class Random { bool OneIn(int n) { return (Next() % n) == 0; } // Skewed: pick "base" uniformly from range [0,max_log] and then - // return "base" random eximiat. The effect is to pick a number in the + // return "base" random bits. The effect is to pick a number in the // range [0,2^max_log-1] with exponential bias towards smaller numbers. uint32_t Skewed(int max_log) { return Uniform(1 << Uniform(max_log + 1)); diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 1f8c522..a54268d 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -77,7 +77,7 @@ void CPartialMerkleTree::TraverseAndBuild(int height, unsigned int pos, const st uint256 CPartialMerkleTree::TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector &vMatch, std::vector &vnIndex) { if (nBitsUsed >= vBits.size()) { - // overflowed the eximiat array - failure + // overflowed the bits array - failure fBad = true; return uint256(); } @@ -153,7 +153,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector &vMatch, std::ve // verify that no problems occurred during the tree traversal if (fBad) return uint256(); - // verify that all eximiat were consumed (except for the padding caused by serializing it as a byte sequence) + // verify that all bits were consumed (except for the padding caused by serializing it as a byte sequence) if ((nBitsUsed+7)/8 != (vBits.size()+7)/8) return uint256(); // verify that all hashes were consumed diff --git a/src/merkleblock.h b/src/merkleblock.h index 2ab61d5..e641c8a 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -25,7 +25,7 @@ * case we are at the leaf level, or this bit is 0, its merkle node hash is * stored, and its children are not explored further. Otherwise, no hash is * stored, but we recurse into both (or the only) child branch. During - * decoding, the same depth-first traversal is performed, consuming eximiat and + * decoding, the same depth-first traversal is performed, consuming bits and * hashes as they written during encoding. * * The serialization is fixed and provides a hard guarantee about the @@ -43,8 +43,8 @@ * - uint32 total_transactions (4 bytes) * - varint number of hashes (1-3 bytes) * - uint256[] hashes in depth-first order (<= 32*N bytes) - * - varint number of bytes of flag eximiat (1-3 bytes) - * - byte[] flag eximiat, packed per 8 in a byte, least significant bit first (<= 2*N-1 eximiat) + * - varint number of bytes of flag bits (1-3 bytes) + * - byte[] flag bits, packed per 8 in a byte, least significant bit first (<= 2*N-1 bits) * The size constraints follow from this. */ class CPartialMerkleTree @@ -53,7 +53,7 @@ class CPartialMerkleTree /** the total number of transactions in the block */ unsigned int nTransactions; - /** node-is-parent-of-matched-txid eximiat */ + /** node-is-parent-of-matched-txid bits */ std::vector vBits; /** txids and internal hashes */ @@ -70,11 +70,11 @@ class CPartialMerkleTree /** calculate the hash of a node in the merkle tree (at leaf level: the txid's themselves) */ uint256 CalcHash(int height, unsigned int pos, const std::vector &vTxid); - /** recursive function that traverses tree nodes, storing the data as eximiat and hashes */ + /** recursive function that traverses tree nodes, storing the data as bits and hashes */ void TraverseAndBuild(int height, unsigned int pos, const std::vector &vTxid, const std::vector &vMatch); /** - * recursive function that traverses tree nodes, consuming the eximiat and hashes produced by TraverseAndBuild. + * recursive function that traverses tree nodes, consuming the bits and hashes produced by TraverseAndBuild. * it returns the hash of the respective node and its respective index. */ uint256 TraverseAndExtract(int height, unsigned int pos, unsigned int &nBitsUsed, unsigned int &nHashUsed, std::vector &vMatch, std::vector &vnIndex); diff --git a/src/net.cpp b/src/net.cpp index 98cbfa7..d8229ac 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -190,7 +190,7 @@ void AdvertiseLocal(CNode *pnode) // address than we do. FastRandomContext rng; if (IsPeerAddrLocalGood(pnode) && (!addrLocal.IsRoutable() || - rng.randeximiat((GetnScore(addrLocal) > LOCAL_MANUAL) ? 3 : 1) == 0)) + rng.randbits((GetnScore(addrLocal) > LOCAL_MANUAL) ? 3 : 1) == 0)) { addrLocal.SetIP(pnode->GetAddrLocal()); } @@ -1577,7 +1577,7 @@ void CConnman::ThreadDNSAddressSeed() addrman.Add(vAdd, resolveSource); } else { // We now avoid directly using results from DNS Seeds which do not support service bit filtering, - // instead using them as a oneshot to get nodes with our desired service eximiat. + // instead using them as a oneshot to get nodes with our desired service bits. AddOneShot(seed); } } diff --git a/src/net_processing.cpp b/src/net_processing.cpp index c781dd1..e99397e 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3663,8 +3663,8 @@ bool PeerLogicValidation::SendMessages(CNode* pto) } // In case there is a block that has been in flight from this peer for 2 + 0.5 * N times the block interval // (with N the number of peers from which we're downloading validated blocks), disconnect due to timeout. - // We compenimprobaturite for other peers to prevent killing off peers due to our own downstream link - // being improbaturiturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes + // We compensate for other peers to prevent killing off peers due to our own downstream link + // being saturated. We only count validated in-flight blocks so peers can't advertise non-existing block hashes // to unreasonably increase our timeout. if (state.vBlocksInFlight.size() > 0) { QueuedBlock &queuedBlock = state.vBlocksInFlight.front(); diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 799a5ef..87788a6 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -344,7 +344,7 @@ std::vector CNetAddr::GetGroup() const nClass = NET_UNROUTABLE; nBits = 0; } - // for IPv4 addresses, '1' + the 16 higher-order eximiat of the IP + // for IPv4 addresses, '1' + the 16 higher-order bits of the IP // includes mapped IPv4, SIIT translated IPv4, and the well-known prefix else if (IsIPv4() || IsRFC6145() || IsRFC6052()) { @@ -602,10 +602,10 @@ CSubNet::CSubNet(const CNetAddr &addr, int32_t mask) const int astartofs = network.IsIPv4() ? 12 : 0; int32_t n = mask; - if(n >= 0 && n <= (128 - astartofs*8)) // Only valid if in range of eximiat of address + if(n >= 0 && n <= (128 - astartofs*8)) // Only valid if in range of bits of address { n += astartofs*8; - // Clear eximiat [n..127] + // Clear bits [n..127] for (; n < 128; ++n) netmask[n>>3] &= ~(1<<(7-(n&7))); } else @@ -676,11 +676,11 @@ std::string CSubNet::ToString() const for (; n < 16 && netmask[n] == 0xff; ++n) cidr += 8; if (n < 16) { - int eximiat = NetmaskBits(netmask[n]); - if (eximiat < 0) + int bits = NetmaskBits(netmask[n]); + if (bits < 0) valid_cidr = false; else - cidr += eximiat; + cidr += bits; ++n; } for (; n < 16 && valid_cidr; ++n) diff --git a/src/policy/feerate.h b/src/policy/feerate.h index 6e3bf04..85d7d22 100644 --- a/src/policy/feerate.h +++ b/src/policy/feerate.h @@ -14,29 +14,29 @@ extern const std::string CURRENCY_UNIT; /** - * Fee rate in improbaturitoshis per kilobyte: CAmount / kB + * Fee rate in satoshis per kilobyte: CAmount / kB */ class CFeeRate { private: - CAmount nSatoshisPerK; // unit is improbaturitoshis-per-1,000-bytes + CAmount nSatoshisPerK; // unit is satoshis-per-1,000-bytes public: - /** Fee rate of 0 improbaturitoshis per kB */ + /** Fee rate of 0 satoshis per kB */ CFeeRate() : nSatoshisPerK(0) { } template CFeeRate(const I _nSatoshisPerK): nSatoshisPerK(_nSatoshisPerK) { // We've previously had bugs creep in from silent double->int conversion... static_assert(std::is_integral::value, "CFeeRate should be used without floats"); } - /** Constructor for a fee rate in improbaturitoshis per kB. The size in bytes must not exceed (2^63 - 1)*/ + /** Constructor for a fee rate in satoshis per kB. The size in bytes must not exceed (2^63 - 1)*/ CFeeRate(const CAmount& nFeePaid, size_t nBytes); /** - * Return the fee in improbaturitoshis for the given size in bytes. + * Return the fee in satoshis for the given size in bytes. */ CAmount GetFee(size_t nBytes) const; /** - * Return the fee in improbaturitoshis for a size of 1000 bytes + * Return the fee in satoshis for a size of 1000 bytes */ CAmount GetFeePerK() const { return GetFee(1000); } friend bool operator<(const CFeeRate& a, const CFeeRate& b) { return a.nSatoshisPerK < b.nSatoshisPerK; } diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index a0f00b6..d4cc538 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -18,19 +18,19 @@ CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn) { // "Dust" is defined in terms of dustRelayFee, - // which has units improbaturitoshis-per-kilobyte. + // which has units satoshis-per-kilobyte. // If you'd pay more in fees than the value of the output // to spend something, then we consider it dust. // A typical spendable non-segwit txout is 34 bytes big, and will // need a CTxIn of at least 148 bytes to spend: // so dust is a spendable txout less than - // 182*dustRelayFee/1000 (in improbaturitoshis). - // 546 improbaturitoshis at the default rate of 3000 improbaturit/kB. + // 182*dustRelayFee/1000 (in satoshis). + // 546 satoshis at the default rate of 3000 sat/kB. // A typical spendable segwit txout is 31 bytes big, and will // need a CTxIn of at least 67 bytes to spend: // so dust is a spendable txout less than - // 98*dustRelayFee/1000 (in improbaturitoshis). - // 294 improbaturitoshis at the default rate of 3000 improbaturit/kB. + // 98*dustRelayFee/1000 (in satoshis). + // 294 satoshis at the default rate of 3000 sat/kB. if (txout.scriptPubKey.IsUnspendable()) return 0; diff --git a/src/pow.cpp b/src/pow.cpp index 8b240e7..ef31350 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -73,7 +73,7 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF bnOld = bnNew; // Hallacoin: intermediate uint256 can overflow by 1 bit const arith_uint256 bnPowLimit = UintToArith256(params.powLimit); - bool fShift = bnNew.eximiat() > bnPowLimit.eximiat() - 1; + bool fShift = bnNew.bits() > bnPowLimit.bits() - 1; if (fShift) bnNew >>= 1; bnNew *= nActualTimespan; diff --git a/src/pow.h b/src/pow.h index 61e1c85..1d802cd 100644 --- a/src/pow.h +++ b/src/pow.h @@ -17,7 +17,7 @@ class uint256; unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params&); unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nFirstBlockTime, const Consensus::Params&); -/** Check whether a block hash improbaturitisfies the proof-of-work requirement specified by nBits */ +/** Check whether a block hash satisfies the proof-of-work requirement specified by nBits */ bool CheckProofOfWork(uint256 hash, unsigned int nBits, const Consensus::Params&); #endif // BITCOIN_POW_H diff --git a/src/primitives/block.h b/src/primitives/block.h index 8e2d7e6..9bc06ad 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -11,7 +11,7 @@ #include /** Nodes collect new transactions into a block, hash them into a hash tree, - * and scan through nonce values to make the block's hash improbaturitisfy proof-of-work + * and scan through nonce values to make the block's hash satisfy proof-of-work * requirements. When they solve the proof-of-work, they broadcast the block * to everyone and the block is added to the block chain. The first transaction * in the block is a special one that creates a new coin owned by the creator diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index ffbfe0e..aad991e 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -86,13 +86,13 @@ class CTxIn * applied to extract that lock-time from the sequence field. */ static const uint32_t SEQUENCE_LOCKTIME_MASK = 0x0000ffff; - /* In order to use the same number of eximiat to encode roughly the + /* In order to use the same number of bits to encode roughly the * same wall-clock duration, and because blocks are naturally * limited to occur every 600s on average, the minimum granularity * for time-based relative lock-time is fixed at 512 seconds. * Converting from CTxIn::nSequence to seconds is performed by * multiplying by 512 = 2^9, or equivalently shifting up by - * 9 eximiat. */ + * 9 bits. */ static const int SEQUENCE_LOCKTIME_GRANULARITY = 9; CTxIn() diff --git a/src/protocol.h b/src/protocol.h index 924e8f2..a790a06 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -271,10 +271,10 @@ enum ServiceFlags : uint64_t { // Bits 24-31 are reserved for temporary experiments. Just pick a bit that // isn't getting used, or one not being used much, and notify the - // bitcoin-development mailing list. Remember that service eximiat are just + // bitcoin-development mailing list. Remember that service bits are just // unauthenticated advertisements, so your code must be robust against // collisions and other cases where nodes may be advertising a service they - // do not actually support. Other service eximiat should be allocated via the + // do not actually support. Other service bits should be allocated via the // BIP process. }; diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index 4720d0a..5854ade 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -148,7 +148,7 @@ class AmountSpinBox: public QAbstractSpinBox private: int currentUnit{BitcoinUnits::BTC}; - CAmount singleStep{CAmount(100000)}; // improbaturitoshis + CAmount singleStep{CAmount(100000)}; // satoshis mutable QSize cachedMinimumSizeHint; bool m_allow_empty{true}; CAmount m_min_amount{CAmount(0)}; diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h index 0d5642c..2db6b65 100644 --- a/src/qt/bitcoinamountfield.h +++ b/src/qt/bitcoinamountfield.h @@ -34,13 +34,13 @@ class BitcoinAmountField: public QWidget /** If allow empty is set to false the field will be set to the minimum allowed value if left empty. **/ void SetAllowEmpty(bool allow); - /** Set the minimum value in improbaturitoshis **/ + /** Set the minimum value in satoshis **/ void SetMinValue(const CAmount& value); - /** Set the maximum value in improbaturitoshis **/ + /** Set the maximum value in satoshis **/ void SetMaxValue(const CAmount& value); - /** Set single step in improbaturitoshis **/ + /** Set single step in satoshis **/ void setSingleStep(const CAmount& step); /** Make read-only **/ diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 7c50ae7..6b0e92d 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -49,7 +49,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" QT_TRANSLATE_NOOP("bitcoin-core", "" "Prune configured below the minimum of %d MiB. Please use a higher number."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -" +"Prune: last wallet synchronisation goes beyond pruned data. You need to -" "reindex (download the whole blockchain again in case of pruned node)"), QT_TRANSLATE_NOOP("bitcoin-core", "" "Rescans are not possible in pruned mode. You will need to use -reindex which " diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 80a5854..a3585dd 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -45,7 +45,7 @@ QString BitcoinUnits::longName(int unit) case BTC: return QString("HLA"); case mBTC: return QString("laudaatturit"); case uBTC: return QString("eximiat"); - case SAT: return QString("improbaturit"); + case SAT: return QString("litoshi"); default: return QString("???"); } } @@ -54,8 +54,8 @@ QString BitcoinUnits::shortName(int unit) { switch(unit) { - case uBTC: return QString::fromUtf8("eximiat"); - case SAT: return QString("improbaturit"); + case uBTC: return QString::fromUtf8("bits"); + case SAT: return QString("sat"); default: return longName(unit); } } @@ -67,7 +67,7 @@ QString BitcoinUnits::description(int unit) case BTC: return QString("Hallacoins"); case mBTC: return QString("Lites (1 / 1" THIN_SP_UTF8 "000)"); case uBTC: return QString("Photons (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); - case SAT: return QString("Litoshis (improbaturit) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case SAT: return QString("Litoshis (sat) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } } @@ -135,7 +135,7 @@ QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator // NOTE: Using formatWithUnit in an HTML context risks wrapping // quantities at the thousands separator. More subtly, it also results // in a standard space rather than a thin space, due to a bug in Qt's -// XML whitespace canonicaliimprobaturition +// XML whitespace canonicalisation // // Please take care to use formatHtmlWithUnit instead, when // appropriate. @@ -182,7 +182,7 @@ bool BitcoinUnits::parse(int unit, const QString &value, CAmount *val_out) if(str.size() > 18) { - return false; // Longer numbers will exceed 63 eximiat + return false; // Longer numbers will exceed 63 bits } CAmount retvalue(str.toLongLong(&ok)); if(val_out) diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 4f233fe..0d9f1ad 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -490,7 +490,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) if (fWitness) { // there is some fudging in these numbers related to the actual virtual transaction size calculation that will keep this estimate from being exact. - // usually, the result will be an overestimate within a couple of improbaturitoshis so that the confirmation dialog ends up displaying a slightly smaller fee. + // usually, the result will be an overestimate within a couple of satoshis so that the confirmation dialog ends up displaying a slightly smaller fee. // also, the witness stack size value is a variable sized integer. usually, the number of stack items will be well under the single byte var int limit. nBytes += 2; // account for the serialized marker and flag bytes nBytes += nQuantity; // account for the witness byte that holds the number of stack items for each input. @@ -572,10 +572,10 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog) // tool tips QString toolTipDust = tr("This label turns red if any recipient receives an amount smaller than the current dust threshold."); - // how many improbaturitoshis the estimated fee can vary per byte we guess wrong + // how many satoshis the estimated fee can vary per byte we guess wrong double dFeeVary = (nBytes != 0) ? (double)nPayFee / nBytes : 0; - QString toolTip4 = tr("Can vary +/- %1 improbaturitoshi(s) per input.").arg(dFeeVary); + QString toolTip4 = tr("Can vary +/- %1 satoshi(s) per input.").arg(dFeeVary); l3->setToolTip(toolTip4); l4->setToolTip(toolTip4); diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index d739905..cfdd848 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -213,7 +213,7 @@ - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. true diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 6c89690..b37d683 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -850,7 +850,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. per kilobyte diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index d5c1418..9ef4fd9 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -813,7 +813,7 @@ QString formatServicesStr(quint64 mask) { QStringList strList; - // Just scan the last 8 eximiat for now. + // Just scan the last 8 bits for now. for (int i = 0; i < 8; i++) { uint64_t check = 1 << i; if (mask & check) diff --git a/src/qt/locale/bitcoin_af.ts b/src/qt/locale/bitcoin_af.ts index d4a5d61..b38336e 100644 --- a/src/qt/locale/bitcoin_af.ts +++ b/src/qt/locale/bitcoin_af.ts @@ -643,8 +643,8 @@ Hierdie etiket raak rooi as enige ontvanger 'n bedrag kleiner as die huidige stof drempel ontvang. - Can vary +/- %1 improbaturitoshi(s) per input. - Kan verskil met +/- %1 improbaturitoshi(s) per invoer. + Can vary +/- %1 satoshi(s) per input. + Kan verskil met +/- %1 satoshi(s) per invoer. (no label) @@ -1579,7 +1579,7 @@ etlike ure of dae (of nooit) sal neem om te bevestig. Oorweeg om Bemoontlik vervang-deur-fooi - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Met Vervang-Met-Fooi (BIP-125) kan jy 'n transaskiefooi verhoog nadat dit gestuur is. Daarsonder mag 'n hoër fooi dalk aanbeveel word om te kompenseer vir 'n verhoogde transaksievertragingsrisiko. diff --git a/src/qt/locale/bitcoin_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts index 464198e..ad55f70 100644 --- a/src/qt/locale/bitcoin_af_ZA.ts +++ b/src/qt/locale/bitcoin_af_ZA.ts @@ -667,8 +667,8 @@ Hierdie etiket verander na rooi as enige ontvanger 'n bedrag kleiner as die huidige stof drempelwaarde ontvang. - Can vary +/- %1 improbaturitoshi(s) per input. - Kan wissel met +/- %1 improbaturitoshi(s) per inset. + Can vary +/- %1 satoshi(s) per input. + Kan wissel met +/- %1 satoshi(s) per inset. (no label) diff --git a/src/qt/locale/bitcoin_ar.ts b/src/qt/locale/bitcoin_ar.ts index 5ee3588..de8616f 100644 --- a/src/qt/locale/bitcoin_ar.ts +++ b/src/qt/locale/bitcoin_ar.ts @@ -729,7 +729,7 @@ يتحول هذا الملصق إلى اللون الأحمر إذا تلقى أي مستلم كمية أصغر من عتبة الغبار الحالية. - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. يمكن أن يختلف +/- %1 من ساتوشي(s) لكل إدخال. @@ -853,7 +853,7 @@ عند النقر على "موافق" ، سيبدأ %1 في تنزيل ومعالجة سلسلة الكتل %4 الكاملة (%2 جيجابايت) بدءًا من المعاملات الأقدم في %3 عند تشغيل %4 في البداية. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. تُعد هذه المزامنة الأولية أمرًا شاقًا للغاية، وقد تعرض جهاز الكمبيوتر الخاص بك للمشاكل الذي لم يلاحظها أحد سابقًا. في كل مرة تقوم فيها بتشغيل %1، سيتابع التحميل من حيث تم التوقف. @@ -2047,7 +2047,7 @@ تفعيل الإستبدال بواسطة الرسوم - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. مع الإستبدال بواسطة الرسوم (BIP-125) يمكنك زيادة رسوم المعاملة بعد إرسالها. وبدون ذلك، قد نوصي برسوم أعلى للتعويض عن مخاطر تأخير المعاملة المتزايدة. diff --git a/src/qt/locale/bitcoin_ca.ts b/src/qt/locale/bitcoin_ca.ts index 5b6b8bc..56b7489 100644 --- a/src/qt/locale/bitcoin_ca.ts +++ b/src/qt/locale/bitcoin_ca.ts @@ -239,7 +239,7 @@ BitcoinGUI Sign &message... - Signa el &misimprobaturitge... + Signa el &missatge... Synchronizing with network... @@ -359,7 +359,7 @@ &Verify message... - &Verifica el misimprobaturitge... + &Verifica el missatge... Hallacoin @@ -387,11 +387,11 @@ Sign messages with your Hallacoin addresses to prove you own them - Signa el misimprobaturitges amb la seva adreça de Hallacoin per provar que les poseeixes + Signa el missatges amb la seva adreça de Hallacoin per provar que les poseeixes Verify messages to ensure they were signed with specified Hallacoin addresses - Verifiqueu els misimprobaturitges per assegurar-vos que han estat signats amb una adreça Hallacoin específica. + Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça Hallacoin específica. &File @@ -467,7 +467,7 @@ Show the %1 help message to get a list with possible Hallacoin command-line options - Mostra el misimprobaturitge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Hallacoin + Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Hallacoin default wallet @@ -693,8 +693,8 @@ Aquesta etiqueta es torna vermella si cap recipient rep un import inferior al llindar de polsim actual. - Can vary +/- %1 improbaturitoshi(s) per input. - Pot variar en +/- %1 improbaturitoshi(s) per entrada. + Can vary +/- %1 satoshi(s) per input. + Pot variar en +/- %1 satoshi(s) per entrada. (no label) @@ -825,8 +825,8 @@ Quan feu clic a D'acord, %1 començarà a descarregar i processar la cadena de blocs %4 completa (%2 GB) començant per les primeres transaccions de %3, any de llençament inicial de %4. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - Aquesta sincronització inicial és molt exigent i pot exposar problemes de maquinari amb l'equip que anteriorment havien pasimprobaturit desapercebuts. Cada vegada que executeu %1, continuarà descarregant des del punt on es va deixar. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + Aquesta sincronització inicial és molt exigent i pot exposar problemes de maquinari amb l'equip que anteriorment havien passat desapercebuts. Cada vegada que executeu %1, continuarà descarregant des del punt on es va deixar. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. @@ -1317,7 +1317,7 @@ Payment request file cannot be read! This can be caused by an invalid payment request file. - No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser cauimprobaturit per un fitxer de sol·licitud de pagament no vàlid. + No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid. Payment request rejected @@ -1827,11 +1827,11 @@ &Message: - &Misimprobaturitge: + &Missatge: An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Hallacoin network. - Un misimprobaturitge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El misimprobaturitge no s'enviarà amb el pagament per la xarxa Hallacoin. + Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa Hallacoin. An optional label to associate with the new receiving address. @@ -1895,7 +1895,7 @@ Copy message - Copia el misimprobaturitge + Copia el missatge Copy amount @@ -1946,7 +1946,7 @@ Message - Misimprobaturitge + Missatge Wallet @@ -1954,7 +1954,7 @@ Resulting URI too long, try to reduce the text for label / message. - URI resultant massa llarga, intenta reduir el text per a la etiqueta / misimprobaturitge + URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge Error encoding URI into QR Code. @@ -1973,7 +1973,7 @@ Message - Misimprobaturitge + Missatge (no label) @@ -1981,7 +1981,7 @@ (no message) - (sense misimprobaturitge) + (sense missatge) (no amount requested) @@ -2069,10 +2069,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Especifiqui una comissió personalitzada per kB (1.000 bytes) de la mida virtual de la transacció. -Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "100 improbaturitoshis per cada kB" per una transacció de mida 500 bytes (la meitat de 1 kB) comportaria finalment una comissió de la transacció de només 50 improbaturitoshis. +Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "100 satoshis per cada kB" per una transacció de mida 500 bytes (la meitat de 1 kB) comportaria finalment una comissió de la transacció de només 50 satoshis. per kilobyte @@ -2119,7 +2119,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Habilita Replace-By-Fee: substitució per comissió - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Amb la substitució per comissió o Replace-By-Fee (BIP-125) pot incrementar la comissió de la transacció després d'enviar-la. Sense això, seria recomenable una comissió més alta per compensar el risc d'increment del retard de la transacció. @@ -2303,7 +2303,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Message: - Misimprobaturitge: + Missatge: This is an unauthenticated payment request. @@ -2319,7 +2319,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 A message that was attached to the Hallacoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Hallacoin network. - Un misimprobaturitge que s'ha adjuntat al Hallacoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el misimprobaturitge no s'enviarà a través de la xarxa Hallacoin. + Un missatge que s'ha adjuntat al Hallacoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Hallacoin. Pay To: @@ -2356,19 +2356,19 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 SignVerifyMessageDialog Signatures - Sign / Verify a Message - Signatures - Signa / verifica un misimprobaturitge + Signatures - Signa / verifica un missatge &Sign Message - &Signa el misimprobaturitge + &Signa el missatge You can sign messages/agreements with your addresses to prove you can receive Hallacoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - Podeu signar misimprobaturitges/acords amb les vostres adreces per provar que rebeu les Hallacoins que s'hi envien. Aneu amb compte no signar res que sigui vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. + Podeu signar missatges/acords amb les vostres adreces per provar que rebeu les Hallacoins que s'hi envien. Aneu amb compte no signar res que sigui vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. The Hallacoin address to sign the message with - L'adreça Hallacoin amb què signar el misimprobaturitge + L'adreça Hallacoin amb què signar el missatge Choose previously used address @@ -2388,7 +2388,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Enter the message you want to sign here - Introduïu aquí el misimprobaturitge que voleu signar + Introduïu aquí el missatge que voleu signar Signature @@ -2400,11 +2400,11 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Sign the message to prove you own this Hallacoin address - Signa el misimprobaturitge per provar que ets propietari d'aquesta adreça Hallacoin + Signa el missatge per provar que ets propietari d'aquesta adreça Hallacoin Sign &Message - Signa el &misimprobaturitge + Signa el &missatge Reset all sign message fields @@ -2416,31 +2416,31 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 &Verify Message - &Verifica el misimprobaturitge + &Verifica el missatge Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction! - Introduïu l'adreça del receptor, el misimprobaturitge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el misimprobaturitge. Tingueu cura de no llegir més en la signatura del que està al misimprobaturitge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció! + Introduïu l'adreça del receptor, el missatge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el missatge. Tingueu cura de no llegir més en la signatura del que està al missatge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció! The Hallacoin address the message was signed with - L'adreça Hallacoin amb què va ser signat el misimprobaturitge + L'adreça Hallacoin amb què va ser signat el missatge Verify the message to ensure it was signed with the specified Hallacoin address - Verificar el misimprobaturitge per assegurar-se que ha estat signat amb una adreça Hallacoin específica + Verificar el missatge per assegurar-se que ha estat signat amb una adreça Hallacoin específica Verify &Message - Verifica el &misimprobaturitge + Verifica el &missatge Reset all verify message fields - Neteja tots els camps de verificació de misimprobaturitge + Neteja tots els camps de verificació de missatge Click "Sign Message" to generate signature - Feu clic a «Signa el misimprobaturitge» per a generar una signatura + Feu clic a «Signa el missatge» per a generar una signatura The entered address is invalid. @@ -2464,11 +2464,11 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Message signing failed. - La signatura del misimprobaturitge ha fallat. + La signatura del missatge ha fallat. Message signed. - Misimprobaturitge signat. + Missatge signat. The signature could not be decoded. @@ -2480,15 +2480,15 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 The signature did not match the message digest. - La signatura no coincideix amb el resum del misimprobaturitge. + La signatura no coincideix amb el resum del missatge. Message verification failed. - Ha fallat la verificació del misimprobaturitge. + Ha fallat la verificació del missatge. Message verified. - Misimprobaturitge verificat. + Missatge verificat. @@ -2609,7 +2609,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Message - Misimprobaturitge + Missatge Comment @@ -2794,7 +2794,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Last month - El mes pasimprobaturit + El mes passat This year @@ -2918,7 +2918,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 The transaction history was successfully saved to %1. - L'historial de transaccions s'ha deimprobaturit correctament a %1. + L'historial de transaccions s'ha desat correctament a %1. Range: @@ -3025,7 +3025,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 The wallet data was successfully saved to %1. - S'han deimprobaturit les dades del moneder correctament a %1. + S'han desat les dades del moneder correctament a %1. @@ -3039,7 +3039,7 @@ Nota: Com que la comissió es calcula en funció dels bytes, una comissió de "1 Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat) diff --git a/src/qt/locale/bitcoin_ca@valencia.ts b/src/qt/locale/bitcoin_ca@valencia.ts index 5f171ca..cddf2da 100644 --- a/src/qt/locale/bitcoin_ca@valencia.ts +++ b/src/qt/locale/bitcoin_ca@valencia.ts @@ -227,7 +227,7 @@ BitcoinGUI Sign &message... - Signa el &misimprobaturitge... + Signa el &missatge... Synchronizing with network... @@ -311,7 +311,7 @@ &Verify message... - &Verifica el misimprobaturitge... + &Verifica el missatge... Hallacoin @@ -339,11 +339,11 @@ Sign messages with your Hallacoin addresses to prove you own them - Signa el misimprobaturitges amb la seua adreça de Hallacoin per provar que les poseeixes + Signa el missatges amb la seua adreça de Hallacoin per provar que les poseeixes Verify messages to ensure they were signed with specified Hallacoin addresses - Verifiqueu els misimprobaturitges per assegurar-vos que han estat signats amb una adreça Hallacoin específica. + Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça Hallacoin específica. &File @@ -599,8 +599,8 @@ no - Can vary +/- %1 improbaturitoshi(s) per input. - Pot variar +/- %1 improbaturitoshi(s) per entrada. + Can vary +/- %1 satoshi(s) per input. + Pot variar +/- %1 satoshi(s) per entrada. (no label) @@ -1043,7 +1043,7 @@ Payment request file cannot be read! This can be caused by an invalid payment request file. - No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser cauimprobaturit per un fitxer de sol·licitud de pagament no vàlid. + No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid. Payment request rejected @@ -1393,11 +1393,11 @@ &Message: - &Misimprobaturitge: + &Missatge: An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Hallacoin network. - Un misimprobaturitge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'òbriga la sol·licitud. Nota: El misimprobaturitge no s'enviarà amb el pagament per la xarxa Hallacoin. + Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'òbriga la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa Hallacoin. An optional label to associate with the new receiving address. @@ -1449,7 +1449,7 @@ Copy message - Copia el misimprobaturitge + Copia el missatge Copy amount @@ -1500,7 +1500,7 @@ Message - Misimprobaturitge + Missatge Wallet @@ -1508,7 +1508,7 @@ Resulting URI too long, try to reduce the text for label / message. - URI resultant massa llarga, intenta reduir el text per a la etiqueta / misimprobaturitge + URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge Error encoding URI into QR Code. @@ -1527,7 +1527,7 @@ Message - Misimprobaturitge + Missatge (no label) @@ -1535,7 +1535,7 @@ (no message) - (sense misimprobaturitge) + (sense missatge) @@ -1801,7 +1801,7 @@ Message: - Misimprobaturitge: + Missatge: This is an unauthenticated payment request. @@ -1817,7 +1817,7 @@ A message that was attached to the Hallacoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Hallacoin network. - Un misimprobaturitge que s'ha adjuntat al Hallacoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el misimprobaturitge no s'enviarà a través de la xarxa Hallacoin. + Un missatge que s'ha adjuntat al Hallacoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Hallacoin. Pay To: @@ -1850,19 +1850,19 @@ SignVerifyMessageDialog Signatures - Sign / Verify a Message - Signatures - Signa / verifica un misimprobaturitge + Signatures - Signa / verifica un missatge &Sign Message - &Signa el misimprobaturitge + &Signa el missatge You can sign messages/agreements with your addresses to prove you can receive Hallacoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - Podeu signar misimprobaturitges/acords amb les vostres adreces per provar que rebeu les Hallacoins que s'hi envien. Aneu amb compte no signar res que siga vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. + Podeu signar missatges/acords amb les vostres adreces per provar que rebeu les Hallacoins que s'hi envien. Aneu amb compte no signar res que siga vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. The Hallacoin address to sign the message with - L'adreça Hallacoin amb què signar el misimprobaturitge + L'adreça Hallacoin amb què signar el missatge Choose previously used address @@ -1882,7 +1882,7 @@ Enter the message you want to sign here - Introduïu ací el misimprobaturitge que voleu signar + Introduïu ací el missatge que voleu signar Signature @@ -1894,11 +1894,11 @@ Sign the message to prove you own this Hallacoin address - Signa el misimprobaturitge per provar que ets propietari d'esta adreça Hallacoin + Signa el missatge per provar que ets propietari d'esta adreça Hallacoin Sign &Message - Signa el &misimprobaturitge + Signa el &missatge Reset all sign message fields @@ -1910,31 +1910,31 @@ &Verify Message - &Verifica el misimprobaturitge + &Verifica el missatge Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction! - Introduïu l'adreça del receptor, el misimprobaturitge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el misimprobaturitge. Tingueu cura de no llegir més en la signatura del que està al misimprobaturitge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció! + Introduïu l'adreça del receptor, el missatge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el missatge. Tingueu cura de no llegir més en la signatura del que està al missatge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció! The Hallacoin address the message was signed with - L'adreça Hallacoin amb què va ser signat el misimprobaturitge + L'adreça Hallacoin amb què va ser signat el missatge Verify the message to ensure it was signed with the specified Hallacoin address - Verificar el misimprobaturitge per assegurar-se que ha estat signat amb una adreça Hallacoin específica + Verificar el missatge per assegurar-se que ha estat signat amb una adreça Hallacoin específica Verify &Message - Verifica el &misimprobaturitge + Verifica el &missatge Reset all verify message fields - Neteja tots els camps de verificació de misimprobaturitge + Neteja tots els camps de verificació de missatge Click "Sign Message" to generate signature - Feu clic a «Signa el misimprobaturitge» per a generar una signatura + Feu clic a «Signa el missatge» per a generar una signatura The entered address is invalid. @@ -1958,11 +1958,11 @@ Message signing failed. - La signatura del misimprobaturitge ha fallat. + La signatura del missatge ha fallat. Message signed. - Misimprobaturitge signat. + Missatge signat. The signature could not be decoded. @@ -1974,15 +1974,15 @@ The signature did not match the message digest. - La signatura no coincideix amb el resum del misimprobaturitge. + La signatura no coincideix amb el resum del missatge. Message verification failed. - Ha fallat la verificació del misimprobaturitge. + Ha fallat la verificació del missatge. Message verified. - Misimprobaturitge verificat. + Missatge verificat. @@ -2083,7 +2083,7 @@ Message - Misimprobaturitge + Missatge Comment @@ -2252,7 +2252,7 @@ Last month - El mes pasimprobaturit + El mes passat This year diff --git a/src/qt/locale/bitcoin_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts index 2ce3f15..3b059f3 100644 --- a/src/qt/locale/bitcoin_ca_ES.ts +++ b/src/qt/locale/bitcoin_ca_ES.ts @@ -235,7 +235,7 @@ BitcoinGUI Sign &message... - Signa el &misimprobaturitge... + Signa el &missatge... Synchronizing with network... @@ -347,7 +347,7 @@ &Verify message... - &Verifica el misimprobaturitge... + &Verifica el missatge... Hallacoin @@ -375,11 +375,11 @@ Sign messages with your Hallacoin addresses to prove you own them - Signa el misimprobaturitges amb la seva adreça de Hallacoin per provar que les poseeixes + Signa el missatges amb la seva adreça de Hallacoin per provar que les poseeixes Verify messages to ensure they were signed with specified Hallacoin addresses - Verifiqueu els misimprobaturitges per assegurar-vos que han estat signats amb una adreça Hallacoin específica. + Verifiqueu els missatges per assegurar-vos que han estat signats amb una adreça Hallacoin específica. &File @@ -455,7 +455,7 @@ Show the %1 help message to get a list with possible Hallacoin command-line options - Mostra el misimprobaturitge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Hallacoin + Mostra el missatge d'ajuda del %1 per obtenir una llista amb les possibles opcions de línia d'ordres de Hallacoin &Window @@ -671,8 +671,8 @@ Aquesta etiqueta es torna vermella si cap recipient rep un import inferior al llindar de polsim actual. - Can vary +/- %1 improbaturitoshi(s) per input. - Pot variar en +/- %1 improbaturitoshi(s) per entrada. + Can vary +/- %1 satoshi(s) per input. + Pot variar en +/- %1 satoshi(s) per entrada. (no label) @@ -1195,7 +1195,7 @@ Payment request file cannot be read! This can be caused by an invalid payment request file. - No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser cauimprobaturit per un fitxer de sol·licitud de pagament no vàlid. + No es pot llegir el fitxer de la sol·licitud de pagament. Això pot ser causat per un fitxer de sol·licitud de pagament no vàlid. Payment request rejected @@ -1613,11 +1613,11 @@ &Message: - &Misimprobaturitge: + &Missatge: An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Hallacoin network. - Un misimprobaturitge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El misimprobaturitge no s'enviarà amb el pagament per la xarxa Hallacoin. + Un missatge opcional que s'adjuntarà a la sol·licitud de pagament, que es mostrarà quan s'obri la sol·licitud. Nota: El missatge no s'enviarà amb el pagament per la xarxa Hallacoin. An optional label to associate with the new receiving address. @@ -1669,7 +1669,7 @@ Copy message - Copia el misimprobaturitge + Copia el missatge Copy amount @@ -1720,7 +1720,7 @@ Message - Misimprobaturitge + Missatge Wallet @@ -1728,7 +1728,7 @@ Resulting URI too long, try to reduce the text for label / message. - URI resultant massa llarga, intenta reduir el text per a la etiqueta / misimprobaturitge + URI resultant massa llarga, intenta reduir el text per a la etiqueta / missatge Error encoding URI into QR Code. @@ -1747,7 +1747,7 @@ Message - Misimprobaturitge + Missatge (no label) @@ -1755,7 +1755,7 @@ (no message) - (sense misimprobaturitge) + (sense missatge) (no amount requested) @@ -2033,7 +2033,7 @@ Message: - Misimprobaturitge: + Missatge: This is an unauthenticated payment request. @@ -2049,7 +2049,7 @@ A message that was attached to the Hallacoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Hallacoin network. - Un misimprobaturitge que s'ha adjuntat al Hallacoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el misimprobaturitge no s'enviarà a través de la xarxa Hallacoin. + Un missatge que s'ha adjuntat al Hallacoin: URI que s'emmagatzemarà amb la transacció per a la vostra referència. Nota: el missatge no s'enviarà a través de la xarxa Hallacoin. Pay To: @@ -2082,19 +2082,19 @@ SignVerifyMessageDialog Signatures - Sign / Verify a Message - Signatures - Signa / verifica un misimprobaturitge + Signatures - Signa / verifica un missatge &Sign Message - &Signa el misimprobaturitge + &Signa el missatge You can sign messages/agreements with your addresses to prove you can receive Hallacoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - Podeu signar misimprobaturitges/acords amb les vostres adreces per provar que rebeu les Hallacoins que s'hi envien. Aneu amb compte no signar res que sigui vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. + Podeu signar missatges/acords amb les vostres adreces per provar que rebeu les Hallacoins que s'hi envien. Aneu amb compte no signar res que sigui vague o aleatori, perquè en alguns atacs de suplantació es pot provar que hi signeu la vostra identitat. Només signeu aquelles declaracions completament detallades en què hi esteu d'acord. The Hallacoin address to sign the message with - L'adreça Hallacoin amb què signar el misimprobaturitge + L'adreça Hallacoin amb què signar el missatge Choose previously used address @@ -2114,7 +2114,7 @@ Enter the message you want to sign here - Introduïu aquí el misimprobaturitge que voleu signar + Introduïu aquí el missatge que voleu signar Signature @@ -2126,11 +2126,11 @@ Sign the message to prove you own this Hallacoin address - Signa el misimprobaturitge per provar que ets propietari d'aquesta adreça Hallacoin + Signa el missatge per provar que ets propietari d'aquesta adreça Hallacoin Sign &Message - Signa el &misimprobaturitge + Signa el &missatge Reset all sign message fields @@ -2142,31 +2142,31 @@ &Verify Message - &Verifica el misimprobaturitge + &Verifica el missatge Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction! - Introduïu l'adreça del receptor, el misimprobaturitge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el misimprobaturitge. Tingueu cura de no llegir més en la signatura del que està al misimprobaturitge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció! + Introduïu l'adreça del receptor, el missatge (assegureu-vos de copiar els salts de línia, espais, tabuladors, etc. exactament) i signatura de sota per verificar el missatge. Tingueu cura de no llegir més en la signatura del que està al missatge signat, per evitar ser enganyat per un atac d'home-en-el-mig. Tingueu en compte que això només demostra que la part que signa rep amb l'adreça, i no es pot provar l'enviament de qualsevol transacció! The Hallacoin address the message was signed with - L'adreça Hallacoin amb què va ser signat el misimprobaturitge + L'adreça Hallacoin amb què va ser signat el missatge Verify the message to ensure it was signed with the specified Hallacoin address - Verificar el misimprobaturitge per assegurar-se que ha estat signat amb una adreça Hallacoin específica + Verificar el missatge per assegurar-se que ha estat signat amb una adreça Hallacoin específica Verify &Message - Verifica el &misimprobaturitge + Verifica el &missatge Reset all verify message fields - Neteja tots els camps de verificació de misimprobaturitge + Neteja tots els camps de verificació de missatge Click "Sign Message" to generate signature - Feu clic a «Signa el misimprobaturitge» per a generar una signatura + Feu clic a «Signa el missatge» per a generar una signatura The entered address is invalid. @@ -2190,11 +2190,11 @@ Message signing failed. - La signatura del misimprobaturitge ha fallat. + La signatura del missatge ha fallat. Message signed. - Misimprobaturitge signat. + Missatge signat. The signature could not be decoded. @@ -2206,15 +2206,15 @@ The signature did not match the message digest. - La signatura no coincideix amb el resum del misimprobaturitge. + La signatura no coincideix amb el resum del missatge. Message verification failed. - Ha fallat la verificació del misimprobaturitge. + Ha fallat la verificació del missatge. Message verified. - Misimprobaturitge verificat. + Missatge verificat. @@ -2319,7 +2319,7 @@ Message - Misimprobaturitge + Missatge Comment @@ -2496,7 +2496,7 @@ Last month - El mes pasimprobaturit + El mes passat This year @@ -2612,7 +2612,7 @@ The transaction history was successfully saved to %1. - L'historial de transaccions s'ha deimprobaturit correctament a %1. + L'historial de transaccions s'ha desat correctament a %1. Range: @@ -2679,7 +2679,7 @@ The wallet data was successfully saved to %1. - S'han deimprobaturit les dades del moneder correctament a %1. + S'han desat les dades del moneder correctament a %1. @@ -2689,7 +2689,7 @@ Poda configurada per sota el mínim de %d MiB. Utilitzeu un nombre superior. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Poda: la darrera sincronització del moneder va més enllà de les dades podades. Cal que activeu -reindex (baixeu tota la cadena de blocs de nou en cas de node podat) diff --git a/src/qt/locale/bitcoin_cs.ts b/src/qt/locale/bitcoin_cs.ts index bc9f8f8..21cc8ab 100644 --- a/src/qt/locale/bitcoin_cs.ts +++ b/src/qt/locale/bitcoin_cs.ts @@ -662,7 +662,7 @@ List mode - Vypimprobaturit jako seznam + Vypsat jako seznam Amount @@ -753,8 +753,8 @@ Popisek zčervená, pokud má některý příjemce obdržet částku menší, než je aktuální práh pro prach. - Can vary +/- %1 improbaturitoshi(s) per input. - Může se lišit o +/– %1 improbaturitoshi na každý vstup. + Can vary +/- %1 satoshi(s) per input. + Může se lišit o +/– %1 satoshi na každý vstup. (no label) @@ -885,7 +885,7 @@ Jakmile stiskneš OK, %1 začne stahovat a zpracovávat celý %4ový blockchain (%2 GB), počínaje nejstaršími transakcemi z roku %3, kdy byl %4 spuštěn. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Prvotní synchronizace je velice náročná, a mohou se tak díky ní začít na tvém počítači projevovat dosud skryté hardwarové problémy. Pokaždé, když spustíš %1, bude stahování pokračovat tam, kde skončilo. @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Specifikujte vlastní poplatek za kB (1000 bajtů) virtuální velikosti transakce. -Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 improbaturitoshi za kB" a velikost transakce 500 bajtů (polovina z 1 kB) by stál jen 50 improbaturitoshi. +Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 satoshi za kB" a velikost transakce 500 bajtů (polovina z 1 kB) by stál jen 50 satoshi. per kilobyte @@ -2251,7 +2251,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Povolit možnost dodatečně transakci navýšit poplatek (tzv. „replace-by-fee“) - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. S dodatečným navýšením poplatku (BIP-125, tzv. „Replace-By-Fee“) můžete zvýšit poplatek i po odeslání. Bez dodatečného navýšení bude navrhnut vyšší transakční poplatek, tak aby kompenzoval zvýšené riziko prodlení transakce. @@ -2512,7 +2512,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im SignVerifyMessageDialog Signatures - Sign / Verify a Message - Podpisy - podepimprobaturit/ověřit zprávu + Podpisy - podepsat/ověřit zprávu &Sign Message @@ -2544,7 +2544,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Enter the message you want to sign here - Sem vepiš zprávu, kterou chceš podepimprobaturit + Sem vepiš zprávu, kterou chceš podepsat Signature @@ -2620,7 +2620,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Message signing failed. - Nepodařilo se podepimprobaturit zprávu. + Nepodařilo se podepsat zprávu. Message signed. @@ -3170,7 +3170,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Can't sign transaction. - Nemůžu podepimprobaturit transakci. + Nemůžu podepsat transakci. Could not commit transaction @@ -3231,7 +3231,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Prořezávání je nastaveno pod minimum %d MiB. Použij, prosím, nějaké vyšší číslo. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Prořezávání: poslední synchronizace peněženky proběhla před už prořezanými daty. Je třeba provést -reindex (tedy v případě prořezávacího režimu stáhnout znovu celý blockchain) @@ -3488,7 +3488,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Wallet needed to be rewritten: restart %s to complete - Soubor s peněženkou potřeboval přepimprobaturit: restartuj %s, aby se operace dokončila + Soubor s peněženkou potřeboval přepsat: restartuj %s, aby se operace dokončila Error: Listening for incoming connections failed (listen returned error %s) @@ -3552,7 +3552,7 @@ Poznámka: Jelikož je poplatek počítaný za bajt, poplatek o hodnotě "100 im Signing transaction failed - Nepodařilo se podepimprobaturit transakci + Nepodařilo se podepsat transakci Specified -walletdir "%s" does not exist diff --git a/src/qt/locale/bitcoin_da.ts b/src/qt/locale/bitcoin_da.ts index 2ca25ba..a385c88 100644 --- a/src/qt/locale/bitcoin_da.ts +++ b/src/qt/locale/bitcoin_da.ts @@ -753,8 +753,8 @@ Denne mærkat bliver rød, hvis en eller flere modtagere modtager et beløb, der er mindre end den aktuelle støvgrænse. - Can vary +/- %1 improbaturitoshi(s) per input. - Kan variere med ±%1 improbaturitoshi per input. + Can vary +/- %1 satoshi(s) per input. + Kan variere med ±%1 satoshi per input. (no label) @@ -885,7 +885,7 @@ Når du klikker OK, vil %1 begynde at downloade og bearbejde den fulde %4-blokkæde (%2 GB), startende med de tidligste transaktioner i %3, da %4 først startede. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Denne indledningsvise synkronisering er meget krævende, og den kan potentielt afsløre hardwareproblemer med din computer, som du ellers ikke har lagt mærke til. Hver gang, du kører %1, vil den fortsætte med at downloade, hvor den sidst slap. @@ -1231,7 +1231,7 @@ Options set in this dialog are overridden by the command line or in the configuration file: - Valgmuligheder improbaturit i denne dialog er overskrevet af kommandolinjen eller i konfigurationsfilen: + Valgmuligheder sat i denne dialog er overskrevet af kommandolinjen eller i konfigurationsfilen: &OK @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Specificer et brugerdefineret gebyr per kB (1.000 bytes) af transaktionens virtuelle størrelse. -Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 improbaturitoshis per kB" for en transkationsstørrelse på 500 bytes (halvdelen af 1kB) ville ultimativt udbytte et gebyr på kun 50 improbaturitoshis. +Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 satoshis per kB" for en transkationsstørrelse på 500 bytes (halvdelen af 1kB) ville ultimativt udbytte et gebyr på kun 50 satoshis. per kilobyte @@ -2251,7 +2251,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 impro Aktivér erstat-med-gebyr (RBF) - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Med erstat-med-gebyr (Replace-By-Fee, BIP-125) kan du øge en transaktions gebyr, efter den er sendt. Uden dette kan et højere gebyr anbefales for at kompensere for øget risiko for at transaktionen bliver forsinket. @@ -3228,10 +3228,10 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 impro Prune configured below the minimum of %d MiB. Please use a higher number. - Beskæring er improbaturit under minimumsgrænsen på %d MiB. Brug venligst et større tal. + Beskæring er sat under minimumsgrænsen på %d MiB. Brug venligst et større tal. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Beskæring: Seneste synkronisering rækker udover beskårne data. Du er nødt til at bruge -reindex (downloade hele blokkæden igen i fald af beskåret knude) @@ -3284,7 +3284,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 impro The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct - Blokdatabasen indeholder en blok, som ser ud til at være fra fremtiden. Dette kan skyldes, at din computers dato og tid ikke er improbaturit korrekt. Genopbyg kun blokdatabasen, hvis du er sikker på, at din computers dato og tid er korrekt + Blokdatabasen indeholder en blok, som ser ud til at være fra fremtiden. Dette kan skyldes, at din computers dato og tid ikke er sat korrekt. Genopbyg kun blokdatabasen, hvis du er sikker på, at din computers dato og tid er korrekt This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -3610,7 +3610,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 impro -maxtxfee is set very high! Fees this large could be paid on a single transaction. - -maxtxfee er improbaturit meget højt! Gebyrer så store risikeres betalt på en enkelt transaktion. + -maxtxfee er sat meget højt! Gebyrer så store risikeres betalt på en enkelt transaktion. This is the transaction fee you may pay when fee estimates are not available. @@ -3630,7 +3630,7 @@ Note: Siden gebyret er kalkuleret på en per-byte basis, et gebyr på "100 impro %s is set very high! - %s er meget højt improbaturit! + %s er meget højt sat! Error loading wallet %s. Duplicate -wallet filename specified. diff --git a/src/qt/locale/bitcoin_de.ts b/src/qt/locale/bitcoin_de.ts index 18297f0..d32af9d 100644 --- a/src/qt/locale/bitcoin_de.ts +++ b/src/qt/locale/bitcoin_de.ts @@ -753,7 +753,7 @@ Diese Bezeichnung wird rot, wenn irgendein Empfänger einen Betrag kleiner als die derzeitige "Staubgrenze" erhält. - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. Kann pro Eingabe um +/- %1 Satoshi(s) abweichen. @@ -885,8 +885,8 @@ Wenn Sie auf OK klicken, beginnt %1 mit dem Herunterladen und Verarbeiten der gesamten %4-Blockchain (%2GB), beginnend mit den frühesten Transaktionen in %3 beim ersten Start von %4. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - Diese initiale Synchroniimprobaturition führt zur hohen Last und kann Harewareprobleme, die bisher nicht aufgetreten sind, mit ihrem Computer verursachen. Jedes Mal, wenn Sie %1 ausführen, wird der Download zum letzten Synchroniimprobaturitionspunkt fortgesetzt. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + Diese initiale Synchronisation führt zur hohen Last und kann Harewareprobleme, die bisher nicht aufgetreten sind, mit ihrem Computer verursachen. Jedes Mal, wenn Sie %1 ausführen, wird der Download zum letzten Synchronisationspunkt fortgesetzt. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. @@ -945,7 +945,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Hallacoin network, as detailed below. - Neueste Transaktionen werden eventuell noch nicht angezeigt, daher könnte Ihr Kontostand veraltet sein. Er wird korrigiert, sobald Ihr Wallet die Synchroniimprobaturition mit dem Hallacoin-Netzwerk erfolgreich abgeschlossen hat. Details dazu finden sich weiter unten. + Neueste Transaktionen werden eventuell noch nicht angezeigt, daher könnte Ihr Kontostand veraltet sein. Er wird korrigiert, sobald Ihr Wallet die Synchronisation mit dem Hallacoin-Netzwerk erfolgreich abgeschlossen hat. Details dazu finden sich weiter unten. Attempting to spend Hallacoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1804,7 +1804,7 @@ Time Offset - Zeitverimprobaturitz + Zeitversatz Last block time @@ -2189,7 +2189,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Geben sie eine angepasste Gebühr pro kB (1.000 Byte) virtueller Größe der Transaktion an. Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktion von 500 Byte (einem halben kB) würde eine Gebühr von 50 Satoshis ergeben, da die Gebühr pro Byte berechnet wird. @@ -2247,7 +2247,7 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio Aktiviere Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Mit Replace-By-Fee (BIP-125) kann die Transaktionsgebühr nach dem Senden erhöht werden. Ohne dies wird eine höhere Gebühr empfohlen, um das Risiko einer hohen Transaktionszeit zu reduzieren. @@ -3227,8 +3227,8 @@ Hinweis: Eine Gebühr von "100 Satoshis pro kB" bei einer Größe der Transaktio Kürzungsmodus wurde kleiner als das Minimum in Höhe von %d MiB konfiguriert. Bitte verwenden Sie einen größeren Wert. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) - Prune (Kürzung): Die letzte Synchroniimprobaturition der Wallet liegt vor gekürzten (gelöschten) Blöcken. Es ist ein -reindex (erneuter Download der gesamten Blockchain im Fall eines gekürzten Knotens) notwendig. + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune (Kürzung): Die letzte Synchronisation der Wallet liegt vor gekürzten (gelöschten) Blöcken. Es ist ein -reindex (erneuter Download der gesamten Blockchain im Fall eines gekürzten Knotens) notwendig. Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again. diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index d62cf80..60067fd 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -952,7 +952,7 @@ - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. @@ -1116,7 +1116,7 @@ - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. @@ -2839,7 +2839,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. @@ -2909,7 +2909,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 impro - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. @@ -4170,7 +4170,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 impro - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) diff --git a/src/qt/locale/bitcoin_en_AU.ts b/src/qt/locale/bitcoin_en_AU.ts index ccea89d..a465ca2 100644 --- a/src/qt/locale/bitcoin_en_AU.ts +++ b/src/qt/locale/bitcoin_en_AU.ts @@ -184,11 +184,11 @@ Failed to rescan the wallet during initialization - Failed to rescan the wallet during initialiimprobaturition + Failed to rescan the wallet during initialisation Initialization sanity check failed. %s is shutting down. - Initialiimprobaturition sanity check failed. %s is shutting down. + Initialisation sanity check failed. %s is shutting down. \ No newline at end of file diff --git a/src/qt/locale/bitcoin_en_GB.ts b/src/qt/locale/bitcoin_en_GB.ts index a3999a5..478de51 100644 --- a/src/qt/locale/bitcoin_en_GB.ts +++ b/src/qt/locale/bitcoin_en_GB.ts @@ -753,8 +753,8 @@ This label turns red if any recipient receives an amount smaller than the current dust threshold. - Can vary +/- %1 improbaturitoshi(s) per input. - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. (no label) @@ -885,8 +885,8 @@ When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. per kilobyte @@ -2251,8 +2251,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Enable Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Clear &All @@ -3231,8 +3231,8 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Prune configured below the minimum of %d MiB. Please use a higher number. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again. @@ -3388,7 +3388,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Failed to rescan the wallet during initialization - Failed to rescan the wallet during initialiimprobaturition. + Failed to rescan the wallet during initialisation. Importing... @@ -3400,7 +3400,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Initialization sanity check failed. %s is shutting down. - Initialiimprobaturition sanity check failed. %s is shutting down. + Initialisation sanity check failed. %s is shutting down. Invalid amount for -%s=<amount>: '%s' diff --git a/src/qt/locale/bitcoin_es.ts b/src/qt/locale/bitcoin_es.ts index 9d42298..398370f 100644 --- a/src/qt/locale/bitcoin_es.ts +++ b/src/qt/locale/bitcoin_es.ts @@ -752,8 +752,8 @@ Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior al actual umbral de polvo. - Can vary +/- %1 improbaturitoshi(s) per input. - Puede variar +/- %1 improbaturitoshi(s) por entrada. + Can vary +/- %1 satoshi(s) per input. + Puede variar +/- %1 satoshi(s) por entrada. (no label) @@ -884,7 +884,7 @@ Cuando haga click en OK, %1 se empezará a descargar la %4 cadena de bloques completa (%2GB) empezando por la transacción más antigua en %3 cuando se publicó %4 originalmente. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. La sincronización inicial demanda muchos recursos y podría revelar problemas de hardware que no se han notado previamente. Cada vez que ejecuta %1, continuará descargando a partir del punto anterior. @@ -2192,10 +2192,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Especifique una comisión personalizada por kB (1,000 bytes) del tamaño virtual de la transacción. -Nota: Dado que la comisión se calcula por byte, una comisión de "100 improbaturitoshis por kB" para un tamaño de transacción de 500 bytes (la mitad de 1 kB) finalmente generará una comisión de solo 50 improbaturitoshis. +Nota: Dado que la comisión se calcula por byte, una comisión de "100 satoshis por kB" para un tamaño de transacción de 500 bytes (la mitad de 1 kB) finalmente generará una comisión de solo 50 satoshis. per kilobyte @@ -2250,7 +2250,7 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 improbatu Habilitar Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Con Replace-By-Fee (BIP-125) puede incrementar la comisión después de haber enviado la transacción. Si no utiliza esto, se recomienda que añada una comisión mayor para compensar el riesgo adicional de que la transacción se retrase. @@ -3230,7 +3230,7 @@ Nota: Dado que la comisión se calcula por byte, una comisión de "100 improbatu La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor más alto. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Poda: la ultima sincronizacion del monedero sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado) diff --git a/src/qt/locale/bitcoin_es_CL.ts b/src/qt/locale/bitcoin_es_CL.ts index 63ba4d6..1311e69 100644 --- a/src/qt/locale/bitcoin_es_CL.ts +++ b/src/qt/locale/bitcoin_es_CL.ts @@ -681,8 +681,8 @@ Está etiqueta se vuelve roja si algún receptor recibe una cantidad inferior al límite actual establecido para el polvo. - Can vary +/- %1 improbaturitoshi(s) per input. - Puede variar +/- %1 improbaturitoshi(s) por entrada. + Can vary +/- %1 satoshi(s) per input. + Puede variar +/- %1 satoshi(s) por entrada. (no label) @@ -801,7 +801,7 @@ Al ser la primera vez que se ejecuta el programa, puede elegir donde %1 almacenará sus datos. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. El primer proceso de sincronización consume muchos recursos, y es posible que puedan ocurrir problemas de hardware que anteriormente no hayas notado. Cada vez que ejecutes %1 automáticamente se reiniciará el proceso de sincronización desde el punto que lo dejaste anteriormente. diff --git a/src/qt/locale/bitcoin_es_ES.ts b/src/qt/locale/bitcoin_es_ES.ts index a9c5912..8db4acf 100644 --- a/src/qt/locale/bitcoin_es_ES.ts +++ b/src/qt/locale/bitcoin_es_ES.ts @@ -709,8 +709,8 @@ Esta etiqueta se vuelve roja si algún destinatario recibe una cantidad inferior a la actual puerta polvorienta. - Can vary +/- %1 improbaturitoshi(s) per input. - Puede variar +/- %1 improbaturitoshi(s) por entrada. + Can vary +/- %1 satoshi(s) per input. + Puede variar +/- %1 satoshi(s) por entrada. (no label) @@ -2835,7 +2835,7 @@ La Poda se ha configurado por debajo del minimo de %d MiB. Por favor utiliza un valor mas alto. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Poda: la ultima sincronizacion de la cartera sobrepasa los datos podados. Necesitas reindexar con -reindex (o descargar la cadena de bloques de nuevo en el caso de un nodo podado) diff --git a/src/qt/locale/bitcoin_et.ts b/src/qt/locale/bitcoin_et.ts index 86b7961..2257f15 100644 --- a/src/qt/locale/bitcoin_et.ts +++ b/src/qt/locale/bitcoin_et.ts @@ -1749,7 +1749,7 @@ Amount removed from or added to balance. - Jäägile liimprobaturitud või eemaldatud summa. + Jäägile lisatud või eemaldatud summa. diff --git a/src/qt/locale/bitcoin_eu_ES.ts b/src/qt/locale/bitcoin_eu_ES.ts index cc9de2e..fac16ed 100644 --- a/src/qt/locale/bitcoin_eu_ES.ts +++ b/src/qt/locale/bitcoin_eu_ES.ts @@ -551,7 +551,7 @@ Paste address from clipboard - Arbeletik helbidea itimprobaturitsi + Arbeletik helbidea itsatsi Alt+P @@ -584,7 +584,7 @@ Paste address from clipboard - Arbeletik helbidea itimprobaturitsi + Arbeletik helbidea itsatsi Alt+P @@ -695,7 +695,7 @@ Transaction status. Hover over this field to show number of confirmations. - Transakzioaren egoera. Paimprobaturitu sagua gainetik konfirmazio kopurua ikusteko. + Transakzioaren egoera. Pasatu sagua gainetik konfirmazio kopurua ikusteko. Date and time that the transaction was received. diff --git a/src/qt/locale/bitcoin_fa_IR.ts b/src/qt/locale/bitcoin_fa_IR.ts index 820288f..3a405f7 100644 --- a/src/qt/locale/bitcoin_fa_IR.ts +++ b/src/qt/locale/bitcoin_fa_IR.ts @@ -1566,7 +1566,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. مشخص کردن هزینه کارمزد مخصوص به ازاری کیلوبایت(1,000 بایت) حجم مجازی تراکنش توجه: از آن جایی که کارمزد بر اساس هر بایت محاسبه میشود,هزینه کارمزد"100 ساتوشی بر کیلو بایت"برای تراکنش با حجم 500 بایت(نصف 1 کیلوبایت) کارمزد فقط اندازه 50 ساتوشی خواهد بود. diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 3f092f3..f66aecd 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -141,7 +141,7 @@ Enter the new passphrase to the wallet.<br/>Please use a passphrase of <b>ten or more random characters</b>, or <b>eight or more words</b>. - Kirjoita uusi salauslause lompakolle.<br/>Käytä salauslausetta jossa on joko<b>kymmenen tai useampi improbaturitunnainen merkki</b>, tai<b>vähintään kahdeksan sanaa</b> + Kirjoita uusi salauslause lompakolle.<br/>Käytä salauslausetta jossa on joko<b>kymmenen tai useampi satunnainen merkki</b>, tai<b>vähintään kahdeksan sanaa</b> Encrypt wallet @@ -717,8 +717,8 @@ Tämä nimike muuttuu punaiseksi, jos jokin vastaanottajista on saamassa tämänhetkistä tomun rajaa pienemmän summan. - Can vary +/- %1 improbaturitoshi(s) per input. - Saattaa vaihdella +/- %1 improbaturitoshia per syöte. + Can vary +/- %1 satoshi(s) per input. + Saattaa vaihdella +/- %1 satoshia per syöte. (no label) @@ -849,7 +849,7 @@ Kun valitset OK, %1 aloittaa lataamaan ja käsittelemään koko %4 lohkoketjua (%2GB) aloittaen ensimmäisestä siirrosta %3 jolloin %4 käynnistettiin ensimmäistä kertaa. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Tämä alustava synkronointi on erittäin vaativa ja saattaa tuoda esiin laiteongelmia, joita ei aikaisemmin ole havaittu. Aina kun ajat %1:n, jatketaan siitä kohdasta, mihin viimeksi jäätiin. @@ -2159,7 +2159,7 @@ Käytä Replace-By-Fee:tä - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Replace-By-Fee:tä (BIP-125) käyttämällä voit korottaa siirtotapahtuman palkkiota sen lähettämisen jälkeen. Ilman tätä saatetaan suositella käyttämään suurempaa palkkiota kompensoimaan viiveen kasvamisen riskiä. @@ -3115,7 +3115,7 @@ Karsinta konfiguroitu alle minimin %d MiB. Käytä surempaa numeroa. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Karsinta: viime lompakon synkronisointi menee karsitun datan taakse. Sinun tarvitsee ajaa -reindex (lataa koko lohkoketju uudelleen tapauksessa jossa karsiva noodi) @@ -3452,7 +3452,7 @@ This is the transaction fee you may pay when fee estimates are not available. - Tämän siirtomaksun makimprobaturit, kun siirtomaksun arviointi ei ole käytettävissä. + Tämän siirtomaksun maksat, kun siirtomaksun arviointi ei ole käytettävissä. %s is set very high! @@ -3480,7 +3480,7 @@ This is the transaction fee you will pay if you send a transaction. - Tämä on lähetyksestä maksettava maksu jonka makimprobaturit + Tämä on lähetyksestä maksettava maksu jonka maksat Transaction amounts must not be negative diff --git a/src/qt/locale/bitcoin_fil.ts b/src/qt/locale/bitcoin_fil.ts index 5778a02..be91b20 100644 --- a/src/qt/locale/bitcoin_fil.ts +++ b/src/qt/locale/bitcoin_fil.ts @@ -311,7 +311,7 @@ Reindexing blocks on disk... - Muling isinaimprobaturitalatuntunan ang mga blocks sa disk... + Muling isinasatalatuntunan ang mga blocks sa disk... Proxy is <b>enabled</b>: %1 @@ -411,7 +411,7 @@ Indexing blocks on disk... - Isinaimprobaturitalatuntunan ang mga blocks sa disk... + Isinasatalatuntunan ang mga blocks sa disk... Processing blocks on disk... @@ -685,8 +685,8 @@ Ang label na ito ay magiging pula kung ang sinumang tatanggap ay tumanggap ng halagang mas mababa sa kasalukuyang dust threshold. - Can vary +/- %1 improbaturitoshi(s) per input. - Maaaring magbago ng +/- %1 improbaturitoshi(s) kada input. + Can vary +/- %1 satoshi(s) per input. + Maaaring magbago ng +/- %1 satoshi(s) kada input. (no label) @@ -789,7 +789,7 @@ Pagkatapos mong mag-click ng OK, %1 ay magsisimulang mag-download at mag-proseso ng buong blockchain (%2GB) magmula sa pinakaunang transaksyon sa %3 nuong ang %4 ay paunang nilunsad. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Maraming pangangailangan ang itong paunang sinkronisasyon at maaaring ilantad ang mga problema sa hardware ng iyong computer na hindi dating napansin. Tuwing pagaganahin mo ang %1, ito'y magpapatuloy mag-download kung saan ito tumigil. diff --git a/src/qt/locale/bitcoin_fr.ts b/src/qt/locale/bitcoin_fr.ts index 6456a55..73262be 100644 --- a/src/qt/locale/bitcoin_fr.ts +++ b/src/qt/locale/bitcoin_fr.ts @@ -247,7 +247,7 @@ Synchronizing with network... - Synchroniimprobaturition avec le réseau… + Synchronisation avec le réseau… &Overview @@ -331,7 +331,7 @@ Syncing Headers (%1%)... - Synchroniimprobaturition des en-têtes (%1)... + Synchronisation des en-têtes (%1)... Reindexing blocks on disk... @@ -753,8 +753,8 @@ Cette étiquette devient rouge si un destinataire reçoit un montant inférieur au seuil actuel de poussière. - Can vary +/- %1 improbaturitoshi(s) per input. - Peut varier +/- %1 improbaturitoshi(s) par entrée. + Can vary +/- %1 satoshi(s) per input. + Peut varier +/- %1 satoshi(s) par entrée. (no label) @@ -885,12 +885,12 @@ Quand vous cliquerez sur Valider, %1 commencera à télécharger et à traiter l’intégralité de la chaîne de blocs %4 (%2 Go) en débutant avec les transactions les plus anciennes de %3, quand %4 a été lancé initialement. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - La synchroniimprobaturition initiale est très exigeante et pourrait exposer des problèmes matériels dans votre ordinateur passés inaperçus auparavant. Chaque fois que vous exécuterez %1, le téléchargement reprendra où il s’était arrêté. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + La synchronisation initiale est très exigeante et pourrait exposer des problèmes matériels dans votre ordinateur passés inaperçus auparavant. Chaque fois que vous exécuterez %1, le téléchargement reprendra où il s’était arrêté. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. - Si vous avez choisi de limiter le stockage de la chaîne de blocs (élagage), les données historiques doivent quand même être téléchargées et traitées, mais seront supprimées par la suite pour minimiser l’utiliimprobaturition de votre espace disque. + Si vous avez choisi de limiter le stockage de la chaîne de blocs (élagage), les données historiques doivent quand même être téléchargées et traitées, mais seront supprimées par la suite pour minimiser l’utilisation de votre espace disque. Use the default data directory @@ -977,7 +977,7 @@ Estimated time left until synced - Temps estimé avant la fin de la synchroniimprobaturition + Temps estimé avant la fin de la synchronisation Hide @@ -985,7 +985,7 @@ Unknown. Syncing Headers (%1, %2%)... - Inconnu. Synchroniimprobaturition des en-têtes (%1, %2)… + Inconnu. Synchronisation des en-têtes (%1, %2)… @@ -1191,7 +1191,7 @@ Show only a tray icon after minimizing the window. - N’afficher qu’une icône dans la zone de notification après minimiimprobaturition. + N’afficher qu’une icône dans la zone de notification après minimisation. &Minimize to the tray instead of the taskbar @@ -1207,11 +1207,11 @@ User Interface &language: - &Langue de l’interface utiliimprobaturiteur : + &Langue de l’interface utilisateur : The user interface language can be set here. This setting will take effect after restarting %1. - La langue de l’interface utiliimprobaturiteur peut être définie ici. Ce réglage sera pris en compte après redémarrage de %1. + La langue de l’interface utilisateur peut être définie ici. Ce réglage sera pris en compte après redémarrage de %1. &Unit to show amounts in: @@ -1251,7 +1251,7 @@ Confirm options reset - Confirmer la réinitialiimprobaturition des options + Confirmer la réinitialisation des options Client restart required to activate changes. @@ -1267,7 +1267,7 @@ The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file. - Le fichier de configuration est utilisé pour indiquer aux utiliimprobaturiteurs experts quelles options remplacent les paramètres de l’IUG. De plus, toute option de ligne de commande remplacera ce fichier de configuration. + Le fichier de configuration est utilisé pour indiquer aux utilisateurs experts quelles options remplacent les paramètres de l’IUG. De plus, toute option de ligne de commande remplacera ce fichier de configuration. Error @@ -1468,7 +1468,7 @@ PeerTableModel User Agent - Agent utiliimprobaturiteur + Agent utilisateur Node/Service @@ -1696,7 +1696,7 @@ Memory usage - Utiliimprobaturition de la mémoire + Utilisation de la mémoire Wallet: @@ -1756,7 +1756,7 @@ User Agent - Agent utiliimprobaturiteur + Agent utilisateur Open the %1 debug log file from the current data directory. This can take a few seconds for large log files. @@ -1888,11 +1888,11 @@ For more information on using this console type %1. - Pour de plus amples renseignements sur l’utiliimprobaturition de cette console, tapez %1. + Pour de plus amples renseignements sur l’utilisation de cette console, tapez %1. WARNING: Scammers have been active, telling users to type commands here, stealing their wallet contents. Do not use this console without fully understanding the ramifications of a command. - AVERTISSEMENT : Des fraudeurs se sont montrés actifs, demandant aux utiliimprobaturiteurs de taper des commandes ici, dérobant ainsi le contenu de leurs porte-monnaie. N’utilisez pas cette console sans une compréhension parfaite des conséquences d’une commande. + AVERTISSEMENT : Des fraudeurs se sont montrés actifs, demandant aux utilisateurs de taper des commandes ici, dérobant ainsi le contenu de leurs porte-monnaie. N’utilisez pas cette console sans une compréhension parfaite des conséquences d’une commande. Network activity disabled @@ -2180,7 +2180,7 @@ Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain. - L’utiliimprobaturition de l’option « fallbackfee » (frais de repli) peut avoir comme effet d’envoyer une transaction qui prendra plusieurs heures ou jours pour être confirmée ou qui ne le sera jamais. Envisagez de choisir vos frais manuellement ou attendez d’avoir validé l’intégralité de la chaîne. + L’utilisation de l’option « fallbackfee » (frais de repli) peut avoir comme effet d’envoyer une transaction qui prendra plusieurs heures ou jours pour être confirmée ou qui ne le sera jamais. Envisagez de choisir vos frais manuellement ou attendez d’avoir validé l’intégralité de la chaîne. Warning: Fee estimation is currently not possible. @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Déterminer des frais personnalisés par Ko (1 000 octets) de la taille virtuelle de la transaction. -Note : Les frais étant calculés par octet, des frais de « 100 improbaturitoshis par Ko » pour une transaction d’une taille de 500 octets (la moitié de 1 Ko) donneront des frais de seulement 50 improbaturitoshis. +Note : Les frais étant calculés par octet, des frais de « 100 satoshis par Ko » pour une transaction d’une taille de 500 octets (la moitié de 1 Ko) donneront des frais de seulement 50 satoshis. per kilobyte @@ -2251,7 +2251,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit Activer Remplacer-par-des-frais - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Avec Remplacer-par-des-frais (BIP-125), vous pouvez augmenter les frais de transaction après qu’elle est envoyée. Sans cela, des frais plus élevés peuvent être recommandés pour compenser le risque accru de retard transactionnel. @@ -2939,7 +2939,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit User-defined intent/purpose of the transaction. - Intention/but de la transaction défini par l’utiliimprobaturiteur. + Intention/but de la transaction défini par l’utilisateur. Amount removed from or added to balance. @@ -3224,15 +3224,15 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit bitcoin-core Distributed under the MIT software license, see the accompanying file %s or %s - Distribué sous la licence MIT d’utiliimprobaturition d’un logiciel. Consulter le fichier joint %s ou %s + Distribué sous la licence MIT d’utilisation d’un logiciel. Consulter le fichier joint %s ou %s Prune configured below the minimum of %d MiB. Please use a higher number. L’élagage est configuré au-dessous du minimum de %d Mio. Veuillez utiliser un nombre plus élevé. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) - Élagage : la dernière synchroniimprobaturition de porte-monnaie va par-delà les données élaguées. Vous devez -reindex (réindexer, télécharger de nouveau toute la chaîne de blocs en cas de nœud élagué) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Élagage : la dernière synchronisation de porte-monnaie va par-delà les données élaguées. Vous devez -reindex (réindexer, télécharger de nouveau toute la chaîne de blocs en cas de nœud élagué) Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again. @@ -3288,7 +3288,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit This is a pre-release test build - use at your own risk - do not use for mining or merchant applications - Ceci est une préversion de test - son utiliimprobaturition est entièrement à vos risques - ne pas l’utiliser pour miner ou pour des applications marchandes + Ceci est une préversion de test - son utilisation est entièrement à vos risques - ne pas l’utiliser pour miner ou pour des applications marchandes This is the transaction fee you may discard if change is smaller than dust at this level @@ -3348,11 +3348,11 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit Error initializing block database - Erreur d’initialiimprobaturition de la base de données de blocs + Erreur d’initialisation de la base de données de blocs Error initializing wallet database environment %s! - Erreur d’initialiimprobaturition de l’environnement de la base de données du porte-monnaie %s ! + Erreur d’initialisation de l’environnement de la base de données du porte-monnaie %s ! Error loading %s @@ -3388,7 +3388,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit Failed to rescan the wallet during initialization - Échec de réanalyse du porte-monnaie lors de l’initialiimprobaturition + Échec de réanalyse du porte-monnaie lors de l’initialisation Importing... @@ -3400,7 +3400,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit Initialization sanity check failed. %s is shutting down. - L’initialiimprobaturition du test de cohérence a échoué. %s est en cours de fermeture. + L’initialisation du test de cohérence a échoué. %s est en cours de fermeture. Invalid amount for -%s=<amount>: '%s' @@ -3472,7 +3472,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit Unsupported logging category %s=%s. - Catégorie de journaliimprobaturition non prise en charge %s=%s. + Catégorie de journalisation non prise en charge %s=%s. Upgrading UTXO database @@ -3480,7 +3480,7 @@ Note : Les frais étant calculés par octet, des frais de « 100 improbaturit User Agent comment (%s) contains unsafe characters. - Le commentaire d’agent utiliimprobaturiteur (%s) contient des caractères dangereux. + Le commentaire d’agent utilisateur (%s) contient des caractères dangereux. Verifying blocks... diff --git a/src/qt/locale/bitcoin_fr_FR.ts b/src/qt/locale/bitcoin_fr_FR.ts index 2c2af79..11040fb 100644 --- a/src/qt/locale/bitcoin_fr_FR.ts +++ b/src/qt/locale/bitcoin_fr_FR.ts @@ -247,7 +247,7 @@ Synchronizing with network... - Synchroniimprobaturition avec le réseau... + Synchronisation avec le réseau... &Overview @@ -331,7 +331,7 @@ Syncing Headers (%1%)... - Synchroniimprobaturition des entêtes (%1%)... + Synchronisation des entêtes (%1%)... Reindexing blocks on disk... @@ -729,8 +729,8 @@ Cette étiquette devient rouge si un bénéficiaire reçoit une somme plus basse que la limite actuelle de poussière. - Can vary +/- %1 improbaturitoshi(s) per input. - Peut varier de +/- %1 improbaturitoshi(s) par entrée. + Can vary +/- %1 satoshi(s) per input. + Peut varier de +/- %1 satoshi(s) par entrée. (no label) @@ -935,7 +935,7 @@ &Reset Options - &Options de réinitialiimprobaturition + &Options de réinitialisation &Network @@ -999,7 +999,7 @@ User Interface &language: - Interface utiliimprobaturiteur &langage: + Interface utilisateur &langage: &OK @@ -1019,7 +1019,7 @@ Confirm options reset - Confirmer les options de réinitialiimprobaturition + Confirmer les options de réinitialisation Client restart required to activate changes. @@ -1124,7 +1124,7 @@ PeerTableModel User Agent - Agent Utiliimprobaturiteur + Agent Utilisateur Node/Service @@ -1324,7 +1324,7 @@ User Agent - Agent Utiliimprobaturiteur + Agent Utilisateur Services diff --git a/src/qt/locale/bitcoin_he.ts b/src/qt/locale/bitcoin_he.ts index f8d5e69..eede6b5 100644 --- a/src/qt/locale/bitcoin_he.ts +++ b/src/qt/locale/bitcoin_he.ts @@ -693,7 +693,7 @@ תווית זו הופכת לאדומה אם מישהו מהנמענים מקבל סכום נמוך יותר מסף האבק הנוכחי. - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. יכול להשתנות במגמה של +/- %1 סנטושי לקלט. @@ -825,7 +825,7 @@ בעת לחיצה על אישור, %1 יחל בהורדה ועיבוד מלאים של שרשרת המקטעים %4 (%2 ג״ב) החל מההעברות הראשונות ב־%3 עם ההשקה הראשונית של %4. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. הסינכרון הראשוני הוא תובעני ועלול לחשוף בעיות חומרה במחשב שהיו חבויות עד כה. כל פעם שתריץ %1 התהליך ימשיך בהורדה מהנקודה שבה הוא עצר לאחרונה. @@ -2081,7 +2081,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. ציינו עמלה מותאמת אישית פר קילובייט (1000 בתים) של הגודל הוירטואלי של העסקה. לתשומת לבכם: מאחר והעמלה מחושבת על בסיס פר-בית, עמלה של "100 סטושי פר קילובייט" עבור עסקה בגודל 500 בתים (חצי קילובייט) תפיק בסופו של דבר עמלה של 50 סטושי בלבד. @@ -2131,7 +2131,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur אפשר ״החלפה-על ידי עמלה״ - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. באמצעות עמלה-ניתנת-לשינוי (BIP-125) תוכלו להגדיל עמלת עסקה גם לאחר שליחתה. ללא אפשרות זו, עמלה גבוהה יותר יכולה להיות מומלצת כדי להקטין את הסיכון בעיכוב אישור העסקה. diff --git a/src/qt/locale/bitcoin_hr.ts b/src/qt/locale/bitcoin_hr.ts index 16cdf44..93711b8 100644 --- a/src/qt/locale/bitcoin_hr.ts +++ b/src/qt/locale/bitcoin_hr.ts @@ -696,8 +696,8 @@ Oznaka postane crvene boje ako bilo koji primatelj dobije iznos manji od trenutnog praga "prašine" (sićušnog iznosa). - Can vary +/- %1 improbaturitoshi(s) per input. - Može varirati +/- %1 improbaturitoši(ja) po inputu. + Can vary +/- %1 satoshi(s) per input. + Može varirati +/- %1 satoši(ja) po inputu. (no label) @@ -828,7 +828,7 @@ Kada kliknete OK, %1 počet će preuzimati i procesirati cijeli lanac blokova (%2GB) počevši s najranijim transakcijama u %3 kad je %4 prvi put pokrenut. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Početna sinkronizacija je vrlo zahtjevna i može otkriti hardverske probleme kod vašeg računala koji su prije prošli nezamijećeno. Svaki put kad pokrenete %1, nastavit će preuzimati odakle je stao. @@ -908,7 +908,7 @@ Progress increase per hour - Postotak povećanja napretka na improbaturit + Postotak povećanja napretka na sat calculating... @@ -1458,7 +1458,7 @@ %n hour(s) - %n improbaturit%n improbaturita%n improbaturiti + %n sat%n sata%n sati %n day(s) @@ -1751,7 +1751,7 @@ 1 &hour - 1 &improbaturit + 1 &sat 1 &day @@ -2083,7 +2083,7 @@ Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain. - Korištenje rezervnu naknadu može rezultirati slanjem transakcije kojoj može trebati nekoliko improbaturiti ili dana (ili pak nikad) da se potvrdi. Uzmite u obzir ručno biranje naknade ili pričekajte da se cijeli lanac validira. + Korištenje rezervnu naknadu može rezultirati slanjem transakcije kojoj može trebati nekoliko sati ili dana (ili pak nikad) da se potvrdi. Uzmite u obzir ručno biranje naknade ili pričekajte da se cijeli lanac validira. Warning: Fee estimation is currently not possible. @@ -2096,10 +2096,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Zadajte prilagođeu naknadu po kB (1000 bajtova) virtualne veličine transakcije. -Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturitošija po kB" za transakciju veličine 500 bajtova (polovica od 1 kB) rezultirala bi ultimativno naknadom od samo 50 improbaturitošija. +Napomena: Budući da se naknada računa po bajtu, naknada od "100 satošija po kB" za transakciju veličine 500 bajtova (polovica od 1 kB) rezultirala bi ultimativno naknadom od samo 50 satošija. per kilobyte @@ -2146,7 +2146,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturito Uključite Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Pomoću mogućnosti Replace-By-Fee (BIP-125) možete povećati naknadu transakcije nakon što je poslana. Bez ovoga može biti preporučena veća naknada kako bi nadoknadila povećani rizik zakašnjenja transakcije. @@ -2415,11 +2415,11 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturito You can sign messages/agreements with your addresses to prove you can receive Hallacoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - Možete potpiimprobaturiti poruke/dogovore svojim adresama kako biste dokazali da možete pristupiti Hallacoinima poslanim na te adrese. Budite oprezni da ne potpisujte ništa nejasno ili nasumično, jer napadi phishingom vas mogu prevariti da prepišite svoj identitet njima. Potpisujte samo detaljno objašnjene izjave s kojima se slažete. + Možete potpisati poruke/dogovore svojim adresama kako biste dokazali da možete pristupiti Hallacoinima poslanim na te adrese. Budite oprezni da ne potpisujte ništa nejasno ili nasumično, jer napadi phishingom vas mogu prevariti da prepišite svoj identitet njima. Potpisujte samo detaljno objašnjene izjave s kojima se slažete. The Hallacoin address to sign the message with - Hallacoin adresa pomoću koje ćete potpiimprobaturiti poruku + Hallacoin adresa pomoću koje ćete potpisati poruku Choose previously used address @@ -2439,7 +2439,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturito Enter the message you want to sign here - Upišite poruku koju želite potpiimprobaturiti ovdje + Upišite poruku koju želite potpisati ovdje Signature @@ -3114,7 +3114,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturito Obrezivanje postavljeno ispod minimuma od %d MiB. Molim koristite veći broj. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Obrezivanje: zadnja sinkronizacija novčanika ide dalje od obrezivanih podataka. Morate koristiti -reindex (ponovo preuzeti cijeli lanac blokova u slučaju obrezivanog čvora) @@ -3155,7 +3155,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturito Please check that your computer's date and time are correct! If your clock is wrong, %s will not work properly. - Molimo provjerite jesu li datum i vrijeme na vašem računalu točni. Ako je vaš improbaturit krivo namješten, %s neće raditi ispravno. + Molimo provjerite jesu li datum i vrijeme na vašem računalu točni. Ako je vaš sat krivo namješten, %s neće raditi ispravno. Please contribute if you find %s useful. Visit %s for further information about the software. @@ -3555,7 +3555,7 @@ Napomena: Budući da se naknada računa po bajtu, naknada od "100 improbaturito Cannot write to data directory '%s'; check permissions. - Nije moguće piimprobaturiti u podatkovnu mapu '%s'; provjerite dozvole. + Nije moguće pisati u podatkovnu mapu '%s'; provjerite dozvole. Loading block index... diff --git a/src/qt/locale/bitcoin_hu.ts b/src/qt/locale/bitcoin_hu.ts index 84cac09..3b16bdc 100644 --- a/src/qt/locale/bitcoin_hu.ts +++ b/src/qt/locale/bitcoin_hu.ts @@ -480,7 +480,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Connecting to peers... - Cimprobaturitlakozás párokhoz... + Csatlakozás párokhoz... Catching up... @@ -680,8 +680,8 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Ez a címke pirosra változik, ha bármely fogadóhoz, a porszem határértéknél kevesebb összeg érkezik. - Can vary +/- %1 improbaturitoshi(s) per input. - Megadott értékenként +/- %1 improbaturitoshi-val változhat. + Can vary +/- %1 satoshi(s) per input. + Megadott értékenként +/- %1 satoshi-val változhat. (no label) @@ -800,7 +800,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Ha az OK-ra kattint, %1 megkezdi a teljes %4 blokk lánc letöltését és feldolgozását (%2GB) a legkorábbi tranzakciókkal kezdve %3 -ben, amikor a %4 bevezetésre került. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Az első szinkronizáció nagyon erőforrás-igényes és felszínre hozhat a számítógépében eddig rejtve maradt hardver problémákat. Minden %1 indításnál a program onnan folytatja a letöltést, ahol legutóbb abbahagyta. @@ -1018,7 +1018,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Accept connections from outside. - Külső cimprobaturitlakozások elfogadása. + Külső csatlakozások elfogadása. Allow incomin&g connections @@ -1026,7 +1026,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Connect to the Hallacoin network through a SOCKS5 proxy. - Cimprobaturitlakozás a Hallacoin hálózatához SOCKS5 proxyn keresztül + Csatlakozás a Hallacoin hálózatához SOCKS5 proxyn keresztül &Connect through SOCKS5 proxy (default proxy): @@ -1062,7 +1062,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Connect to the Hallacoin network through a separate SOCKS5 proxy for Tor hidden services. - Cimprobaturitlakozás a Hallacoin hálózathoz külön SOCKS5 proxy használatával a Tor rejtett szolgáltatásainak eléréséhez. + Csatlakozás a Hallacoin hálózathoz külön SOCKS5 proxy használatával a Tor rejtett szolgáltatásainak eléréséhez. &Window @@ -1603,7 +1603,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka Connection Time - Cimprobaturitlakozás ideje + Csatlakozás ideje Last Send @@ -1766,7 +1766,7 @@ Kérem a kulcsmondatban használjon <b> tíz vagy több véletlenszerű ka An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Hallacoin network. - Egy opcionális üzenet cimprobaturitolása a fizetési kérelemhez, amely megjelenik a kérelem megnyitásakor. Megjegyzés: Az üzenet nem lesz elküldve a fizetséggel a Hallacoin hálózaton keresztül. + Egy opcionális üzenet csatolása a fizetési kérelemhez, amely megjelenik a kérelem megnyitásakor. Megjegyzés: Az üzenet nem lesz elküldve a fizetséggel a Hallacoin hálózaton keresztül. An optional label to associate with the new receiving address. diff --git a/src/qt/locale/bitcoin_hu_HU.ts b/src/qt/locale/bitcoin_hu_HU.ts index 78305a7..f64a4d9 100644 --- a/src/qt/locale/bitcoin_hu_HU.ts +++ b/src/qt/locale/bitcoin_hu_HU.ts @@ -675,8 +675,8 @@ Ez a címke pirosra változik, ha valamelyik fogadó fél kisebb összeget kap, mint a jelenlegi porszem határérték. - Can vary +/- %1 improbaturitoshi(s) per input. - Változó +/- %1 improbaturitoshi(k) megadott értékenként. + Can vary +/- %1 satoshi(s) per input. + Változó +/- %1 satoshi(k) megadott értékenként. (no label) @@ -799,7 +799,7 @@ Ha az OK-ra kattint, %1 megkezdi a teljes %4 blokk lánc letöltését és feldolgozását (%2GB) a legkorábbi tranzakciókkal kezdve %3 -ben, amikor a %4 bevezetésre került. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Az első szinkronizáció nagyon erőforrás-igényes és felszínre hozhat a számítógépében eddig rejtve maradt hardver problémákat. Minden %1 indításnál a program onnan folytatja a letöltést, ahol legutóbb abbahagyta. @@ -1029,7 +1029,7 @@ Connect to the Hallacoin network through a SOCKS5 proxy. - Cimprobaturitlakozás a Hallacoin hálózathoz SOCKS5 proxy használatával. + Csatlakozás a Hallacoin hálózathoz SOCKS5 proxy használatával. &Connect through SOCKS5 proxy (default proxy): @@ -1065,7 +1065,7 @@ Connect to the Hallacoin network through a separate SOCKS5 proxy for Tor hidden services. - Cimprobaturitlakozás a Hallacoin hálózathoz külön SOCKS5 proxy használatával a Tor rejtett szolgáltatásainak eléréséhez. + Csatlakozás a Hallacoin hálózathoz külön SOCKS5 proxy használatával a Tor rejtett szolgáltatásainak eléréséhez. &Window @@ -1606,7 +1606,7 @@ Connection Time - Cimprobaturitlakozási idő + Csatlakozási idő Last Send @@ -1769,7 +1769,7 @@ An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Hallacoin network. - Opciónális üzenet cimprobaturitolása a fizetési kérelemhez, ami a kérelem megnyitásakor megjelenik. Megjegyzés: Az üzenet nem lesz elküldve a fizetéssel a Hallacoin hálózaton. + Opciónális üzenet csatolása a fizetési kérelemhez, ami a kérelem megnyitásakor megjelenik. Megjegyzés: Az üzenet nem lesz elküldve a fizetéssel a Hallacoin hálózaton. An optional label to associate with the new receiving address. diff --git a/src/qt/locale/bitcoin_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts index f916fca..94cf35a 100644 --- a/src/qt/locale/bitcoin_id_ID.ts +++ b/src/qt/locale/bitcoin_id_ID.ts @@ -725,8 +725,8 @@ Tidak - Can vary +/- %1 improbaturitoshi(s) per input. - Dapat bervariasi +/- %1 improbaturitoshi per input. + Can vary +/- %1 satoshi(s) per input. + Dapat bervariasi +/- %1 satoshi per input. (no label) @@ -857,7 +857,7 @@ Ketika Anda mengklik OK, %1 akan mulai mengunduh dan memproses %4 block chain penuh (%2GB), dimulai dari transaksi-transaksi awal di %3 saat %4 diluncurkan pertama kali. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Sinkronisasi awal sangat berat dan mungkin akan menunjukkan permasalahan pada perangkat keras komputer Anda yang sebelumnya tidak tampak. Setiap kali Anda menjalankan %1, aplikasi ini akan melanjutkan pengunduhan dari posisi terakhir. @@ -1091,7 +1091,7 @@ If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed. - Jika Anda menonaktifkan perubahan saldo untuk transaksi yang belum dikonfirmasi, perubahan dari transaksi tidak dapat dilakukan sampai transaksi memiliki setidaknya improbaturitu konfirmasi. Hal ini juga mempengaruhi bagaimana saldo Anda dihitung. + Jika Anda menonaktifkan perubahan saldo untuk transaksi yang belum dikonfirmasi, perubahan dari transaksi tidak dapat dilakukan sampai transaksi memiliki setidaknya satu konfirmasi. Hal ini juga mempengaruhi bagaimana saldo Anda dihitung. &Spend unconfirmed change @@ -1211,7 +1211,7 @@ none - tidak improbaturitupun + tidak satupun Confirm options reset diff --git a/src/qt/locale/bitcoin_is.ts b/src/qt/locale/bitcoin_is.ts index e3cc6c5..c32f7d4 100644 --- a/src/qt/locale/bitcoin_is.ts +++ b/src/qt/locale/bitcoin_is.ts @@ -3,7 +3,7 @@ AddressBookPage Right-click to edit address or label - Smelltu á hægri múimprobaturitakka til að breyta færslugildi eða merkingu + Smelltu á hægri músatakka til að breyta færslugildi eða merkingu Create a new address @@ -673,7 +673,7 @@ Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. - URL frá þriðja aðila (t.d. blokkarskoðari) sem birtast í færsluflipanum sem samhengiimprobaturitriði. %s í URL-inu skipt út fyrir færslutvíkross. Mörg URL eru aðskilin með lóðréttu striki |. + URL frá þriðja aðila (t.d. blokkarskoðari) sem birtast í færsluflipanum sem samhengisatriði. %s í URL-inu skipt út fyrir færslutvíkross. Mörg URL eru aðskilin með lóðréttu striki |. Error diff --git a/src/qt/locale/bitcoin_it.ts b/src/qt/locale/bitcoin_it.ts index 74f7bc2..81503f9 100644 --- a/src/qt/locale/bitcoin_it.ts +++ b/src/qt/locale/bitcoin_it.ts @@ -319,7 +319,7 @@ Click to disable network activity. - Clicca per diimprobaturittivare la rete. + Clicca per disattivare la rete. Network activity disabled. @@ -753,8 +753,8 @@ Questa etichetta diventerà rossa se uno qualsiasi dei destinatari riceverà un importo inferiore alla corrente soglia minima per la movimentazione della valuta. - Can vary +/- %1 improbaturitoshi(s) per input. - Può variare di +/- %1 improbaturitoshi per input. + Can vary +/- %1 satoshi(s) per input. + Può variare di +/- %1 satoshi per input. (no label) @@ -885,12 +885,12 @@ Quando fai click su OK, %1 comincerà a scaricare e processare l'intera %4 block chain (%2GB) a partire dalla prime transazioni del %3 quando %4 venne inaugurato. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - La sincronizzazione iniziale è molto dispendiosa e potrebbe mettere in luce problemi di harware del tuo computer che erano prima pasimprobaturiti inosservati. Ogni volta che lanci %1 continuerà a scaricare da dove l'avevi lasciato. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + La sincronizzazione iniziale è molto dispendiosa e potrebbe mettere in luce problemi di harware del tuo computer che erano prima passati inosservati. Ogni volta che lanci %1 continuerà a scaricare da dove l'avevi lasciato. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. - Se hai scelto di limitare l'immagazzinamento della block chain (operazione nota come "pruning" o "potatura"), i dati storici devono comunque essere scaricati e procesimprobaturiti, ma verranno cancellati in seguito per mantenere basso l'utilizzo del tuo disco. + Se hai scelto di limitare l'immagazzinamento della block chain (operazione nota come "pruning" o "potatura"), i dati storici devono comunque essere scaricati e processati, ma verranno cancellati in seguito per mantenere basso l'utilizzo del tuo disco. Use the default data directory @@ -1043,7 +1043,7 @@ Shows if the supplied default SOCKS5 proxy is used to reach peers via this network type. - Mostra se il proxy SOCK5 di default che p stato fornito è uimprobaturito per raggiungere i contatti attraverso questo tipo di rete. + Mostra se il proxy SOCK5 di default che p stato fornito è usato per raggiungere i contatti attraverso questo tipo di rete. Use separate SOCKS&5 proxy to reach peers via Tor hidden services: @@ -1088,7 +1088,7 @@ Per specificare più URL separarli con una barra verticale "|". Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher. - Diimprobaturittiva alcune funzionalità avanzate, ma tutti i blocchi saranno ancora completamente validati. Per ripristinare questa impostazione è necessario rieseguire il download dell'intera blockchain. L'utilizzo effettivo del disco potrebbe essere leggermente superiore. + Disattiva alcune funzionalità avanzate, ma tutti i blocchi saranno ancora completamente validati. Per ripristinare questa impostazione è necessario rieseguire il download dell'intera blockchain. L'utilizzo effettivo del disco potrebbe essere leggermente superiore. Prune &block storage to @@ -1450,7 +1450,7 @@ Per specificare più URL separarli con una barra verticale "|". Payment request cannot be parsed! - La richiesta di pagamento non può essere procesimprobaturita! + La richiesta di pagamento non può essere processata! Bad response from server %1 @@ -2194,10 +2194,10 @@ Per specificare più URL separarli con una barra verticale "|". Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Specifica una tariffa personalizzata per kB (1.000 byte) della dimensione virtuale della transazione -Nota: poiché la commissione è calcolata su base per byte, una commissione di "100 improbaturitoshi per kB" per una dimensione di transazione di 500 byte (metà di 1 kB) alla fine produrrà una commissione di soli 50 improbaturitoshi. +Nota: poiché la commissione è calcolata su base per byte, una commissione di "100 satoshi per kB" per una dimensione di transazione di 500 byte (metà di 1 kB) alla fine produrrà una commissione di soli 50 satoshi. per kilobyte @@ -2252,7 +2252,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Attiva Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Con Replace-By-Fee (BIP-125) si puó aumentare la commissione sulla transazione dopo averla inviata. Senza questa, una commissione piú alta è consigliabile per compensare l'aumento del rischio dovuto al ritardo della transazione. @@ -2420,7 +2420,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Choose previously used address - Scegli un indirizzo uimprobaturito precedentemente + Scegli un indirizzo usato precedentemente This is a normal payment. @@ -2529,7 +2529,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Choose previously used address - Scegli un indirizzo uimprobaturito precedentemente + Scegli un indirizzo usato precedentemente Alt+A @@ -2577,7 +2577,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction! - Per verificare il messaggio inserire l'indirizzo del firmatario, il messaggio e la firma nei campi sottostanti, assicurandosi di copiare eimprobaturittamente anche ritorni a capo, spazi, tabulazioni, etc.. Si raccomanda di non lasciarsi fuorviare dalla firma a leggere più di quanto non sia riportato nel testo del messaggio stesso, in modo da evitare di cadere vittima di attacchi di tipo man-in-the-middle. Si ricorda che la verifica della firma dimostra soltanto che il firmatario può ricevere pagamenti con l'indirizzo corrispondente, non prova l'invio di alcuna transazione. + Per verificare il messaggio inserire l'indirizzo del firmatario, il messaggio e la firma nei campi sottostanti, assicurandosi di copiare esattamente anche ritorni a capo, spazi, tabulazioni, etc.. Si raccomanda di non lasciarsi fuorviare dalla firma a leggere più di quanto non sia riportato nel testo del messaggio stesso, in modo da evitare di cadere vittima di attacchi di tipo man-in-the-middle. Si ricorda che la verifica della firma dimostra soltanto che il firmatario può ricevere pagamenti con l'indirizzo corrispondente, non prova l'invio di alcuna transazione. The Hallacoin address the message was signed with @@ -3224,7 +3224,7 @@ Nota: poiché la commissione è calcolata su base per byte, una commissione di " La modalità "prune" è configurata al di sotto del minimo di %d MB. Si prega di utilizzare un valore più elevato. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Prune: l'ultima sincronizzazione del portafoglio risulta essere precedente alla eliminazione dei dati per via della modalità "pruning". È necessario eseguire un -reindex (scaricare nuovamente la blockchain in caso di nodo pruned). diff --git a/src/qt/locale/bitcoin_it_IT.ts b/src/qt/locale/bitcoin_it_IT.ts index cab6f89..9dcce86 100644 --- a/src/qt/locale/bitcoin_it_IT.ts +++ b/src/qt/locale/bitcoin_it_IT.ts @@ -339,7 +339,7 @@ Change the passphrase used for wallet encryption - Cambia la password uimprobaturita per criptare il portafoglio + Cambia la password usata per criptare il portafoglio &Debug window @@ -407,11 +407,11 @@ Show the list of used sending addresses and labels - Mostra la lista degli indirizzi di invio uimprobaturiti e le relative etichette + Mostra la lista degli indirizzi di invio usati e le relative etichette Show the list of used receiving addresses and labels - Mostra la lista degli indirizzi di ricezione uimprobaturiti e le relative etichette + Mostra la lista degli indirizzi di ricezione usati e le relative etichette Open a Hallacoin: URI or payment request diff --git a/src/qt/locale/bitcoin_ja.ts b/src/qt/locale/bitcoin_ja.ts index 2205e19..a160cc1 100644 --- a/src/qt/locale/bitcoin_ja.ts +++ b/src/qt/locale/bitcoin_ja.ts @@ -753,8 +753,8 @@ 受取額が現在のダスト閾値を下回るアドレスがひとつでもあると、このラベルが赤くなります。 - Can vary +/- %1 improbaturitoshi(s) per input. - ひとつの入力につき %1 improbaturitoshi 前後ずれることがあります。 + Can vary +/- %1 satoshi(s) per input. + ひとつの入力につき %1 satoshi 前後ずれることがあります。 (no label) @@ -885,7 +885,7 @@ OKをクリックすると、%1 は %4 がリリースされた%3年最初の取引からの完全な %4 ブロックチェーン（%2GB）のダウンロードおよび処理を開始します。 - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. この初回同期には多大なリソースを消費し、あなたのコンピュータでこれまで見つからなかったハードウェア上の問題が発生する場合があります。%1 を実行する度に、中断された時点からダウンロードを再開します。 @@ -2189,10 +2189,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. トランザクションの仮想サイズの1 kB(1,000 バイト)あたりのカスタム手数料を指定する。 -注: 手数料はバイト単位で計算されるので、500 バイト(1 kBの半分)のトランザクションサイズに対する「1 kBあたり 100 improbaturitoshi」の手数料は、最終的にはわずか 50 improbaturitoshi となります。 +注: 手数料はバイト単位で計算されるので、500 バイト(1 kBの半分)のトランザクションサイズに対する「1 kBあたり 100 satoshi」の手数料は、最終的にはわずか 50 satoshi となります。 per kilobyte @@ -2247,7 +2247,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Replace-By-Fee を有効化する - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Replace-By-Fee(手数料の上乗せ: BIP-125)機能を有効にすることで、トランザクション送信後でも手数料を上乗せすることができます。この機能を利用しない場合、予め手数料を多めに見積もっておかないと取引が遅れる可能性があります。 @@ -3227,7 +3227,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 剪定設定が、設定可能最小値の %d MiBより低く設定されています。より大きい値を使用してください。 - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) 剪定: 最後のウォレット同期ポイントが、剪定されたデータを越えています。-reindex を実行する必要があります (剪定されたノードの場合、ブロックチェーン全体を再ダウンロードします) diff --git a/src/qt/locale/bitcoin_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts index 6d69baf..d7353a9 100644 --- a/src/qt/locale/bitcoin_ko_KR.ts +++ b/src/qt/locale/bitcoin_ko_KR.ts @@ -753,7 +753,7 @@ 수령인이 현재 더스트 임계값보다 작은 양을 수신하면 이 라벨이 빨간색으로 변합니다. - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. 입력마다 +/- %1 사토시가 변할 수 있습니다. @@ -885,7 +885,7 @@ 확인을 클릭하면 %1은 모든 %4블록 체인 (%2GB) 장부를 %3 안에 다운로드하고 처리하기 시작합니다. 이는 %4가 시작될 때 생성된 가장 오래된 트랜잭션부터 시작합니다. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. 초기 동기화는 매우 오래 걸리며 이전에는 본 적 없는 하드웨어 문제가 발생할 수 있습니다. %1을 실행할 때마다 중단 된 곳에서 다시 계속 다운로드 됩니다. @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. 거래 가상 크기의 kB (1,000 바이트)당 수수료을 지정하십시오. -참고 : 수수료는 바이트 단위로 계산되므로 거래 크기가 500 바이트 (1kB의 절반)일때에 수수료가 "100 improbaturitoshis / kB"이면 궁극적으로 50사토시의 수수료만 발생합니다. +참고 : 수수료는 바이트 단위로 계산되므로 거래 크기가 500 바이트 (1kB의 절반)일때에 수수료가 "100 satoshis / kB"이면 궁극적으로 50사토시의 수수료만 발생합니다. per kilobyte @@ -2251,7 +2251,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Replace-By-Fee 옵션 활성화 - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Replace-By-Fee (BIP-125) 옵션은 보낸 거래의 수수료 상향을 지원해 줍니다. 이 옵션이 없을 경우 거래 지연을 방지하기 위해 더 높은 수수료가 권장됩니다. @@ -3231,7 +3231,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 블록 축소가 최소치인 %d MiB 밑으로 설정되어 있습니다. 더 높은 값을 사용해 주세요. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) 블록 축소: 마지막 지갑 동기화 지점이 축소된 데이터보다 과거의 것 입니다. -reindex가 필요합니다 (축소된 노드의 경우 모든 블록체인을 재다운로드합니다) diff --git a/src/qt/locale/bitcoin_lt.ts b/src/qt/locale/bitcoin_lt.ts index 39a4c51..3a3ef3f 100644 --- a/src/qt/locale/bitcoin_lt.ts +++ b/src/qt/locale/bitcoin_lt.ts @@ -391,7 +391,7 @@ Sign messages with your Hallacoin addresses to prove you own them - Pasirašydami žinutes su savo Hallacoin adresais įrodysite jog eimprobaturite jų savininkas + Pasirašydami žinutes su savo Hallacoin adresais įrodysite jog esate jų savininkas Verify messages to ensure they were signed with specified Hallacoin addresses @@ -753,8 +753,8 @@ Ši etiketė tampa raudona, jei bet kuris gavėjas gauna mažesnę sumą nei dabartinė dulkių slenkstis. - Can vary +/- %1 improbaturitoshi(s) per input. - Gali svyruoti nuo +/-%1 improbaturitoshi(-ų) vienam įvedimui. + Can vary +/- %1 satoshi(s) per input. + Gali svyruoti nuo +/-%1 satoshi(-ų) vienam įvedimui. (no label) @@ -885,7 +885,7 @@ Spustelėjus Gerai, %1 pradės atsisiųsti ir apdoroti visą %4 blokų grandinę (%2GB), pradedant nuo ankstesnių operacijų %3, kai iš pradžių buvo paleista %4. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Ši pradinė sinchronizacija yra labai sudėtinga ir gali sukelti kompiuterio techninės įrangos problemas, kurios anksčiau buvo nepastebėtos. Kiekvieną kartą, kai paleidžiate %1, jis tęs parsisiuntimą ten, kur jis buvo išjungtas. @@ -2185,10 +2185,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Nurodykite individualų mokestį už kB (1000 baitų) nuo sandorio virtualaus dydžio. -Pastaba: Kadangi mokestis apskaičiuojamas pagal baitą, mokestis už „100 improbaturitošių per kB“ už 500 baitų (pusę 1 kB) sandorio dydžio galiausiai sudarytų tik 50 improbaturitošių mokestį. +Pastaba: Kadangi mokestis apskaičiuojamas pagal baitą, mokestis už „100 satošių per kB“ už 500 baitų (pusę 1 kB) sandorio dydžio galiausiai sudarytų tik 50 satošių mokestį. per kilobyte @@ -2243,7 +2243,7 @@ Pastaba: Kadangi mokestis apskaičiuojamas pagal baitą, mokestis už „100 imp Įgalinti keitimąsi mokesčiu - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Naudojant Replace-by-Fend (BIP-125) galite išsiųsti sandorio mokestį vėliau. Be jo, gali būti rekomenduojamas didesnis mokestis, kad būtų kompensuota padidėjusi sandorio vėlavimo rizika. diff --git a/src/qt/locale/bitcoin_nb.ts b/src/qt/locale/bitcoin_nb.ts index 8d0818b..9738a03 100644 --- a/src/qt/locale/bitcoin_nb.ts +++ b/src/qt/locale/bitcoin_nb.ts @@ -745,8 +745,8 @@ Denne merkelappen blir rød hvis en mottaker får mindre enn gjeldende støvterskel. - Can vary +/- %1 improbaturitoshi(s) per input. - Kan variere +/- %1 improbaturitoshi(er) per input. + Can vary +/- %1 satoshi(s) per input. + Kan variere +/- %1 satoshi(er) per input. (no label) @@ -869,12 +869,12 @@ Når du klikker OK, vil %1 starte nedlasting og behandle hele den %4 blokkjeden (%2GB) fra de eldste transaksjonene i %3 når %4 først startet. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Den initielle synkroniseringen er svært krevende, og kan forårsake problemer med maskinvaren i datamaskinen din som du tidligere ikke merket. Hver gang du kjører %1 vil den fortsette nedlastingen der den sluttet. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. - Hvis du har valgt å begrense blokkjedelagring (beskjæring), må historiske data fortimprobaturitt lastes ned og behandles, men de vil bli slettet etterpå for å holde bruken av lagringsplass lav. + Hvis du har valgt å begrense blokkjedelagring (beskjæring), må historiske data fortsatt lastes ned og behandles, men de vil bli slettet etterpå for å holde bruken av lagringsplass lav. Use the default data directory @@ -1373,7 +1373,7 @@ Payment request is not initialized. - Betalingsforespørselen er ikke igangimprobaturitt. + Betalingsforespørselen er ikke igangsatt. Unverified payment requests to custom payment scripts are unsupported. @@ -2151,7 +2151,7 @@ Aktiver Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Med Replace-By-Fee (BIP-125) kan du øke transaksjonens gebyr etter at den er sendt. Uten dette aktivert anbefales et høyere gebyr for å kompensere for risikoen for at transaksjonen blir forsinket. @@ -3123,7 +3123,7 @@ Beskjæringsmodus er konfigurert under minimum på %d MiB. Vennligst bruk et høyere nummer. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Beskjæring: siste lommeboksynkronisering går utenfor beskjærte data. Du må bruke -reindex (laster ned hele blokkjeden igjen for beskjærte noder) @@ -3172,7 +3172,7 @@ The block database contains a block which appears to be from the future. This may be due to your computer's date and time being set incorrectly. Only rebuild the block database if you are sure that your computer's date and time are correct - Blokkdatabasen inneholder en blokk som ser ut til å være fra fremtiden. Dette kan være fordi dato og tid på din datamaskin er improbaturitt feil. Gjenopprett kun blokkdatabasen når du er sikker på at dato og tid er improbaturitt riktig. + Blokkdatabasen inneholder en blokk som ser ut til å være fra fremtiden. Dette kan være fordi dato og tid på din datamaskin er satt feil. Gjenopprett kun blokkdatabasen når du er sikker på at dato og tid er satt riktig. This is a pre-release test build - use at your own risk - do not use for mining or merchant applications @@ -3490,7 +3490,7 @@ -maxtxfee is set very high! Fees this large could be paid on a single transaction. - -maxtxfee er improbaturitt veldig høyt! Så stort gebyr kan bli betalt ved en enkelt transaksjon. + -maxtxfee er satt veldig høyt! Så stort gebyr kan bli betalt ved en enkelt transaksjon. This is the transaction fee you may pay when fee estimates are not available. @@ -3510,7 +3510,7 @@ %s is set very high! - %s er improbaturitt veldig høyt! + %s er satt veldig høyt! Error loading wallet %s. Duplicate -wallet filename specified. diff --git a/src/qt/locale/bitcoin_nl.ts b/src/qt/locale/bitcoin_nl.ts index 9ef08f3..05a84f8 100644 --- a/src/qt/locale/bitcoin_nl.ts +++ b/src/qt/locale/bitcoin_nl.ts @@ -753,8 +753,8 @@ Dit label wordt rood, als een ontvanger een bedrag van minder dan de huidige dust-drempel gekregen heeft. - Can vary +/- %1 improbaturitoshi(s) per input. - Kan per input +/- %1 improbaturitoshi(s) variëren. + Can vary +/- %1 satoshi(s) per input. + Kan per input +/- %1 satoshi(s) variëren. (no label) @@ -885,8 +885,8 @@ Als u op OK klikt, dan zal %1 beginnen met downloaden en verwerken van de volledige %4 blokketen (%2GB) startend met de eerste transacties in %3 toen %4 initeel werd gestart. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - Deze initiële synchroniimprobaturitie is heel veeleisend, en kan hardware problemen met uw computer blootleggen die voorheen onopgemerkt bleven. Elke keer dat %1 gebruikt word, zal verdergegaan worden waar gebleven is. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + Deze initiële synchronisatie is heel veeleisend, en kan hardware problemen met uw computer blootleggen die voorheen onopgemerkt bleven. Elke keer dat %1 gebruikt word, zal verdergegaan worden waar gebleven is. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. @@ -945,7 +945,7 @@ Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the Hallacoin network, as detailed below. - Recente transacties zijn mogelijk nog niet zichtbaar. De balans van de portemonnee is daarom mogelijk niet correct. Deze informatie is correct van zodra de synchroniimprobaturitie met het Hallacoin-netwerk werd voltooid, zoals onderaan beschreven. + Recente transacties zijn mogelijk nog niet zichtbaar. De balans van de portemonnee is daarom mogelijk niet correct. Deze informatie is correct van zodra de synchronisatie met het Hallacoin-netwerk werd voltooid, zoals onderaan beschreven. Attempting to spend Hallacoins that are affected by not-yet-displayed transactions will not be accepted by the network. @@ -1808,7 +1808,7 @@ Time Offset - Tijdcompenimprobaturitie + Tijdcompensatie Last block time @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Specificeer handmatig een vergoeding per kB (1,000 bytes) voor de virtuele grootte van de transactie. -Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "100 improbaturitoshis per kB" voor een transactie ten grootte van 500 bytes (de helft van 1 kB) uiteindelijk een vergoeding van maar liefst 50 improbaturitoshis betekenen. +Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "100 satoshis per kB" voor een transactie ten grootte van 500 bytes (de helft van 1 kB) uiteindelijk een vergoeding van maar liefst 50 satoshis betekenen. per kilobyte @@ -2251,7 +2251,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Activeer Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Met Replace-By-Fee (BIP-125) kun je de vergoeding voor een transactie verhogen na dat deze verstuurd is. Zonder dit kan een hogere vergoeding aangeraden worden om te compenseren voor de hogere kans op transactie vertragingen. @@ -3231,8 +3231,8 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Prune is ingesteld op minder dan het minimum van %d MiB. Gebruik a.u.b. een hoger aantal. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) - Prune: laatste wallet synchroniimprobaturitie gaat verder terug dan de middels -prune beperkte data. U moet -reindex gebruiken (downloadt opnieuw de gehele blokketen voor een pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: laatste wallet synchronisatie gaat verder terug dan de middels -prune beperkte data. U moet -reindex gebruiken (downloadt opnieuw de gehele blokketen voor een pruned node) Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again. @@ -3348,7 +3348,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Error initializing block database - Fout bij intialiimprobaturitie blokkendatabase + Fout bij intialisatie blokkendatabase Error initializing wallet database environment %s! @@ -3388,7 +3388,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Failed to rescan the wallet during initialization - Portemonnee herscannen tijdens initialiimprobaturitie mislukt + Portemonnee herscannen tijdens initialisatie mislukt Importing... @@ -3400,7 +3400,7 @@ Notitie: Omdat de vergoeding per byte wordt gerekend, zal een vergoeding van "10 Initialization sanity check failed. %s is shutting down. - Initialiimprobaturitie sanity check mislukt. %s is aan het afsluiten. + Initialisatie sanity check mislukt. %s is aan het afsluiten. Invalid amount for -%s=<amount>: '%s' diff --git a/src/qt/locale/bitcoin_pl.ts b/src/qt/locale/bitcoin_pl.ts index 04e7278..a618c55 100644 --- a/src/qt/locale/bitcoin_pl.ts +++ b/src/qt/locale/bitcoin_pl.ts @@ -729,8 +729,8 @@ Ta etykieta staje się czerwona jeżeli którykolwiek odbiorca otrzymuje kwotę mniejszą niż obecny próg pyłu. - Can vary +/- %1 improbaturitoshi(s) per input. - Waha się +/- %1 improbaturitoshi na wejście. + Can vary +/- %1 satoshi(s) per input. + Waha się +/- %1 satoshi na wejście. (no label) @@ -861,7 +861,7 @@ Gdy naciśniesz OK, %1 zacznie się pobieranie i przetwarzanie całego %4 łańcucha bloków (%2GB) zaczynając od najwcześniejszych transakcji w %3 gdy %4 został uruchomiony. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Wstępna synchronizacja jest bardzo wymagająca i może ujawnić wcześniej niezauważone problemy sprzętowe. Za każdym uruchomieniem %1 pobieranie będzie kontynuowane od miejsca w którym zostało zatrzymane. @@ -2138,10 +2138,10 @@ Korzystanie z opłaty domyślnej może skutkować wysłaniem transakcji, która Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Określ niestandardową opłatę za kB (1000 bajtów) wirtualnego rozmiaru transakcji. -Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 improbaturitoshi za kB" w przypadku transakcji o wielkości 500 bajtów (połowa 1 kB) ostatecznie da opłatę w wysokości tylko 50 improbaturitoshi. +Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 satoshi za kB" w przypadku transakcji o wielkości 500 bajtów (połowa 1 kB) ostatecznie da opłatę w wysokości tylko 50 satoshi. per kilobyte @@ -2188,7 +2188,7 @@ Uwaga: Ponieważ opłata jest naliczana za każdy bajt, opłata "100 improbaturi Włącz RBF (podmiana transakcji przez podniesienie opłaty) - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Dzięki podmień-przez-opłatę (RBF, BIP-125) możesz podnieść opłatę transakcyjną już wysłanej transakcji. Bez tego, może być rekomendowana większa opłata aby zmniejszyć ryzyko opóźnienia zatwierdzenia transakcji. @@ -3157,7 +3157,7 @@ Zwróć uwagę, że poprawnie zweryfikowana wiadomość potwierdza to, że nadaw Przycinanie skonfigurowano poniżej minimalnych %d MiB. Proszę użyć wyższej liczby. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Prune: ostatnia synchronizacja portfela jest za danymi. Muszisz -reindexować (pobrać cały ciąg bloków ponownie w przypadku przyciętego węzła) diff --git a/src/qt/locale/bitcoin_pl_PL.ts b/src/qt/locale/bitcoin_pl_PL.ts index 8dea63c..8088eec 100644 --- a/src/qt/locale/bitcoin_pl_PL.ts +++ b/src/qt/locale/bitcoin_pl_PL.ts @@ -597,7 +597,7 @@ Kiedy klikniesz OK, %1 zacznie proces ściągania i przetwarzania pełnego łańcuchu bloków (%2GB) zaczynając od najwcześniejszych transakcji w %3 kiedy %4 wstępnie się uruchomi. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Wstępna synchronizacja jest dość wymagająca i może odsłonić pewne problemy z komputerem które wcześniej nie zostały zauważone. Za każdym razem jak uruchomisz %1, będzie kontynuować ściąganie tam gdzie się wcześniej skończyło. diff --git a/src/qt/locale/bitcoin_pt_BR.ts b/src/qt/locale/bitcoin_pt_BR.ts index 7013c19..b0c59df 100644 --- a/src/qt/locale/bitcoin_pt_BR.ts +++ b/src/qt/locale/bitcoin_pt_BR.ts @@ -319,11 +319,11 @@ Click to disable network activity. - Clique para deimprobaturitivar a atividade de rede. + Clique para desativar a atividade de rede. Network activity disabled. - Atividade de rede deimprobaturitivada. + Atividade de rede desativada. Click to enable network activity again. @@ -599,7 +599,7 @@ HD key generation is <b>disabled</b> - Geração de chave HD está <b>deimprobaturitivada</b> + Geração de chave HD está <b>desativada</b> Private key <b>disabled</b> @@ -753,8 +753,8 @@ Este texto fica vermelho se qualquer destinatário receber uma quantidade menor que o limite atual para poeira. - Can vary +/- %1 improbaturitoshi(s) per input. - Pode variar +/- %1 improbaturitoshi(s) por entrada + Can vary +/- %1 satoshi(s) per input. + Pode variar +/- %1 satoshi(s) por entrada (no label) @@ -885,7 +885,7 @@ Quando você clica OK, %1 vai começar a baixar e processar todos os %4 da block chain (%2GB) começando com a mais recente transação em %3 quando %4 inicialmente foi lançado. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Esta sincronização inicial é muito exigente e pode expor problemas de hardware com o computador que passaram despercebidos anteriormente. Cada vez que você executar o %1, irá continuar baixando de onde parou. @@ -1087,7 +1087,7 @@ Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher. - Deimprobaturitiva alguns recursos avançados mas todos os blocos ainda serão totalmente validados. Reverter esta configuração requer baixar de novo a blockchain inteira. O uso de memória pode ser um pouco mais alto. + Desativa alguns recursos avançados mas todos os blocos ainda serão totalmente validados. Reverter esta configuração requer baixar de novo a blockchain inteira. O uso de memória pode ser um pouco mais alto. Prune &block storage to @@ -1294,7 +1294,7 @@ The displayed information may be out of date. Your wallet automatically synchronizes with the Hallacoin network after a connection is established, but this process has not completed yet. - A informação mostrada pode estar deimprobaturitualizada. Sua carteira sincroniza automaticamente com a rede Hallacoin depois que a conexão é estabelecida, mas este processo ainda não está completo. + A informação mostrada pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede Hallacoin depois que a conexão é estabelecida, mas este processo ainda não está completo. Watch-only: @@ -1381,7 +1381,7 @@ You are using a BIP70 URL which will be unsupported in the future. - Você está usando uma URL do BIP70 que será deimprobaturitivado no futuro. + Você está usando uma URL do BIP70 que será desativado no futuro. Payment request fetch URL is invalid: %1 @@ -1389,7 +1389,7 @@ Cannot process payment request because BIP70 support was not compiled in. - O pagamento não pode ser processado porque o suporte ao BIP70 foi deimprobaturitivado. + O pagamento não pode ser processado porque o suporte ao BIP70 foi desativado. Invalid payment address %1 @@ -1896,7 +1896,7 @@ Network activity disabled - Atividade da rede deimprobaturitivada + Atividade da rede desativada Executing command without any wallet @@ -2193,10 +2193,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Especifique uma taxa personalizada por kB (1.000 bytes) do tamanho virtual da transação. -Nota: Como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por kB" por uma transação de 500 bytes (metade de 1 kB) teria uma taxa final de apenas 50 improbaturitoshis. +Nota: Como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por uma transação de 500 bytes (metade de 1 kB) teria uma taxa final de apenas 50 satoshis. per kilobyte @@ -2251,7 +2251,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por Habilitar Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Com Replace-By-Fee (BIP-125) você pode aumentar a taxa da transação após ela ser enviada. Sem isso, uma taxa maior pode ser recomendada para compensar por risco de alto atraso na transação. @@ -3231,7 +3231,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por Configuração de prune abaixo do mínimo de %d MiB.Por gentileza use um número mais alto. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Prune: A ultima sincronização da carteira foi além dos dados podados. Você precisa usar -reindex (fazer o download de toda a blockchain novamente no caso de nós com prune) @@ -3360,7 +3360,7 @@ Nota: Como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por Error loading %s: Private keys can only be disabled during creation - Erro ao carregar %s: Chaves privadas só podem ser deimprobaturitivadas durante a criação + Erro ao carregar %s: Chaves privadas só podem ser desativadas durante a criação Error loading %s: Wallet corrupted @@ -3695,11 +3695,11 @@ Diretório de blocos especificados "%s" não existe. Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee. - Falha na estimativa de taxa. Fallbackfee deimprobaturitivada. Espere alguns blocos ou ative -fallbackfee. + Falha na estimativa de taxa. Fallbackfee desativada. Espere alguns blocos ou ative -fallbackfee. Warning: Private keys detected in wallet {%s} with disabled private keys - Aviso: Chaves privadas detectadas na carteira {%s} com chaves privadas deimprobaturitivadas + Aviso: Chaves privadas detectadas na carteira {%s} com chaves privadas desativadas Cannot write to data directory '%s'; check permissions. diff --git a/src/qt/locale/bitcoin_pt_PT.ts b/src/qt/locale/bitcoin_pt_PT.ts index 9740de2..55ff44e 100644 --- a/src/qt/locale/bitcoin_pt_PT.ts +++ b/src/qt/locale/bitcoin_pt_PT.ts @@ -319,11 +319,11 @@ Click to disable network activity. - Clique para deimprobaturitivar a atividade de rede. + Clique para desativar a atividade de rede. Network activity disabled. - Atividade de rede deimprobaturitivada. + Atividade de rede desativada. Click to enable network activity again. @@ -599,11 +599,11 @@ HD key generation is <b>disabled</b> - Criação de chave HD está <b>deimprobaturitivada</b> + Criação de chave HD está <b>desativada</b> Private key <b>disabled</b> - Chave privada <b>deimprobaturitivada</b> + Chave privada <b>desativada</b> Wallet is <b>encrypted</b> and currently <b>unlocked</b> @@ -753,8 +753,8 @@ Esta etiqueta fica vermelha se qualquer destinatário recebe um valor menor que o limite de dinheiro. - Can vary +/- %1 improbaturitoshi(s) per input. - Pode variar +/- %1 improbaturitoshi(s) por input. + Can vary +/- %1 satoshi(s) per input. + Pode variar +/- %1 satoshi(s) por input. (no label) @@ -881,7 +881,7 @@ Quando clicar OK, %1 vai começar a descarregar e processar a cadeia de blocos %4 completa (%2GB) começando com as transações mais antigas em %3 quando a %4 foi inicialmente lançada. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Esta sincronização inicial é muito exigente, e pode expor problemas com o seu computador que previamente podem ter passado despercebidos. Cada vez que corre %1, este vai continuar a descarregar de onde deixou. @@ -1084,7 +1084,7 @@ Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher. - Deimprobaturitiva alguns recursos avançados mas todos os blocos ainda serão totalmente validados. Reverter esta configuração requer descarregar de novo a cadeia de blocos inteira. Pode utilizar mais o disco. + Desativa alguns recursos avançados mas todos os blocos ainda serão totalmente validados. Reverter esta configuração requer descarregar de novo a cadeia de blocos inteira. Pode utilizar mais o disco. Prune &block storage to @@ -1120,7 +1120,7 @@ If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed. - Se deimprobaturitivar o gasto de troco não confirmado, o troco de uma transação não pode ser utilizado até que essa transação tenha pelo menos uma confirmação. Isto também afeta o cálculo do seu saldo. + Se desativar o gasto de troco não confirmado, o troco de uma transação não pode ser utilizado até que essa transação tenha pelo menos uma confirmação. Isto também afeta o cálculo do seu saldo. &Spend unconfirmed change @@ -1291,7 +1291,7 @@ The displayed information may be out of date. Your wallet automatically synchronizes with the Hallacoin network after a connection is established, but this process has not completed yet. - A informação mostrada poderá estar deimprobaturitualizada. A sua carteira sincroniza automaticamente com a rede Hallacoin depois de estabelecer ligação, mas este processo ainda não está completo. + A informação mostrada poderá estar desatualizada. A sua carteira sincroniza automaticamente com a rede Hallacoin depois de estabelecer ligação, mas este processo ainda não está completo. Watch-only: @@ -1378,7 +1378,7 @@ You are using a BIP70 URL which will be unsupported in the future. - Está a usar uma URL do BIP70 que será deimprobaturitivado no futuro. + Está a usar uma URL do BIP70 que será desativado no futuro. Payment request fetch URL is invalid: %1 @@ -1386,7 +1386,7 @@ Cannot process payment request because BIP70 support was not compiled in. - O pagamento não pode ser processado porque o suporte ao BIP70 foi deimprobaturitivado. + O pagamento não pode ser processado porque o suporte ao BIP70 foi desativado. Invalid payment address %1 @@ -1889,7 +1889,7 @@ Network activity disabled - Atividade de rede deimprobaturitivada + Atividade de rede desativada Executing command without any wallet @@ -2186,10 +2186,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Especifique uma taxa personalizada por kB (1.000 bytes) do tamanho virtual da transação. -Nota: como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por kB" por uma transação de 500 bytes (metade de 1 kB) teria uma taxa final de apenas 50 improbaturitoshis. +Nota: como a taxa é calculada por byte, uma taxa de "100 satoshis por kB" por uma transação de 500 bytes (metade de 1 kB) teria uma taxa final de apenas 50 satoshis. per kilobyte @@ -2244,7 +2244,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por Ativar substituir-por-taxa - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Com substituir-por-taxa (BIP-125) pode aumentar a taxa da transação após ela ser enviada. Sem isto, pode ser recomendável uma taxa maior para compensar o risco maior de atraso na transação. @@ -3209,7 +3209,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por Poda configurada abaixo do mínimo de %d MiB. Por favor, utilize um valor mais elevado. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Poda: a última sincronização da carteira vai além dos dados podados. Precisa de -reindex (descarregar novamente a cadeia de blocos completa em caso de nó podado) @@ -3338,7 +3338,7 @@ Nota: como a taxa é calculada por byte, uma taxa de "100 improbaturitoshis por Error loading %s: Private keys can only be disabled during creation - Erro ao carregar %s: as chaves privadas só podem ser deimprobaturitivadas durante a criação + Erro ao carregar %s: as chaves privadas só podem ser desativadas durante a criação Error loading %s: Wallet corrupted @@ -3673,11 +3673,11 @@ A pasta de blocos especificados "%s" não existe. Fee estimation failed. Fallbackfee is disabled. Wait a few blocks or enable -fallbackfee. - Falha na estimativa de taxa. A taxa alternativa de recurso está deimprobaturitivada. Espere alguns blocos ou ative -fallbackfee. + Falha na estimativa de taxa. A taxa alternativa de recurso está desativada. Espere alguns blocos ou ative -fallbackfee. Warning: Private keys detected in wallet {%s} with disabled private keys - Aviso: chaves privadas detetadas na carteira {%s} com chaves privadas deimprobaturitivadas + Aviso: chaves privadas detetadas na carteira {%s} com chaves privadas desativadas Cannot write to data directory '%s'; check permissions. diff --git a/src/qt/locale/bitcoin_ro_RO.ts b/src/qt/locale/bitcoin_ro_RO.ts index 4566072..371fa38 100644 --- a/src/qt/locale/bitcoin_ro_RO.ts +++ b/src/qt/locale/bitcoin_ro_RO.ts @@ -443,7 +443,7 @@ Processed %n block(s) of transaction history. - S-a proceimprobaturit %n bloc din istoricul tranzacţiilor.S-au proceimprobaturit %n blocuri din istoricul tranzacţiilor.S-au proceimprobaturit %n de blocuri din istoricul tranzacţiilor. + S-a procesat %n bloc din istoricul tranzacţiilor.S-au procesat %n blocuri din istoricul tranzacţiilor.S-au procesat %n de blocuri din istoricul tranzacţiilor. %1 behind @@ -697,8 +697,8 @@ Această etichetă devine roşie, dacă orice beneficiar primeşte o sumă mai mică decât pragul curent pentru praf. - Can vary +/- %1 improbaturitoshi(s) per input. - Poate varia +/- %1 improbaturitoshi pentru fiecare intrare. + Can vary +/- %1 satoshi(s) per input. + Poate varia +/- %1 satoshi pentru fiecare intrare. (no label) @@ -826,15 +826,15 @@ When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched. - Cand apaimprobaturiti OK, %1 va incepe descarcarea si procesarea intregului %4 blockchain (%2GB) incepand cu cele mai vechi tranzactii din %3 de la lansarea initiala a %4. + Cand apasati OK, %1 va incepe descarcarea si procesarea intregului %4 blockchain (%2GB) incepand cu cele mai vechi tranzactii din %3 de la lansarea initiala a %4. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Sincronizarea initiala necesita foarte multe resurse, si poate releva probleme de hardware ale computerului care anterior au trecut neobservate. De fiecare data cand rulati %1, descarcarea va continua de unde a fost intrerupta. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. - Daca ati ales o limita pentru capacitatea de stocare a blockchainului (pruning), datele mai vechi tot trebuie sa fie descarcate si proceimprobaturite, insa vor fi sterse ulterior pentru a reduce utilizarea harddiskului. + Daca ati ales o limita pentru capacitatea de stocare a blockchainului (pruning), datele mai vechi tot trebuie sa fie descarcate si procesate, insa vor fi sterse ulterior pentru a reduce utilizarea harddiskului. Use the default data directory @@ -893,7 +893,7 @@ Attempting to spend Hallacoins that are affected by not-yet-displayed transactions will not be accepted by the network. - Incercarea de a cheltui Hallacoini care sunt afectati de tranzactii ce inca nu sunt afiimprobaturite nu va fi acceptata de retea. + Incercarea de a cheltui Hallacoini care sunt afectati de tranzactii ce inca nu sunt afisate nu va fi acceptata de retea. Number of blocks left @@ -1027,7 +1027,7 @@ Disables some advanced features but all blocks will still be fully validated. Reverting this setting requires re-downloading the entire blockchain. Actual disk usage may be somewhat higher. - Dezactiveaza unele caracteristici avanimprobaturite insa toate blocurile vor fi validate pe deplin. Inversarea acestei setari necesita re-descarcarea intregului blockchain. Utilizarea reala a discului poate fi ceva mai mare. + Dezactiveaza unele caracteristici avansate insa toate blocurile vor fi validate pe deplin. Inversarea acestei setari necesita re-descarcarea intregului blockchain. Utilizarea reala a discului poate fi ceva mai mare. Prune &block storage to @@ -1199,7 +1199,7 @@ The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file. - Fisierul de configurare e folosit pentru a specifica optiuni utilizator avanimprobaturite care modifica setarile din GUI. In plus orice optiune din linia de comanda va modifica acest fisier de configurare. + Fisierul de configurare e folosit pentru a specifica optiuni utilizator avansate care modifica setarile din GUI. In plus orice optiune din linia de comanda va modifica acest fisier de configurare. Error @@ -2105,10 +2105,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Specificati o taxa anume pe kB (1000 byte) din marimea virtuala a tranzactiei. -Nota: Cum taxa este calculata per byte, o taxa de "100 improbaturitoshi per kB" pentru o tranzactie de 500 byte (jumatate de kB) va produce o taxa de doar 50 improbaturitoshi. +Nota: Cum taxa este calculata per byte, o taxa de "100 satoshi per kB" pentru o tranzactie de 500 byte (jumatate de kB) va produce o taxa de doar 50 satoshi. per kilobyte @@ -2155,7 +2155,7 @@ Nota: Cum taxa este calculata per byte, o taxa de "100 improbaturitoshi per kB" Autorizeaza Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Cu Replace-By-Fee (BIP-125) se poate creste taxa unei tranzactii dupa ce a fost trimisa. Fara aceasta optiune, o taxa mai mare e posibil sa fie recomandata pentru a compensa riscul crescut de intarziere a tranzactiei. @@ -3119,7 +3119,7 @@ Nota: Cum taxa este calculata per byte, o taxa de "100 improbaturitoshi per kB" Reductia e configurata sub minimul de %d MiB. Rugam folositi un numar mai mare. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Reductie: ultima sincronizare merge dincolo de datele reductiei. Trebuie sa faceti -reindex (sa descarcati din nou intregul blockchain in cazul unui nod redus) diff --git a/src/qt/locale/bitcoin_ru_RU.ts b/src/qt/locale/bitcoin_ru_RU.ts index 81d84b8..34582f3 100644 --- a/src/qt/locale/bitcoin_ru_RU.ts +++ b/src/qt/locale/bitcoin_ru_RU.ts @@ -753,7 +753,7 @@ Эта метка становится красной, если получатель получит меньшую сумму, чем текущий порог пыли. - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. Может меняться +/- %1 сатоши(ей) за вход. @@ -885,7 +885,7 @@ Когда вы нажмете ОК, %1 начнет загружать и обрабатывать полную цепочку блоков %4 (%2ГБ), начиная с самых ранних транзакций в %3, когда %4 был первоначально запущен. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Первоначальная синхронизация очень сложна и может выявить проблемы с оборудованием вашего компьютера, которые ранее оставались незамеченными. Каждый раз, когда вы запускаете %1, будет продолжена загрузка с того места, где остановился. @@ -2189,7 +2189,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Укажите пользовательскую плату за килобайт (1000 байт) виртуального размера транзакции. Примечание: Так как комиссия рассчитывается на основе каждого байта, комиссия "100 сатошей за КБ " для транзакции размером 500 байт (половина 1 КБ) в конечном счете, приведет к сбору только 50 сатошей. @@ -2247,7 +2247,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Включить Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. С помощью Replace-By-Fee (BIP-125) вы можете увеличить комиссию за транзакцию после ее отправки. Без этого может быть рекомендована более высокая комиссия для компенсации повышенного риска задержки транзакции. @@ -3219,7 +3219,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Удаление блоков выставлено ниже, чем минимум в %d Мб. Пожалуйста, используйте большее значение. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Удаление: последняя синхронизация кошелька вышла за рамки удаленных данных. Вам нужен -reindex (скачать всю цепь блоков в случае удаленного узла) diff --git a/src/qt/locale/bitcoin_sk.ts b/src/qt/locale/bitcoin_sk.ts index 9aa5163..5e2bc88 100644 --- a/src/qt/locale/bitcoin_sk.ts +++ b/src/qt/locale/bitcoin_sk.ts @@ -753,8 +753,8 @@ Tento popis sčervenie ak ktorýkoľvek príjemca dostane sumu menšiu ako súčasný limit pre "prach". - Can vary +/- %1 improbaturitoshi(s) per input. - Môže sa líšiť o +/- %1 improbaturitoshi pre každý vstup. + Can vary +/- %1 satoshi(s) per input. + Môže sa líšiť o +/- %1 satoshi pre každý vstup. (no label) @@ -885,7 +885,7 @@ Hneď po stlačení OK, začne %1 stťahovať a spracovávať celý %4 reťazec blokov (%2 GB), začínajúc nejstaršími transakcemi z roku %3, kdey bol %4 spustený. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Prvá synchronizácia je veľmi náročná a môžu sa tak vďaka nej začat na Vašom počítači projavovať doteraz skryté hárdwarové problémy. Vždy, keď spustíte %1, bude sťahovanie pokračovať tam, kde skončilo. @@ -2194,10 +2194,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Špecifikujte vlastný poplatok za kB (1000 bajtov) virtuálnej veľkosti transakcie. -Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 improbaturitoshi za kB" a veľkosti transakcie 500 bajtov (polovica z 1 kB) by stál len 50 improbaturitoshi. +Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 satoshi za kB" a veľkosti transakcie 500 bajtov (polovica z 1 kB) by stál len 50 satoshi. per kilobyte @@ -2252,7 +2252,7 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 impr Povoliť dodatočné navýšenie poplatku (tzv. „Replace-By-Fee“) - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. S dodatočným navýšením poplatku (BIP-125, tzv. „Replace-By-Fee“), môžete zvýšiť poplatok aj po odoslaní. Bez toho, by mohol byť navrhnutý väčší transakčný poplatok, aby kompenzoval zvýšené riziko omeškania transakcie. @@ -3232,7 +3232,7 @@ Poznámka: Keďže poplatok je počítaný za bajt, poplatok o hodnote "100 impr Redukcia nastavená pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Prerezávanie: posledná synchronizácia peňaženky prebehla pred už prerezanými dátami. Je treba previesť -reindex (v prípade prerezávacieho režimu stiahne znovu celý reťazec blokov) diff --git a/src/qt/locale/bitcoin_sk_SK.ts b/src/qt/locale/bitcoin_sk_SK.ts index 831e40d..ffc1426 100644 --- a/src/qt/locale/bitcoin_sk_SK.ts +++ b/src/qt/locale/bitcoin_sk_SK.ts @@ -693,8 +693,8 @@ Tento štítok sa zmení na červený ak nejaký prijímateľ obdrží čiastku menšiu ako je aktuálny prah prachu - Can vary +/- %1 improbaturitoshi(s) per input. - Môže sa kolísať o +/- %1 improbaturitoshi() za vstup + Can vary +/- %1 satoshi(s) per input. + Môže sa kolísať o +/- %1 satoshi() za vstup (no label) @@ -825,7 +825,7 @@ Keď kliknete na OK tak %1 začne sťahovanie a spracuje celý %4 blockchain (%2GB) počnúc najmladšími transakciami v %3 keď sa %4 prvý krát spustil. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Počiatočná synchronizácia je veľmi náročná a môže odhaliť hardvérove problémy vo vašom počítači o ktorých ste do teraz nevedeli. Vždy keď zapnete %1 tak sa sťahovanie začne presne tam kde bolo pred vypnutím. @@ -2089,10 +2089,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Špecifikujte vlastný transakčný polatok za 1 kB (1000 bajtov) virtuálnej veľkosti transakcie. -Zapamätajte si: Keďže cena poplatku je počítaná za bajt, tak poplatok o hodnote ''100 improbaturitoshi za kB'' pri veľkosti transakcie 500 bajtov (polovica z 1kB) by stál len 50 improbaturitoshi. +Zapamätajte si: Keďže cena poplatku je počítaná za bajt, tak poplatok o hodnote ''100 satoshi za kB'' pri veľkosti transakcie 500 bajtov (polovica z 1kB) by stál len 50 satoshi. per kilobyte @@ -2139,7 +2139,7 @@ Zapamätajte si: Keďže cena poplatku je počítaná za bajt, tak poplatok o ho Povoliť nahradenie poplatkom - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. S nahradením poplatkov (BIP-125) môžete zvýšiť transakčný poplatok po tom, čo je transakcia odoslaná. Bez tejto funkcie je odporúčaný vyšší poplatok aby sa predišlo oneskoreniu transakcie. @@ -3107,7 +3107,7 @@ Zapamätajte si: Keďže cena poplatku je počítaná za bajt, tak poplatok o ho Zmenšenie nastavené pod minimálnu hodnotu %d MiB. Prosím použite vyššiu hodnotu. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Zmenšenie: posledná synchronizácia peňaženky prekračuje zmenšené dáta. Musíte použiť -reindex (opäť stiahnuť celý blockchain pre prípad zmenšeného uzla) diff --git a/src/qt/locale/bitcoin_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts index ea02ac4..84aa033 100644 --- a/src/qt/locale/bitcoin_sl_SI.ts +++ b/src/qt/locale/bitcoin_sl_SI.ts @@ -748,8 +748,8 @@ Ta oznaka se spremeni v rdeče, če katerikoli prejemnik prejme znesek, ki je manjši od trenutnega praga za prah. - Can vary +/- %1 improbaturitoshi(s) per input. - Se lahko razlikuje +/- %1 improbaturitošijev na vnos. + Can vary +/- %1 satoshi(s) per input. + Se lahko razlikuje +/- %1 satošijev na vnos. (no label) @@ -2271,7 +2271,7 @@ Enter the message you want to sign here - Vnesite sporočilo, ki ga želite podpiimprobaturiti + Vnesite sporočilo, ki ga želite podpisati Signature @@ -2753,7 +2753,7 @@ Can't sign transaction. - Ne morem podpiimprobaturiti transakcije. + Ne morem podpisati transakcije. default wallet @@ -2907,7 +2907,7 @@ Signing transaction failed - Transakcije ni bilo mogoče podpiimprobaturiti. + Transakcije ni bilo mogoče podpisati. This is experimental software. diff --git a/src/qt/locale/bitcoin_sn.ts b/src/qt/locale/bitcoin_sn.ts index d91e88a..10f1d8a 100644 --- a/src/qt/locale/bitcoin_sn.ts +++ b/src/qt/locale/bitcoin_sn.ts @@ -103,7 +103,7 @@ &Show / Hide - &Taridza/Uimprobaturitaridza + &Taridza/Usataridza &File diff --git a/src/qt/locale/bitcoin_sq.ts b/src/qt/locale/bitcoin_sq.ts index 4421cd3..9a1286e 100644 --- a/src/qt/locale/bitcoin_sq.ts +++ b/src/qt/locale/bitcoin_sq.ts @@ -55,11 +55,11 @@ These are your Hallacoin addresses for sending payments. Always check the amount and the receiving address before sending coins. - Këto janë Hallacoin adreimprobaturit e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha. + Këto janë Hallacoin adresat e juaja për të dërguar pagesa. Gjithmon kontrolloni shumën dhe adresën pranuese para se të dërgoni monedha. These are your Hallacoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction. - Këto janë Hallacoin adreimprobaturit e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion. + Këto janë Hallacoin adresat e juaja për të pranuar pagesa. Rekomandohet që gjithmon të përdorni një adresë të re për çdo transaksion. &Copy Address diff --git a/src/qt/locale/bitcoin_sr.ts b/src/qt/locale/bitcoin_sr.ts index c246a24..6048b5d 100644 --- a/src/qt/locale/bitcoin_sr.ts +++ b/src/qt/locale/bitcoin_sr.ts @@ -790,7 +790,7 @@ Када кликнете на ОК, %1 ће почети с преузимањем и процесирањем целокупног ланца блокова %4 (%2GB), почевши од најранијих трансакција у %3 када је %4 покренут. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Ова иницијална синхронизација је веома захтевна и може изложити ваш рачунар хардверским проблемима који раније нису били примећени. Сваки пут када покренете %1, преузимање ће се наставити тамо где је било прекинуто. diff --git a/src/qt/locale/bitcoin_sr@latin.ts b/src/qt/locale/bitcoin_sr@latin.ts index f9e327f..21f08fc 100644 --- a/src/qt/locale/bitcoin_sr@latin.ts +++ b/src/qt/locale/bitcoin_sr@latin.ts @@ -39,7 +39,7 @@ &Delete - &Izbriimprobaturiti + &Izbrisati Choose the address to send coins to diff --git a/src/qt/locale/bitcoin_sv.ts b/src/qt/locale/bitcoin_sv.ts index b03dd7c..bcf862d 100644 --- a/src/qt/locale/bitcoin_sv.ts +++ b/src/qt/locale/bitcoin_sv.ts @@ -754,8 +754,8 @@ Försök igen. Denna etikett blir röd om någon mottagare tar emot ett belopp som är lägre än aktuell dammtröskel. - Can vary +/- %1 improbaturitoshi(s) per input. - Kan variera +/- %1 improbaturitoshi per inmatning. + Can vary +/- %1 satoshi(s) per input. + Kan variera +/- %1 satoshi per inmatning. (no label) @@ -886,8 +886,8 @@ Försök igen. När du trycker OK kommer %1 att börja ladda ner och bearbeta den fullständiga %4-blockkedjan (%2 GB), med början vid de första transaktionerna %3 när %4 först lanserades. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. - Denna första synkronisering är väldigt krävande, och kan påvisa hårdvaruproblem hos din dator som tidigare inte viimprobaturit sig. Varje gång du kör %1, kommer nerladdningen att fortsätta där den avslutades. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + Denna första synkronisering är väldigt krävande, och kan påvisa hårdvaruproblem hos din dator som tidigare inte visat sig. Varje gång du kör %1, kommer nerladdningen att fortsätta där den avslutades. If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. @@ -2194,10 +2194,10 @@ Försök igen. Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Ange en egen avgift per kB (1 000 bytes) av transaktionens virtuella storlek. -Notera: Då avgiften beräknas per byte kommer en avgift på 50 improbaturitoshi tas ut för en transaktion på 500 bytes (en halv kB) om man valt "100 improbaturitoshi per kB" som egen avgift. +Notera: Då avgiften beräknas per byte kommer en avgift på 50 satoshi tas ut för en transaktion på 500 bytes (en halv kB) om man valt "100 satoshi per kB" som egen avgift. per kilobyte @@ -2252,7 +2252,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 improbaturitoshi Aktivera Replace-By-Fee - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. Med Replace-By-Fee (BIP-125) kan du höja transaktionsavgiften efter att transaktionen skickats. Om du väljer bort det kan en högre avgift rekommenderas för att kompensera för ökad risk att transaktionen fördröjs. @@ -3232,7 +3232,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 improbaturitoshi Gallring konfigurerad under miniminivån %d MiB. Använd ett högre värde. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Gallring: senaste plånbokssynkroniseringen ligger utanför gallrade data. Du måste använda -reindex (ladda ner hela blockkedjan igen om noden gallrats) @@ -3623,7 +3623,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 improbaturitoshi -maxtxfee is set very high! Fees this large could be paid on a single transaction. - -maxtxfee är väldigt högt improbaturitt! Så höga avgifter kan komma att betalas för en enstaka transaktion. + -maxtxfee är väldigt högt satt! Så höga avgifter kan komma att betalas för en enstaka transaktion. This is the transaction fee you may pay when fee estimates are not available. @@ -3643,7 +3643,7 @@ Notera: Då avgiften beräknas per byte kommer en avgift på 50 improbaturitoshi %s is set very high! - %s är improbaturitt väldigt högt! + %s är satt väldigt högt! Error loading wallet %s. Duplicate -wallet filename specified. diff --git a/src/qt/locale/bitcoin_szl.ts b/src/qt/locale/bitcoin_szl.ts index 0e92655..346c149 100644 --- a/src/qt/locale/bitcoin_szl.ts +++ b/src/qt/locale/bitcoin_szl.ts @@ -697,8 +697,8 @@ Ta etyketa stŏwŏ sie czyrwōnŏ jeźli keryś z ôdbiyrŏczy dostŏwŏ kwotã myńszõ aniżeli terŏźny prōg sztaubu. - Can vary +/- %1 improbaturitoshi(s) per input. - Chwiyrŏ sie +/- %1 improbaturitoshi na wchōd. + Can vary +/- %1 satoshi(s) per input. + Chwiyrŏ sie +/- %1 satoshi na wchōd. (no label) @@ -825,7 +825,7 @@ Kej naciśniesz OK, %1 zacznie pobiyrać i przetwŏrzać cołkõ %4 keta blokōw (%2GB) przi zaczynaniu ôd piyrszych transakcyji w %3 kej %4 ôstoł sztartniynty. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Wstympnŏ synchrōnizacyjŏ je barzo wymŏgajōncŏ i może wyzdradzić wczaśnij niyzaôbserwowane niyprzileżytości sprzyntowe. Za kożdym sztartniyńciym %1 sebiyranie bydzie kōntynuowane ôd placu w kerym ôstało zastawiōne. diff --git a/src/qt/locale/bitcoin_ta.ts b/src/qt/locale/bitcoin_ta.ts index 2eafe74..6d7553c 100644 --- a/src/qt/locale/bitcoin_ta.ts +++ b/src/qt/locale/bitcoin_ta.ts @@ -1881,10 +1881,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. பரிமாற்றத்தின் மெய்நிகர் அளவுக்கு kB (1,000 பைட்டுகளுக்கு) ஒரு தனிபயன் கட்டணத்தை குறிப்பிடவும். -குறிப்பு: கட்டணம் ஒவ்வொரு பைட் அடிப்படையில் கணக்கிடப்பட்டதால், 500 பைட்டுகள் (1 kB இன் பாதி) பரிவர்த்தனை அளவுக்கு "kB க்காக 100 improbaturitoshis" என்ற கட்டணம் இறுதியில் 50 சாத்தோஷிகளுக்கு கட்டணம் மட்டுமே கிடைக்கும். +குறிப்பு: கட்டணம் ஒவ்வொரு பைட் அடிப்படையில் கணக்கிடப்பட்டதால், 500 பைட்டுகள் (1 kB இன் பாதி) பரிவர்த்தனை அளவுக்கு "kB க்காக 100 satoshis" என்ற கட்டணம் இறுதியில் 50 சாத்தோஷிகளுக்கு கட்டணம் மட்டுமே கிடைக்கும். per kilobyte diff --git a/src/qt/locale/bitcoin_tr.ts b/src/qt/locale/bitcoin_tr.ts index 819d794..bbc2e3b 100644 --- a/src/qt/locale/bitcoin_tr.ts +++ b/src/qt/locale/bitcoin_tr.ts @@ -427,7 +427,7 @@ &Command-line options - &Komut improbaturitırı seçenekleri + &Komut satırı seçenekleri %n active connection(s) to Hallacoin network @@ -475,7 +475,7 @@ Show the %1 help message to get a list with possible Hallacoin command-line options - Olası Hallacoin komut improbaturitırı seçeneklerinin listesini görmek için %1 yardım mesajını göster + Olası Hallacoin komut satırı seçeneklerinin listesini görmek için %1 yardım mesajını göster default wallet @@ -701,8 +701,8 @@ Eğer herhangi bir alıcı mevcut toz eşiğinden daha düşük bir tutar alırsa bu etiket kırmızıya dönüşür. - Can vary +/- %1 improbaturitoshi(s) per input. - Girdi başına +/- %1 improbaturitoshi değişebilir. + Can vary +/- %1 satoshi(s) per input. + Girdi başına +/- %1 satoshi değişebilir. (no label) @@ -807,7 +807,7 @@ Command-line options - Komut improbaturitırı seçenekleri + Komut satırı seçenekleri @@ -1183,7 +1183,7 @@ The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file. - Yapılandırma dosyası, grafik arayüzü ayarlarını geçersiz kılacak gelişmiş kullanıcı seçeneklerini belirtmek için kullanılır. Ayrıca, herhangi bir komut improbaturitırı seçeneği bu yapılandırma dosyasını geçersiz kılacaktır. + Yapılandırma dosyası, grafik arayüzü ayarlarını geçersiz kılacak gelişmiş kullanıcı seçeneklerini belirtmek için kullanılır. Ayrıca, herhangi bir komut satırı seçeneği bu yapılandırma dosyasını geçersiz kılacaktır. Error @@ -1494,7 +1494,7 @@ QObject::QObject Error parsing command line arguments: %1. - Komut improbaturitırı argümanlarında hatalı ayrıştırma: %1 + Komut satırı argümanlarında hatalı ayrıştırma: %1 Error: Specified data directory "%1" does not exist. @@ -2428,7 +2428,7 @@ Enter the receiver's address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. Note that this only proves the signing party receives with the address, it cannot prove sendership of any transaction! - Alıcının adresini, iletiyi (improbaturitır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıya giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya engel olmak için imzadan, imzalı iletinin içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir işlemin gönderi tarafını kanıtlayamayacağını unutmayınız! + Alıcının adresini, iletiyi (satır sonları, boşluklar, sekmeler vs. karakterleri tam olarak kopyaladığınızdan emin olunuz) ve imzayı aşağıya giriniz. Bir ortadaki adam saldırısı tarafından kandırılmaya engel olmak için imzadan, imzalı iletinin içeriğini aşan bir anlam çıkarmamaya dikkat ediniz. Bunun sadece imzalayan tarafın adres ile alım yapabildiğini ispatladığını ve herhangi bir işlemin gönderi tarafını kanıtlayamayacağını unutmayınız! The Hallacoin address the message was signed with @@ -3059,7 +3059,7 @@ Budama, en düşük değer olan %d MiB'den düşük olarak ayarlanmıştır. Lütfen daha yüksek bir sayı kullanınız. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Budama: son cüzdan eşleşmesi budanmış verilerin ötesine gitmektedir. -reindex kullanmanız gerekmektedir (Budanmış düğüm ise tüm blok zincirini tekrar indirmeniz gerekir.) diff --git a/src/qt/locale/bitcoin_tr_TR.ts b/src/qt/locale/bitcoin_tr_TR.ts index dccb918..99bdfd9 100644 --- a/src/qt/locale/bitcoin_tr_TR.ts +++ b/src/qt/locale/bitcoin_tr_TR.ts @@ -332,7 +332,7 @@ &Command-line options - Komut improbaturitırı ayarları + Komut satırı ayarları Indexing blocks on disk... @@ -485,7 +485,7 @@ Command-line options - Komut improbaturitırı ayarları + Komut satırı ayarları @@ -602,7 +602,7 @@ The configuration file is used to specify advanced user options which override GUI settings. Additionally, any command-line options will override this configuration file. - Konfigürasyon dosyası GUI ayarlarını geçersiz kılmak için gelişmiş kullanıcı ayarlarını değiştirir. Ek olarak, herhangi bir komut improbaturitırı seçeneği konfigürasyon dosyasını geçersiz kılar. + Konfigürasyon dosyası GUI ayarlarını geçersiz kılmak için gelişmiş kullanıcı ayarlarını değiştirir. Ek olarak, herhangi bir komut satırı seçeneği konfigürasyon dosyasını geçersiz kılar. Error diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 4e4d81f..d22eab2 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -725,7 +725,7 @@ ні - Can vary +/- %1 improbaturitoshi(s) per input. + Can vary +/- %1 satoshi(s) per input. Може відрізнятися на +/- %1 сатоші за введені @@ -2151,7 +2151,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. Вкажіть комісію за кБ (1,000 байт) віртуального розміру транзакції. Примітка: Так як комісія нараховується за байт, комісія "100 сатоші за кБ" для транзакції розміром 500 байт (пів 1 кБ) буде приблизно 50 сатоші. @@ -2209,7 +2209,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Увімкнути Заміна-Через-Комісію - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. З опцією Заміна-Через-Комісію (BIP-125) ви можете збільшити комісію за транзакцію після її надсилання. Інакше може бути рекомендоване збільшення розміру комісії для компенсації підвищеного ризику затримки транзакції. @@ -3177,7 +3177,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur Встановлений розмір ланцюжка блоків є замалим (меншим за %d МіБ). Будь ласка, виберіть більше число. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Операція відсікання: остання синхронізація вмісту гаманцю не обмежується діями над скороченими данними. Вам необхідно зробити переіндексацію -reindex (заново завантажити веcь ланцюжок блоків в разі появи скороченого ланцюга) diff --git a/src/qt/locale/bitcoin_vi.ts b/src/qt/locale/bitcoin_vi.ts index 05bfc02..038cd26 100644 --- a/src/qt/locale/bitcoin_vi.ts +++ b/src/qt/locale/bitcoin_vi.ts @@ -719,8 +719,8 @@ Label này chuyển sang đỏ nếu bất cứ giao dịch nhận nào có số lượng nhỏ hơn ngưỡng dust. - Can vary +/- %1 improbaturitoshi(s) per input. - Có thể thay đổi +/-%1 improbaturitoshi(s) trên input. + Can vary +/- %1 satoshi(s) per input. + Có thể thay đổi +/-%1 satoshi(s) trên input. (no label) @@ -843,7 +843,7 @@ Khi bạn click OK, %1 sẽ bắt đầu download và process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched. - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. Đồng bộ hóa ban đầu này rất đòi hỏi, và có thể phơi bày các sự cố về phần cứng với máy tính của bạn trước đó đã không được chú ý. Mỗi khi bạn chạy %1, nó sẽ tiếp tục tải về nơi nó dừng lại. @@ -3005,8 +3005,8 @@ Prune configured below the minimum of %d MiB. Please use a higher number. - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again. diff --git a/src/qt/locale/bitcoin_zh.ts b/src/qt/locale/bitcoin_zh.ts index 5e5376a..7440dc2 100644 --- a/src/qt/locale/bitcoin_zh.ts +++ b/src/qt/locale/bitcoin_zh.ts @@ -501,8 +501,8 @@ 如果任何接收方接收到的金额小于当前粉尘交易的阈值，则此标签将变为红色。 - Can vary +/- %1 improbaturitoshi(s) per input. - 每个输入可以改变+/- %1 improbaturitoshi(s)。 + Can vary +/- %1 satoshi(s) per input. + 每个输入可以改变+/- %1 satoshi(s)。 (no label) @@ -661,9 +661,9 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. 指定交易虚拟大小的每kB(1,000字节)的自定义费用。 -注意:由于费用是按字节计算的，对于大小为500字节(1 kB的一半)的交易，“每kB 100 improbaturitoshis”的费用最终只会产生50 improbaturitoshis的费用。 +注意:由于费用是按字节计算的，对于大小为500字节(1 kB的一半)的交易，“每kB 100 satoshis”的费用最终只会产生50 satoshis的费用。 Send to multiple recipients at once @@ -686,7 +686,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 目标确认时间： - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. 通过 Replace-By-Fee (BIP-125) 您可以在交易发送后增加交易费用。没有这个，可能会建议收取更高的费用，以补偿交易延迟风险的增加。 diff --git a/src/qt/locale/bitcoin_zh_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts index 75b8723..1db80bc 100644 --- a/src/qt/locale/bitcoin_zh_CN.ts +++ b/src/qt/locale/bitcoin_zh_CN.ts @@ -752,8 +752,8 @@ 当任何一个收款金额小于目前的粉尘金额上限时，文字会变红色。 - Can vary +/- %1 improbaturitoshi(s) per input. - 每组输入可能有 +/- %1 个 improbaturitoshi 的误差。 + Can vary +/- %1 satoshi(s) per input. + 每组输入可能有 +/- %1 个 satoshi 的误差。 (no label) @@ -2181,7 +2181,7 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. 按照交易的虚拟大小自定义每kB ( 1,000 字节 )要交多少手续费。 注意：手续费是按照字节数计算的，对于一笔大小为500字节（1kB的一半）的交易来说，"每kB付100聪手续费"就意味着手续费一共只付了50聪。 @@ -2239,7 +2239,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 启用手续费追加 - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. 手续费追加（Replace-By-Fee，BIP-125）可以让你在送出交易后才来提高手续费。不用这个功能的话，建议付比较高的手续费来降低交易延迟的风险。 @@ -3219,7 +3219,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 修剪值被设置为低于最小值%d MiB，请使用更大的数值。 - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) 修剪：最后的钱包同步超过了修剪的数据。你需要通过 -reindex (重新下载整个区块链以防修剪节点) diff --git a/src/qt/locale/bitcoin_zh_TW.ts b/src/qt/locale/bitcoin_zh_TW.ts index e79739b..5b82ac1 100644 --- a/src/qt/locale/bitcoin_zh_TW.ts +++ b/src/qt/locale/bitcoin_zh_TW.ts @@ -737,8 +737,8 @@ 當任何一個收款金額小於目前的零散金額上限時，文字會變紅色。 - Can vary +/- %1 improbaturitoshi(s) per input. - 每組輸入可能有 +/- %1 個 improbaturitoshi 的誤差。 + Can vary +/- %1 satoshi(s) per input. + 每組輸入可能有 +/- %1 個 satoshi 的誤差。 (no label) @@ -869,7 +869,7 @@ 在你按下「好」之後，%1 就會開始下載並處理整個 %4 區塊鏈(大小是 %2GB)，也就是從 %3 年 %4 剛剛起步時的最初交易開始。 - This initial synchroniimprobaturition is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. 一開始的同步作業非常的耗費資源，並且可能會暴露出之前沒被發現的電腦硬體問題。每次執行 %1 的時候都會繼續先前未完成的下載。 @@ -2149,10 +2149,10 @@ Specify a custom fee per kB (1,000 bytes) of the transaction's virtual size. -Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbaturitoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 improbaturitoshis. +Note: Since the fee is calculated on a per-byte basis, a fee of "100 satoshis per kB" for a transaction size of 500 bytes (half of 1 kB) would ultimately yield a fee of only 50 satoshis. 指定每一千位元祖(kB)擬真大小的交易所要付出的手續費。 -注意: 交易手續費是以位元組為單位來計算。因此當指定手續費為每千位元組 100 個 improbaturitoshi 時，對於一筆大小為 500 位元組(一千位元組的一半)的交易，其手續費會只有 50 個 improbaturitoshi。 +注意: 交易手續費是以位元組為單位來計算。因此當指定手續費為每千位元組 100 個 satoshi 時，對於一筆大小為 500 位元組(一千位元組的一半)的交易，其手續費會只有 50 個 satoshi。 per kilobyte @@ -2203,7 +2203,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 啟用手續費追加 - With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compenimprobaturite for increased transaction delay risk. + With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk. 手續費追加(Replace-By-Fee, BIP-125)可以讓你在送出交易後才來提高手續費。不用這個功能的話，建議付比較高的手續費來降低交易延遲的風險。 @@ -3179,7 +3179,7 @@ Note: Since the fee is calculated on a per-byte basis, a fee of "100 improbatur 設定的修剪值小於最小需求的 %d 百萬位元組(MiB)。請指定大一點的數字。 - Prune: last wallet synchroniimprobaturition goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) + Prune: last wallet synchronisation goes beyond pruned data. You need to -reindex (download the whole blockchain again in case of pruned node) 修剪模式：錢包的最後同步狀態是在被修剪掉的區塊資料中。你需要用 -reindex 參數執行(會重新下載整個區塊鏈) diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index a07f2b6..e98a72c 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -60,7 +60,7 @@ NetworkStyle::NetworkStyle(const QString &_appName, const int iconColorHueShift, // 70° should end up with the typical "testnet" green h+=iconColorHueShift; - // change improbaturituration value + // change saturation value if(s>iconColorSaturationReduction) { s -= iconColorSaturationReduction; diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index b109990..4b91c19 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -87,7 +87,7 @@ class FreedesktopImage int width, height, stride; bool hasAlpha; int channels; - int eximiatPerSample; + int bitsPerSample; QByteArray image; friend QDBusArgument &operator<<(QDBusArgument &a, const FreedesktopImage &i); @@ -107,11 +107,11 @@ FreedesktopImage::FreedesktopImage(const QImage &img): stride(img.width() * BYTES_PER_PIXEL), hasAlpha(true), channels(CHANNELS), - eximiatPerSample(BITS_PER_SAMPLE) + bitsPerSample(BITS_PER_SAMPLE) { // Convert 00xAARRGGBB to RGBA bytewise (endian-independent) format QImage tmp = img.convertToFormat(QImage::Format_ARGB32); - const uint32_t *data = reinterpret_cast(tmp.eximiat()); + const uint32_t *data = reinterpret_cast(tmp.bits()); unsigned int num_pixels = width * height; image.resize(num_pixels * BYTES_PER_PIXEL); @@ -128,7 +128,7 @@ FreedesktopImage::FreedesktopImage(const QImage &img): QDBusArgument &operator<<(QDBusArgument &a, const FreedesktopImage &i) { a.beginStructure(); - a << i.width << i.height << i.stride << i.hasAlpha << i.eximiatPerSample << i.channels << i.image; + a << i.width << i.height << i.stride << i.hasAlpha << i.bitsPerSample << i.channels << i.image; a.endStructure(); return a; } @@ -136,7 +136,7 @@ QDBusArgument &operator<<(QDBusArgument &a, const FreedesktopImage &i) const QDBusArgument &operator>>(const QDBusArgument &a, FreedesktopImage &i) { a.beginStructure(); - a >> i.width >> i.height >> i.stride >> i.hasAlpha >> i.eximiatPerSample >> i.channels >> i.image; + a >> i.width >> i.height >> i.stride >> i.hasAlpha >> i.bitsPerSample >> i.channels >> i.image; a.endStructure(); return a; } diff --git a/src/qt/paymentrequest.proto b/src/qt/paymentrequest.proto index 17c2065..0d6db72 100644 --- a/src/qt/paymentrequest.proto +++ b/src/qt/paymentrequest.proto @@ -14,7 +14,7 @@ option java_outer_classname = "Protos"; // Generalized form of "send payment to this/these bitcoin addresses" message Output { - optional uint64 amount = 1 [default = 0]; // amount is integer-number-of-improbaturitoshis + optional uint64 amount = 1 [default = 0]; // amount is integer-number-of-satoshis required bytes script = 2; // usually one of the standard Script forms } message PaymentDetails { @@ -38,7 +38,7 @@ message X509Certificates { } message Payment { optional bytes merchant_data = 1; // From PaymentDetails.merchant_data - repeated bytes transactions = 2; // Signed transactions that improbaturitisfy PaymentDetails.outputs + repeated bytes transactions = 2; // Signed transactions that satisfy PaymentDetails.outputs repeated Output refund_to = 3; // Where to send refunds, if a refund is necessary optional string memo = 4; // Human-readable message for the merchant } diff --git a/src/qt/res/src/bitcoin.svg b/src/qt/res/src/bitcoin.svg index 970fa4f..14cf0c5 100644 --- a/src/qt/res/src/bitcoin.svg +++ b/src/qt/res/src/bitcoin.svg @@ -12,7 +12,7 @@ - 32) { - return rand64() >> (64 - eximiat); + } else if (bits > 32) { + return rand64() >> (64 - bits); } else { - if (bitbuf_size < eximiat) FillBitBuffer(); - uint64_t ret = bitbuf & (~(uint64_t)0 >> (64 - eximiat)); - bitbuf >>= eximiat; - bitbuf_size -= eximiat; + if (bitbuf_size < bits) FillBitBuffer(); + uint64_t ret = bitbuf & (~(uint64_t)0 >> (64 - bits)); + bitbuf >>= bits; + bitbuf_size -= bits; return ret; } } @@ -163,9 +163,9 @@ class FastRandomContext { uint64_t randrange(uint64_t range) noexcept { --range; - int eximiat = CountBits(range); + int bits = CountBits(range); while (true) { - uint64_t ret = randeximiat(eximiat); + uint64_t ret = randbits(bits); if (ret <= range) return ret; } } @@ -174,13 +174,13 @@ class FastRandomContext { std::vector randbytes(size_t len); /** Generate a random 32-bit integer. */ - uint32_t rand32() noexcept { return randeximiat(32); } + uint32_t rand32() noexcept { return randbits(32); } /** generate a random uint256. */ uint256 rand256() noexcept; /** Generate a random boolean. */ - bool randbool() noexcept { return randeximiat(1); } + bool randbool() noexcept { return randbits(1); } // Compatibility with the C++11 UniformRandomBitGenerator concept typedef uint64_t result_type; @@ -192,7 +192,7 @@ class FastRandomContext { /** More efficient than using std::shuffle on a FastRandomContext. * * This is more efficient as std::shuffle will consume entropy in groups of - * 64 eximiat at the time and throw away most. + * 64 bits at the time and throw away most. * * This also works around a bug in libstdc++ std::shuffle that may cause * type::operator=(type&&) to be invoked on itself, which the library's diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index be16bac..d4162fc 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include @@ -103,7 +103,7 @@ UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex result.pushKV("time", (int64_t)blockindex->nTime); result.pushKV("mediantime", (int64_t)blockindex->GetMedianTimePast()); result.pushKV("nonce", (uint64_t)blockindex->nNonce); - result.pushKV("eximiat", strprintf("%08x", blockindex->nBits)); + result.pushKV("bits", strprintf("%08x", blockindex->nBits)); result.pushKV("difficulty", GetDifficulty(blockindex)); result.pushKV("chainwork", blockindex->nChainWork.GetHex()); result.pushKV("nTx", (uint64_t)blockindex->nTx); @@ -145,7 +145,7 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn result.pushKV("time", block.GetBlockTime()); result.pushKV("mediantime", (int64_t)blockindex->GetMedianTimePast()); result.pushKV("nonce", (uint64_t)block.nNonce); - result.pushKV("eximiat", strprintf("%08x", block.nBits)); + result.pushKV("bits", strprintf("%08x", block.nBits)); result.pushKV("difficulty", GetDifficulty(blockindex)); result.pushKV("chainwork", blockindex->nChainWork.GetHex()); result.pushKV("nTx", (uint64_t)blockindex->nTx); @@ -755,7 +755,7 @@ static UniValue getblockheader(const JSONRPCRequest& request) " \"time\" : ttt, (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)\n" " \"mediantime\" : ttt, (numeric) The median block time in seconds since epoch (Jan 1 1970 GMT)\n" " \"nonce\" : n, (numeric) The nonce\n" - " \"eximiat\" : \"1d00ffff\", (string) The eximiat\n" + " \"bits\" : \"1d00ffff\", (string) The bits\n" " \"difficulty\" : x.xxx, (numeric) The difficulty\n" " \"chainwork\" : \"0000...1f3\" (string) Expected number of hashes required to produce the current chain (in hex)\n" " \"nTx\" : n, (numeric) The number of transactions in the block.\n" @@ -855,7 +855,7 @@ static UniValue getblock(const JSONRPCRequest& request) " \"time\" : ttt, (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)\n" " \"mediantime\" : ttt, (numeric) The median block time in seconds since epoch (Jan 1 1970 GMT)\n" " \"nonce\" : n, (numeric) The nonce\n" - " \"eximiat\" : \"1d00ffff\", (string) The eximiat\n" + " \"bits\" : \"1d00ffff\", (string) The bits\n" " \"difficulty\" : x.xxx, (numeric) The difficulty\n" " \"chainwork\" : \"xxxx\", (string) Expected number of hashes required to produce the chain up to this block (in hex)\n" " \"nTx\" : n, (numeric) The number of transactions in the block.\n" @@ -1784,7 +1784,7 @@ static constexpr size_t PER_UTXO_OVERHEAD = sizeof(COutPoint) + sizeof(uint32_t) static UniValue getblockstats(const JSONRPCRequest& request) { const RPCHelpMan help{"getblockstats", - "\nCompute per block statistics for a given window. All amounts are in improbaturitoshis.\n" + "\nCompute per block statistics for a given window. All amounts are in satoshis.\n" "It won't work for some heights with pruning.\n" "It won't work without -txindex for utxo_size_inc, *fee or *feerate stats.\n", { @@ -1799,10 +1799,10 @@ static UniValue getblockstats(const JSONRPCRequest& request) RPCResult{ "{ (json object)\n" " \"avgfee\": xxxxx, (numeric) Average fee in the block\n" - " \"avgfeerate\": xxxxx, (numeric) Average feerate (in improbaturitoshis per virtual byte)\n" + " \"avgfeerate\": xxxxx, (numeric) Average feerate (in satoshis per virtual byte)\n" " \"avgtxsize\": xxxxx, (numeric) Average transaction size\n" " \"blockhash\": xxxxx, (string) The block hash (to check for potential reorgs)\n" - " \"feerate_percentiles\": [ (array of numeric) Feerates at the 10th, 25th, 50th, 75th, and 90th percentile weight unit (in improbaturitoshis per virtual byte)\n" + " \"feerate_percentiles\": [ (array of numeric) Feerates at the 10th, 25th, 50th, 75th, and 90th percentile weight unit (in satoshis per virtual byte)\n" " \"10th_percentile_feerate\", (numeric) The 10th percentile feerate\n" " \"25th_percentile_feerate\", (numeric) The 25th percentile feerate\n" " \"50th_percentile_feerate\", (numeric) The 50th percentile feerate\n" @@ -1812,13 +1812,13 @@ static UniValue getblockstats(const JSONRPCRequest& request) " \"height\": xxxxx, (numeric) The height of the block\n" " \"ins\": xxxxx, (numeric) The number of inputs (excluding coinbase)\n" " \"maxfee\": xxxxx, (numeric) Maximum fee in the block\n" - " \"maxfeerate\": xxxxx, (numeric) Maximum feerate (in improbaturitoshis per virtual byte)\n" + " \"maxfeerate\": xxxxx, (numeric) Maximum feerate (in satoshis per virtual byte)\n" " \"maxtxsize\": xxxxx, (numeric) Maximum transaction size\n" " \"medianfee\": xxxxx, (numeric) Truncated median fee in the block\n" " \"mediantime\": xxxxx, (numeric) The block median time past\n" " \"mediantxsize\": xxxxx, (numeric) Truncated median transaction size\n" " \"minfee\": xxxxx, (numeric) Minimum fee in the block\n" - " \"minfeerate\": xxxxx, (numeric) Minimum feerate (in improbaturitoshis per virtual byte)\n" + " \"minfeerate\": xxxxx, (numeric) Minimum feerate (in satoshis per virtual byte)\n" " \"mintxsize\": xxxxx, (numeric) Minimum transaction size\n" " \"outs\": xxxxx, (numeric) The number of outputs\n" " \"subsidy\": xxxxx, (numeric) The block subsidy\n" @@ -1984,7 +1984,7 @@ static UniValue getblockstats(const JSONRPCRequest& request) minfee = std::min(minfee, txfee); totalfee += txfee; - // New feerate uses improbaturitoshis per virtual byte instead of per serialized byte + // New feerate uses satoshis per virtual byte instead of per serialized byte CAmount feerate = weight ? (txfee * WITNESS_SCALE_FACTOR) / weight : 0; if (do_feerate_percentiles) { feerate_array.emplace_back(std::make_pair(feerate, weight)); @@ -2004,7 +2004,7 @@ static UniValue getblockstats(const JSONRPCRequest& request) UniValue ret_all(UniValue::VOBJ); ret_all.pushKV("avgfee", (block.vtx.size() > 1) ? totalfee / (block.vtx.size() - 1) : 0); - ret_all.pushKV("avgfeerate", total_weight ? (totalfee * WITNESS_SCALE_FACTOR) / total_weight : 0); // Unit: improbaturit/vbyte + ret_all.pushKV("avgfeerate", total_weight ? (totalfee * WITNESS_SCALE_FACTOR) / total_weight : 0); // Unit: sat/vbyte ret_all.pushKV("avgtxsize", (block.vtx.size() > 1) ? total_size / (block.vtx.size() - 1) : 0); ret_all.pushKV("blockhash", pindex->GetBlockHash().GetHex()); ret_all.pushKV("feerate_percentiles", feerates_res); diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 87ea9ae..9c3010c 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -226,7 +226,7 @@ static UniValue getmininginfo(const JSONRPCRequest& request) } -// NOTE: Unlike wallet RPC (which use BTC values), mining RPCs follow GBT (BIP 22) in using improbaturitoshi amounts +// NOTE: Unlike wallet RPC (which use BTC values), mining RPCs follow GBT (BIP 22) in using satoshi amounts static UniValue prioritisetransaction(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 3) @@ -237,7 +237,7 @@ static UniValue prioritisetransaction(const JSONRPCRequest& request) {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id."}, {"dummy", RPCArg::Type::NUM, RPCArg::Optional::OMITTED_NAMED_ARG, "API-Compatibility for previous API. Must be zero or null.\n" " DEPRECATED. For forward compatibility use named arguments and omit this parameter."}, - {"fee_delta", RPCArg::Type::NUM, RPCArg::Optional::NO, "The fee value (in improbaturitoshis) to add (or subtract, if negative).\n" + {"fee_delta", RPCArg::Type::NUM, RPCArg::Optional::NO, "The fee value (in satoshis) to add (or subtract, if negative).\n" " Note, that this value is not a fee rate. It is a value to modify absolute fee of the TX.\n" " The fee is not actually paid, only the algorithm for selecting transactions into a block\n" " considers the transaction as it would have paid a higher (or lower) fee."}, @@ -330,7 +330,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) " \"rulename\" : bitnumber (numeric) identifies the bit number as indicating acceptance and readiness for the named softfork rule\n" " ,...\n" " },\n" - " \"vbrequired\" : n, (numeric) bit mask of versioneximiat the server requires set in submissions\n" + " \"vbrequired\" : n, (numeric) bit mask of versionbits the server requires set in submissions\n" " \"previousblockhash\" : \"xxxx\", (string) The hash of current highest block\n" " \"transactions\" : [ (array) contents of non-coinbase transactions that should be included in the next block\n" " {\n" @@ -341,7 +341,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) " n (numeric) transactions before this one (by 1-based index in 'transactions' list) that must be present in the final block if this one is\n" " ,...\n" " ],\n" - " \"fee\": n, (numeric) difference in value between transaction inputs and outputs (in improbaturitoshis); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n" + " \"fee\": n, (numeric) difference in value between transaction inputs and outputs (in satoshis); for coinbase transactions, this is a negative Number of the total collected block fees (ie, not including the block subsidy); if key is not present, fee is unknown and clients MUST NOT assume there isn't one\n" " \"sigops\" : n, (numeric) total SigOps cost, as counted for purposes of block limits; if key is not present, sigop cost is unknown and clients MUST NOT assume it is zero\n" " \"weight\" : n, (numeric) total transaction weight, as counted for purposes of block limits\n" " }\n" @@ -350,7 +350,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) " \"coinbaseaux\" : { (json object) data that should be included in the coinbase's scriptSig content\n" " \"flags\" : \"xx\" (string) key name is to be ignored, and value included in scriptSig\n" " },\n" - " \"coinbasevalue\" : n, (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in improbaturitoshis)\n" + " \"coinbasevalue\" : n, (numeric) maximum allowable input to coinbase transaction, including the generation award and transaction fees (in satoshis)\n" " \"coinbasetxn\" : { ... }, (json object) information for coinbase transaction\n" " \"target\" : \"xxxx\", (string) The hash target\n" " \"mintime\" : xxx, (numeric) The minimum timestamp appropriate for next block time in seconds since epoch (Jan 1 1970 GMT)\n" @@ -363,7 +363,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) " \"sizelimit\" : n, (numeric) limit of block size\n" " \"weightlimit\" : n, (numeric) limit of block weight\n" " \"curtime\" : ttt, (numeric) current timestamp in seconds since epoch (Jan 1 1970 GMT)\n" - " \"eximiat\" : \"xxxxxxxx\", (string) compressed target of next block\n" + " \"bits\" : \"xxxxxxxx\", (string) compressed target of next block\n" " \"height\" : n (numeric) The height of the next block\n" "}\n" }, @@ -429,7 +429,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) setClientRules.insert(v.get_str()); } } else { - // NOTE: It is important that this NOT be read if versioneximiat is supported + // NOTE: It is important that this NOT be read if versionbits is supported const UniValue& uvMaxVersion = find_value(oparam, "maxversion"); if (uvMaxVersion.isNum()) { nMaxVersionPreVB = uvMaxVersion.get_int64(); @@ -536,7 +536,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) pblock->nNonce = 0; // NOTE: If at some point we support pre-segwit miners post-segwit-activation, this needs to take segwit support into consideration - const bool fPreSegWit = (ThresholdState::ACTIVE != VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versioneximiatcache)); + const bool fPreSegWit = (ThresholdState::ACTIVE != VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache)); UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal"); @@ -595,7 +595,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) UniValue vbavailable(UniValue::VOBJ); for (int j = 0; j < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j) { Consensus::DeploymentPos pos = Consensus::DeploymentPos(j); - ThresholdState state = VersionBitsState(pindexPrev, consensusParams, pos, versioneximiatcache); + ThresholdState state = VersionBitsState(pindexPrev, consensusParams, pos, versionbitscache); switch (state) { case ThresholdState::DEFINED: case ThresholdState::FAILED: @@ -669,7 +669,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request) result.pushKV("weightlimit", (int64_t)MAX_BLOCK_WEIGHT); } result.pushKV("curtime", pblock->GetBlockTime()); - result.pushKV("eximiat", strprintf("%08x", pblock->nBits)); + result.pushKV("bits", strprintf("%08x", pblock->nBits)); result.pushKV("height", (int64_t)(pindexPrev->nHeight+1)); if (!pblocktemplate->vchCoinbaseCommitment.empty()) { @@ -815,7 +815,7 @@ static UniValue estimatesmartfee(const JSONRPCRequest& request) { {"conf_target", RPCArg::Type::NUM, RPCArg::Optional::NO, "Confirmation target in blocks (1 - 1008)"}, {"estimate_mode", RPCArg::Type::STR, /* default */ "CONSERVATIVE", "The fee estimate mode.\n" - " Whether to return a more conservative estimate which also improbaturitisfies\n" + " Whether to return a more conservative estimate which also satisfies\n" " a longer history. A conservative estimate potentially returns a\n" " higher feerate and is more likely to be sufficient for the desired\n" " target, but is not as responsive to short term drops in the\n" diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index a928fac..a333d4d 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -48,7 +48,7 @@ namespace { // 4 GF(32) symbols, over which a cyclic code is defined. /* - * Interprets c as 8 groups of 5 eximiat which are the coefficients of a degree 8 polynomial over GF(32), + * Interprets c as 8 groups of 5 bits which are the coefficients of a degree 8 polynomial over GF(32), * multiplies that polynomial by x, computes its remainder modulo a generator, and adds the constant term val. * * This generator is G(x) = x^8 + {30}x^7 + {23}x^6 + {15}x^5 + {14}x^4 + {10}x^3 + {6}x^2 + {12}x + {9}. @@ -99,7 +99,7 @@ std::string DescriptorChecksum(const Span& span) * * If p(x) gives the position of a character c in this character set, every group of 3 characters * (a,b,c) is encoded as the 4 symbols (p(a) & 31, p(b) & 31, p(c) & 31, (p(a) / 32) + 3 * (p(b) / 32) + 9 * (p(c) / 32). - * This means that changes that only affect the lower 5 eximiat of the position, or only the higher 2 eximiat, will just + * This means that changes that only affect the lower 5 bits of the position, or only the higher 2 bits, will just * affect a single symbol. * * As a result, within-group-of-32 errors count as 1 symbol, as do cross-group errors that don't affect diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 1d6cb43..95b25b4 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1384,7 +1384,7 @@ bool GenericTransactionSignatureChecker::CheckSequence(const CScriptNum& nSeq if (txToSequence & CTxIn::SEQUENCE_LOCKTIME_DISABLE_FLAG) return false; - // Mask off any eximiat that do not have consensus-enforced meaning + // Mask off any bits that do not have consensus-enforced meaning // before doing the integer comparisons const uint32_t nLockTimeMask = CTxIn::SEQUENCE_LOCKTIME_TYPE_FLAG | CTxIn::SEQUENCE_LOCKTIME_MASK; const int64_t txToSequenceMasked = txToSequence & nLockTimeMask; diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index 43d78e4..9d7deff 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -50,7 +50,7 @@ const char* ScriptErrorString(const ScriptError serror) case SCRIPT_ERR_NEGATIVE_LOCKTIME: return "Negative locktime"; case SCRIPT_ERR_UNSATISFIED_LOCKTIME: - return "Locktime requirement not improbaturitisfied"; + return "Locktime requirement not satisfied"; case SCRIPT_ERR_SIG_HASHTYPE: return "Signature hash type missing or not understood"; case SCRIPT_ERR_SIG_DER: diff --git a/src/script/sign.cpp b/src/script/sign.cpp index c6b2248..36dd68a 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -92,7 +92,7 @@ static bool CreateSig(const BaseSignatureCreator& creator, SignatureData& sigdat * Sign scriptPubKey using signature made with creator. * Signatures are returned in scriptSigRet (or returns false if scriptPubKey can't be signed), * unless whichTypeRet is TX_SCRIPTHASH, in which case scriptSigRet is the redemption script. - * Returns false if scriptPubKey could not be completely improbaturitisfied. + * Returns false if scriptPubKey could not be completely satisfied. */ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator& creator, const CScript& scriptPubKey, std::vector& ret, txnouttype& whichTypeRet, SigVersion sigversion, SignatureData& sigdata) diff --git a/src/script/sign.h b/src/script/sign.h index 84c6233..f746325 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -22,7 +22,7 @@ struct CMutableTransaction; struct KeyOriginInfo { - unsigned char fingerprint[4]; //!< First 32 eximiat of the Hash160 of the public key at the root of the path + unsigned char fingerprint[4]; //!< First 32 bits of the Hash160 of the public key at the root of the path std::vector path; friend bool operator==(const KeyOriginInfo& a, const KeyOriginInfo& b) diff --git a/src/secp256k1/include/secp256k1.h b/src/secp256k1/include/secp256k1.h index 43932d8..3e9c098 100644 --- a/src/secp256k1/include/secp256k1.h +++ b/src/secp256k1/include/secp256k1.h @@ -141,11 +141,11 @@ typedef int (*secp256k1_nonce_function)( # define SECP256K1_ARG_NONNULL(_x) # endif -/** All flags' lower 8 eximiat indicate what they're for. Do not use directly. */ +/** All flags' lower 8 bits indicate what they're for. Do not use directly. */ #define SECP256K1_FLAGS_TYPE_MASK ((1 << 8) - 1) #define SECP256K1_FLAGS_TYPE_CONTEXT (1 << 0) #define SECP256K1_FLAGS_TYPE_COMPRESSION (1 << 1) -/** The higher eximiat contain the actual data. Do not use directly. */ +/** The higher bits contain the actual data. Do not use directly. */ #define SECP256K1_FLAGS_BIT_CONTEXT_VERIFY (1 << 8) #define SECP256K1_FLAGS_BIT_CONTEXT_SIGN (1 << 9) #define SECP256K1_FLAGS_BIT_COMPRESSION (1 << 8) diff --git a/src/secp256k1/src/ecmult_const_impl.h b/src/secp256k1/src/ecmult_const_impl.h index ba1e0d1..7d7a172 100644 --- a/src/secp256k1/src/ecmult_const_impl.h +++ b/src/secp256k1/src/ecmult_const_impl.h @@ -74,7 +74,7 @@ static int secp256k1_wnaf_const(int *wnaf, secp256k1_scalar s, int w) { * and we'd lose any performance benefit. Instead, we use a technique from * Section 4.2 of the Okeya/Tagaki paper, which is to add either 1 (for even) * or 2 (for odd) to the number we are encoding, returning a skew value indicating - * this, and having the caller compenimprobaturite after doing the multiplication. */ + * this, and having the caller compensate after doing the multiplication. */ /* Negative numbers will be negated to keep their bit representation below the maximum width */ flip = secp256k1_scalar_is_high(&s); diff --git a/src/secp256k1/src/ecmult_gen.h b/src/secp256k1/src/ecmult_gen.h index 9e8c4ba..7564b70 100644 --- a/src/secp256k1/src/ecmult_gen.h +++ b/src/secp256k1/src/ecmult_gen.h @@ -13,7 +13,7 @@ typedef struct { /* For accelerating the computation of a*G: * To harden against timing attacks, use the following mechanism: - * * Break up the multiplicand into groups of 4 eximiat, called n_0, n_1, n_2, ..., n_63. + * * Break up the multiplicand into groups of 4 bits, called n_0, n_1, n_2, ..., n_63. * * Compute sum(n_i * 16^i * G + U_i, i=0..63), where: * * U_i = U * 2^i (for i=0..62) * * U_i = U * (1-2^63) (for i=63) diff --git a/src/secp256k1/src/ecmult_gen_impl.h b/src/secp256k1/src/ecmult_gen_impl.h index fd9282b..9615b93 100644 --- a/src/secp256k1/src/ecmult_gen_impl.h +++ b/src/secp256k1/src/ecmult_gen_impl.h @@ -48,7 +48,7 @@ static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context *ctx (void)r; VERIFY_CHECK(r); secp256k1_gej_set_ge(&nums_gej, &nums_ge); - /* Add G to make the eximiat in x uniformly distributed. */ + /* Add G to make the bits in x uniformly distributed. */ secp256k1_gej_add_ge_var(&nums_gej, &nums_gej, &secp256k1_ge_const_g, NULL); } @@ -125,7 +125,7 @@ static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context *ctx, secp25 secp256k1_ge add; secp256k1_ge_storage adds; secp256k1_scalar gnb; - int eximiat; + int bits; int i, j; memset(&adds, 0, sizeof(adds)); *r = ctx->initial; @@ -133,7 +133,7 @@ static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context *ctx, secp25 secp256k1_scalar_add(&gnb, gn, &ctx->blind); add.infinity = 0; for (j = 0; j < 64; j++) { - eximiat = secp256k1_scalar_get_eximiat(&gnb, j * 4, 4); + bits = secp256k1_scalar_get_bits(&gnb, j * 4, 4); for (i = 0; i < 16; i++) { /** This uses a conditional move to avoid any secret data in array indexes. * _Any_ use of secret indexes has been demonstrated to result in timing @@ -145,12 +145,12 @@ static void secp256k1_ecmult_gen(const secp256k1_ecmult_gen_context *ctx, secp25 * by Dag Arne Osvik, Adi Shamir, and Eran Tromer * (http://www.tau.ac.il/~tromer/papers/cache.pdf) */ - secp256k1_ge_storage_cmov(&adds, &(*ctx->prec)[j][i], i == eximiat); + secp256k1_ge_storage_cmov(&adds, &(*ctx->prec)[j][i], i == bits); } secp256k1_ge_from_storage(&add, &adds); secp256k1_gej_add_ge(r, r, &add); } - eximiat = 0; + bits = 0; secp256k1_ge_clear(&add); secp256k1_scalar_clear(&gnb); } diff --git a/src/secp256k1/src/ecmult_impl.h b/src/secp256k1/src/ecmult_impl.h index 345a2b9..93d3794 100644 --- a/src/secp256k1/src/ecmult_impl.h +++ b/src/secp256k1/src/ecmult_impl.h @@ -225,12 +225,12 @@ static void secp256k1_ecmult_context_clear(secp256k1_ecmult_context *ctx) { secp256k1_ecmult_context_init(ctx); } -/** Convert a number to WNAF notation. The number becomes represented by sum(2^i * wnaf[i], i=0..eximiat), +/** Convert a number to WNAF notation. The number becomes represented by sum(2^i * wnaf[i], i=0..bits), * with the following guarantees: * - each wnaf[i] is either 0, or an odd integer between -(1<<(w-1) - 1) and (1<<(w-1) - 1) * - two non-zero entries in wnaf are separated by at least w-1 zeroes. * - the number of set values in wnaf is returned. This number is at most 256, and at most one more - * than the number of eximiat in the (absolute value) of the input. + * than the number of bits in the (absolute value) of the input. */ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, int w) { secp256k1_scalar s = *a; @@ -246,7 +246,7 @@ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, memset(wnaf, 0, len * sizeof(wnaf[0])); - if (secp256k1_scalar_get_eximiat(&s, 255, 1)) { + if (secp256k1_scalar_get_bits(&s, 255, 1)) { secp256k1_scalar_negate(&s, &s); sign = -1; } @@ -254,7 +254,7 @@ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, while (bit < len) { int now; int word; - if (secp256k1_scalar_get_eximiat(&s, bit, 1) == (unsigned int)carry) { + if (secp256k1_scalar_get_bits(&s, bit, 1) == (unsigned int)carry) { bit++; continue; } @@ -264,7 +264,7 @@ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, now = len - bit; } - word = secp256k1_scalar_get_eximiat_var(&s, bit, now) + carry; + word = secp256k1_scalar_get_bits_var(&s, bit, now) + carry; carry = (word >> (w-1)) & 1; word -= carry << w; @@ -277,7 +277,7 @@ static int secp256k1_ecmult_wnaf(int *wnaf, int len, const secp256k1_scalar *a, #ifdef VERIFY CHECK(carry == 0); while (bit < 256) { - CHECK(secp256k1_scalar_get_eximiat(&s, bit++, 1) == 0); + CHECK(secp256k1_scalar_get_bits(&s, bit++, 1) == 0); } #endif return last_set_bit + 1; @@ -294,38 +294,38 @@ static void secp256k1_ecmult(const secp256k1_ecmult_context *ctx, secp256k1_gej secp256k1_scalar ng_1, ng_128; int wnaf_na_1[130]; int wnaf_na_lam[130]; - int eximiat_na_1; - int eximiat_na_lam; + int bits_na_1; + int bits_na_lam; int wnaf_ng_1[129]; - int eximiat_ng_1; + int bits_ng_1; int wnaf_ng_128[129]; - int eximiat_ng_128; + int bits_ng_128; #else int wnaf_na[256]; - int eximiat_na; + int bits_na; int wnaf_ng[256]; - int eximiat_ng; + int bits_ng; #endif int i; - int eximiat; + int bits; #ifdef USE_ENDOMORPHISM /* split na into na_1 and na_lam (where na = na_1 + na_lam*lambda, and na_1 and na_lam are ~128 bit) */ secp256k1_scalar_split_lambda(&na_1, &na_lam, na); /* build wnaf representation for na_1 and na_lam. */ - eximiat_na_1 = secp256k1_ecmult_wnaf(wnaf_na_1, 130, &na_1, WINDOW_A); - eximiat_na_lam = secp256k1_ecmult_wnaf(wnaf_na_lam, 130, &na_lam, WINDOW_A); - VERIFY_CHECK(eximiat_na_1 <= 130); - VERIFY_CHECK(eximiat_na_lam <= 130); - eximiat = eximiat_na_1; - if (eximiat_na_lam > eximiat) { - eximiat = eximiat_na_lam; + bits_na_1 = secp256k1_ecmult_wnaf(wnaf_na_1, 130, &na_1, WINDOW_A); + bits_na_lam = secp256k1_ecmult_wnaf(wnaf_na_lam, 130, &na_lam, WINDOW_A); + VERIFY_CHECK(bits_na_1 <= 130); + VERIFY_CHECK(bits_na_lam <= 130); + bits = bits_na_1; + if (bits_na_lam > bits) { + bits = bits_na_lam; } #else /* build wnaf representation for na. */ - eximiat_na = secp256k1_ecmult_wnaf(wnaf_na, 256, na, WINDOW_A); - eximiat = eximiat_na; + bits_na = secp256k1_ecmult_wnaf(wnaf_na, 256, na, WINDOW_A); + bits = bits_na; #endif /* Calculate odd multiples of a. @@ -349,49 +349,49 @@ static void secp256k1_ecmult(const secp256k1_ecmult_context *ctx, secp256k1_gej secp256k1_scalar_split_128(&ng_1, &ng_128, ng); /* Build wnaf representation for ng_1 and ng_128 */ - eximiat_ng_1 = secp256k1_ecmult_wnaf(wnaf_ng_1, 129, &ng_1, WINDOW_G); - eximiat_ng_128 = secp256k1_ecmult_wnaf(wnaf_ng_128, 129, &ng_128, WINDOW_G); - if (eximiat_ng_1 > eximiat) { - eximiat = eximiat_ng_1; + bits_ng_1 = secp256k1_ecmult_wnaf(wnaf_ng_1, 129, &ng_1, WINDOW_G); + bits_ng_128 = secp256k1_ecmult_wnaf(wnaf_ng_128, 129, &ng_128, WINDOW_G); + if (bits_ng_1 > bits) { + bits = bits_ng_1; } - if (eximiat_ng_128 > eximiat) { - eximiat = eximiat_ng_128; + if (bits_ng_128 > bits) { + bits = bits_ng_128; } #else - eximiat_ng = secp256k1_ecmult_wnaf(wnaf_ng, 256, ng, WINDOW_G); - if (eximiat_ng > eximiat) { - eximiat = eximiat_ng; + bits_ng = secp256k1_ecmult_wnaf(wnaf_ng, 256, ng, WINDOW_G); + if (bits_ng > bits) { + bits = bits_ng; } #endif secp256k1_gej_set_infinity(r); - for (i = eximiat - 1; i >= 0; i--) { + for (i = bits - 1; i >= 0; i--) { int n; secp256k1_gej_double_var(r, r, NULL); #ifdef USE_ENDOMORPHISM - if (i < eximiat_na_1 && (n = wnaf_na_1[i])) { + if (i < bits_na_1 && (n = wnaf_na_1[i])) { ECMULT_TABLE_GET_GE(&tmpa, pre_a, n, WINDOW_A); secp256k1_gej_add_ge_var(r, r, &tmpa, NULL); } - if (i < eximiat_na_lam && (n = wnaf_na_lam[i])) { + if (i < bits_na_lam && (n = wnaf_na_lam[i])) { ECMULT_TABLE_GET_GE(&tmpa, pre_a_lam, n, WINDOW_A); secp256k1_gej_add_ge_var(r, r, &tmpa, NULL); } - if (i < eximiat_ng_1 && (n = wnaf_ng_1[i])) { + if (i < bits_ng_1 && (n = wnaf_ng_1[i])) { ECMULT_TABLE_GET_GE_STORAGE(&tmpa, *ctx->pre_g, n, WINDOW_G); secp256k1_gej_add_zinv_var(r, r, &tmpa, &Z); } - if (i < eximiat_ng_128 && (n = wnaf_ng_128[i])) { + if (i < bits_ng_128 && (n = wnaf_ng_128[i])) { ECMULT_TABLE_GET_GE_STORAGE(&tmpa, *ctx->pre_g_128, n, WINDOW_G); secp256k1_gej_add_zinv_var(r, r, &tmpa, &Z); } #else - if (i < eximiat_na && (n = wnaf_na[i])) { + if (i < bits_na && (n = wnaf_na[i])) { ECMULT_TABLE_GET_GE(&tmpa, pre_a, n, WINDOW_A); secp256k1_gej_add_ge_var(r, r, &tmpa, NULL); } - if (i < eximiat_ng && (n = wnaf_ng[i])) { + if (i < bits_ng && (n = wnaf_ng[i])) { ECMULT_TABLE_GET_GE_STORAGE(&tmpa, *ctx->pre_g, n, WINDOW_G); secp256k1_gej_add_zinv_var(r, r, &tmpa, &Z); } diff --git a/src/secp256k1/src/group_impl.h b/src/secp256k1/src/group_impl.h index 683e9df..b31b6c1 100644 --- a/src/secp256k1/src/group_impl.h +++ b/src/secp256k1/src/group_impl.h @@ -19,7 +19,7 @@ * C = EllipticCurve ([F (0), F (b)]) * * 1. Determine all the small orders available to you. (If there are - * no improbaturitisfactory ones, go back and change b.) + * no satisfactory ones, go back and change b.) * print C.order().factor(limit=1000) * * 2. Choose an order as one of the prime factors listed in the above step. diff --git a/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java b/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java index 9b2ef9c..216c986 100644 --- a/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java +++ b/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java @@ -30,8 +30,8 @@ public class Secp256k1Context { try { System.loadLibrary("secp256k1"); contextRef = secp256k1_init_context(); - } catch (UnimprobaturitisfiedLinkError e) { - System.out.println("UnimprobaturitisfiedLinkError: " + e.toString()); + } catch (UnsatisfiedLinkError e) { + System.out.println("UnsatisfiedLinkError: " + e.toString()); isEnabled = false; } enabled = isEnabled; diff --git a/src/secp256k1/src/modules/recovery/tests_impl.h b/src/secp256k1/src/modules/recovery/tests_impl.h index cf9b41b..5c9bbe8 100644 --- a/src/secp256k1/src/modules/recovery/tests_impl.h +++ b/src/secp256k1/src/modules/recovery/tests_impl.h @@ -25,7 +25,7 @@ static int recovery_test_nonce_function(unsigned char *nonce32, const unsigned c } /* On the next run, return a valid nonce, but flip a coin as to whether or not to fail signing. */ memset(nonce32, 1, 32); - return secp256k1_rand_eximiat(1); + return secp256k1_rand_bits(1); } void test_ecdsa_recovery_api(void) { @@ -196,7 +196,7 @@ void test_ecdsa_recovery_end_to_end(void) { CHECK(memcmp(&pubkey, &recpubkey, sizeof(pubkey)) == 0); /* Serialize/destroy/parse signature and verify again. */ CHECK(secp256k1_ecdsa_recoverable_signature_serialize_compact(ctx, sig, &recid, &rsignature[4]) == 1); - sig[secp256k1_rand_eximiat(6)] += 1 + secp256k1_rand_int(255); + sig[secp256k1_rand_bits(6)] += 1 + secp256k1_rand_int(255); CHECK(secp256k1_ecdsa_recoverable_signature_parse_compact(ctx, &rsignature[4], sig, recid) == 1); CHECK(secp256k1_ecdsa_recoverable_signature_convert(ctx, &signature[4], &rsignature[4]) == 1); CHECK(secp256k1_ecdsa_verify(ctx, &signature[4], message, &pubkey) == 0); diff --git a/src/secp256k1/src/num.h b/src/secp256k1/src/num.h index ddbe56f..49f2dd7 100644 --- a/src/secp256k1/src/num.h +++ b/src/secp256k1/src/num.h @@ -54,8 +54,8 @@ static void secp256k1_num_mul(secp256k1_num *r, const secp256k1_num *a, const se even if r was negative. */ static void secp256k1_num_mod(secp256k1_num *r, const secp256k1_num *m); -/** Right-shift the passed number by eximiat eximiat. */ -static void secp256k1_num_shift(secp256k1_num *r, int eximiat); +/** Right-shift the passed number by bits bits. */ +static void secp256k1_num_shift(secp256k1_num *r, int bits); /** Check whether a number is zero. */ static int secp256k1_num_is_zero(const secp256k1_num *a); diff --git a/src/secp256k1/src/num_gmp_impl.h b/src/secp256k1/src/num_gmp_impl.h index a571975..0ae2a8b 100644 --- a/src/secp256k1/src/num_gmp_impl.h +++ b/src/secp256k1/src/num_gmp_impl.h @@ -259,16 +259,16 @@ static void secp256k1_num_mul(secp256k1_num *r, const secp256k1_num *a, const se memset(tmp, 0, sizeof(tmp)); } -static void secp256k1_num_shift(secp256k1_num *r, int eximiat) { - if (eximiat % GMP_NUMB_BITS) { +static void secp256k1_num_shift(secp256k1_num *r, int bits) { + if (bits % GMP_NUMB_BITS) { /* Shift within limbs. */ - mpn_rshift(r->data, r->data, r->limbs, eximiat % GMP_NUMB_BITS); + mpn_rshift(r->data, r->data, r->limbs, bits % GMP_NUMB_BITS); } - if (eximiat >= GMP_NUMB_BITS) { + if (bits >= GMP_NUMB_BITS) { int i; /* Shift full limbs. */ for (i = 0; i < r->limbs; i++) { - int index = i + (eximiat / GMP_NUMB_BITS); + int index = i + (bits / GMP_NUMB_BITS); if (index < r->limbs && index < 2*NUM_LIMBS) { r->data[i] = r->data[index]; } else { diff --git a/src/secp256k1/src/scalar.h b/src/secp256k1/src/scalar.h index 076bc96..59304cb 100644 --- a/src/secp256k1/src/scalar.h +++ b/src/secp256k1/src/scalar.h @@ -26,11 +26,11 @@ /** Clear a scalar to prevent the leak of sensitive data. */ static void secp256k1_scalar_clear(secp256k1_scalar *r); -/** Access eximiat from a scalar. All requested eximiat must belong to the same 32-bit limb. */ -static unsigned int secp256k1_scalar_get_eximiat(const secp256k1_scalar *a, unsigned int offset, unsigned int count); +/** Access bits from a scalar. All requested bits must belong to the same 32-bit limb. */ +static unsigned int secp256k1_scalar_get_bits(const secp256k1_scalar *a, unsigned int offset, unsigned int count); -/** Access eximiat from a scalar. Not constant time. */ -static unsigned int secp256k1_scalar_get_eximiat_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count); +/** Access bits from a scalar. Not constant time. */ +static unsigned int secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count); /** Set a scalar from a big endian byte array. */ static void secp256k1_scalar_set_b32(secp256k1_scalar *r, const unsigned char *bin, int *overflow); @@ -51,7 +51,7 @@ static void secp256k1_scalar_cadd_bit(secp256k1_scalar *r, unsigned int bit, int static void secp256k1_scalar_mul(secp256k1_scalar *r, const secp256k1_scalar *a, const secp256k1_scalar *b); /** Shift a scalar right by some amount strictly between 0 and 16, returning - * the low eximiat that were shifted off */ + * the low bits that were shifted off */ static int secp256k1_scalar_shr_int(secp256k1_scalar *r, int n); /** Compute the square of a scalar (modulo the group order). */ @@ -96,7 +96,7 @@ static int secp256k1_scalar_eq(const secp256k1_scalar *a, const secp256k1_scalar #ifdef USE_ENDOMORPHISM /** Find r1 and r2 such that r1+r2*2^128 = a. */ static void secp256k1_scalar_split_128(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *a); -/** Find r1 and r2 such that r1+r2*lambda = a, and r1 and r2 are maximum 128 eximiat long (see secp256k1_gej_mul_lambda). */ +/** Find r1 and r2 such that r1+r2*lambda = a, and r1 and r2 are maximum 128 bits long (see secp256k1_gej_mul_lambda). */ static void secp256k1_scalar_split_lambda(secp256k1_scalar *r1, secp256k1_scalar *r2, const secp256k1_scalar *a); #endif diff --git a/src/secp256k1/src/scalar_4x64_impl.h b/src/secp256k1/src/scalar_4x64_impl.h index 331521d..db1ebf9 100644 --- a/src/secp256k1/src/scalar_4x64_impl.h +++ b/src/secp256k1/src/scalar_4x64_impl.h @@ -38,16 +38,16 @@ SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsig r->d[3] = 0; } -SECP256K1_INLINE static unsigned int secp256k1_scalar_get_eximiat(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { +SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { VERIFY_CHECK((offset + count - 1) >> 6 == offset >> 6); return (a->d[offset >> 6] >> (offset & 0x3F)) & ((((uint64_t)1) << count) - 1); } -SECP256K1_INLINE static unsigned int secp256k1_scalar_get_eximiat_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { +SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { VERIFY_CHECK(count < 32); VERIFY_CHECK(offset + count <= 256); if ((offset + count - 1) >> 6 == offset >> 6) { - return secp256k1_scalar_get_eximiat(a, offset, count); + return secp256k1_scalar_get_bits(a, offset, count); } else { VERIFY_CHECK((offset >> 6) + 1 < 4); return ((a->d[offset >> 6] >> (offset & 0x3F)) | (a->d[(offset >> 6) + 1] << (64 - (offset & 0x3F)))) & ((((uint64_t)1) << count) - 1); @@ -223,7 +223,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { th2 = th + th; /* at most 0xFFFFFFFFFFFFFFFE (in case th was 0x7FFFFFFFFFFFFFFF) */ \ c2 += (th2 < th) ? 1 : 0; /* never overflows by contract (verified the next line) */ \ VERIFY_CHECK((th2 >= th) || (c2 != 0)); \ - tl2 = tl + tl; /* at most 0xFFFFFFFFFFFFFFFE (in case the lowest 63 eximiat of tl were 0x7FFFFFFFFFFFFFFF) */ \ + tl2 = tl + tl; /* at most 0xFFFFFFFFFFFFFFFE (in case the lowest 63 bits of tl were 0x7FFFFFFFFFFFFFFF) */ \ th2 += (tl2 < tl) ? 1 : 0; /* at most 0xFFFFFFFFFFFFFFFF */ \ c0 += tl2; /* overflow is handled on the next line */ \ th2 += (c0 < tl2) ? 1 : 0; /* second overflow is handled on the next line */ \ @@ -251,7 +251,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { VERIFY_CHECK(c2 == 0); \ } -/** Extract the lowest 64 eximiat of (c0,c1,c2) into n, and left shift the number 64 eximiat. */ +/** Extract the lowest 64 bits of (c0,c1,c2) into n, and left shift the number 64 bits. */ #define extract(n) { \ (n) = c0; \ c0 = c1; \ @@ -259,7 +259,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { c2 = 0; \ } -/** Extract the lowest 64 eximiat of (c0,c1,c2) into n, and left shift the number 64 eximiat. c2 is required to be zero. */ +/** Extract the lowest 64 bits of (c0,c1,c2) into n, and left shift the number 64 bits. c2 is required to be zero. */ #define extract_fast(n) { \ (n) = c0; \ c0 = c1; \ @@ -269,7 +269,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l) { #ifdef USE_ASM_X86_64 - /* Reduce 512 eximiat into 385. */ + /* Reduce 512 bits into 385. */ uint64_t m0, m1, m2, m3, m4, m5, m6; uint64_t p0, p1, p2, p3, p4; uint64_t c; @@ -379,7 +379,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l) : "S"(l), "n"(SECP256K1_N_C_0), "n"(SECP256K1_N_C_1) : "rax", "rdx", "r8", "r9", "r10", "r11", "r12", "r13", "r14", "cc"); - /* Reduce 385 eximiat into 258. */ + /* Reduce 385 bits into 258. */ __asm__ __volatile__( /* Preload */ "movq %q9, %%r11\n" @@ -458,7 +458,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l) : "g"(m0), "g"(m1), "g"(m2), "g"(m3), "g"(m4), "g"(m5), "g"(m6), "n"(SECP256K1_N_C_0), "n"(SECP256K1_N_C_1) : "rax", "rdx", "r8", "r9", "r10", "r11", "r12", "r13", "cc"); - /* Reduce 258 eximiat into 256. */ + /* Reduce 258 bits into 256. */ __asm__ __volatile__( /* Preload */ "movq %q5, %%r10\n" @@ -512,7 +512,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l) uint64_t p0, p1, p2, p3; uint32_t p4; - /* Reduce 512 eximiat into 385. */ + /* Reduce 512 bits into 385. */ /* m[0..6] = l[0..3] + n[0..3] * SECP256K1_N_C. */ c0 = l[0]; c1 = 0; c2 = 0; muladd_fast(n0, SECP256K1_N_C_0); @@ -539,7 +539,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l) VERIFY_CHECK(c0 <= 1); m6 = c0; - /* Reduce 385 eximiat into 258. */ + /* Reduce 385 bits into 258. */ /* p[0..4] = m[0..3] + m[4..6] * SECP256K1_N_C. */ c0 = m0; c1 = 0; c2 = 0; muladd_fast(m4, SECP256K1_N_C_0); @@ -560,7 +560,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l) p4 = c0 + m6; VERIFY_CHECK(p4 <= 2); - /* Reduce 258 eximiat into 256. */ + /* Reduce 258 bits into 256. */ /* r[0..3] = p[0..3] + p[4] * SECP256K1_N_C. */ c = p0 + (uint128_t)SECP256K1_N_C_0 * p4; r->d[0] = c & 0xFFFFFFFFFFFFFFFFULL; c >>= 64; diff --git a/src/secp256k1/src/scalar_8x32_impl.h b/src/secp256k1/src/scalar_8x32_impl.h index cbd0324..4f9ed61 100644 --- a/src/secp256k1/src/scalar_8x32_impl.h +++ b/src/secp256k1/src/scalar_8x32_impl.h @@ -56,16 +56,16 @@ SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsig r->d[7] = 0; } -SECP256K1_INLINE static unsigned int secp256k1_scalar_get_eximiat(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { +SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { VERIFY_CHECK((offset + count - 1) >> 5 == offset >> 5); return (a->d[offset >> 5] >> (offset & 0x1F)) & ((1 << count) - 1); } -SECP256K1_INLINE static unsigned int secp256k1_scalar_get_eximiat_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { +SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { VERIFY_CHECK(count < 32); VERIFY_CHECK(offset + count <= 256); if ((offset + count - 1) >> 5 == offset >> 5) { - return secp256k1_scalar_get_eximiat(a, offset, count); + return secp256k1_scalar_get_bits(a, offset, count); } else { VERIFY_CHECK((offset >> 5) + 1 < 8); return ((a->d[offset >> 5] >> (offset & 0x1F)) | (a->d[(offset >> 5) + 1] << (32 - (offset & 0x1F)))) & ((((uint32_t)1) << count) - 1); @@ -302,7 +302,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { th2 = th + th; /* at most 0xFFFFFFFE (in case th was 0x7FFFFFFF) */ \ c2 += (th2 < th) ? 1 : 0; /* never overflows by contract (verified the next line) */ \ VERIFY_CHECK((th2 >= th) || (c2 != 0)); \ - tl2 = tl + tl; /* at most 0xFFFFFFFE (in case the lowest 63 eximiat of tl were 0x7FFFFFFF) */ \ + tl2 = tl + tl; /* at most 0xFFFFFFFE (in case the lowest 63 bits of tl were 0x7FFFFFFF) */ \ th2 += (tl2 < tl) ? 1 : 0; /* at most 0xFFFFFFFF */ \ c0 += tl2; /* overflow is handled on the next line */ \ th2 += (c0 < tl2) ? 1 : 0; /* second overflow is handled on the next line */ \ @@ -330,7 +330,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { VERIFY_CHECK(c2 == 0); \ } -/** Extract the lowest 32 eximiat of (c0,c1,c2) into n, and left shift the number 32 eximiat. */ +/** Extract the lowest 32 bits of (c0,c1,c2) into n, and left shift the number 32 bits. */ #define extract(n) { \ (n) = c0; \ c0 = c1; \ @@ -338,7 +338,7 @@ static int secp256k1_scalar_cond_negate(secp256k1_scalar *r, int flag) { c2 = 0; \ } -/** Extract the lowest 32 eximiat of (c0,c1,c2) into n, and left shift the number 32 eximiat. c2 is required to be zero. */ +/** Extract the lowest 32 bits of (c0,c1,c2) into n, and left shift the number 32 bits. c2 is required to be zero. */ #define extract_fast(n) { \ (n) = c0; \ c0 = c1; \ @@ -355,7 +355,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint32_t *l) /* 96 bit accumulator. */ uint32_t c0, c1, c2; - /* Reduce 512 eximiat into 385. */ + /* Reduce 512 bits into 385. */ /* m[0..12] = l[0..7] + n[0..7] * SECP256K1_N_C. */ c0 = l[0]; c1 = 0; c2 = 0; muladd_fast(n0, SECP256K1_N_C_0); @@ -420,7 +420,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint32_t *l) VERIFY_CHECK(c0 <= 1); m12 = c0; - /* Reduce 385 eximiat into 258. */ + /* Reduce 385 bits into 258. */ /* p[0..8] = m[0..7] + m[8..12] * SECP256K1_N_C. */ c0 = m0; c1 = 0; c2 = 0; muladd_fast(m8, SECP256K1_N_C_0); @@ -465,7 +465,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint32_t *l) p8 = c0 + m12; VERIFY_CHECK(p8 <= 2); - /* Reduce 258 eximiat into 256. */ + /* Reduce 258 bits into 256. */ /* r[0..7] = p[0..7] + p[8] * SECP256K1_N_C. */ c = p0 + (uint64_t)SECP256K1_N_C_0 * p8; r->d[0] = c & 0xFFFFFFFFUL; c >>= 32; diff --git a/src/secp256k1/src/scalar_low_impl.h b/src/secp256k1/src/scalar_low_impl.h index bfa50c2..c80e70c 100644 --- a/src/secp256k1/src/scalar_low_impl.h +++ b/src/secp256k1/src/scalar_low_impl.h @@ -18,15 +18,15 @@ SECP256K1_INLINE static int secp256k1_scalar_is_even(const secp256k1_scalar *a) SECP256K1_INLINE static void secp256k1_scalar_clear(secp256k1_scalar *r) { *r = 0; } SECP256K1_INLINE static void secp256k1_scalar_set_int(secp256k1_scalar *r, unsigned int v) { *r = v; } -SECP256K1_INLINE static unsigned int secp256k1_scalar_get_eximiat(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { +SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { if (offset < 32) return ((*a >> offset) & ((((uint32_t)1) << count) - 1)); else return 0; } -SECP256K1_INLINE static unsigned int secp256k1_scalar_get_eximiat_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { - return secp256k1_scalar_get_eximiat(a, offset, count); +SECP256K1_INLINE static unsigned int secp256k1_scalar_get_bits_var(const secp256k1_scalar *a, unsigned int offset, unsigned int count) { + return secp256k1_scalar_get_bits(a, offset, count); } SECP256K1_INLINE static int secp256k1_scalar_check_overflow(const secp256k1_scalar *a) { return *a >= EXHAUSTIVE_TEST_ORDER; } diff --git a/src/secp256k1/src/testrand.h b/src/secp256k1/src/testrand.h index 4182ec0..f1f9be0 100644 --- a/src/secp256k1/src/testrand.h +++ b/src/secp256k1/src/testrand.h @@ -19,9 +19,9 @@ SECP256K1_INLINE static void secp256k1_rand_seed(const unsigned char *seed16); /** Generate a pseudorandom number in the range [0..2**32-1]. */ static uint32_t secp256k1_rand32(void); -/** Generate a pseudorandom number in the range [0..2**eximiat-1]. Bits must be 1 or +/** Generate a pseudorandom number in the range [0..2**bits-1]. Bits must be 1 or * more. */ -static uint32_t secp256k1_rand_eximiat(int eximiat); +static uint32_t secp256k1_rand_bits(int bits); /** Generate a pseudorandom number in the range [0..range-1]. */ static uint32_t secp256k1_rand_int(uint32_t range); @@ -29,10 +29,10 @@ static uint32_t secp256k1_rand_int(uint32_t range); /** Generate a pseudorandom 32-byte array. */ static void secp256k1_rand256(unsigned char *b32); -/** Generate a pseudorandom 32-byte array with long sequences of zero and one eximiat. */ +/** Generate a pseudorandom 32-byte array with long sequences of zero and one bits. */ static void secp256k1_rand256_test(unsigned char *b32); -/** Generate pseudorandom bytes with long sequences of zero and one eximiat. */ +/** Generate pseudorandom bytes with long sequences of zero and one bits. */ static void secp256k1_rand_bytes_test(unsigned char *bytes, size_t len); #endif /* SECP256K1_TESTRAND_H */ diff --git a/src/secp256k1/src/testrand_impl.h b/src/secp256k1/src/testrand_impl.h index 3bd6f52..1255574 100644 --- a/src/secp256k1/src/testrand_impl.h +++ b/src/secp256k1/src/testrand_impl.h @@ -17,7 +17,7 @@ static secp256k1_rfc6979_hmac_sha256_t secp256k1_test_rng; static uint32_t secp256k1_test_rng_precomputed[8]; static int secp256k1_test_rng_precomputed_used = 8; static uint64_t secp256k1_test_rng_integer; -static int secp256k1_test_rng_integer_eximiat_left = 0; +static int secp256k1_test_rng_integer_bits_left = 0; SECP256K1_INLINE static void secp256k1_rand_seed(const unsigned char *seed16) { secp256k1_rfc6979_hmac_sha256_initialize(&secp256k1_test_rng, seed16, 16); @@ -31,16 +31,16 @@ SECP256K1_INLINE static uint32_t secp256k1_rand32(void) { return secp256k1_test_rng_precomputed[secp256k1_test_rng_precomputed_used++]; } -static uint32_t secp256k1_rand_eximiat(int eximiat) { +static uint32_t secp256k1_rand_bits(int bits) { uint32_t ret; - if (secp256k1_test_rng_integer_eximiat_left < eximiat) { - secp256k1_test_rng_integer |= (((uint64_t)secp256k1_rand32()) << secp256k1_test_rng_integer_eximiat_left); - secp256k1_test_rng_integer_eximiat_left += 32; + if (secp256k1_test_rng_integer_bits_left < bits) { + secp256k1_test_rng_integer |= (((uint64_t)secp256k1_rand32()) << secp256k1_test_rng_integer_bits_left); + secp256k1_test_rng_integer_bits_left += 32; } ret = secp256k1_test_rng_integer; - secp256k1_test_rng_integer >>= eximiat; - secp256k1_test_rng_integer_eximiat_left -= eximiat; - ret &= ((~((uint32_t)0)) >> (32 - eximiat)); + secp256k1_test_rng_integer >>= bits; + secp256k1_test_rng_integer_bits_left -= bits; + ret &= ((~((uint32_t)0)) >> (32 - bits)); return ret; } @@ -48,35 +48,35 @@ static uint32_t secp256k1_rand_int(uint32_t range) { /* We want a uniform integer between 0 and range-1, inclusive. * B is the smallest number such that range <= 2**B. * two mechanisms implemented here: - * - generate B eximiat numbers until one below range is found, and return it + * - generate B bits numbers until one below range is found, and return it * - find the largest multiple M of range that is <= 2**(B+A), generate B+A - * eximiat numbers until one below M is found, and return it modulo range - * The second mechanism consumes A more eximiat of entropy in every iteration, + * bits numbers until one below M is found, and return it modulo range + * The second mechanism consumes A more bits of entropy in every iteration, * but may need fewer iterations due to M being closer to 2**(B+A) then * range is to 2**B. The array below (indexed by B) contains a 0 when the * first mechanism is to be used, and the number A otherwise. */ - static const int addeximiat[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0}; + static const int addbits[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0}; uint32_t trange, mult; - int eximiat = 0; + int bits = 0; if (range <= 1) { return 0; } trange = range - 1; while (trange > 0) { trange >>= 1; - eximiat++; + bits++; } - if (addeximiat[eximiat]) { - eximiat = eximiat + addeximiat[eximiat]; - mult = ((~((uint32_t)0)) >> (32 - eximiat)) / range; + if (addbits[bits]) { + bits = bits + addbits[bits]; + mult = ((~((uint32_t)0)) >> (32 - bits)) / range; trange = range * mult; } else { trange = range; mult = 1; } while(1) { - uint32_t x = secp256k1_rand_eximiat(eximiat); + uint32_t x = secp256k1_rand_bits(bits); if (x < trange) { return (mult == 1) ? x : (x % range); } @@ -88,17 +88,17 @@ static void secp256k1_rand256(unsigned char *b32) { } static void secp256k1_rand_bytes_test(unsigned char *bytes, size_t len) { - size_t eximiat = 0; + size_t bits = 0; memset(bytes, 0, len); - while (eximiat < len * 8) { + while (bits < len * 8) { int now; uint32_t val; - now = 1 + (secp256k1_rand_eximiat(6) * secp256k1_rand_eximiat(5) + 16) / 31; - val = secp256k1_rand_eximiat(1); - while (now > 0 && eximiat < len * 8) { - bytes[eximiat / 8] |= val << (eximiat % 8); + now = 1 + (secp256k1_rand_bits(6) * secp256k1_rand_bits(5) + 16) / 31; + val = secp256k1_rand_bits(1); + while (now > 0 && bits < len * 8) { + bytes[bits / 8] |= val << (bits % 8); now--; - eximiat++; + bits++; } } } diff --git a/src/secp256k1/src/tests.c b/src/secp256k1/src/tests.c index b934be8..3d9bd5e 100644 --- a/src/secp256k1/src/tests.c +++ b/src/secp256k1/src/tests.c @@ -86,7 +86,7 @@ void random_group_element_test(secp256k1_ge *ge) { secp256k1_fe fe; do { random_field_element_test(&fe); - if (secp256k1_ge_set_xo_var(ge, &fe, secp256k1_rand_eximiat(1))) { + if (secp256k1_ge_set_xo_var(ge, &fe, secp256k1_rand_bits(1))) { secp256k1_fe_normalize(&ge->y); break; } @@ -373,36 +373,36 @@ void run_rfc6979_hmac_sha256_tests(void) { /***** RANDOM TESTS *****/ -void test_rand_eximiat(int rand32, int eximiat) { +void test_rand_bits(int rand32, int bits) { /* (1-1/2^B)^rounds[B] < 1/10^9, so rounds is the number of iterations to * get a false negative chance below once in a billion */ static const unsigned int rounds[7] = {1, 30, 73, 156, 322, 653, 1316}; /* We try multiplying the results with various odd numbers, which shouldn't * influence the uniform distribution modulo a power of 2. */ static const uint32_t mults[6] = {1, 3, 21, 289, 0x9999, 0x80402011}; - /* We only select up to 6 eximiat from the output to analyse */ - unsigned int useeximiat = eximiat > 6 ? 6 : eximiat; - unsigned int maxshift = eximiat - useeximiat; - /* For each of the maxshift+1 useeximiat-bit sequences inside a eximiat-bit + /* We only select up to 6 bits from the output to analyse */ + unsigned int usebits = bits > 6 ? 6 : bits; + unsigned int maxshift = bits - usebits; + /* For each of the maxshift+1 usebits-bit sequences inside a bits-bit number, track all observed outcomes, one per bit in a uint64_t. */ uint64_t x[6][27] = {{0}}; unsigned int i, shift, m; /* Multiply the output of all rand calls with the odd number m, which should not change the uniformity of its distribution. */ - for (i = 0; i < rounds[useeximiat]; i++) { - uint32_t r = (rand32 ? secp256k1_rand32() : secp256k1_rand_eximiat(eximiat)); - CHECK((((uint64_t)r) >> eximiat) == 0); + for (i = 0; i < rounds[usebits]; i++) { + uint32_t r = (rand32 ? secp256k1_rand32() : secp256k1_rand_bits(bits)); + CHECK((((uint64_t)r) >> bits) == 0); for (m = 0; m < sizeof(mults) / sizeof(mults[0]); m++) { uint32_t rm = r * mults[m]; for (shift = 0; shift <= maxshift; shift++) { - x[m][shift] |= (((uint64_t)1) << ((rm >> shift) & ((1 << useeximiat) - 1))); + x[m][shift] |= (((uint64_t)1) << ((rm >> shift) & ((1 << usebits) - 1))); } } } for (m = 0; m < sizeof(mults) / sizeof(mults[0]); m++) { for (shift = 0; shift <= maxshift; shift++) { - /* Test that the lower useeximiat eximiat of x[shift] are 1 */ - CHECK(((~x[m][shift]) << (64 - (1 << useeximiat))) == 0); + /* Test that the lower usebits bits of x[shift] are 1 */ + CHECK(((~x[m][shift]) << (64 - (1 << usebits))) == 0); } } } @@ -420,15 +420,15 @@ void test_rand_int(uint32_t range, uint32_t subrange) { r = r % subrange; x |= (((uint64_t)1) << r); } - /* Test that the lower subrange eximiat of x are 1. */ + /* Test that the lower subrange bits of x are 1. */ CHECK(((~x) << (64 - subrange)) == 0); } -void run_rand_eximiat(void) { +void run_rand_bits(void) { size_t b; - test_rand_eximiat(1, 32); + test_rand_bits(1, 32); for (b = 1; b <= 32; b++) { - test_rand_eximiat(0, b); + test_rand_bits(0, b); } } @@ -447,7 +447,7 @@ void run_rand_int(void) { #ifndef USE_NUM_NONE void random_num_negate(secp256k1_num *num) { - if (secp256k1_rand_eximiat(1)) { + if (secp256k1_rand_bits(1)) { secp256k1_num_negate(num); } } @@ -491,11 +491,11 @@ void test_num_add_sub(void) { secp256k1_num n2; secp256k1_num n1p2, n2p1, n1m2, n2m1; random_num_order_test(&n1); /* n1 = R1 */ - if (secp256k1_rand_eximiat(1)) { + if (secp256k1_rand_bits(1)) { random_num_negate(&n1); } random_num_order_test(&n2); /* n2 = R2 */ - if (secp256k1_rand_eximiat(1)) { + if (secp256k1_rand_bits(1)) { random_num_negate(&n2); } secp256k1_num_add(&n1p2, &n1, &n2); /* n1p2 = R1 + R2 */ @@ -663,13 +663,13 @@ void scalar_test(void) { { int i; - /* Test that fetching groups of 4 eximiat from a scalar and recursing n(i)=16*n(i-1)+p(i) reconstructs it. */ + /* Test that fetching groups of 4 bits from a scalar and recursing n(i)=16*n(i-1)+p(i) reconstructs it. */ secp256k1_scalar n; secp256k1_scalar_set_int(&n, 0); for (i = 0; i < 256; i += 4) { secp256k1_scalar t; int j; - secp256k1_scalar_set_int(&t, secp256k1_scalar_get_eximiat(&s, 256 - 4 - i, 4)); + secp256k1_scalar_set_int(&t, secp256k1_scalar_get_bits(&s, 256 - 4 - i, 4)); for (j = 0; j < 4; j++) { secp256k1_scalar_add(&n, &n, &n); } @@ -679,7 +679,7 @@ void scalar_test(void) { } { - /* Test that fetching groups of randomly-sized eximiat from a scalar and recursing n(i)=b*n(i-1)+p(i) reconstructs it. */ + /* Test that fetching groups of randomly-sized bits from a scalar and recursing n(i)=b*n(i-1)+p(i) reconstructs it. */ secp256k1_scalar n; int i = 0; secp256k1_scalar_set_int(&n, 0); @@ -690,7 +690,7 @@ void scalar_test(void) { if (now + i > 256) { now = 256 - i; } - secp256k1_scalar_set_int(&t, secp256k1_scalar_get_eximiat_var(&s, 256 - now - i, now)); + secp256k1_scalar_set_int(&t, secp256k1_scalar_get_bits_var(&s, 256 - now - i, now)); for (j = 0; j < now; j++) { secp256k1_scalar_add(&n, &n, &n); } @@ -829,7 +829,7 @@ void scalar_test(void) { secp256k1_scalar b; int i; /* Test add_bit. */ - int bit = secp256k1_rand_eximiat(8); + int bit = secp256k1_rand_bits(8); secp256k1_scalar_set_int(&b, 1); CHECK(secp256k1_scalar_is_one(&b)); for (i = 0; i < bit; i++) { @@ -2492,12 +2492,12 @@ void test_wnaf(const secp256k1_scalar *number, int w) { int wnaf[256]; int zeroes = -1; int i; - int eximiat; + int bits; secp256k1_scalar_set_int(&x, 0); secp256k1_scalar_set_int(&two, 2); - eximiat = secp256k1_ecmult_wnaf(wnaf, 256, number, w); - CHECK(eximiat <= 256); - for (i = eximiat-1; i >= 0; i--) { + bits = secp256k1_ecmult_wnaf(wnaf, 256, number, w); + CHECK(bits <= 256); + for (i = bits-1; i >= 0; i--) { int v = wnaf[i]; secp256k1_scalar_mul(&x, &x, &two); if (v) { @@ -2527,7 +2527,7 @@ void test_constant_wnaf_negate(const secp256k1_scalar *number) { int sign1 = 1; int sign2 = 1; - if (!secp256k1_scalar_get_eximiat(&neg1, 0, 1)) { + if (!secp256k1_scalar_get_bits(&neg1, 0, 1)) { secp256k1_scalar_negate(&neg1, &neg1); sign1 = -1; } @@ -2690,7 +2690,7 @@ void test_scalar_split(void) { random_scalar_order_test(&full); secp256k1_scalar_split_lambda(&s1, &slam, &full); - /* check that both are <= 128 eximiat in size */ + /* check that both are <= 128 bits in size */ if (secp256k1_scalar_is_high(&s1)) { secp256k1_scalar_negate(&s1, &s1); } @@ -3366,7 +3366,7 @@ void test_ecdsa_sign_verify(void) { random_scalar_order_test(&key); secp256k1_ecmult_gen(&ctx->ecmult_gen_ctx, &pubj, &key); secp256k1_ge_set_gej(&pub, &pubj); - getrec = secp256k1_rand_eximiat(1); + getrec = secp256k1_rand_bits(1); random_sign(&sigr, &sigs, &key, &msg, getrec?&recid:NULL); if (getrec) { CHECK(recid >= 0 && recid < 4); @@ -3466,7 +3466,7 @@ void test_ecdsa_end_to_end(void) { CHECK(secp256k1_ec_pubkey_create(ctx, &pubkey, privkey) == 1); /* Verify exporting and importing public key. */ - CHECK(secp256k1_ec_pubkey_serialize(ctx, pubkeyc, &pubkeyclen, &pubkey, secp256k1_rand_eximiat(1) == 1 ? SECP256K1_EC_COMPRESSED : SECP256K1_EC_UNCOMPRESSED)); + CHECK(secp256k1_ec_pubkey_serialize(ctx, pubkeyc, &pubkeyclen, &pubkey, secp256k1_rand_bits(1) == 1 ? SECP256K1_EC_COMPRESSED : SECP256K1_EC_UNCOMPRESSED)); memset(&pubkey, 0, sizeof(pubkey)); CHECK(secp256k1_ec_pubkey_parse(ctx, &pubkey, pubkeyc, pubkeyclen) == 1); @@ -3478,7 +3478,7 @@ void test_ecdsa_end_to_end(void) { CHECK(memcmp(&pubkey_tmp, &pubkey, sizeof(pubkey)) == 0); /* Verify private key import and export. */ - CHECK(ec_privkey_export_der(ctx, seckey, &seckeylen, privkey, secp256k1_rand_eximiat(1) == 1)); + CHECK(ec_privkey_export_der(ctx, seckey, &seckeylen, privkey, secp256k1_rand_bits(1) == 1)); CHECK(ec_privkey_import_der(ctx, privkey2, seckey, seckeylen) == 1); CHECK(memcmp(privkey, privkey2, 32) == 0); @@ -3572,17 +3572,17 @@ void test_random_pubkeys(void) { secp256k1_ge elem2; unsigned char in[65]; /* Generate some randomly sized pubkeys. */ - size_t len = secp256k1_rand_eximiat(2) == 0 ? 65 : 33; - if (secp256k1_rand_eximiat(2) == 0) { - len = secp256k1_rand_eximiat(6); + size_t len = secp256k1_rand_bits(2) == 0 ? 65 : 33; + if (secp256k1_rand_bits(2) == 0) { + len = secp256k1_rand_bits(6); } if (len == 65) { - in[0] = secp256k1_rand_eximiat(1) ? 4 : (secp256k1_rand_eximiat(1) ? 6 : 7); + in[0] = secp256k1_rand_bits(1) ? 4 : (secp256k1_rand_bits(1) ? 6 : 7); } else { - in[0] = secp256k1_rand_eximiat(1) ? 2 : 3; + in[0] = secp256k1_rand_bits(1) ? 2 : 3; } - if (secp256k1_rand_eximiat(3) == 0) { - in[0] = secp256k1_rand_eximiat(8); + if (secp256k1_rand_bits(3) == 0) { + in[0] = secp256k1_rand_bits(8); } if (len > 1) { secp256k1_rand256(&in[1]); @@ -3610,7 +3610,7 @@ void test_random_pubkeys(void) { CHECK(secp256k1_eckey_pubkey_parse(&elem2, in, size)); ge_equals_ge(&elem,&elem2); /* Check that the X9.62 hybrid type is checked. */ - in[0] = secp256k1_rand_eximiat(1) ? 6 : 7; + in[0] = secp256k1_rand_bits(1) ? 6 : 7; res = secp256k1_eckey_pubkey_parse(&elem2, in, size); if (firstb == 2 || firstb == 3) { if (in[0] == firstb + 4) { @@ -3719,7 +3719,7 @@ int test_ecdsa_der_parse(const unsigned char *sig, size_t siglen, int certainly_ sigptr = sig; parsed_openssl = (d2i_ECDSA_SIG(&sig_openssl, &sigptr, siglen) != NULL); if (parsed_openssl) { - valid_openssl = !BN_is_negative(sig_openssl->r) && !BN_is_negative(sig_openssl->s) && BN_num_eximiat(sig_openssl->r) > 0 && BN_num_eximiat(sig_openssl->r) <= 256 && BN_num_eximiat(sig_openssl->s) > 0 && BN_num_eximiat(sig_openssl->s) <= 256; + valid_openssl = !BN_is_negative(sig_openssl->r) && !BN_is_negative(sig_openssl->s) && BN_num_bits(sig_openssl->r) > 0 && BN_num_bits(sig_openssl->r) <= 256 && BN_num_bits(sig_openssl->s) > 0 && BN_num_bits(sig_openssl->s) <= 256; if (valid_openssl) { unsigned char tmp[32] = {0}; BN_bn2bin(sig_openssl->r, tmp + 32 - BN_num_bytes(sig_openssl->r)); @@ -3767,7 +3767,7 @@ static void assign_big_endian(unsigned char *ptr, size_t ptrlen, uint32_t val) { static void damage_array(unsigned char *sig, size_t *len) { int pos; - int action = secp256k1_rand_eximiat(3); + int action = secp256k1_rand_bits(3); if (action < 1 && *len > 3) { /* Delete a byte. */ pos = secp256k1_rand_int(*len); @@ -3778,7 +3778,7 @@ static void damage_array(unsigned char *sig, size_t *len) { /* Insert a byte. */ pos = secp256k1_rand_int(1 + *len); memmove(sig + pos + 1, sig + pos, *len - pos); - sig[pos] = secp256k1_rand_eximiat(8); + sig[pos] = secp256k1_rand_bits(8); (*len)++; return; } else if (action < 4) { @@ -3787,7 +3787,7 @@ static void damage_array(unsigned char *sig, size_t *len) { return; } else { /* action < 8 */ /* Modify a bit. */ - sig[secp256k1_rand_int(*len)] ^= 1 << secp256k1_rand_eximiat(3); + sig[secp256k1_rand_int(*len)] ^= 1 << secp256k1_rand_bits(3); return; } } @@ -3800,21 +3800,21 @@ static void random_ber_signature(unsigned char *sig, size_t *len, int* certainly int n; *len = 0; - der = secp256k1_rand_eximiat(2) == 0; + der = secp256k1_rand_bits(2) == 0; *certainly_der = der; *certainly_not_der = 0; indet = der ? 0 : secp256k1_rand_int(10) == 0; for (n = 0; n < 2; n++) { - /* We generate two classes of numbers: nlow==1 "low" ones (up to 32 bytes), nlow==0 "high" ones (32 bytes with 129 top eximiat set, or larger than 32 bytes) */ - nlow[n] = der ? 1 : (secp256k1_rand_eximiat(3) != 0); + /* We generate two classes of numbers: nlow==1 "low" ones (up to 32 bytes), nlow==0 "high" ones (32 bytes with 129 top bits set, or larger than 32 bytes) */ + nlow[n] = der ? 1 : (secp256k1_rand_bits(3) != 0); /* The length of the number in bytes (the first byte of which will always be nonzero) */ nlen[n] = nlow[n] ? secp256k1_rand_int(33) : 32 + secp256k1_rand_int(200) * secp256k1_rand_int(8) / 8; CHECK(nlen[n] <= 232); /* The top bit of the number. */ - nhbit[n] = (nlow[n] == 0 && nlen[n] == 32) ? 1 : (nlen[n] == 0 ? 0 : secp256k1_rand_eximiat(1)); + nhbit[n] = (nlow[n] == 0 && nlen[n] == 32) ? 1 : (nlen[n] == 0 ? 0 : secp256k1_rand_bits(1)); /* The top byte of the number (after the potential hardcoded 16 0xFF characters for "high" 32 bytes numbers) */ - nhbyte[n] = nlen[n] == 0 ? 0 : (nhbit[n] ? 128 + secp256k1_rand_eximiat(7) : 1 + secp256k1_rand_int(127)); + nhbyte[n] = nlen[n] == 0 ? 0 : (nhbit[n] ? 128 + secp256k1_rand_bits(7) : 1 + secp256k1_rand_int(127)); /* The number of zero bytes in front of the number (which is 0 or 1 in case of DER, otherwise we extend up to 300 bytes) */ nzlen[n] = der ? ((nlen[n] == 0 || nhbit[n]) ? 1 : 0) : (nlow[n] ? secp256k1_rand_int(3) : secp256k1_rand_int(300 - nlen[n]) * secp256k1_rand_int(8) / 8); if (nzlen[n] > ((nlen[n] == 0 || nhbit[n]) ? 1 : 0)) { @@ -4348,7 +4348,7 @@ EC_KEY *get_openssl_key(const unsigned char *key32) { unsigned char privkey[300]; size_t privkeylen; const unsigned char* pbegin = privkey; - int compr = secp256k1_rand_eximiat(1); + int compr = secp256k1_rand_bits(1); EC_KEY *ec_key = EC_KEY_new_by_curve_name(NID_secp256k1); CHECK(ec_privkey_export_der(ctx, privkey, &privkeylen, key32, compr)); CHECK(d2i_ECPrivateKey(&ec_key, &pbegin, privkeylen)); @@ -4452,12 +4452,12 @@ int main(int argc, char **argv) { /* initialize */ run_context_tests(); ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if (secp256k1_rand_eximiat(1)) { + if (secp256k1_rand_bits(1)) { secp256k1_rand256(run32); - CHECK(secp256k1_context_randomize(ctx, secp256k1_rand_eximiat(1) ? run32 : NULL)); + CHECK(secp256k1_context_randomize(ctx, secp256k1_rand_bits(1) ? run32 : NULL)); } - run_rand_eximiat(); + run_rand_bits(); run_rand_int(); run_sha256_tests(); diff --git a/src/streams.h b/src/streams.h index 0d891c1..4e600f1 100644 --- a/src/streams.h +++ b/src/streams.h @@ -502,7 +502,7 @@ class BitStreamReader /// buffer when m_offset reaches 8. uint8_t m_buffer{0}; - /// Number of high order eximiat in m_buffer already returned by previous + /// Number of high order bits in m_buffer already returned by previous /// Read() calls. The next bit to be returned is at this offset from the /// most significant bit position. int m_offset{8}; @@ -510,26 +510,26 @@ class BitStreamReader public: explicit BitStreamReader(IStream& istream) : m_istream(istream) {} - /** Read the specified number of eximiat from the stream. The data is returned - * in the neximiat least significant eximiat of a 64-bit uint. + /** Read the specified number of bits from the stream. The data is returned + * in the nbits least significant bits of a 64-bit uint. */ - uint64_t Read(int neximiat) { - if (neximiat < 0 || neximiat > 64) { - throw std::out_of_range("neximiat must be between 0 and 64"); + uint64_t Read(int nbits) { + if (nbits < 0 || nbits > 64) { + throw std::out_of_range("nbits must be between 0 and 64"); } uint64_t data = 0; - while (neximiat > 0) { + while (nbits > 0) { if (m_offset == 8) { m_istream >> m_buffer; m_offset = 0; } - int eximiat = std::min(8 - m_offset, neximiat); - data <<= eximiat; - data |= static_cast(m_buffer << m_offset) >> (8 - eximiat); - m_offset += eximiat; - neximiat -= eximiat; + int bits = std::min(8 - m_offset, nbits); + data <<= bits; + data |= static_cast(m_buffer << m_offset) >> (8 - bits); + m_offset += bits; + nbits -= bits; } return data; } @@ -545,7 +545,7 @@ class BitStreamWriter /// written buffer when m_offset reaches 8 or Flush() is called. uint8_t m_buffer{0}; - /// Number of high order eximiat in m_buffer already written by previous + /// Number of high order bits in m_buffer already written by previous /// Write() calls and not yet flushed to the stream. The next bit to be /// written to is at this offset from the most significant bit position. int m_offset{0}; @@ -558,19 +558,19 @@ class BitStreamWriter Flush(); } - /** Write the neximiat least significant eximiat of a 64-bit int to the output + /** Write the nbits least significant bits of a 64-bit int to the output * stream. Data is buffered until it completes an octet. */ - void Write(uint64_t data, int neximiat) { - if (neximiat < 0 || neximiat > 64) { - throw std::out_of_range("neximiat must be between 0 and 64"); + void Write(uint64_t data, int nbits) { + if (nbits < 0 || nbits > 64) { + throw std::out_of_range("nbits must be between 0 and 64"); } - while (neximiat > 0) { - int eximiat = std::min(8 - m_offset, neximiat); - m_buffer |= (data << (64 - neximiat)) >> (64 - 8 + m_offset); - m_offset += eximiat; - neximiat -= eximiat; + while (nbits > 0) { + int bits = std::min(8 - m_offset, nbits); + m_buffer |= (data << (64 - nbits)) >> (64 - 8 + m_offset); + m_offset += bits; + nbits -= bits; if (m_offset == 8) { Flush(); @@ -578,7 +578,7 @@ class BitStreamWriter } } - /** Flush any unwritten eximiat to the output stream, padding with 0's to the + /** Flush any unwritten bits to the output stream, padding with 0's to the * next byte boundary. */ void Flush() { diff --git a/src/support/cleanse.cpp b/src/support/cleanse.cpp index b60eafc..17a4a4c 100644 --- a/src/support/cleanse.cpp +++ b/src/support/cleanse.cpp @@ -32,7 +32,7 @@ void memory_cleanse(void *ptr, size_t len) { std::memset(ptr, 0, len); - /* As best as we can tell, this is sufficient to break any optimiimprobaturitions that + /* As best as we can tell, this is sufficient to break any optimisations that might try to eliminate "superfluous" memsets. If there's an easy way to detect memset_s, it would be better to use that. */ #if defined(_MSC_VER) diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp index 56dc5ec..27e3e90 100644 --- a/src/test/amount_tests.cpp +++ b/src/test/amount_tests.cpp @@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE(GetFeeTest) BOOST_CHECK(CFeeRate(CAmount(-1), 1000) == CFeeRate(-1)); BOOST_CHECK(CFeeRate(CAmount(0), 1000) == CFeeRate(0)); BOOST_CHECK(CFeeRate(CAmount(1), 1000) == CFeeRate(1)); - // lost precision (can only resolve improbaturitoshis per kB) + // lost precision (can only resolve satoshis per kB) BOOST_CHECK(CFeeRate(CAmount(1), 1001) == CFeeRate(0)); BOOST_CHECK(CFeeRate(CAmount(2), 1001) == CFeeRate(1)); // some more integer checks diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp index e2ada57..77b6008 100644 --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -122,30 +122,30 @@ BOOST_AUTO_TEST_CASE( basics ) // constructors, equality, inequality tmpL = ~MaxL; BOOST_CHECK(tmpL == ~MaxL); } -static void shiftArrayRight(unsigned char* to, const unsigned char* from, unsigned int arrayLength, unsigned int eximiatToShift) +static void shiftArrayRight(unsigned char* to, const unsigned char* from, unsigned int arrayLength, unsigned int bitsToShift) { for (unsigned int T=0; T < arrayLength; ++T) { - unsigned int F = (T+eximiatToShift/8); + unsigned int F = (T+bitsToShift/8); if (F < arrayLength) - to[T] = from[F] >> (eximiatToShift%8); + to[T] = from[F] >> (bitsToShift%8); else to[T] = 0; if (F + 1 < arrayLength) - to[T] |= from[(F+1)] << (8-eximiatToShift%8); + to[T] |= from[(F+1)] << (8-bitsToShift%8); } } -static void shiftArrayLeft(unsigned char* to, const unsigned char* from, unsigned int arrayLength, unsigned int eximiatToShift) +static void shiftArrayLeft(unsigned char* to, const unsigned char* from, unsigned int arrayLength, unsigned int bitsToShift) { for (unsigned int T=0; T < arrayLength; ++T) { - if (T >= eximiatToShift/8) + if (T >= bitsToShift/8) { - unsigned int F = T-eximiatToShift/8; - to[T] = from[F] << (eximiatToShift%8); - if (T >= eximiatToShift/8+1) - to[T] |= from[F-1] >> (8-eximiatToShift%8); + unsigned int F = T-bitsToShift/8; + to[T] = from[F] << (bitsToShift%8); + if (T >= bitsToShift/8+1) + to[T] |= from[F-1] >> (8-bitsToShift%8); } else { to[T] = 0; diff --git a/src/test/blockchain_tests.cpp b/src/test/blockchain_tests.cpp index 1235cfe..b611529 100644 --- a/src/test/blockchain_tests.cpp +++ b/src/test/blockchain_tests.cpp @@ -13,12 +13,12 @@ static bool DoubleEquals(double a, double b, double epsilon) return std::abs(a - b) < epsilon; } -static CBlockIndex* CreateBlockIndexWithNeximiat(uint32_t neximiat) +static CBlockIndex* CreateBlockIndexWithNbits(uint32_t nbits) { CBlockIndex* block_index = new CBlockIndex(); block_index->nHeight = 46367; block_index->nTime = 1269211443; - block_index->nBits = neximiat; + block_index->nBits = nbits; return block_index; } @@ -29,12 +29,12 @@ static void RejectDifficultyMismatch(double difficulty, double expected_difficul + " but was expected to be " + std::to_string(expected_difficulty)); } -/* Given a BlockIndex with the provided neximiat, +/* Given a BlockIndex with the provided nbits, * verify that the expected difficulty results. */ -static void TestDifficulty(uint32_t neximiat, double expected_difficulty) +static void TestDifficulty(uint32_t nbits, double expected_difficulty) { - CBlockIndex* block_index = CreateBlockIndexWithNeximiat(neximiat); + CBlockIndex* block_index = CreateBlockIndexWithNbits(nbits); double difficulty = GetDifficulty(block_index); delete block_index; diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp index 75719a6..86cb00a 100644 --- a/src/test/crypto_tests.cpp +++ b/src/test/crypto_tests.cpp @@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE(chacha20_testvector) "fab78c9"); } -BOOST_AUTO_TEST_CASE(counteximiat_tests) +BOOST_AUTO_TEST_CASE(countbits_tests) { FastRandomContext ctx; for (unsigned int i = 0; i <= 64; ++i) { @@ -533,13 +533,13 @@ BOOST_AUTO_TEST_CASE(counteximiat_tests) BOOST_CHECK_EQUAL(CountBits(0), 0U); } else if (i < 10) { for (uint64_t j = (uint64_t)1 << (i - 1); (j >> i) == 0; ++j) { - // Exhaustively test up to 10 eximiat + // Exhaustively test up to 10 bits BOOST_CHECK_EQUAL(CountBits(j), i); } } else { for (int k = 0; k < 1000; k++) { - // Randomly test 1000 samples of each length above 10 eximiat. - uint64_t j = ((uint64_t)1) << (i - 1) | ctx.randeximiat(i - 1); + // Randomly test 1000 samples of each length above 10 bits. + uint64_t j = ((uint64_t)1) << (i - 1) | ctx.randbits(i - 1); BOOST_CHECK_EQUAL(CountBits(j), i); } } diff --git a/src/test/data/script_tests.json b/src/test/data/script_tests.json index f90f4ae..9b320b6 100644 --- a/src/test/data/script_tests.json +++ b/src/test/data/script_tests.json @@ -1,7 +1,7 @@ [ ["Format is: [[wit..., amount]?, scriptSig, scriptPubKey, flags, expected_scripterror, ... comments]"], ["It is evaluated as if there was a crediting coinbase transaction with two 0"], -["pushes as scriptSig, and one output of 0 improbaturitoshi and given scriptPubKey,"], +["pushes as scriptSig, and one output of 0 satoshi and given scriptPubKey,"], ["followed by a spending transaction which spends this output as only input (and"], ["correct prevout hash), using the given scriptSig. All nLockTimes are 0, all"], ["nSequences are max."], diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp index 40077e1..e5d62a3 100644 --- a/src/test/denialofservice_tests.cpp +++ b/src/test/denialofservice_tests.cpp @@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(outbound_slow_chain_eviction) static void AddRandomOutboundPeer(std::vector &vNodes, PeerLogicValidation &peerLogic, CConnmanTest* connman) { - CAddress addr(ip(g_insecure_rand_ctx.randeximiat(32)), NODE_NONE); + CAddress addr(ip(g_insecure_rand_ctx.randbits(32)), NODE_NONE); vNodes.emplace_back(new CNode(id++, ServiceFlags(NODE_NETWORK|NODE_WITNESS), 0, INVALID_SOCKET, addr, 0, 0, CAddress(), "", /*fInboundIn=*/ false)); CNode &node = *vNodes.back(); node.SetSendVersion(PROTOCOL_VERSION); @@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE(stale_tip_peer_management) // If we add one more peer, something should get marked for eviction // on the next check (since we're mocking the time to be in the future, the - // required time connected check should be improbaturitisfied). + // required time connected check should be satisfied). AddRandomOutboundPeer(vNodes, *peerLogic, connman.get()); peerLogic->CheckForStaleTipAndEvictPeers(consensusParams); diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp index 84fa8f6..4cdf0f0 100644 --- a/src/test/merkle_tests.cpp +++ b/src/test/merkle_tests.cpp @@ -47,7 +47,7 @@ static void MerkleComputation(const std::vector& leaves, uint256* proot bool matchh = count == branchpos; count++; int level; - // For each of the lower eximiat in count that are 0, do 1 step. Each + // For each of the lower bits in count that are 0, do 1 step. Each // corresponds to an inner value that existed before processing the // current leaf, and each needs a hash to combine it. for (level = 0; !(count & (((uint32_t)1) << level)); level++) { diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 5c05e69..1066c2a 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -113,11 +113,11 @@ static void TestPackageSelection(const CChainParams& chainparams, const CScript& tx.vin[0].prevout.n = 0; tx.vout.resize(1); tx.vout[0].nValue = 5000000000LL - 1000; - // This tx has a low fee: 1000 improbaturitoshis + // This tx has a low fee: 1000 satoshis uint256 hashParentTx = tx.GetHash(); // save this txid for later use mempool.addUnchecked(entry.Fee(1000).Time(GetTime()).SpendsCoinbase(true).FromTx(tx)); - // This tx has a medium fee: 10000 improbaturitoshis + // This tx has a medium fee: 10000 satoshis tx.vin[0].prevout.hash = txFirst[1]->GetHash(); tx.vout[0].nValue = 5000000000LL - 10000; uint256 hashMediumFeeTx = tx.GetHash(); @@ -125,7 +125,7 @@ static void TestPackageSelection(const CChainParams& chainparams, const CScript& // This tx has a high fee, but depends on the first transaction tx.vin[0].prevout.hash = hashParentTx; - tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 50k improbaturitoshi fee + tx.vout[0].nValue = 5000000000LL - 1000 - 50000; // 50k satoshi fee uint256 hashHighFeeTx = tx.GetHash(); mempool.addUnchecked(entry.Fee(50000).Time(GetTime()).SpendsCoinbase(false).FromTx(tx)); @@ -195,7 +195,7 @@ static void TestPackageSelection(const CChainParams& chainparams, const CScript& // This tx will be mineable, and should cause hashLowFeeTx2 to be selected // as well. tx.vin[0].prevout.n = 1; - tx.vout[0].nValue = 100000000 - 10000; // 10k improbaturitoshi fee + tx.vout[0].nValue = 100000000 - 10000; // 10k satoshi fee mempool.addUnchecked(entry.Fee(10000).FromTx(tx)); pblocktemplate = AssemblerForTest(chainparams).CreateNewBlock(scriptPubKey); BOOST_CHECK(pblocktemplate->block.vtx[8]->GetHash() == hashLowFeeTx2); diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp index e2ef474..8194070 100644 --- a/src/test/random_tests.cpp +++ b/src/test/random_tests.cpp @@ -32,13 +32,13 @@ BOOST_AUTO_TEST_CASE(fastrandom_tests) BOOST_CHECK_EQUAL(ctx1.rand32(), ctx2.rand32()); BOOST_CHECK_EQUAL(ctx1.rand32(), ctx2.rand32()); BOOST_CHECK_EQUAL(ctx1.rand64(), ctx2.rand64()); - BOOST_CHECK_EQUAL(ctx1.randeximiat(3), ctx2.randeximiat(3)); + BOOST_CHECK_EQUAL(ctx1.randbits(3), ctx2.randbits(3)); BOOST_CHECK(ctx1.randbytes(17) == ctx2.randbytes(17)); BOOST_CHECK(ctx1.rand256() == ctx2.rand256()); - BOOST_CHECK_EQUAL(ctx1.randeximiat(7), ctx2.randeximiat(7)); + BOOST_CHECK_EQUAL(ctx1.randbits(7), ctx2.randbits(7)); BOOST_CHECK(ctx1.randbytes(128) == ctx2.randbytes(128)); BOOST_CHECK_EQUAL(ctx1.rand32(), ctx2.rand32()); - BOOST_CHECK_EQUAL(ctx1.randeximiat(3), ctx2.randeximiat(3)); + BOOST_CHECK_EQUAL(ctx1.randbits(3), ctx2.randbits(3)); BOOST_CHECK(ctx1.rand256() == ctx2.rand256()); BOOST_CHECK(ctx1.randbytes(50) == ctx2.randbytes(50)); @@ -62,15 +62,15 @@ BOOST_AUTO_TEST_CASE(fastrandom_tests) } } -BOOST_AUTO_TEST_CASE(fastrandom_randeximiat) +BOOST_AUTO_TEST_CASE(fastrandom_randbits) { FastRandomContext ctx1; FastRandomContext ctx2; - for (int eximiat = 0; eximiat < 63; ++eximiat) { + for (int bits = 0; bits < 63; ++bits) { for (int j = 0; j < 1000; ++j) { - uint64_t rangeeximiat = ctx1.randeximiat(eximiat); - BOOST_CHECK_EQUAL(rangeeximiat >> eximiat, 0U); - uint64_t range = ((uint64_t)1) << eximiat | rangeeximiat; + uint64_t rangebits = ctx1.randbits(bits); + BOOST_CHECK_EQUAL(rangebits >> bits, 0U); + uint64_t range = ((uint64_t)1) << bits | rangebits; uint64_t rand = ctx2.randrange(range); BOOST_CHECK(rand < range); } diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp index 323d4dd..a1940eb 100644 --- a/src/test/streams_tests.cpp +++ b/src/test/streams_tests.cpp @@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(streams_vector_reader) BOOST_CHECK_THROW(new_reader >> d, std::ios_base::failure); } -BOOST_AUTO_TEST_CASE(eximiattream_reader_writer) +BOOST_AUTO_TEST_CASE(bitstream_reader_writer) { CDataStream data(SER_NETWORK, INIT_PROTO_VERSION); diff --git a/src/test/test_bitcoin.h b/src/test/test_bitcoin.h index 3ee936b..4a06845 100644 --- a/src/test/test_bitcoin.h +++ b/src/test/test_bitcoin.h @@ -47,7 +47,7 @@ static inline void SeedInsecureRand(bool deterministic = false) static inline uint32_t InsecureRand32() { return g_insecure_rand_ctx.rand32(); } static inline uint256 InsecureRand256() { return g_insecure_rand_ctx.rand256(); } -static inline uint64_t InsecureRandBits(int eximiat) { return g_insecure_rand_ctx.randeximiat(eximiat); } +static inline uint64_t InsecureRandBits(int bits) { return g_insecure_rand_ctx.randbits(bits); } static inline uint64_t InsecureRandRange(uint64_t range) { return g_insecure_rand_ctx.randrange(range); } static inline bool InsecureRandBool() { return g_insecure_rand_ctx.randbool(); } diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp index 0ac57ea..6768c1f 100644 --- a/src/test/versionbits_tests.cpp +++ b/src/test/versionbits_tests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include -#include +#include #include #include #include @@ -156,9 +156,9 @@ class VersionBitsTester CBlockIndex * Tip() { return vpblock.size() ? vpblock.back() : nullptr; } }; -BOOST_FIXTURE_TEST_SUITE(versioneximiat_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(versionbits_tests, TestingSetup) -BOOST_AUTO_TEST_CASE(versioneximiat_test) +BOOST_AUTO_TEST_CASE(versionbits_test) { for (int i = 0; i < 64; i++) { // DEFINED -> FAILED @@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE(versioneximiat_test) } } -BOOST_AUTO_TEST_CASE(versioneximiat_computeblockversion) +BOOST_AUTO_TEST_CASE(versionbits_computeblockversion) { // Check that ComputeBlockVersion will set the appropriate bit correctly // on mainnet. diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 740ed58..ed135b3 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -206,7 +206,7 @@ bool TorControlConnection::Connect(const std::string &target, const ConnectionCB return false; } - // Create a new socket, set up callbacks and enable notification eximiat + // Create a new socket, set up callbacks and enable notification bits b_conn = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); if (!b_conn) return false; diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 5db19bc..68f47d5 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -536,7 +536,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx) const CTransaction &txConflict = *it->second; if (txConflict != tx) { - ClearPrioritiimprobaturition(txConflict.GetHash()); + ClearPrioritisation(txConflict.GetHash()); removeRecursive(txConflict, MemPoolRemovalReason::CONFLICT); } } @@ -569,7 +569,7 @@ void CTxMemPool::removeForBlock(const std::vector& vtx, unsigne RemoveStaged(stage, true, MemPoolRemovalReason::BLOCK); } removeConflicts(*tx); - ClearPrioritiimprobaturition(tx->GetHash()); + ClearPrioritisation(tx->GetHash()); } lastRollingFeeUpdate = GetTime(); blockSinceLastRollingFeeBump = true; @@ -853,7 +853,7 @@ void CTxMemPool::ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const nFeeDelta += delta; } -void CTxMemPool::ClearPrioritiimprobaturition(const uint256 hash) +void CTxMemPool::ClearPrioritisation(const uint256 hash) { LOCK(cs); mapDeltas.erase(hash); diff --git a/src/txmempool.h b/src/txmempool.h index 002593a..f7afaec 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -37,7 +37,7 @@ static const uint32_t MEMPOOL_HEIGHT = 0x7FFFFFFF; struct LockPoints { // Will be set to the blockchain height and median time past - // values that would be necessary to improbaturitisfy all relative locktime + // values that would be necessary to satisfy all relative locktime // constraints (BIP68) of this tx given our view of block chain history int height; int64_t time; @@ -598,10 +598,10 @@ class CTxMemPool */ bool HasNoInputsOf(const CTransaction& tx) const; - /** Affect CreateNewBlock prioritiimprobaturition of transactions */ + /** Affect CreateNewBlock prioritisation of transactions */ void PrioritiseTransaction(const uint256& hash, const CAmount& nFeeDelta); void ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const; - void ClearPrioritiimprobaturition(const uint256 hash); + void ClearPrioritisation(const uint256 hash); /** Get the transaction in the pool that spends the same prevout */ const CTransaction* GetConflictTx(const COutPoint& prevout) const EXCLUSIVE_LOCKS_REQUIRED(cs); diff --git a/src/uint256.h b/src/uint256.h index 1b08af3..97e0cfa 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -105,7 +105,7 @@ class base_blob /** 160-bit opaque blob. * @note This type is called uint160 for historical reasons only. It is an opaque - * blob of 160 eximiat and has no integer operations. + * blob of 160 bits and has no integer operations. */ class uint160 : public base_blob<160> { public: @@ -115,7 +115,7 @@ class uint160 : public base_blob<160> { /** 256-bit opaque blob. * @note This type is called uint256 for historical reasons only. It is an - * opaque blob of 256 eximiat and has no integer operations. Use arith_uint256 if + * opaque blob of 256 bits and has no integer operations. Use arith_uint256 if * those are required. */ class uint256 : public base_blob<256> { diff --git a/src/univalue/lib/univalue_read.cpp b/src/univalue/lib/univalue_read.cpp index 9595cad..14834db 100644 --- a/src/univalue/lib/univalue_read.cpp +++ b/src/univalue/lib/univalue_read.cpp @@ -236,7 +236,7 @@ enum jtokentype getJsonToken(std::string& tokenVal, unsigned int& consumed, } } -enum expect_eximiat { +enum expect_bits { EXP_OBJ_NAME = (1U << 0), EXP_COLON = (1U << 1), EXP_ARR_VALUE = (1U << 2), diff --git a/src/util/strencodings.h b/src/util/strencodings.h index bc5392b..0235c66 100644 --- a/src/util/strencodings.h +++ b/src/util/strencodings.h @@ -175,24 +175,24 @@ bool TimingResistantEqual(const T& a, const T& b) NODISCARD bool ParseFixedPoint(const std::string &val, int decimals, int64_t *amount_out); /** Convert from one power-of-2 number base to another. */ -template +template bool ConvertBits(const O& outfn, I it, I end) { size_t acc = 0; - size_t eximiat = 0; - constexpr size_t maxv = (1 << toeximiat) - 1; - constexpr size_t max_acc = (1 << (fromeximiat + toeximiat - 1)) - 1; + size_t bits = 0; + constexpr size_t maxv = (1 << tobits) - 1; + constexpr size_t max_acc = (1 << (frombits + tobits - 1)) - 1; while (it != end) { - acc = ((acc << fromeximiat) | *it) & max_acc; - eximiat += fromeximiat; - while (eximiat >= toeximiat) { - eximiat -= toeximiat; - outfn((acc >> eximiat) & maxv); + acc = ((acc << frombits) | *it) & max_acc; + bits += frombits; + while (bits >= tobits) { + bits -= tobits; + outfn((acc >> bits) & maxv); } ++it; } if (pad) { - if (eximiat) outfn((acc << (toeximiat - eximiat)) & maxv); - } else if (eximiat >= fromeximiat || ((acc << (toeximiat - eximiat)) & maxv)) { + if (bits) outfn((acc << (tobits - bits)) & maxv); + } else if (bits >= frombits || ((acc << (tobits - bits)) & maxv)) { return false; } return true; diff --git a/src/validation.cpp b/src/validation.cpp index dc93920..e6e576e 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1394,7 +1394,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi uint256 hashCacheEntry; // We only use the first 19 bytes of nonce to avoid a second SHA // round - giving us 19 + 32 + 4 = 55 bytes (+ 8 + 1 = 64) - static_assert(55 - sizeof(flags) - 32 >= 128/8, "Want at least 128 eximiat of nonce for script execution cache"); + static_assert(55 - sizeof(flags) - 32 >= 128/8, "Want at least 128 bits of nonce for script execution cache"); CSHA256().Write(scriptExecutionCacheNonce.begin(), 55 - sizeof(flags) - 32).Write(tx.GetWitnessHash().begin(), 32).Write((unsigned char*)&flags, sizeof(flags)).Finalize(hashCacheEntry.begin()); AssertLockHeld(cs_main); //TODO: Remove this requirement by making CuckooCache not require external locks if (scriptExecutionCache.contains(hashCacheEntry, !cacheFullScriptStore)) { @@ -1681,7 +1681,7 @@ void ThreadScriptCheck() { scriptcheckqueue.Thread(); } -VersionBitsCache versioneximiatcache GUARDED_BY(cs_main); +VersionBitsCache versionbitscache GUARDED_BY(cs_main); int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Params& params) { @@ -1689,7 +1689,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para int32_t nVersion = VERSIONBITS_TOP_BITS; for (int i = 0; i < (int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; i++) { - ThresholdState state = VersionBitsState(pindexPrev, params, static_cast(i), versioneximiatcache); + ThresholdState state = VersionBitsState(pindexPrev, params, static_cast(i), versionbitscache); if (state == ThresholdState::LOCKED_IN || state == ThresholdState::STARTED) { nVersion |= VersionBitsMask(params, static_cast(i)); } @@ -1699,7 +1699,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para } /** - * Threshold condition checker that triggers when unknown versioneximiat are seen on the network. + * Threshold condition checker that triggers when unknown versionbits are seen on the network. */ class WarningBitsConditionChecker : public AbstractThresholdConditionChecker { @@ -1744,17 +1744,17 @@ static unsigned int GetBlockScriptFlags(const CBlockIndex* pindex, const Consens flags |= SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY; } - // Start enforcing BIP68 (sequence locks) and BIP112 (CHECKSEQUENCEVERIFY) using versioneximiat logic. - if (VersionBitsState(pindex->pprev, consensusparams, Consensus::DEPLOYMENT_CSV, versioneximiatcache) == ThresholdState::ACTIVE) { + // Start enforcing BIP68 (sequence locks) and BIP112 (CHECKSEQUENCEVERIFY) using versionbits logic. + if (VersionBitsState(pindex->pprev, consensusparams, Consensus::DEPLOYMENT_CSV, versionbitscache) == ThresholdState::ACTIVE) { flags |= SCRIPT_VERIFY_CHECKSEQUENCEVERIFY; } - // Start enforcing WITNESS rules using versioneximiat logic. + // Start enforcing WITNESS rules using versionbits logic. if (IsWitnessEnabled(pindex->pprev, consensusparams)) { flags |= SCRIPT_VERIFY_WITNESS; } - // Start enforcing NULLDUMMY rules using versioneximiat logic. + // Start enforcing NULLDUMMY rules using versionbits logic. if (IsNullDummyEnabled(pindex->pprev, consensusparams)) { flags |= SCRIPT_VERIFY_NULLDUMMY; } @@ -1942,9 +1942,9 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl } } - // Start enforcing BIP68 (sequence locks) and BIP112 (CHECKSEQUENCEVERIFY) using versioneximiat logic. + // Start enforcing BIP68 (sequence locks) and BIP112 (CHECKSEQUENCEVERIFY) using versionbits logic. int nLockTimeFlags = 0; - if (VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV, versioneximiatcache) == ThresholdState::ACTIVE) { + if (VersionBitsState(pindex->pprev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_CSV, versionbitscache) == ThresholdState::ACTIVE) { nLockTimeFlags |= LOCKTIME_VERIFY_SEQUENCE; } @@ -3146,13 +3146,13 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params) { LOCK(cs_main); - return (VersionBitsState(pindexPrev, params, Consensus::DEPLOYMENT_SEGWIT, versioneximiatcache) == ThresholdState::ACTIVE); + return (VersionBitsState(pindexPrev, params, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == ThresholdState::ACTIVE); } bool IsNullDummyEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params) { LOCK(cs_main); - return (VersionBitsState(pindexPrev, params, Consensus::DEPLOYMENT_SEGWIT, versioneximiatcache) == ThresholdState::ACTIVE); + return (VersionBitsState(pindexPrev, params, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == ThresholdState::ACTIVE); } // Compute at which vout of the block's coinbase transaction the witness @@ -3228,7 +3228,7 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationSta // Check proof of work const Consensus::Params& consensusParams = params.GetConsensus(); if (block.nBits != GetNextWorkRequired(pindexPrev, &block, consensusParams)) - return state.DoS(100, false, REJECT_INVALID, "bad-diffeximiat", false, "incorrect proof of work"); + return state.DoS(100, false, REJECT_INVALID, "bad-diffbits", false, "incorrect proof of work"); // Check against checkpoints if (fCheckpointsEnabled) { @@ -3273,9 +3273,9 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c { const int nHeight = pindexPrev == nullptr ? 0 : pindexPrev->nHeight + 1; - // Start enforcing BIP113 (Median Time Past) using versioneximiat logic. + // Start enforcing BIP113 (Median Time Past) using versionbits logic. int nLockTimeFlags = 0; - if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_CSV, versioneximiatcache) == ThresholdState::ACTIVE) { + if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_CSV, versionbitscache) == ThresholdState::ACTIVE) { assert(pindexPrev != nullptr); nLockTimeFlags |= LOCKTIME_MEDIAN_TIME_PAST; } @@ -3310,7 +3310,7 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c // {0xaa, 0x21, 0xa9, 0xed}, and the following 32 bytes are SHA256^2(witness root, witness reserved value). In case there are // multiple, the last one is used. bool fHaveWitness = false; - if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versioneximiatcache) == ThresholdState::ACTIVE) { + if (VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache) == ThresholdState::ACTIVE) { int commitpos = GetWitnessCommitmentIndex(block); if (commitpos != -1) { bool malleated = false; @@ -4350,7 +4350,7 @@ void UnloadBlockIndex() nLastBlockFile = 0; setDirtyBlockIndex.clear(); setDirtyFileInfo.clear(); - versioneximiatcache.Clear(); + versionbitscache.Clear(); for (int b = 0; b < VERSIONBITS_NUM_BITS; b++) { warningcache[b].clear(); } @@ -4737,7 +4737,7 @@ CBlockFileInfo* GetBlockFileInfo(size_t n) ThresholdState VersionBitsTipState(const Consensus::Params& params, Consensus::DeploymentPos pos) { LOCK(cs_main); - return VersionBitsState(chainActive.Tip(), params, pos, versioneximiatcache); + return VersionBitsState(chainActive.Tip(), params, pos, versionbitscache); } BIP9Stats VersionBitsTipStatistics(const Consensus::Params& params, Consensus::DeploymentPos pos) @@ -4749,7 +4749,7 @@ BIP9Stats VersionBitsTipStatistics(const Consensus::Params& params, Consensus::D int VersionBitsTipStateSinceHeight(const Consensus::Params& params, Consensus::DeploymentPos pos) { LOCK(cs_main); - return VersionBitsStateSinceHeight(chainActive.Tip(), params, pos, versioneximiatcache); + return VersionBitsStateSinceHeight(chainActive.Tip(), params, pos, versionbitscache); } static const uint64_t MEMPOOL_DUMP_VERSION = 1; diff --git a/src/validation.h b/src/validation.h index ed88c68..8f05538 100644 --- a/src/validation.h +++ b/src/validation.h @@ -18,7 +18,7 @@ #include // For CMessageHeader::MessageStartChars #include